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

Chat message sound + minor JSOn fix

Browse Source
This commit is contained in:
Anuken
2022-05-25 23:15:09 -04:00
parent 6d9029fb23
commit e2bd6571b1
5 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/sounds/ui/chatMessage.ogg Normal file
View File

Binary file not shown.

BIN
core/assets/sounds/windowHide.ogg
View File

Binary file not shown.

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

@@ -198,6 +198,7 @@ public class NetClient implements ApplicationListener{
public static void sendMessage(String message, @Nullable String unformatted, @Nullable Player playersender){ public static void sendMessage(String message, @Nullable String unformatted, @Nullable Player playersender){
if(Vars.ui != null){ if(Vars.ui != null){
Vars.ui.chatfrag.addMessage(message); Vars.ui.chatfrag.addMessage(message);
Sounds.chatMessage.play();
} }
//display raw unformatted text above player head //display raw unformatted text above player head
@@ -212,6 +213,7 @@ public class NetClient implements ApplicationListener{
public static void sendMessage(String message){ public static void sendMessage(String message){
if(Vars.ui != null){ if(Vars.ui != null){
Vars.ui.chatfrag.addMessage(message); Vars.ui.chatfrag.addMessage(message);
Sounds.chatMessage.play();
} }
} }

2
core/src/mindustry/entities/effect/WrapEffect.java
View File

@@ -8,7 +8,7 @@ import mindustry.entities.*;
public class WrapEffect extends Effect{ public class WrapEffect extends Effect{
public Effect effect = Fx.none; public Effect effect = Fx.none;
public Color color = Color.white.cpy(); public Color color = Color.white.cpy();
public float rotation = Float.NaN; public float rotation;
public WrapEffect(){ public WrapEffect(){
} }

4
core/src/mindustry/mod/ContentParser.java
View File

@@ -443,6 +443,10 @@ public class ContentParser{
unit = make(resolve(value.getString("class", ""), UnitType.class), mod + "-" + name); unit = make(resolve(value.getString("class", ""), UnitType.class), mod + "-" + name);
if(value.has("class")){
value.remove("class");
}
var typeVal = value.get("type"); var typeVal = value.get("type");
if(typeVal != null && !typeVal.isString()){ if(typeVal != null && !typeVal.isString()){