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

Minor Conquer buff

Browse Source
This commit is contained in:
Anuken
2023-02-15 10:34:52 -05:00
parent 460dbff7d1
commit d457901d2e
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/mindustry/content/UnitTypes.java
View File

@@ -2751,7 +2751,7 @@ public class UnitTypes{
weapons.add(new Weapon("conquer-weapon"){{ weapons.add(new Weapon("conquer-weapon"){{
shootSound = Sounds.largeCannon; shootSound = Sounds.largeCannon;
layerOffset = 0.1f; layerOffset = 0.1f;
reload = 110f; reload = 100f;
shootY = 32.5f; shootY = 32.5f;
shake = 5f; shake = 5f;
recoil = 5f; recoil = 5f;
@@ -2823,7 +2823,7 @@ public class UnitTypes{
}}); }});
} }
bullet = new BasicBulletType(8f, 330f){{ bullet = new BasicBulletType(8f, 360f){{
sprite = "missile-large"; sprite = "missile-large";
width = 12f; width = 12f;
height = 20f; height = 20f;
@@ -2862,7 +2862,7 @@ public class UnitTypes{
float fin = 0.05f + (j + 1) / (float)count; float fin = 0.05f + (j + 1) / (float)count;
float spd = speed; float spd = speed;
float life = lifetime / Mathf.lerp(fin, 1f, 0.5f); float life = lifetime / Mathf.lerp(fin, 1f, 0.5f);
spawnBullets.add(new BasicBulletType(spd * fin, 55){{ spawnBullets.add(new BasicBulletType(spd * fin, 60){{
drag = 0.002f; drag = 0.002f;
width = 12f; width = 12f;
height = 11f; height = 11f;
@@ -2879,7 +2879,7 @@ public class UnitTypes{
weaveScale = (3f + s/2f) / 1.2f; weaveScale = (3f + s/2f) / 1.2f;
weaveMag = i * (4f - fin * 2f); weaveMag = i * (4f - fin * 2f);
splashDamage = 60f; splashDamage = 65f;
splashDamageRadius = 30f; splashDamageRadius = 30f;
despawnEffect = new ExplosionEffect(){{ despawnEffect = new ExplosionEffect(){{
lifetime = 50f; lifetime = 50f;
@@ -3434,9 +3434,9 @@ public class UnitTypes{
}}); }});
} }
bullet = new ArtilleryBulletType(5.5f, 280){{ bullet = new ArtilleryBulletType(5.5f, 260){{
collidesTiles = collides = true; collidesTiles = collides = true;
lifetime = 75f; lifetime = 70f;
shootEffect = Fx.shootBigColor; shootEffect = Fx.shootBigColor;
smokeEffect = Fx.shootSmokeSquareBig; smokeEffect = Fx.shootSmokeSquareBig;
frontColor = Color.white; frontColor = Color.white;

10
core/src/mindustry/logic/Settable.java Normal file
View File

@@ -0,0 +1,10 @@
package mindustry.logic;
import mindustry.ctype.*;
//TODO
public interface Settable{
void setProperty(LAccess prop, double value);
void setProperty(LAccess prop, Object value);
void setProperty(UnlockableContent content, double value);
}