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

placeEffect (#7968)

Browse Source
This commit is contained in:
MEEPofFaith
2023-01-07 08:46:14 -08:00
committed by GitHub
parent 0d26b9e4f8
commit 6eadac38b7
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/core/Control.java
View File

@@ -250,7 +250,7 @@ public class Control implements ApplicationListener, Loadable{
}else{ }else{
//when already hosting, instantly build everything. this looks bad but it's better than a desync //when already hosting, instantly build everything. this looks bad but it's better than a desync
Fx.coreBuildBlock.at(build.x, build.y, 0f, build.block); Fx.coreBuildBlock.at(build.x, build.y, 0f, build.block);
Fx.placeBlock.at(build.x, build.y, build.block.size); build.block.placeEffect.at(build.x, build.y, build.block.size);
} }
} }
} }
@@ -288,7 +288,7 @@ public class Control implements ApplicationListener, Loadable{
build.dropped(); build.dropped();
Fx.coreBuildBlock.at(build.x, build.y, 0f, build.block); Fx.coreBuildBlock.at(build.x, build.y, 0f, build.block);
Fx.placeBlock.at(build.x, build.y, build.block.size); build.block.placeEffect.at(build.x, build.y, build.block.size);
} }
@Override @Override

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

@@ -179,7 +179,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
} }
Fx.unitDrop.at(tile); Fx.unitDrop.at(tile);
Fx.placeBlock.at(on.drawx(), on.drawy(), on.block().size); on.block().placeEffect.at(on.drawx(), on.drawy(), on.block().size);
return true; return true;
} }

2
core/src/mindustry/world/Block.java
View File

@@ -312,6 +312,8 @@ public class Block extends UnlockableContent implements Senseable{
public float deconstructThreshold = 0f; public float deconstructThreshold = 0f;
/** If true, this block deconstructs immediately. Instant deconstruction implies no resource refund. */ /** If true, this block deconstructs immediately. Instant deconstruction implies no resource refund. */
public boolean instantDeconstruct = false; public boolean instantDeconstruct = false;
/** Effect for placing the block. Passes size as rotation. */
public Effect placeEffect = Fx.placeBlock;
/** Effect for breaking the block. Passes size as rotation. */ /** Effect for breaking the block. Passes size as rotation. */
public Effect breakEffect = Fx.breakBlock; public Effect breakEffect = Fx.breakBlock;
/** Effect for destroying the block. */ /** Effect for destroying the block. */

2
core/src/mindustry/world/blocks/ConstructBlock.java
View File

@@ -99,7 +99,7 @@ public class ConstructBlock extends Block{
} }
if(fogControl.isVisibleTile(team, tile.x, tile.y)){ if(fogControl.isVisibleTile(team, tile.x, tile.y)){
Fx.placeBlock.at(tile.drawx(), tile.drawy(), block.size); block.placeEffect.at(tile.drawx(), tile.drawy(), block.size);
if(shouldPlay()) block.placeSound.at(tile, block.placePitchChange ? calcPitch(true) : 1f); if(shouldPlay()) block.placeSound.at(tile, block.placePitchChange ? calcPitch(true) : 1f);
} }

2
core/src/mindustry/world/blocks/payloads/BlockProducer.java
View File

@@ -96,7 +96,7 @@ public abstract class BlockProducer extends PayloadBlock{
if(progress >= recipe.buildCost){ if(progress >= recipe.buildCost){
consume(); consume();
payload = new BuildPayload(recipe, team); payload = new BuildPayload(recipe, team);
Fx.placeBlock.at(x, y, payload.size() / tilesize); payload.block().placeEffect.at(x, y, payload.size() / tilesize);
payVector.setZero(); payVector.setZero();
progress %= 1f; progress %= 1f;
} }

2
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -150,7 +150,7 @@ public class CoreBlock extends StorageBlock{
//finish placement immediately when a block is replaced. //finish placement immediately when a block is replaced.
if(previous instanceof CoreBlock){ if(previous instanceof CoreBlock){
tile.setBlock(this, tile.team()); tile.setBlock(this, tile.team());
Fx.placeBlock.at(tile, tile.block().size); tile.block().placeEffect.at(tile, tile.block().size);
Fx.upgradeCore.at(tile.drawx(), tile.drawy(), 0f, tile.block()); Fx.upgradeCore.at(tile.drawx(), tile.drawy(), 0f, tile.block());
Fx.upgradeCoreBloom.at(tile, tile.block().size); Fx.upgradeCoreBloom.at(tile, tile.block().size);