Merge pull request #2 from CN-ARC/master

增强死星和爬，略削弱蜂群和齐射伤害，回调雷光的高射速机制。削弱兵种修复能力
way-zer · Feb 15, 2022 · 1258f08 · 1258f08
2 parents 14af604 + fe3e8ab
commit 1258f08
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 63 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 ### JetBrains template
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
+*.class
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml

diff --git a/contents/flood/src/mindustry/content/flood/Blocks.java b/contents/flood/src/mindustry/content/flood/Blocks.java
@@ -1413,8 +1413,8 @@ public void load(){
         duo = new ItemTurret("duo"){{
             requirements(Category.turret, with(Items.copper, 35), true);
             ammo(
-            Items.copper, Bullets.standardDense,
-            Items.graphite, Bullets.standardThorium,
+            Items.copper, Bullets.standardCopper,
+            Items.graphite, Bullets.standardDense,
             Items.pyratite, Bullets.standardIncendiary,
             Items.silicon, Bullets.standardHoming
             );
@@ -1516,12 +1516,12 @@ public void load(){
 
         lancer = new PowerTurret("lancer"){{
             requirements(Category.turret, with(Items.copper, 60, Items.lead, 70, Items.silicon, 50));
-            range = 90f;
+            range = 180f;
             chargeTime = 40f;
             chargeMaxDelay = 30f;
             chargeEffects = 7;
             recoilAmount = 2f;
-            reloadTime = 80f;
+            reloadTime = 160f;
             cooldown = 0.03f;
             powerUse = 6f;
             shootShake = 2f;
@@ -1592,7 +1592,7 @@ public void load(){
                 Items.pyratite, Bullets.missileIncendiary,
                 Items.surgeAlloy, Bullets.missileSurge
             );
-            reloadTime = 30f;
+            reloadTime = 25f;
             shots = 5;
             burstSpacing = 4;
             inaccuracy = 10f;
@@ -1617,7 +1617,7 @@ public void load(){
 
             size = 2;
             range = 230f;
-            reloadTime = 20f;
+            reloadTime = 30f;
             restitution = 0.03f;
             ammoEjectBack = 3f;
             cooldown = 0.03f;
@@ -1655,6 +1655,7 @@ public void load(){
                 Liquids.oil, Bullets.heavyOilShot
             );
             size = 3;
+            recoilAmount = 0f;
             reloadTime = 2f;
             shots = 2;
             velocityInaccuracy = 0.1f;
@@ -1670,9 +1671,9 @@ public void load(){
         }};
 
         fuse = new ItemTurret("fuse"){{
-            requirements(Category.turret, with(Items.copper, 455, Items.graphite, 275, Items.thorium, 150));
+            requirements(Category.turret, with(Items.copper, 225, Items.graphite, 225, Items.thorium, 100));
 
-            reloadTime = 180f;
+            reloadTime = 20f;
             shootShake = 4f;
             range = 90f;
             recoilAmount = 5f;
@@ -1688,20 +1689,20 @@ public void load(){
             float brange = range + 10f;
 
             ammo(
-            Items.titanium, new ShrapnelBulletType(){{
-                length = brange;
-                damage = 85f;
-                ammoMultiplier = 2f;
-                width = 17f;
-                reloadMultiplier = 1.5f;
-            }},
-            Items.thorium, new ShrapnelBulletType(){{
-                length = brange;
-                damage = 150f;
-                ammoMultiplier = 1f;
-                toColor = Pal.thoriumPink;
-                shootEffect = smokeEffect = Fx.thoriumShoot;
-            }}
+                Items.titanium, new ShrapnelBulletType(){{
+                    length = brange;
+                    damage = 10f;
+                    ammoMultiplier = 2f;
+                    width = 17f;
+                    reloadMultiplier = 1.3f;
+                }},
+                Items.thorium, new ShrapnelBulletType(){{
+                    length = brange;
+                    damage = 25f;
+                    ammoMultiplier = 2f;
+                    toColor = Pal.thoriumPink;
+                    shootEffect = smokeEffect = Fx.thoriumShoot;
+                }}
             );
         }};
 

diff --git a/contents/flood/src/mindustry/content/flood/Bullets.java b/contents/flood/src/mindustry/content/flood/Bullets.java
@@ -256,21 +256,21 @@ public void load(){
             status = StatusEffects.burning;
         }};
 
-        missileSurge = new MissileBulletType(3.7f, 100){{
+        missileSurge = new MissileBulletType(3.7f, 60){{
             width = 8f;
             height = 8f;
             shrinkY = 0f;
             splashDamageRadius = 25f;
-            splashDamage = 50f * 1.4f;
+            splashDamage = 40f * 1.4f;
             hitEffect = Fx.blastExplosion;
             despawnEffect = Fx.blastExplosion;
             ammoMultiplier = 3f;
-            lightningDamage = 60;
+            lightningDamage = 40;
             lightning = 2;
-            lightningLength = 25;
+            lightningLength = 20;
         }};
 
-        standardCopper = new BasicBulletType(2.5f, 40){{
+        standardCopper = new BasicBulletType(2.5f, 35){{
             width = 7f;
             height = 9f;
             lifetime = 60f;
@@ -279,15 +279,15 @@ public void load(){
             ammoMultiplier = 5;
         }};
 
-        standardDense = new BasicBulletType(3.5f, 60){{
+        standardDense = new BasicBulletType(3.5f, 50){{
             width = 9f;
             height = 12f;
             reloadMultiplier = 0.6f;
             ammoMultiplier = 6;
             lifetime = 60f;
         }};
 
-        standardThorium = new BasicBulletType(4f, 80, "bullet"){{
+        standardThorium = new BasicBulletType(4f, 60, "bullet"){{
             width = 10f;
             height = 13f;
             shootEffect = Fx.shootBig;
@@ -298,7 +298,7 @@ public void load(){
             lifetime = 60f;
         }};
 
-        standardHoming = new BasicBulletType(3f, 55, "bullet"){{
+        standardHoming = new BasicBulletType(3f, 50, "bullet"){{
             width = 7f;
             height = 9f;
             homingPower = 0.1f;
@@ -307,7 +307,7 @@ public void load(){
             lifetime = 60f;
         }};
 
-        standardIncendiary = new BasicBulletType(3.2f, 60, "bullet"){{
+        standardIncendiary = new BasicBulletType(3.2f, 55, "bullet"){{
             width = 10f;
             height = 12f;
             frontColor = Pal.lightishOrange;