From f0a0b4cfc989ce9629de602f8fae4ce14f6664aa Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 6 Aug 2021 18:01:57 -0400
Subject: [PATCH] Fixed keyDown not registering at low FPS / Spectre bullet
 balance

---
 core/src/mindustry/content/Blocks.java               |  2 +-
 core/src/mindustry/content/Bullets.java              | 12 ++++++++----
 .../src/mindustry/ui/dialogs/SettingsMenuDialog.java |  2 +-
 gradle.properties                                    |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 03fed2dd61..0a19f9eee7 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -83,7 +83,7 @@ public class Blocks implements ContentList{
     commandCenter,
     groundFactory, airFactory, navalFactory,
     additiveReconstructor, multiplicativeReconstructor, exponentialReconstructor, tetrativeReconstructor,
-    repairPoint, repairTurret, resupplyPoint,
+    repairPoint, repairTurret,
 
     //payloads
     payloadConveyor, payloadRouter, payloadPropulsionTower,
diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java
index 560e34f6cd..612053ca51 100644
--- a/core/src/mindustry/content/Bullets.java
+++ b/core/src/mindustry/content/Bullets.java
@@ -342,11 +342,14 @@ public class Bullets implements ContentList{
             lifetime = 60f;
         }};
 
-        standardDenseBig = new BasicBulletType(7f, 55, "bullet"){{
-            hitSize = 5;
+        standardDenseBig = new BasicBulletType(7.5f, 50, "bullet"){{
+            hitSize = 4.8f;
             width = 15f;
             height = 21f;
             shootEffect = Fx.shootBig;
+            ammoMultiplier = 4;
+            reloadMultiplier = 1.7f;
+            knockback = 0.3f;
         }};
 
         standardThoriumBig = new BasicBulletType(8f, 80, "bullet"){{
@@ -359,7 +362,7 @@ public class Bullets implements ContentList{
             knockback = 0.7f;
         }};
 
-        standardIncendiaryBig = new BasicBulletType(7f, 60, "bullet"){{
+        standardIncendiaryBig = new BasicBulletType(7f, 70, "bullet"){{
             hitSize = 5;
             width = 16f;
             height = 21f;
@@ -370,7 +373,8 @@ public class Bullets implements ContentList{
             makeFire = true;
             pierceCap = 2;
             pierceBuilding = true;
-            knockback = 0.7f;            
+            knockback = 0.7f;
+            ammoMultiplier = 3;
         }};
 
         fireball = new BulletType(1f, 4){
diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
index 10f399bbe2..8efa0f740e 100644
--- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -356,7 +356,7 @@ public class SettingsMenuDialog extends Dialog{
         });
 
         graphics.sliderPref("screenshake", 4, 0, 8, i -> (i / 4f) + "x");
-        graphics.sliderPref("fpscap", 240, 15, 245, 5, s -> (s > 240 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s)));
+        graphics.sliderPref("fpscap", 240, 10, 245, 5, s -> (s > 240 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s)));
         graphics.sliderPref("chatopacity", 100, 0, 100, 5, s -> s + "%");
         graphics.sliderPref("lasersopacity", 100, 0, 100, 5, s -> {
             if(ui.settings != null){
diff --git a/gradle.properties b/gradle.properties
index 8595a5a09d..fb533c1a2f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,4 +8,4 @@ kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
 #needed for android compilation
 android.useAndroidX=true
-archash=68277c42b4883e5fcb01dfa20fd27a5434ace891
+archash=e226c78ba913d348c97430e453f038e824c06bcb