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

Misc ammo balancing

Browse Source
This commit is contained in:
Anuken
2021-08-07 17:37:55 -04:00
parent 71c4f27d60
commit 644d00b268
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,6 +113,7 @@ public class Bullets implements ContentList{
splashDamageRadius = 25f * 0.75f; splashDamageRadius = 25f * 0.75f;
splashDamage = 35f; splashDamage = 35f;
status = StatusEffects.burning; status = StatusEffects.burning;
statusDuration = 60f * 12f;
frontColor = Pal.lightishOrange; frontColor = Pal.lightishOrange;
backColor = Pal.lightOrange; backColor = Pal.lightOrange;
makeFire = true; makeFire = true;
@@ -132,7 +133,6 @@ public class Bullets implements ContentList{
frontColor = Pal.missileYellow; frontColor = Pal.missileYellow;
status = StatusEffects.blasted; status = StatusEffects.blasted;
statusDuration = 60f;
}}; }};
flakGlassFrag = new BasicBulletType(3f, 5, "bullet"){{ flakGlassFrag = new BasicBulletType(3f, 5, "bullet"){{
@@ -177,7 +177,7 @@ public class Bullets implements ContentList{
width = 6f; width = 6f;
height = 8f; height = 8f;
hitEffect = Fx.flakExplosion; hitEffect = Fx.flakExplosion;
splashDamage = 22f * 1.5f; splashDamage = 25f * 1.5f;
splashDamageRadius = 20f; splashDamageRadius = 20f;
fragBullet = flakGlassFrag; fragBullet = flakGlassFrag;
fragBullets = 6; fragBullets = 6;
@@ -432,13 +432,13 @@ public class Bullets implements ContentList{
hittable = false; hittable = false;
}}; }};
pyraFlame = new BulletType(3.35f, 25f){{ pyraFlame = new BulletType(4f, 45f){{
ammoMultiplier = 4f; ammoMultiplier = 6f;
hitSize = 7f; hitSize = 7f;
lifetime = 18f; lifetime = 18f;
pierce = true; pierce = true;
collidesAir = false; collidesAir = false;
statusDuration = 60f * 6; statusDuration = 60f * 10;
shootEffect = Fx.shootPyraFlame; shootEffect = Fx.shootPyraFlame;
hitEffect = Fx.hitFlameSmall; hitEffect = Fx.hitFlameSmall;
despawnEffect = Fx.none; despawnEffect = Fx.none;

2
core/src/mindustry/input/DesktopInput.java
View File

@@ -43,7 +43,7 @@ public class DesktopInput extends InputHandler{
/** Whether player is currently deleting removal requests. */ /** Whether player is currently deleting removal requests. */
public boolean deleting = false, shouldShoot = false, panning = false; public boolean deleting = false, shouldShoot = false, panning = false;
/** Mouse pan speed. */ /** 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. */ /** Delta time between consecutive clicks. */
public long selectMillis = 0; public long selectMillis = 0;
/** Previously selected tile. */ /** Previously selected tile. */