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

Crash fix, begin rebalancing

Browse Source
This commit is contained in:
Anuken
2022-05-03 11:23:24 -04:00
parent 6c3eb3fe1e
commit 459428ef25
7 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4213,22 +4213,20 @@ public class Blocks{
}};
mechFabricator = new UnitFactory("mech-fabricator"){{
requirements(Category.units, with(Items.silicon, 200, Items.beryllium, 150));
requirements(Category.units, with(Items.silicon, 250, Items.beryllium, 200));
size = 3;
configurable = false;
plans.add(new UnitPlan(UnitTypes.merui, 60f * 35f, with(Items.beryllium, 40f, Items.silicon, 50f)));
researchCost = with(Items.beryllium, 200, Items.graphite, 80, Items.silicon, 80);
plans.add(new UnitPlan(UnitTypes.merui, 60f * 45f, with(Items.beryllium, 50f, Items.silicon, 70f)));
regionSuffix = "-dark";
fogRadius = 3;
consumePower(2f);
}};
shipFabricator = new UnitFactory("ship-fabricator"){{
requirements(Category.units, with(Items.silicon, 200, Items.beryllium, 150));
requirements(Category.units, with(Items.silicon, 200, Items.graphite, 300));
size = 3;
configurable = false;
plans.add(new UnitPlan(UnitTypes.osc, 60f * 35f, with(Items.beryllium, 40f, Items.silicon, 50f)));
researchCost = with(Items.beryllium, 200, Items.graphite, 80, Items.silicon, 80);
plans.add(new UnitPlan(UnitTypes.osc, 60f * 40f, with(Items.graphite, 40f, Items.silicon, 70f)));
regionSuffix = "-dark";
fogRadius = 3;
consumePower(2f);

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

@@ -39,13 +39,13 @@ public class UnitTypes{
//legs
public static @EntityDef({Unitc.class, Legsc.class}) UnitType corvus, atrax,
merui, latum, anthicus,
bulwark, krepost;
bulwark, krepost; //TODO horrid name here
//legs, legacy
public static @EntityDef(value = {Unitc.class, Legsc.class}, legacy = true) UnitType spiroct, arkyid, toxopid;
//hover
public static @EntityDef({Unitc.class, ElevationMovec.class}) UnitType osc;
public static @EntityDef({Unitc.class, ElevationMovec.class}) UnitType osc; //TODO bad name
//air
public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra,
@@ -2679,7 +2679,7 @@ public class UnitTypes{
bullet = new BasicBulletType(8f, 140){{
sprite = "missile-large";
width = 9.5f;
height = 15f;
height = 13f;
lifetime = 18f;
hitSize = 6f;
shootEffect = Fx.shootTitan;
@@ -2702,7 +2702,7 @@ public class UnitTypes{
fragVelocityMin = 1f;
//TODO
fragBullet = new BasicBulletType(8f, 30){{
fragBullet = new BasicBulletType(8f, 25){{
sprite = "missile-large";
width = 8f;
height = 12f;