Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed keyDown not registering at low FPS / Spectre bullet balance

Browse Source
This commit is contained in:
Anuken
2021-08-06 18:01:57 -04:00
parent b80129e17b
commit f0a0b4cfc9
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/Blocks.java
View File

@@ -83,7 +83,7 @@ public class Blocks implements ContentList{
commandCenter, commandCenter,
groundFactory, airFactory, navalFactory, groundFactory, airFactory, navalFactory,
additiveReconstructor, multiplicativeReconstructor, exponentialReconstructor, tetrativeReconstructor, additiveReconstructor, multiplicativeReconstructor, exponentialReconstructor, tetrativeReconstructor,
repairPoint, repairTurret, resupplyPoint, repairPoint, repairTurret,
//payloads //payloads
payloadConveyor, payloadRouter, payloadPropulsionTower, payloadConveyor, payloadRouter, payloadPropulsionTower,

10
core/src/mindustry/content/Bullets.java
View File

@@ -342,11 +342,14 @@ public class Bullets implements ContentList{
lifetime = 60f; lifetime = 60f;
}}; }};
standardDenseBig = new BasicBulletType(7f, 55, "bullet"){{ standardDenseBig = new BasicBulletType(7.5f, 50, "bullet"){{
hitSize = 5; hitSize = 4.8f;
width = 15f; width = 15f;
height = 21f; height = 21f;
shootEffect = Fx.shootBig; shootEffect = Fx.shootBig;
ammoMultiplier = 4;
reloadMultiplier = 1.7f;
knockback = 0.3f;
}}; }};
standardThoriumBig = new BasicBulletType(8f, 80, "bullet"){{ standardThoriumBig = new BasicBulletType(8f, 80, "bullet"){{
@@ -359,7 +362,7 @@ public class Bullets implements ContentList{
knockback = 0.7f; knockback = 0.7f;
}}; }};
standardIncendiaryBig = new BasicBulletType(7f, 60, "bullet"){{ standardIncendiaryBig = new BasicBulletType(7f, 70, "bullet"){{
hitSize = 5; hitSize = 5;
width = 16f; width = 16f;
height = 21f; height = 21f;
@@ -371,6 +374,7 @@ public class Bullets implements ContentList{
pierceCap = 2; pierceCap = 2;
pierceBuilding = true; pierceBuilding = true;
knockback = 0.7f; knockback = 0.7f;
ammoMultiplier = 3;
}}; }};
fireball = new BulletType(1f, 4){ fireball = new BulletType(1f, 4){

2
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -356,7 +356,7 @@ public class SettingsMenuDialog extends Dialog{
}); });
graphics.sliderPref("screenshake", 4, 0, 8, i -> (i / 4f) + "x"); 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("chatopacity", 100, 0, 100, 5, s -> s + "%");
graphics.sliderPref("lasersopacity", 100, 0, 100, 5, s -> { graphics.sliderPref("lasersopacity", 100, 0, 100, 5, s -> {
if(ui.settings != null){ if(ui.settings != null){

2
gradle.properties
View File

@@ -8,4 +8,4 @@ kapt.include.compile.classpath=false
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false
#needed for android compilation #needed for android compilation
android.useAndroidX=true android.useAndroidX=true
archash=68277c42b4883e5fcb01dfa20fd27a5434ace891 archash=e226c78ba913d348c97430e453f038e824c06bcb