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

Fixed #8967

Browse Source
This commit is contained in:
Anuken
2023-08-22 10:10:08 -04:00
parent e6aa87ed71
commit 207806440b
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/bundles/bundle.properties
View File

@@ -2216,8 +2216,8 @@ unit.collaris.description = Fires long-range fragmenting artillery at enemy targ
unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid. unit.elude.description = Fires pairs of homing bullets at enemy targets. Can float over bodies of liquid.
unit.avert.description = Fires twisting pairs of bullets at enemy targets. unit.avert.description = Fires twisting pairs of bullets at enemy targets.
unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets. unit.obviate.description = Fires twisting pairs of lightning orbs at enemy targets.
unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks. unit.quell.description = Fires long-range homing missiles at enemy targets. Suppresses enemy structure repair blocks. Only attacks ground targets.
unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks. unit.disrupt.description = Fires long-range homing suppression missiles at enemy targets. Suppresses enemy structure repair blocks. Only attacks ground targets.
unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam. Capable of carrying 2x2 structures. unit.evoke.description = Builds structures to defend the Bastion core. Repairs structures with a beam. Capable of carrying 2x2 structures.
unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam. Capable of carrying 2x2 structures. unit.incite.description = Builds structures to defend the Citadel core. Repairs structures with a beam. Capable of carrying 2x2 structures.
unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams. Capable of carrying 2x2 structures. unit.emanate.description = Builds structures to defend the Acropolis core. Repairs structures with beams. Capable of carrying 2x2 structures.

4
core/src/mindustry/ai/types/MinerAI.java
View File

@@ -23,6 +23,10 @@ public class MinerAI extends AIController{
unit.mineTile(null); unit.mineTile(null);
} }
if(ore != null && !unit.validMine(ore)){
ore = null;
}
if(mining){ if(mining){
if(timer.get(timerTarget2, 60 * 4) || targetItem == null){ if(timer.get(timerTarget2, 60 * 4) || targetItem == null){
targetItem = unit.type.mineItems.min(i -> indexer.hasOre(i) && unit.canMine(i), i -> core.items.get(i)); targetItem = unit.type.mineItems.min(i -> indexer.hasOre(i) && unit.canMine(i), i -> core.items.get(i));

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

@@ -165,14 +165,14 @@ public class NetClient implements ApplicationListener{
public static void sound(Sound sound, float volume, float pitch, float pan){ public static void sound(Sound sound, float volume, float pitch, float pan){
if(sound == null || headless) return; if(sound == null || headless) return;
sound.play(Mathf.clamp(volume, 0, 8f) * Core.settings.getInt("sfxvol") / 100f, pitch, pan, false, false); sound.play(Mathf.clamp(volume, 0, 8f) * Core.settings.getInt("sfxvol") / 100f, Mathf.clamp(pitch, 0f, 20f), pan, false, false);
} }
@Remote(variants = Variant.both, unreliable = true, called = Loc.server) @Remote(variants = Variant.both, unreliable = true, called = Loc.server)
public static void soundAt(Sound sound, float x, float y, float volume, float pitch){ public static void soundAt(Sound sound, float x, float y, float volume, float pitch){
if(sound == null || headless) return; if(sound == null || headless) return;
sound.at(x, y, pitch, Mathf.clamp(volume, 0, 4f)); sound.at(x, y, Mathf.clamp(pitch, 0f, 20f), Mathf.clamp(volume, 0, 4f));
} }
@Remote(variants = Variant.both, unreliable = true) @Remote(variants = Variant.both, unreliable = true)

2
gradle.properties
View File

@@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=5baefbb2af archash=f0ed7ae5d4