Some minor modifications (#11575)
* update * update * update * update * update * update * update * update * update * update * update * update * update * update * update * Update ForceProjector.java
This commit is contained in:
@@ -94,16 +94,18 @@ public class Blocks{
|
|||||||
//sandbox
|
//sandbox
|
||||||
powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator, heatSource,
|
powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator, heatSource,
|
||||||
|
|
||||||
//defense
|
//walls
|
||||||
copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
|
copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
|
||||||
phaseWall, phaseWallLarge, surgeWall, surgeWallLarge,
|
phaseWall, phaseWallLarge, surgeWall, surgeWallLarge,
|
||||||
|
|
||||||
|
scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet
|
||||||
|
|
||||||
//walls - erekir
|
//walls - erekir
|
||||||
berylliumWall, berylliumWallLarge, tungstenWall, tungstenWallLarge, blastDoor, reinforcedSurgeWall, reinforcedSurgeWallLarge, carbideWall, carbideWallLarge,
|
berylliumWall, berylliumWallLarge, tungstenWall, tungstenWallLarge, blastDoor, reinforcedSurgeWall, reinforcedSurgeWallLarge, carbideWall, carbideWallLarge,
|
||||||
shieldedWall,
|
shieldedWall,
|
||||||
|
|
||||||
|
//defense
|
||||||
mender, mendProjector, overdriveProjector, overdriveDome, forceProjector, shockMine,
|
mender, mendProjector, overdriveProjector, overdriveDome, forceProjector, shockMine,
|
||||||
scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet
|
|
||||||
|
|
||||||
//defense - erekir
|
//defense - erekir
|
||||||
radar,
|
radar,
|
||||||
|
|||||||
@@ -89,7 +89,8 @@ abstract class TankComp implements Posc, Hitboxc, Unitc, ElevationMovec{
|
|||||||
&& Math.max(Math.abs(dx), Math.abs(dy)) <= r - 1){
|
&& Math.max(Math.abs(dx), Math.abs(dy)) <= r - 1){
|
||||||
|
|
||||||
if(t.build != null && t.build.team != team){
|
if(t.build != null && t.build.team != team){
|
||||||
t.build.damage(team, type.crushDamage * Time.delta * t.block().crushDamageMultiplier * state.rules.unitDamage(team));
|
t.build.damage(team, type.crushDamage * Time.delta * t.block().crushDamageMultiplier * state.rules.unitDamage(team)
|
||||||
|
* ((speedMultiplier- 1) / 5 + 1));
|
||||||
}else if(t.block().unitMoveBreakable){
|
}else if(t.block().unitMoveBreakable){
|
||||||
ConstructBlock.deconstructFinish(t, t.block(), self());
|
ConstructBlock.deconstructFinish(t, t.block(), self());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -544,6 +544,8 @@ public class ContentParser{
|
|||||||
child.isArray() ? new ConsumeItems(parser.readValue(ItemStack[].class, child)) :
|
child.isArray() ? new ConsumeItems(parser.readValue(ItemStack[].class, child)) :
|
||||||
child.isString() ? new ConsumeItems(new ItemStack[]{parser.readValue(ItemStack.class, child)}) :
|
child.isString() ? new ConsumeItems(new ItemStack[]{parser.readValue(ItemStack.class, child)}) :
|
||||||
parser.readValue(ConsumeItems.class, child));
|
parser.readValue(ConsumeItems.class, child));
|
||||||
|
case "itemsBoost" -> block.consume(child.isArray() ? new ConsumeItems(parser.readValue(ItemStack[].class, child)) :
|
||||||
|
parser.readValue(ConsumeItems.class, child)).boost();
|
||||||
|
|
||||||
case "liquidFlammable" -> block.consume((Consume)parser.readValue(ConsumeLiquidFlammable.class, child));
|
case "liquidFlammable" -> block.consume((Consume)parser.readValue(ConsumeLiquidFlammable.class, child));
|
||||||
case "liquid" -> block.consume((Consume)parser.readValue(ConsumeLiquid.class, child));
|
case "liquid" -> block.consume((Consume)parser.readValue(ConsumeLiquid.class, child));
|
||||||
@@ -551,6 +553,8 @@ public class ContentParser{
|
|||||||
child.isArray() ? new ConsumeLiquids(parser.readValue(LiquidStack[].class, child)) :
|
child.isArray() ? new ConsumeLiquids(parser.readValue(LiquidStack[].class, child)) :
|
||||||
parser.readValue(ConsumeLiquids.class, child));
|
parser.readValue(ConsumeLiquids.class, child));
|
||||||
case "coolant" -> block.consume((Consume)parser.readValue(ConsumeCoolant.class, child));
|
case "coolant" -> block.consume((Consume)parser.readValue(ConsumeCoolant.class, child));
|
||||||
|
case "liquidsBoost" -> block.consume(child.isArray() ? new ConsumeLiquids(parser.readValue(LiquidStack[].class, child)) :
|
||||||
|
parser.readValue(ConsumeLiquids.class, child)).boost();
|
||||||
case "power" -> {
|
case "power" -> {
|
||||||
if(child.isNumber()){
|
if(child.isNumber()){
|
||||||
block.consumePower(child.asFloat());
|
block.consumePower(child.asFloat());
|
||||||
|
|||||||
@@ -736,6 +736,12 @@ public class Block extends UnlockableContent implements Senseable{
|
|||||||
setBars();
|
setBars();
|
||||||
offset = ((size + 1) % 2) * tilesize / 2f;
|
offset = ((size + 1) % 2) * tilesize / 2f;
|
||||||
sizeOffset = -((size - 1) / 2);
|
sizeOffset = -((size - 1) / 2);
|
||||||
|
|
||||||
|
if(consumeBuilder.size != 0){
|
||||||
|
for(var consume : consumeBuilder){
|
||||||
|
consume.apply(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean consumesItem(Item item){
|
public boolean consumesItem(Item item){
|
||||||
|
|||||||
Reference in New Issue
Block a user