mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-08 01:43:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Allow PlaySound To Work Normally With High IPT World Processor (#10083)

Browse Source 
* allow global sound to play more than once per frame

might need an arc pr for the positional

* carhash

* thing

* extra field

* change "check frame" to "limit"

* description

* Update core/assets/bundles/bundle.properties

---------

Co-authored-by: Anuken <arnukren@gmail.com>
This commit is contained in:
Mythril382 2024-08-06 23:14:29 +08:00 committed by GitHub
parent 548c6961eb
commit bace523de4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2563,6 +2563,8 @@ unitlocate.outx = Output X coordinate.
unitlocate.outy = Output Y coordinate.
unitlocate.group = Building group to look for.
playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
lenum.idle = Don't move, but keep building/mining.\nThe default state.
lenum.stop = Stop moving/mining/building.
lenum.unbind = Completely disable logic control.\nResume standard AI.

9
core/src/mindustry/logic/LExecutor.java
View File

@ -1919,12 +1919,12 @@ public class LExecutor{
public static class PlaySoundI implements LInstruction{
public boolean positional;
public LVar id, volume, pitch, pan, x, y;
public LVar id, volume, pitch, pan, x, y, limit;
public PlaySoundI(){
}
public PlaySoundI(boolean positional, LVar id, LVar volume, LVar pitch, LVar pan, LVar x, LVar y){
public PlaySoundI(boolean positional, LVar id, LVar volume, LVar pitch, LVar pan, LVar x, LVar y, LVar limit){
this.positional = positional;
this.id = id;
this.volume = volume;
@ -1932,6 +1932,7 @@ public class LExecutor{
this.pan = pan;
this.x = x;
this.y = y;
this.limit = limit;
}
@Override
@ -1940,9 +1941,9 @@ public class LExecutor{
if(sound == null || sound == Sounds.swish) sound = Sounds.none; //no.
if(positional){
sound.at(World.unconv(x.numf()), World.unconv(y.numf()), pitch.numf(), Math.min(volume.numf(), 2f));
sound.at(World.unconv(x.numf()), World.unconv(y.numf()), pitch.numf(), Math.min(volume.numf(), 2f), limit.bool());
}else{
sound.play(Math.min(volume.numf() * (Core.settings.getInt("sfxvol") / 100f), 2f), pitch.numf(), pan.numf());
sound.play(Math.min(volume.numf() * (Core.settings.getInt("sfxvol") / 100f), 2f), pitch.numf(), pan.numf(), false, limit.bool());
}
}
}

8
core/src/mindustry/logic/LStatements.java
View File

@ -2127,7 +2127,7 @@ public class LStatements{
@RegisterStatement("playsound")
public static class PlaySoundStatement extends LStatement{
public boolean positional;
public String id = "@sfx-pew", volume = "1", pitch = "1", pan = "0", x = "@thisx", y = "@thisy";
public String id = "@sfx-pew", volume = "1", pitch = "1", pan = "0", x = "@thisx", y = "@thisy", limit = "true";
@Override
public void build(Table table){
@ -2169,6 +2169,10 @@ public class LStatements{
}else{
fieldst(table, "pan", pan, str -> pan = str);
}
table.row();
fieldst(table, "limit", limit, str -> limit = str);
}
@Override
@ -2178,7 +2182,7 @@ public class LStatements{
@Override
public LInstruction build(LAssembler builder){
return new PlaySoundI(positional, builder.var(id), builder.var(volume), builder.var(pitch), builder.var(pan), builder.var(x), builder.var(y));
return new PlaySoundI(positional, builder.var(id), builder.var(volume), builder.var(pitch), builder.var(pan), builder.var(x), builder.var(y), builder.var(limit));
}
@Override