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

Re-added remote effect methods

Browse Source
This commit is contained in:
Anuken
2020-08-04 13:38:40 -04:00
parent 3038862af5
commit 0d4e75fc42
23 changed files with 137 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,7 +163,7 @@ public class BuildBlock extends Block{
Fx.blockExplosionSmoke.at(tile);
if(!tile.floor().solid && !tile.floor().isLiquid){
Effects.rubble(x, y, size);
Effect.rubble(x, y, size);
}
}

2
core/src/mindustry/world/blocks/campaign/LaunchPad.java
View File

@@ -104,7 +104,7 @@ public class LaunchPad extends Block{
entity.add();
Fx.launchPod.at(this);
items.clear();
Effects.shake(3f, 3f, this);
Effect.shake(3f, 3f, this);
}
}
}

2
core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
View File

@@ -98,7 +98,7 @@ public class LiquidTurret extends Turret{
shootSound.at(tile);
if(shootShake > 0){
Effects.shake(shootShake, shootShake, tile.build);
Effect.shake(shootShake, shootShake, tile.build);
}
recoil = recoilAmount;

2
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -369,7 +369,7 @@ public abstract class Turret extends Block{
shootSound.at(tile, Mathf.random(0.9f, 1.1f));
if(shootShake > 0){
Effects.shake(shootShake, shootShake, this);
Effect.shake(shootShake, shootShake, this);
}
recoil = recoilAmount;

4
core/src/mindustry/world/blocks/distribution/MassDriver.java
View File

@@ -262,7 +262,7 @@ public class MassDriver extends Block{
smokeEffect.at(x + Angles.trnsx(angle, translation),
y + Angles.trnsy(angle, translation), angle);
Effects.shake(shake, shake, this);
Effect.shake(shake, shake, this);
}
public void handlePayload(Bullet bullet, DriverBulletData data){
@@ -280,7 +280,7 @@ public class MassDriver extends Block{
}
}
Effects.shake(shake, shake, this);
Effect.shake(shake, shake, this);
receiveEffect.at(bullet);
reload = 1f;

2
core/src/mindustry/world/blocks/power/ImpactReactor.java
View File

@@ -126,7 +126,7 @@ public class ImpactReactor extends PowerGenerator{
Sounds.explosionbig.at(tile);
Effects.shake(6f, 16f, x, y);
Effect.shake(6f, 16f, x, y);
Fx.impactShockwave.at(x, y);
for(int i = 0; i < 6; i++){
Time.run(Mathf.random(80), () -> Fx.impactcloud.at(x, y));

2
core/src/mindustry/world/blocks/power/NuclearReactor.java
View File

@@ -117,7 +117,7 @@ public class NuclearReactor extends PowerGenerator{
if((fuel < 5 && heat < 0.5f) || !state.rules.reactorExplosions) return;
Effects.shake(6f, 16f, x, y);
Effect.shake(6f, 16f, x, y);
Fx.nuclearShockwave.at(x, y);
for(int i = 0; i < 6; i++){
Time.run(Mathf.random(40), () -> Fx.nuclearcloud.at(x, y));

2
core/src/mindustry/world/blocks/units/Reconstructor.java
View File

@@ -146,7 +146,7 @@ public class Reconstructor extends UnitBlock{
if(progress >= constructTime){
payload.unit = upgrade(payload.unit.type()).create(payload.unit.team());
progress = 0;
Effects.shake(2f, 3f, this);
Effect.shake(2f, 3f, this);
Fx.producesmoke.at(this);
consume();
}