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

Cleanup

Browse Source
This commit is contained in:
Anuken
2022-05-03 15:27:30 -04:00
parent a784d184aa
commit 8b9eb0b466
6 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2054,14 +2054,12 @@ public class Blocks{
liquidRouter = new LiquidRouter("liquid-router"){{
requirements(Category.liquid, with(Items.graphite, 4, Items.metaglass, 2));
liquidCapacity = 20f;
newDrawing = true;
}};
liquidContainer = new LiquidRouter("liquid-container"){{
requirements(Category.liquid, with(Items.titanium, 10, Items.metaglass, 15));
liquidCapacity = 700f;
size = 2;
newDrawing = true;
}};
liquidTank = new LiquidRouter("liquid-tank"){{
@@ -2069,7 +2067,6 @@ public class Blocks{
size = 3;
liquidCapacity = 1800f;
health = 500;
newDrawing = true;
}};
liquidJunction = new LiquidJunction("liquid-junction"){{
@@ -2144,7 +2141,6 @@ public class Blocks{
reinforcedLiquidRouter = new LiquidRouter("reinforced-liquid-router"){{
requirements(Category.liquid, with(Items.graphite, 8, Items.beryllium, 4));
liquidCapacity = 30f;
newDrawing = true;
liquidPadding = 3f/4f;
researchCostMultiplier = 3;
underBullets = true;
@@ -2154,19 +2150,17 @@ public class Blocks{
requirements(Category.liquid, with(Items.tungsten, 10, Items.beryllium, 16));
liquidCapacity = 1000f;
size = 2;
newDrawing = true;
liquidPadding = 6f/4f;
researchCostMultiplier = 4;
underBullets = true;
solid = true;
}};
reinforcedLiquidTank = new LiquidRouter("reinforced-liquid-tank"){{
requirements(Category.liquid, with(Items.tungsten, 40, Items.beryllium, 50));
size = 3;
solid = true;
liquidCapacity = 2700f;
newDrawing = true;
liquidPadding = 2f;
underBullets = true;
}};
//endregion
@@ -3791,7 +3785,7 @@ public class Blocks{
velocityRnd = 0.17f;
shootShake = 1f;
ammoPerShot = 3;
maxAmmo = 50;
maxAmmo = 30;
consumeAmmoOnce = true;
drawer = new DrawTurret("reinforced-"){{
@@ -4261,7 +4255,7 @@ public class Blocks{
size = 5;
consumePower(5f);
consumeLiquid(Liquids.nitrogen, 10f / 60f);
consumeItems(with(Items.oxide, 110, Items.tungsten, 100));
consumeItems(with(Items.oxide, 20, Items.tungsten, 100));
constructTime = 60f * 60f;

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

@@ -3970,6 +3970,7 @@ public class UnitTypes{
engineSize = 0;
payloadCapacity = 2f * 2f * tilesize * tilesize;
pickupUnits = false;
vulnerableWithPayloads = true;
fogRadius = 0f;
targetable = false;
@@ -4032,6 +4033,7 @@ public class UnitTypes{
hitSize = 11f;
payloadCapacity = 2f * 2f * tilesize * tilesize;
pickupUnits = false;
vulnerableWithPayloads = true;
fogRadius = 0f;
targetable = false;
@@ -4109,6 +4111,7 @@ public class UnitTypes{
buildBeamOffset = 8f;
payloadCapacity = 2f * 2f * tilesize * tilesize;
pickupUnits = false;
vulnerableWithPayloads = true;
fogRadius = 0f;
targetable = false;

2
core/src/mindustry/entities/comp/PayloadComp.java
View File

@@ -78,7 +78,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
}
boolean canPickup(Unit unit){
return unit.type.pickupUnits && payloadUsed() + unit.hitSize * unit.hitSize <= type.payloadCapacity + 0.001f && unit.team == team() && unit.isAI();
return type.pickupUnits && payloadUsed() + unit.hitSize * unit.hitSize <= type.payloadCapacity + 0.001f && unit.team == team() && unit.isAI();
}
boolean canPickup(Building build){

1
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@@ -150,6 +150,7 @@ public class CustomRulesDialog extends BaseDialog{
title("@rules.title.resourcesbuilding");
check("@rules.infiniteresources", b -> rules.infiniteResources = b, () -> rules.infiniteResources);
check("@rules.onlydepositcore", b -> rules.onlyDepositCore = b, () -> rules.onlyDepositCore);
check("@rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions);
check("@rules.schematic", b -> rules.schematicsAllowed = b, () -> rules.schematicsAllowed);
check("@rules.coreincinerates", b -> rules.coreIncinerates = b, () -> rules.coreIncinerates);

17
core/src/mindustry/world/blocks/liquid/LiquidRouter.java
View File

@@ -5,8 +5,6 @@ import mindustry.gen.*;
import mindustry.type.*;
public class LiquidRouter extends LiquidBlock{
/** kept only for mod compatibility reasons; all vanilla blocks have this as true */
public boolean newDrawing = false;
public float liquidPadding = 0f;
public LiquidRouter(String name){
@@ -20,7 +18,7 @@ public class LiquidRouter extends LiquidBlock{
@Override
public TextureRegion[] icons(){
return newDrawing ? new TextureRegion[]{bottomRegion, region} : super.icons();
return new TextureRegion[]{bottomRegion, region};
}
public class LiquidRouterBuild extends LiquidBuild{
@@ -33,18 +31,13 @@ public class LiquidRouter extends LiquidBlock{
@Override
public void draw(){
if(newDrawing){
Draw.rect(bottomRegion, x, y);
Draw.rect(bottomRegion, x, y);
if(liquids.currentAmount() > 0.001f){
drawTiledFrames(size, x, y, liquidPadding, liquids.current(), liquids.currentAmount() / liquidCapacity);
}
Draw.rect(region, x, y);
}else{
super.draw();
if(liquids.currentAmount() > 0.001f){
drawTiledFrames(size, x, y, liquidPadding, liquids.current(), liquids.currentAmount() / liquidCapacity);
}
Draw.rect(region, x, y);
}
@Override