From e2bd6571b1405d03e99385402c6cc704390f7e0d Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 May 2022 23:15:09 -0400 Subject: [PATCH] Chat message sound + minor JSOn fix --- core/assets/sounds/ui/chatMessage.ogg | Bin 0 -> 6148 bytes core/assets/sounds/windowHide.ogg | Bin 6849 -> 0 bytes core/src/mindustry/core/NetClient.java | 2 ++ .../mindustry/entities/effect/WrapEffect.java | 2 +- core/src/mindustry/mod/ContentParser.java | 4 ++++ 5 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 core/assets/sounds/ui/chatMessage.ogg delete mode 100644 core/assets/sounds/windowHide.ogg diff --git a/core/assets/sounds/ui/chatMessage.ogg b/core/assets/sounds/ui/chatMessage.ogg new file mode 100644 index 0000000000000000000000000000000000000000..4d7e07ab4dc08707c75919ca28b363f1277663ab GIT binary patch literal 6148 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 UU`WVc?#YnA5?m+$_Zkx)09d$gh5!Hn literal 0 HcmV?d00001 diff --git a/core/assets/sounds/windowHide.ogg b/core/assets/sounds/windowHide.ogg deleted file mode 100644 index 9039d4e3b42d7b613137972fb8832b699a2e0d79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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

G1w;lS3*> zDl;(r+iLQ0I>UzA>Sxt8bKZac`+TFF%l>6M4(bLlWHNX(!1Qv+6-Ft6%wb|!lLi_) z4!EBL(!Au^`VY~&(*H`%KlZ)y|H03TA6yeLw-9~-N=~q-V_2Xswt^d^nc;vXBz@gy zsM~hr?R=(x4{jE(wcYnESL^@jf5)$gm|J*$VO+wX30BO&AYkX1$jG3uA6!y=;AUW$ z5Xi_-w@u_}{KMk1^M$sLC%<3)UVKrwx`};2@SKCZ8jT_f;8e!Iz;J{cA`5{QJ+pU!QOP*RsU)sN|f(Yz9XM^TZSXZ zx?~21BoKXICCJL0KkW?*{=Kc-b=+>>`TPFq27ZRB29TD|VayB+ z_d(iHKCEw8p;`URc;A`#pa1Oo^`ig6RgrW9&bba;6Bt!MYC-r*V#5v45F> zh6kJsa@%YU`ZDauI`8LZf4~0W)JYmipumxv;vmJ)#{lypLps+PP{TYSia|jcWRL(e z$kI8ty6flKt`C~?x3+KnxffSO%zto}F=#qKY9Iy%j~NZz3=BWPS?R!@Tn2^*i3|*N z+j6ewKjeE?Yg27=%lt}s`^~qN*!zfq~(N^oBER2g;Zk9t2KhU^oL# zu_fo_o67U$Z0|jv{cicUcdc>0h0Rus6PQvMpdre@ki_&rmVx1bJ_Ex9aB0sl|9T*U z+_n(=|M?H~a^4^R*Af5W-?GZm9o6;Q&dqwnYSaMo8OT!%u{;f|3=AC%3@OSJ z7>%p581`-Dx&Pmv$?V7W>2mj<%|7-1SI4YJY{niN9AI6R2g@8J85q{7GdM7@eG@&v z^58PF+_od{>sz1KRm&fJ{LT0MYgyBy&D;zM3=^1O7CG=axH2&OVPd$z%W&Z9?imcn z8UJlniTf|I?fvcDEj`=wr~HtW4-CHZfU!XYo}GTNdNDAZcn0#TK*27CI}HD}Zn6J2 zpXJVr{crb%)O_@P|NR|*R+n%AAA_a?*gFgi408k>7=C~nNHr`5jB?vd*2f?E{AS%} z@#EL?{j$2GfB7&rm@u4y2cTTvlBxwVt`nWSn63O78Pb>`CEcG}dV6Z`AAFnb>nj)n QPZK{9LFwwk_sP>40MA-66951J diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 9543605e0b..566b4cdb3d 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -198,6 +198,7 @@ public class NetClient implements ApplicationListener{ public static void sendMessage(String message, @Nullable String unformatted, @Nullable Player playersender){ if(Vars.ui != null){ Vars.ui.chatfrag.addMessage(message); + Sounds.chatMessage.play(); } //display raw unformatted text above player head @@ -212,6 +213,7 @@ public class NetClient implements ApplicationListener{ public static void sendMessage(String message){ if(Vars.ui != null){ Vars.ui.chatfrag.addMessage(message); + Sounds.chatMessage.play(); } } diff --git a/core/src/mindustry/entities/effect/WrapEffect.java b/core/src/mindustry/entities/effect/WrapEffect.java index 313aba5660..7eb1fa60e1 100644 --- a/core/src/mindustry/entities/effect/WrapEffect.java +++ b/core/src/mindustry/entities/effect/WrapEffect.java @@ -8,7 +8,7 @@ import mindustry.entities.*; public class WrapEffect extends Effect{ public Effect effect = Fx.none; public Color color = Color.white.cpy(); - public float rotation = Float.NaN; + public float rotation; public WrapEffect(){ } diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 3d2d1cb2a0..1ba18b6f8f 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -443,6 +443,10 @@ public class ContentParser{ unit = make(resolve(value.getString("class", ""), UnitType.class), mod + "-" + name); + if(value.has("class")){ + value.remove("class"); + } + var typeVal = value.get("type"); if(typeVal != null && !typeVal.isString()){