Skip to content

Commit

Permalink
новые эффекты
Browse files Browse the repository at this point in the history
  • Loading branch information
Darkness committed Sep 24, 2023
1 parent 1a8c4da commit 966c596
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 26 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
project.version = json["version"]!!

val mindustryVersion = json["minGameVersion"]
val usefulHash = "96f5ca2126"
val usefulHash = "32fc5f4d1c"

compileOnly("com.github.anuken.arc:arc-core:v$mindustryVersion")
compileOnly("com.github.anuken.mindustryjitpack:core:v$mindustryVersion") {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/darkdustry/PluginVars.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class PluginVars {
public static final int maxSpawnAmount = 25;

/** Максимальная длительность применяемого эффекта статуса. В секундах. */
public static final int maxEffectDuration = 5 * 60;
public static final int maxEffectDuration = 60 * 60;

/** Максимальная площадь для заливки. */
public static final int maxFillArea = 512;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/darkdustry/components/Console.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static void load() {

terminal.enterRawMode();

instance.serverInput = () -> {};
instance.serverInput = null;
System.setOut(new BlockingPrintStream(reader::printAbove));

handleInput(reader);
Expand Down
47 changes: 24 additions & 23 deletions src/main/java/darkdustry/features/menus/MenuHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import arc.func.*;
import arc.graphics.Color;
import arc.struct.Seq;
import arc.util.Tmp;
import darkdustry.components.Cache;
import darkdustry.utils.Admins;
import mindustry.content.Fx;
Expand Down Expand Up @@ -371,7 +372,7 @@ public enum EffectsPack implements OptionData {
scathe("Scathe",
player -> Effects.stack(player, Fx.scatheExplosion, Fx.scatheLight),
player -> Effects.stack(player, Fx.scatheExplosion, Fx.scatheLight),
player -> Effects.at(Fx.neoplasiaSmoke, player)
player -> Effects.at(Fx.artilleryTrailSmoke, player)
),

titan("Titan",
Expand Down Expand Up @@ -404,34 +405,40 @@ public enum EffectsPack implements OptionData {
player -> Effects.at(Fx.smeltsmoke, player, Color.red)
),

coreDust("Core Dust",
player -> Effects.rotatedPoly(Fx.coreLandDust, player, 6, 12f, -180f, 90f, Color.royal),
player -> Effects.rotatedPoly(Fx.coreLandDust, player, 6, 4f, -90f, 30f, Color.royal),
player -> Effects.at(Fx.shootLiquid, player, player.unit().rotation - 180f, Color.royal)
waterBubbles("Water Bubbles",
player -> Effects.rotatedPoly(Fx.coreLandDust, player, 6, 12f, -180f, 90f),
player -> Effects.rotatedPoly(Fx.coreLandDust, player, 6, 4f, -90f, 30f),
player -> Effects.at(Fx.bubble, player, 30f)
),

airBubbles("Air Bubbles",
player -> Effects.repeat(6, 60f, time -> Effects.at(Fx.missileTrailSmoke, Tmp.v1.set(60f, 0f).rotate(time * 60f).add(player))),
player -> Effects.repeat(6, 60f, time -> Effects.at(Fx.missileTrailSmoke, Tmp.v1.set(60f, 0f).rotate(time * 300f).add(player))),
player -> Effects.at(Fx.airBubble, player)
),

impactDrill("Impact Drill",
player -> Effects.stack(player, 120f, Fx.mineImpactWave, Fx.mineImpactWave, Fx.mineImpactWave, Fx.mineImpact),
player -> Effects.stack(player, 120f, Fx.mineImpactWave, Fx.mineImpactWave, Fx.mineImpactWave, Fx.mineImpact),
player -> Effects.at(Fx.mineSmall, player, Color.cyan)
player -> Effects.at(Fx.mine, player, Color.cyan)
),

greenLaser("Green Laser",
player -> Effects.at(Fx.greenBomb, player),
player -> Effects.at(Fx.greenLaserCharge, player),
player -> Effects.at(Fx.greenCloud, player)
),

thoriumReactor("Thorium reactor",
thoriumReactor("Thorium Reactor",
player -> Effects.at(Fx.reactorExplosion, player),
player -> Effects.at(Fx.reactorExplosion, player),
player -> Effects.at(Fx.shootSmokeSquareSparse, player, player.unit().rotation - 180f, Color.purple)
player -> Effects.at(Fx.shootSmokeSquare, player, player.unit().rotation - 180f, Pal.reactorPurple)
),

impactReactor("Impact reactor",
impactReactor("Impact Reactor",
player -> Effects.at(Fx.impactReactorExplosion, player),
player -> Effects.at(Fx.impactReactorExplosion, player),
player -> Effects.at(Fx.shootSmokeSquareSparse, player, player.unit().rotation - 180f, Color.gold)
),

greenLaser("Green Laser",
player -> Effects.at(Fx.greenBomb, player),
player -> Effects.at(Fx.greenLaserCharge, player),
player -> Effects.at(Fx.electrified, player)
player -> Effects.at(Fx.shootSmokeSquare, player, player.unit().rotation - 180f, Pal.lighterOrange)
),

suppressParticle("Suppress Particle",
Expand All @@ -443,13 +450,7 @@ public enum EffectsPack implements OptionData {
missileSmoke("Missile Smoke",
player -> Effects.rotatedPoly(Fx.shootSmokeMissile, player, 6, 6f, -180f, 50f),
player -> Effects.rotatedPoly(Fx.shootSmokeMissile, player, 6, 6f, 0f, 100f),
player -> Effects.at(Fx.shootSmokeDisperse, player, player.unit().rotation - 180)
),

coreLaunch("Core Launch",
player -> Effects.repeat(3, 30f, number -> Effects.at(Fx.coreLaunchConstruct, player, (number + 1) * 5f)),
player -> Effects.repeat(3, 30f, number -> Effects.at(Fx.coreLaunchConstruct, player, (3 - number) * 5f)),
player -> Effects.at(Fx.shootSmokeSquareBig, player, player.unit().rotation - 180, Color.acid)
player -> Effects.at(Fx.vapor, player)
),

none("effects.disabled", "effects.disable");
Expand Down

0 comments on commit 966c596

Please sign in to comment.