From 644d00b268dcd4b67051714275fc9ab5469c66a1 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 7 Aug 2021 17:37:55 -0400
Subject: [PATCH] Misc ammo balancing

---
 core/src/mindustry/content/Bullets.java    | 10 +++++-----
 core/src/mindustry/input/DesktopInput.java |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java
index 612053ca51..600bf4fddf 100644
--- a/core/src/mindustry/content/Bullets.java
+++ b/core/src/mindustry/content/Bullets.java
@@ -113,6 +113,7 @@ public class Bullets implements ContentList{
             splashDamageRadius = 25f * 0.75f;
             splashDamage = 35f;
             status = StatusEffects.burning;
+            statusDuration = 60f * 12f;
             frontColor = Pal.lightishOrange;
             backColor = Pal.lightOrange;
             makeFire = true;
@@ -132,7 +133,6 @@ public class Bullets implements ContentList{
             frontColor = Pal.missileYellow;
 
             status = StatusEffects.blasted;
-            statusDuration = 60f;
         }};
 
         flakGlassFrag = new BasicBulletType(3f, 5, "bullet"){{
@@ -177,7 +177,7 @@ public class Bullets implements ContentList{
             width = 6f;
             height = 8f;
             hitEffect = Fx.flakExplosion;
-            splashDamage = 22f * 1.5f;
+            splashDamage = 25f * 1.5f;
             splashDamageRadius = 20f;
             fragBullet = flakGlassFrag;
             fragBullets = 6;
@@ -432,13 +432,13 @@ public class Bullets implements ContentList{
             hittable = false;
         }};
 
-        pyraFlame = new BulletType(3.35f, 25f){{
-            ammoMultiplier = 4f;
+        pyraFlame = new BulletType(4f, 45f){{
+            ammoMultiplier = 6f;
             hitSize = 7f;
             lifetime = 18f;
             pierce = true;
             collidesAir = false;
-            statusDuration = 60f * 6;
+            statusDuration = 60f * 10;
             shootEffect = Fx.shootPyraFlame;
             hitEffect = Fx.hitFlameSmall;
             despawnEffect = Fx.none;
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index c2d61af046..efe122e893 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -43,7 +43,7 @@ public class DesktopInput extends InputHandler{
     /** Whether player is currently deleting removal requests. */
     public boolean deleting = false, shouldShoot = false, panning = false;
     /** Mouse pan speed. */
-    public float panScale = 0.005f, panSpeed = 4.5f, panBoostSpeed = 11f;
+    public float panScale = 0.005f, panSpeed = 4.5f, panBoostSpeed = 15f;
     /** Delta time between consecutive clicks. */
     public long selectMillis = 0;
     /** Previously selected tile. */