Merge pull request #22 from CN-ARC/master

4/4|4/5平衡总结这段时间的游戏体验和反馈，调整属性
way-zer · Apr 4, 2022 · ac43f22 · ac43f22
2 parents ec159ca + 1f14bba
commit ac43f22
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 59 deletions.
diff --git a/contents/flood/src/mindustry/content/flood/Blocks.java b/contents/flood/src/mindustry/content/flood/Blocks.java
@@ -1550,17 +1550,17 @@ public void load(){
         arc = new PowerTurret("arc"){{
             requirements(Category.turret, with(Items.copper, 50, Items.lead, 50));
             shootType = new LightningBulletType(){{
-                damage = 4;
-                lightningLength = 15;
+                damage = 25;
+                lightningLength = 5;
                 collidesAir = false;
                 ammoMultiplier = 1f;
             }};
-            reloadTime = 35f;
+            reloadTime = 60f;
             shootCone = 40f;
             rotateSpeed = 8f;
             powerUse = 3.3f;
             targetAir = false;
-            range = 90f;
+            range = 30f;
             shootEffect = Fx.lightningShoot;
             heatColor = Color.red;
             recoilAmount = 1f;
@@ -1615,7 +1615,7 @@ public void load(){
             );
 
             size = 2;
-            range = 230f;
+            range = 200f;
             reloadTime = 30f;
             restitution = 0.03f;
             ammoEjectBack = 3f;
@@ -1691,14 +1691,14 @@ public void load(){
                 Items.titanium, new ShrapnelBulletType(){{
                     length = brange;
                     damage = 200f;
-                    ammoMultiplier = 2f;
+                    ammoMultiplier = 1f;
                     width = 17f;
                     reloadMultiplier = 1.5f;
                 }},
                 Items.thorium, new ShrapnelBulletType(){{
                     length = brange;
                     damage = 500f;
-                    ammoMultiplier = 2f;
+                    ammoMultiplier = 1f;
                     toColor = Pal.thoriumPink;
                     shootEffect = smokeEffect = Fx.thoriumShoot;
                 }}
@@ -1763,29 +1763,17 @@ Items.thorium, new ShrapnelBulletType(){{
             requirements(Category.turret, with(Items.copper, 1000, Items.metaglass, 600, Items.surgeAlloy, 300, Items.plastanium, 200, Items.silicon, 600));
 
             ammo(
-                    Items.surgeAlloy, new LaserBulletType(){{
-                        length = 460f;
-                        damage = 560f;
-                        width = 75f;
-
-                        lifetime = 65f;
-
-                        lightningSpacing = 35f;
-                        lightningLength = 5;
-                        lightningDelay = 1.1f;
-                        lightningLengthRand = 15;
-                        lightningDamage = 50;
-                        lightningAngleRand = 40f;
-                        largeHit = true;
-                        lightColor = lightningColor = Pal.heal;
-
-                        shootEffect = Fx.greenLaserCharge;
-
-                        sideAngle = 15f;
-                        sideWidth = 0f;
-                        sideLength = 0f;
-                        colors = new Color[]{Pal.heal.cpy().a(0.4f), Pal.heal, Color.white};
-                    }}
+                    Items.surgeAlloy, new RailBulletType(){{
+                shootEffect = Fx.railShoot;
+                length = 500f;
+                updateEffectSeg = 60f;
+                pierceEffect = Fx.railHit;
+                updateEffect = Fx.railTrail;
+                hitEffect = Fx.massiveExplosion;
+                smokeEffect = Fx.shootBig2;
+                damage = 2000;
+                pierceDamageFactor = 0.33f;
+                }}
             );
 
             maxAmmo = 60;

diff --git a/contents/flood/src/mindustry/content/flood/Bullets.java b/contents/flood/src/mindustry/content/flood/Bullets.java
@@ -265,9 +265,9 @@ public void load(){
             hitEffect = Fx.blastExplosion;
             despawnEffect = Fx.blastExplosion;
             ammoMultiplier = 3f;
-            lightningDamage = 40;
+            lightningDamage = 60;
             lightning = 2;
-            lightningLength = 20;
+            lightningLength = 13;
         }};
 
         standardCopper = new BasicBulletType(2.5f, 35){{
@@ -292,7 +292,7 @@ public void load(){
             height = 13f;
             shootEffect = Fx.shootBig;
             smokeEffect = Fx.shootBigSmoke;
-            ammoMultiplier = 6;
+            ammoMultiplier = 5;
             pierceCap = 2;
             pierceBuilding = true;
             lifetime = 60f;
@@ -328,25 +328,26 @@ public void load(){
             hitSize = 4.8f;
             width = 15f;
             height = 21f;
-            pierceCap = 6;
+            pierceCap = 5;
             pierceBuilding = true;
             shootEffect = Fx.shootBig;
             ammoMultiplier = 4;
             reloadMultiplier = 1.7f;
             knockback = 0.3f;
         }};
 
-        standardThoriumBig = new BasicBulletType(8f, 50, "bullet"){{
+        standardThoriumBig = new BasicBulletType(8f, 60, "bullet"){{
             hitSize = 5;
             width = 16f;
             height = 23f;
             shootEffect = Fx.shootBig;
             pierceCap = 8;
             pierceBuilding = true;
             knockback = 0.7f;
+            ammoMultiplier = 3;
         }};
 
-        standardIncendiaryBig = new BasicBulletType(7f, 1, "bullet"){{
+        standardIncendiaryBig = new BasicBulletType(7f, 25, "bullet"){{
             width = 16f;
             height = 21f;
             frontColor = Pal.lightishOrange;
@@ -355,11 +356,11 @@ public void load(){
             hitEffect = new MultiEffect(Fx.hitBulletSmall, Fx.fireHit);
             shootEffect = Fx.shootBig;
             makeFire = true;
-            pierceCap = 16;
+            pierceCap = 5;
             pierceBuilding = true;
             knockback = 0.6f;
             ammoMultiplier = 3;
-            splashDamage = 15f;
+            splashDamage = 35f;
             splashDamageRadius = 24f;
         }};
 
@@ -414,7 +415,7 @@ public void load(){
         }};
 
         heavyWaterShot = new LiquidBulletType(Liquids.water){{
-            lifetime = 49f;
+            lifetime = 65f;
             speed = 4f;
             knockback = 1.7f;
             puddleSize = 8f;
@@ -426,7 +427,7 @@ public void load(){
         }};
 
         heavyCryoShot = new LiquidBulletType(Liquids.cryofluid){{
-            lifetime = 49f;
+            lifetime = 65f;
             speed = 4f;
             knockback = 1.3f;
             puddleSize = 8f;
@@ -438,7 +439,7 @@ public void load(){
         }};
 
         heavySlagShot = new LiquidBulletType(Liquids.slag){{
-            lifetime = 49f;
+            lifetime = 65f;
             speed = 4f;
             knockback = 1.3f;
             puddleSize = 16f;
@@ -450,7 +451,7 @@ public void load(){
         }};
 
         heavyOilShot = new LiquidBulletType(Liquids.oil){{
-            lifetime = 49f;
+            lifetime = 65f;
             speed = 4f;
             knockback = 1.3f;
             puddleSize = 16f;

diff --git a/contents/flood/src/mindustry/content/flood/UnitTypes.java b/contents/flood/src/mindustry/content/flood/UnitTypes.java
@@ -113,9 +113,9 @@ public void load(){
         }};
 
         scepter = new UnitType("scepter"){{
-            speed = 0.45f;
+            speed = 0.55f;
             hitSize = 22f;
-            rotateSpeed = 2.1f;
+            rotateSpeed = 2.3f;
             health = 9000;
             armor = 10f;
             mechFrontSway = 1f;
@@ -146,11 +146,11 @@ public void load(){
                     height = 20f;
                     lifetime = 25f;
                     shootEffect = Fx.shootBig;
-                    lightning = 4;
+                    lightning = 2;
                     lightningLength = 15;
                     lightningColor = Pal.surge;
                     //standard bullet damage is far too much for lightning
-                    lightningDamage = 40;
+                    lightningDamage = 80;
                 }};
             }},
 
@@ -175,9 +175,9 @@ public void load(){
         }};
 
         reign = new UnitType("reign"){{
-            speed = 0.45f;
+            speed = 0.5f;
             hitSize = 26f;
-            rotateSpeed = 1.65f;
+            rotateSpeed = 2f;
             health = 24000;
             armor = 14f;
             mechStepParticles = true;
@@ -199,7 +199,7 @@ public void load(){
                 ejectEffect = Fx.casing4;
                 shootSound = Sounds.bang;
 
-                bullet = new BasicBulletType(13f, 150){{
+                bullet = new BasicBulletType(13f, 175){{
                     pierce = true;
                     pierceCap = 20;
                     width = 14f;
@@ -1343,7 +1343,7 @@ public void load(){
             new Weapon(){{
                 x = y = 0f;
                 mirror = false;
-                reload = 900f;
+                reload = 600f;
                 minShootVelocity = 0.01f;
 
                 soundPitchMin = 1f;
@@ -1491,7 +1491,7 @@ public void load(){
                 inaccuracy = 8f;
                 ejectEffect = Fx.casing1;
                 shootSound = Sounds.shoot;
-                bullet = Bullets.flakLead;
+                bullet = Bullets.fragGlassFrag;
             }});
 
             weapons.add(new Weapon("artillery-mount"){{
@@ -1652,7 +1652,7 @@ public void load(){
                 xRand = 8f;
                 shotDelay = 1f;
 
-                bullet = new MissileBulletType(4.2f, 42){{
+                bullet = new MissileBulletType(4.2f, 56){{
                     homingPower = 0.12f;
                     width = 8f;
                     height = 8f;
@@ -1690,7 +1690,7 @@ public void load(){
                 shots = 3;
                 shotDelay = 4f;
                 inaccuracy = 1f;
-                bullet = new BasicBulletType(7f, 57){{
+                bullet = new BasicBulletType(7f, 75){{
                     width = 13f;
                     height = 19f;
                     shootEffect = Fx.shootBig;
@@ -1738,14 +1738,14 @@ public void load(){
 
                 bullet = new RailBulletType(){{
                     shootEffect = Fx.railShoot;
-                    length = 500;
+                    length = 500f;
                     updateEffectSeg = 60f;
                     pierceEffect = Fx.railHit;
                     updateEffect = Fx.railTrail;
                     hitEffect = Fx.massiveExplosion;
                     smokeEffect = Fx.shootBig2;
-                    damage = 4000;
-                    pierceDamageFactor = 0.9f;
+                    damage = 2000;
+                    pierceDamageFactor = 0.2f;
                 }};
             }});
         }};
@@ -1908,7 +1908,7 @@ public void load(){
                 bullet = new BulletType(){{
                     shootEffect = Fx.sparkShoot;
                     hitEffect = Fx.pointHit;
-                    maxRange = 100f;
+                    maxRange = 150f;
                     damage = 17f;
                 }};
             }});
@@ -2073,7 +2073,7 @@ public void load(){
 
             buildSpeed = 3f;
 
-            abilities.add(new EnergyFieldAbility(50f, 65f, 180f){{
+            abilities.add(new EnergyFieldAbility(100f, 65f, 180f){{
                 statusDuration = 60f * 6f;
                 maxTargets = 25;
             }});
@@ -2089,7 +2089,7 @@ public void load(){
                     bullet = new BulletType(){{
                         shootEffect = Fx.sparkShoot;
                         hitEffect = Fx.pointHit;
-                        maxRange = 180f;
+                        maxRange = 240f;
                         damage = 24f;
                     }};
                 }});