mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-09 10:18:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #4261 / Basic rotation shine effect

Browse Source
This commit is contained in:
Anuken 2021-01-04 17:22:18 -05:00
parent 0ab4f01d5d
commit 69eb8faf67
8 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/audio/SoundControl.java
View File

@ -130,7 +130,11 @@ public class SoundControl{
Core.audio.soundBus.play();
setupFilters();
}else{
Core.audio.soundBus.stop();
for(Sound sound : Core.assets.getAll(Sound.class, new Seq<>())){
if(sound.bus == Core.audio.soundBus){
sound.stop();
}
}
}
}

6
core/src/mindustry/content/Fx.java
View File

@ -1564,6 +1564,12 @@ public class Fx{
Fill.square(e.x, e.y, e.rotation * tilesize / 2f);
}),
rotateBlock = new Effect(30, e -> {
color(Pal.accent);
alpha(e.fout() * 1);
Fill.square(e.x, e.y, e.rotation * tilesize / 2f);
}),
overdriveBlockFull = new Effect(60, e -> {
color(e.color);
alpha(e.fslope() * 0.4f);

4
core/src/mindustry/entities/comp/BuildingComp.java
View File

@ -970,8 +970,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
}
if(block.hasLiquids){
flammability += liquids.sum((liquid, amount) -> liquid.explosiveness * amount / 2f);
explosiveness += liquids.sum((liquid, amount) -> liquid.flammability * amount / 2f);
flammability += liquids.sum((liquid, amount) -> liquid.flammability * amount / 2f);
explosiveness += liquids.sum((liquid, amount) -> liquid.explosiveness * amount / 2f);
}
if(block.consumes.hasPower() && block.consumes.getPower().buffered){

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

@ -273,7 +273,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
team.data().updateCount(type, 1);
//check if over unit cap
if(count() > cap() && !spawnedByCore && !dead){
if(count() > cap() && !spawnedByCore && !dead && !state.rules.editor){
Call.unitCapDeath(self());
team.data().updateCount(type, -1);
}

1
core/src/mindustry/input/InputHandler.java
View File

@ -305,6 +305,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
build.rotation = Mathf.mod(build.rotation + Mathf.sign(direction), 4);
build.updateProximity();
build.noSleep();
Fx.rotateBlock.at(build.x, build.y, build.block.size);
}
@Remote(targets = Loc.both, called = Loc.both, forward = true)

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

@ -142,7 +142,7 @@ public class CustomRulesDialog extends BaseDialog{
check("@rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions);
check("@rules.schematic", b -> rules.schematicsAllowed = b, () -> rules.schematicsAllowed);
number("@rules.buildcostmultiplier", false, f -> rules.buildCostMultiplier = f, () -> rules.buildCostMultiplier, () -> !rules.infiniteResources);
number("@rules.buildspeedmultiplier", f -> rules.buildSpeedMultiplier = f, () -> rules.buildSpeedMultiplier, 0.00001f, 10000f);
number("@rules.buildspeedmultiplier", f -> rules.buildSpeedMultiplier = f, () -> rules.buildSpeedMultiplier, 0.001f, 50f);
number("@rules.deconstructrefundmultiplier", false, f -> rules.deconstructRefundMultiplier = f, () -> rules.deconstructRefundMultiplier, () -> !rules.infiniteResources);
number("@rules.blockhealthmultiplier", f -> rules.blockHealthMultiplier = f, () -> rules.blockHealthMultiplier);
number("@rules.blockdamagemultiplier", f -> rules.blockDamageMultiplier = f, () -> rules.blockDamageMultiplier);
@ -162,7 +162,7 @@ public class CustomRulesDialog extends BaseDialog{
check("@rules.unitammo", b -> rules.unitAmmo = b, () -> rules.unitAmmo);
number("@rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier);
number("@rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier);
number("@rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier, 0.00001f, 100f);
number("@rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier, 0.001f, 50f);
title("@rules.title.enemy");
check("@rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);

1
core/src/mindustry/world/Build.java
View File

@ -71,6 +71,7 @@ public class Build{
tile.build.rotation = Mathf.mod(rotation, 4);
tile.build.updateProximity();
tile.build.noSleep();
Fx.rotateBlock.at(tile.build.x, tile.build.y, tile.build.block.size);
return;
}

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=5e9176c3feefa5ee2f14b08f82da1f01f790e64a
archash=0f1967eae73429ade796500d5ec352c6a4d1d19d