diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 45ce5af170..86e72b4f63 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -785,8 +785,6 @@ rules.unitdrops = Unit Drops rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier rules.unithealthmultiplier = Unit Health Multiplier rules.blockhealthmultiplier = Block Health Multiplier -rules.playerhealthmultiplier = Player Health Multiplier -rules.playerdamagemultiplier = Player Damage Multiplier rules.unitdamagemultiplier = Unit Damage Multiplier rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles) rules.wavespacing = Wave Spacing:[lightgray] (sec) @@ -796,12 +794,11 @@ rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier rules.waitForWaveToEnd = Waves Wait for Enemies rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles) rules.title.waves = Waves -rules.title.respawns = Respawns rules.title.resourcesbuilding = Resources & Building -rules.title.player = Players rules.title.enemy = Enemies rules.title.unit = Units rules.title.experimental = Experimental +rules.title.environment = Environment rules.lighting = Lighting rules.ambientlight = Ambient Light rules.solarpowermultiplier = Solar Power Multiplier diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index b039e94614..bf6fc3e21d 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -82,6 +82,8 @@ public abstract class BulletType extends Content{ public int lightning; public int lightningLength = 5; + /** Use a negative value to use default bullet damage. */ + public float lightningDamage = -1; public float weaveScale = 1f; public float weaveMag = -1f; @@ -136,7 +138,7 @@ public abstract class BulletType extends Content{ } for(int i = 0; i < lightning; i++){ - Lightning.create(b.team(), Pal.surge, damage, b.getX(), b.getY(), Mathf.random(360f), lightningLength); + Lightning.create(b.team(), Pal.surge, lightningDamage < 0 ? damage : lightningDamage, b.getX(), b.getY(), Mathf.random(360f), lightningLength); } } diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index 541c0ddbbc..168e6858e0 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -163,7 +163,7 @@ public class CustomRulesDialog extends BaseDialog{ check("$rules.enemyCheat", b -> rules.enemyCheat = b, () -> rules.enemyCheat); number("$rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200)); - title("$rules.title.experimental"); + title("$rules.title.environment"); number("$rules.solarpowermultiplier", f -> rules.solarPowerMultiplier = f, () -> rules.solarPowerMultiplier); check("$rules.lighting", b -> rules.lighting = b, () -> rules.lighting);