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

WIP branch merging

Browse Source
This commit is contained in:
Anuken
2021-10-14 19:15:03 -04:00
parent b30eb26eb7
commit ad1c75d050
38 changed files with 502 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ public class Blocks implements ContentList{
duct, ductRouter, ductBridge,
//liquid
mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidContainer, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
//power
combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
@@ -86,18 +86,19 @@ public class Blocks implements ContentList{
repairPoint, repairTurret,
//payloads
payloadConveyor, payloadRouter, payloadPropulsionTower,
payloadConveyor, payloadRouter, payloadPropulsionTower, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader,
//logic
message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, memoryCell, memoryBank,
//campaign
launchPad, interplanetaryAccelerator,
//misc experimental
blockForge, blockLoader, blockUnloader
launchPad, interplanetaryAccelerator
;
/** @deprecated use the blocks with proper names, */
@Deprecated
public static Block blockForge, blockLoader, blockUnloader;
@Override
public void load(){
//region environment
@@ -125,7 +126,7 @@ public class Blocks implements ContentList{
isLiquid = true;
status = StatusEffects.wet;
statusDuration = 120f;
drownTime = 140f;
drownTime = 200f;
cacheLayer = CacheLayer.water;
albedo = 0.9f;
}};
@@ -158,7 +159,7 @@ public class Blocks implements ContentList{
variants = 0;
status = StatusEffects.wet;
statusDuration = 140f;
drownTime = 120f;
drownTime = 200f;
liquidDrop = Liquids.water;
isLiquid = true;
cacheLayer = CacheLayer.water;
@@ -186,7 +187,7 @@ public class Blocks implements ContentList{
}};
tar = new Floor("tar"){{
drownTime = 150f;
drownTime = 230f;
status = StatusEffects.tarred;
statusDuration = 240f;
speedMultiplier = 0.19f;
@@ -213,7 +214,7 @@ public class Blocks implements ContentList{
}};
slag = new Floor("molten-slag"){{
drownTime = 150f;
drownTime = 230f;
status = StatusEffects.melting;
statusDuration = 240f;
speedMultiplier = 0.19f;
@@ -233,6 +234,12 @@ public class Blocks implements ContentList{
placeableOn = false;
solid = true;
variants = 0;
canShadow = false;
}};
empty = new EmptyFloor("empty"){{
placeableOn = false;
solid = true;
}};
stone = new Floor("stone");
@@ -337,34 +344,36 @@ public class Blocks implements ContentList{
attributes.set(Attribute.oil, 1.6f);
}};
moss = new Floor("moss"){{
variants = 3;
attributes.set(Attribute.spores, 0.15f);
}};
sporeMoss = new Floor("spore-moss"){{
variants = 3;
attributes.set(Attribute.spores, 0.3f);
}};
stoneWall = new StaticWall("stone-wall"){{
variants = 2;
}};
sporeWall = new StaticWall("spore-wall"){{
variants = 2;
taintedWater.asFloor().wall = deepTaintedWater.asFloor().wall = this;
taintedWater.asFloor().wall = deepTaintedWater.asFloor().wall = sporeMoss.asFloor().wall = this;
}};
dirtWall = new StaticWall("dirt-wall"){{
variants = 2;
}};
dirtWall = new StaticWall("dirt-wall");
daciteWall = new StaticWall("dacite-wall"){{
variants = 2;
}};
daciteWall = new StaticWall("dacite-wall");
iceWall = new StaticWall("ice-wall"){{
variants = 2;
iceSnow.asFloor().wall = this;
albedo = 0.6f;
}};
snowWall = new StaticWall("snow-wall"){{
variants = 2;
}};
snowWall = new StaticWall("snow-wall");
duneWall = new StaticWall("dune-wall"){{
variants = 2;
basalt.asFloor().wall = darksandWater.asFloor().wall = darksandTaintedWater.asFloor().wall = this;
}};
@@ -377,21 +386,15 @@ public class Blocks implements ContentList{
shrubs = new StaticWall("shrubs");
shaleWall = new StaticWall("shale-wall"){{
variants = 2;
}};
shaleWall = new StaticWall("shale-wall");
sporePine = new StaticTree("spore-pine"){{
variants = 0;
moss.asFloor().wall = this;
}};
snowPine = new StaticTree("snow-pine"){{
variants = 0;
}};
snowPine = new StaticTree("snow-pine");
pine = new StaticTree("pine"){{
variants = 0;
}};
pine = new StaticTree("pine");
whiteTreeDead = new TreeBlock("white-tree-dead");
@@ -404,7 +407,7 @@ public class Blocks implements ContentList{
boulder = new Prop("boulder"){{
variants = 2;
stone.asFloor().decoration = this;
stone.asFloor().decoration = craters.asFloor().decoration = charr.asFloor().decoration = this;
}};
snowBoulder = new Prop("snow-boulder"){{
@@ -414,18 +417,22 @@ public class Blocks implements ContentList{
shaleBoulder = new Prop("shale-boulder"){{
variants = 2;
shale.asFloor().decoration = this;
}};
sandBoulder = new Prop("sand-boulder"){{
variants = 2;
sand.asFloor().decoration = this;
}};
daciteBoulder = new Prop("dacite-boulder"){{
variants = 2;
dacite.asFloor().decoration = this;
}};
basaltBoulder = new Prop("basalt-boulder"){{
variants = 2;
basalt.asFloor().decoration = hotrock.asFloor().decoration = darksand.asFloor().decoration = magmarock.asFloor().decoration = this;
}};
moss = new Floor("moss"){{
@@ -1130,10 +1137,16 @@ public class Blocks implements ContentList{
liquidCapacity = 20f;
}};
liquidContainer = new LiquidRouter("liquid-container"){{
requirements(Category.liquid, with(Items.titanium, 10, Items.metaglass, 15));
liquidCapacity = 700f;
size = 2;
}};
liquidTank = new LiquidRouter("liquid-tank"){{
requirements(Category.liquid, with(Items.titanium, 25, Items.metaglass, 25));
requirements(Category.liquid, with(Items.titanium, 30, Items.metaglass, 40));
size = 3;
liquidCapacity = 1500f;
liquidCapacity = 1800f;
health = 500;
}};
@@ -1899,6 +1912,7 @@ public class Blocks implements ContentList{
length = 200f;
hitEffect = Fx.hitMeltdown;
hitColor = Pal.meltdownHit;
status = StatusEffects.melting;
drawSize = 420f;
incendChance = 0.4f;
@@ -2082,6 +2096,49 @@ public class Blocks implements ContentList{
consumes.power(6f);
}};
deconstructor = new PayloadDeconstructor("deconstructor"){{
requirements(Category.units, with(Items.thorium, 250, Items.silicon, 200, Items.graphite, 250));
itemCapacity = 250;
consumes.power(3f);
size = 5;
deconstructSpeed = 2f;
}};
constructor = new Constructor("constructor"){{
requirements(Category.units, with(Items.thorium, 100));
hasPower = true;
consumes.power(2f);
size = 3;
}};
largeConstructor = new Constructor("large-constructor"){{
requirements(Category.units, with(Items.thorium, 100));
hasPower = true;
consumes.power(2f);
maxBlockSize = 4;
minBlockSize = 3;
size = 5;
}};
payloadLoader = new PayloadLoader("payload-loader"){{
requirements(Category.units, with(Items.thorium, 100));
hasPower = true;
consumes.power(2f);
size = 3;
}};
payloadUnloader = new PayloadUnloader("payload-unloader"){{
requirements(Category.units, with(Items.thorium, 100));
hasPower = true;
consumes.power(2f);
size = 3;
}};
//TODO deprecated
blockForge = constructor;
blockLoader = payloadLoader;
blockUnloader = payloadUnloader;
//endregion
//region sandbox
@@ -2244,30 +2301,6 @@ public class Blocks implements ContentList{
size = 6;
}};
//endregion
//region experimental
blockForge = new BlockForge("block-forge"){{
requirements(Category.units, BuildVisibility.debugOnly, with(Items.thorium, 100));
hasPower = true;
consumes.power(2f);
size = 3;
}};
blockLoader = new BlockLoader("block-loader"){{
requirements(Category.units, BuildVisibility.debugOnly, with(Items.thorium, 100));
hasPower = true;
consumes.power(2f);
size = 3;
}};
blockUnloader = new BlockUnloader("block-unloader"){{
requirements(Category.units, BuildVisibility.debugOnly, with(Items.thorium, 100));
hasPower = true;
consumes.power(2f);
size = 3;
}};
//endregion
}
}