Skip to content

Commit

Permalink
i cant anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
Otamamori917 committed Oct 14, 2024
1 parent 9a2fa7b commit 7c419a8
Show file tree
Hide file tree
Showing 25 changed files with 229 additions and 39 deletions.
2 changes: 2 additions & 0 deletions assets/bundles/bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,7 @@ status.aj-precludedX.name = Precluded X
status.aj-precludedX.description = Redirect all unit energy to attacking.
status.aj-precludedA.name = Precluded A
status.aj-precludedA.description = Redirect all unit energy to building and movement.
status.aj-gravical-slow.name = Gravitational Slowness
status.aj-gravical-slow.description = Resonating Gravitational waves slow you down


Binary file added assets/sounds/pandemonium-minigame-theme.ogg
Binary file not shown.
Binary file added assets/sounds/pandemonium-moving.ogg
Binary file not shown.
Binary file added assets/sounds/pandemonium-screaming.ogg
Binary file not shown.
Binary file added assets/sprites/misc/white-line.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/statuseffects/gravical-slow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/units/Misc/pnadi/pandemonium-dim.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/units/Misc/pnadi/pandemonium-eyes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/units/Misc/pnadi/pandemonium.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/axthrix/AxthrixLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,10 @@ public void loadContent(){
Log.info("Loading Axthrix content");
StackWorldState.load();
MountWorldState.load();
DroneWorldState.load();
//DroneWorldState.load();
AxFactions.load();
AxStats.load();
AxthrixSounds.LoadSounds();
//AxItems.load();
AxthrixStatus.load();
//AxLiquids.load();
Expand Down
22 changes: 22 additions & 0 deletions src/axthrix/content/AxthrixSounds.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package axthrix.content;

import arc.audio.Sound;
import arc.struct.Seq;

import static mindustry.Vars.*;

public class AxthrixSounds {
static Sound
PandemoniumMoving = new Sound(),
PandemoniumScreaming = new Sound(),
PandemoniumMinigameTheme = new Sound()

;

public static void LoadSounds(){
//Note: Vars.tree.loadSound only works with .mp3 and .ogg
PandemoniumMoving = tree.loadSound("pandemonium-moving");
PandemoniumScreaming = tree.loadSound("pandemonium-screaming");
PandemoniumMinigameTheme = tree.loadSound("pandemonium-minigame-theme");
}
}
52 changes: 50 additions & 2 deletions src/axthrix/content/AxthrixStatus.java
Original file line number Diff line number Diff line change
@@ -1,21 +1,39 @@
package axthrix.content;

import arc.Core;
import arc.Events;
import arc.graphics.Color;
import arc.util.Log;
import arc.util.Time;
import axthrix.content.FX.AxthrixFfx;
import axthrix.content.FX.AxthrixFx;
import axthrix.world.types.abilities.ChainHealAbility;
import axthrix.world.types.statuseffects.*;
import mindustry.entities.abilities.ArmorPlateAbility;
import mindustry.game.EventType;
import mindustry.gen.Unit;
import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.content.*;
import mindustry.ui.dialogs.BaseDialog;
import mindustry.world.meta.Stat;

import java.util.HashMap;

import static axthrix.content.AxthrixSounds.PandemoniumMinigameTheme;

public class AxthrixStatus {
public static StatusEffect vindicationI, vindicationII, vindicationIII, nanodiverge, precludedX, precludedA, repent, finalStand,excert,chainExcert,slivered,unrepair,grayRepair,repair,gravicalSlow,
public static StatusEffect
vindicationI, vindicationII, vindicationIII, nanodiverge,
precludedX, precludedA,
repent,
finalStand,
excert,chainExcert,
slivered,
unrepair,grayRepair,repair,
gravicalSlow,
minigame,


//visual statuses
standFx,bFx
Expand Down Expand Up @@ -79,7 +97,7 @@ public static void load(){
}};
gravicalSlow = new StackStatusEffect("gravical-slow"){{
color = Color.purple;
speedMultiplier = .98f;
speedMultiplier = buildSpeedMultiplier = .985f;
charges = 50;
}};

Expand Down Expand Up @@ -144,6 +162,36 @@ public void setStats(){
opposite(precludedX);
});
}};
minigame = new StatusEffect("minigame"){

@Override
public void update(Unit unit, float time){
if(!unit.isPlayer()){
unit.health = 0;
unit.unapply(this);
} else {
BaseDialog dialog = new BaseDialog(Core.bundle.get("menu.aj-minigame.title"));
dialog.cont.add(Core.bundle.get("menu.aj-minigame.message")).row();
dialog.cont.image(Core.atlas.find("aj-white-line")).row();
dialog.cont.image(Core.atlas.find("aj-safe-circle")).pad(16f).row();
Log.info(time);
if (!dialog.isShown() && time >= 570){
dialog.show();
PandemoniumMinigameTheme.at(dialog.x,dialog.y, 1.5f);
}
if(time <= -4290){
dialog.hide();
unit.unapply(this);
}
}
}
{
color = Color.black;
speedMultiplier = 0f;
buildSpeedMultiplier = 0f;
reloadMultiplier = 0f;
permanent = true;
}};

repent = new StackStatusEffect("repent"){{
color = Color.yellow;
Expand Down
Loading

0 comments on commit 7c419a8

Please sign in to comment.