Test fixes / Building module presence saving

This commit is contained in:
Anuken
2021-11-17 10:58:36 -05:00
parent 29f8ebddb9
commit 4567ee9a13
8 changed files with 54 additions and 19 deletions

View File

@@ -1021,7 +1021,7 @@ public class Blocks implements ContentList{
requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 30));
craftEffect = Fx.none;
outputItem = new ItemStack(Items.carbide, 1);
craftTime = 60f * 4f;
craftTime = 60f * 3f;
size = 3;
itemCapacity = 20;
hasPower = hasItems = true;
@@ -1044,15 +1044,25 @@ public class Blocks implements ContentList{
}};
//TODO implement
//TODO "crucible" is getting old
//TODO should have a useful turret ammo byproduct?
//original: consumes.items(with(Items.copper, 3, Items.lead, 4, Items.titanium, 2, Items.silicon, 3));
if(false)
surgeCrucible = new GenericCrafter("surge-crucible"){{
//needs:
//liquid lead???
//slag (a lot of it)
//silicon
//heat
surgeCrucible = new HeatCrafter("surge-crucible"){{
size = 3;
itemCapacity = 20;
heatRequirement = 5f;
craftTime = 60f * 2.5f;
ambientSound = Sounds.smelter;
ambientSoundVolume = 0.07f;
consumes.item(Items.silicon, 3);
//TODO must consume from 2 pumps, 1, or 1.5?
//TODO consume hydrogen/ozone?
consumes.liquid(Liquids.slag, 2f * 80f / 60f);
consumes.power(2f); //TODO necessary?
}};
//TODO needs to be completely redone from the ground up
@@ -1534,7 +1544,7 @@ public class Blocks implements ContentList{
//TODO CUSTOM DRAW ANIMATION - pistons - repurpose DrawBlock?
consumes.liquid(Liquids.hydrogen, 1.5f / 60f);
pumpAmount = 0.4f;
pumpAmount = 80f / 60f / 4f;
liquidCapacity = 40f;
size = 2;
}};

View File

@@ -40,7 +40,7 @@ public class UnitTypes implements ContentList{
//air
public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra,
evoke; //elicit, incite?
evoke;
//air, legacy
public static @EntityDef(value = {Unitc.class}, legacy = true) UnitType mono;
@@ -50,7 +50,7 @@ public class UnitTypes implements ContentList{
//air + payload
public static @EntityDef({Unitc.class, Payloadc.class}) UnitType mega,
incite;
incite, emanate;
//air + payload, legacy
public static @EntityDef(value = {Unitc.class, Payloadc.class}, legacy = true) UnitType quad;
@@ -2526,6 +2526,8 @@ public class UnitTypes implements ContentList{
}});
}};
//TODO emanate (+ better names)
//endregion
//region internal