From 721c2d40d8d4c78cc1f5d1c3d5cd061657040e82 Mon Sep 17 00:00:00 2001 From: Atomic-Laboratory <146392884+Atomic-Laboratory@users.noreply.github.com> Date: Mon, 16 Oct 2023 12:16:38 -0400 Subject: [PATCH 1/5] Change port for Atomic Servers (#9174) * Change port for Atomic Servers I cant choose ports when making a new game server node... * change domain move domain to 129.146.33.189 --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 0738a81b52..cd3a3b6366 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -258,6 +258,6 @@ }, { "name": "Atomic", - "address": ["129.146.33.189:25709", "atomic-lab.ddns.net:30315"] + "address": ["atomic-lab.ddns.net:25709", "atomic-lab.ddns.net:25907"] } ] From 033e3d136e2442952727164974fd381d7508aad2 Mon Sep 17 00:00:00 2001 From: lemon3357 <126368248+lemon3357@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:18:29 +0800 Subject: [PATCH 2/5] Update servers_v7.json (#9175) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index cd3a3b6366..4b505bf6dc 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -193,7 +193,7 @@ }, { "name": "Realm of Serene Lime", - "address": ["43.248.185.167:8517","n2.akiracloud.net:10686","n2.akiracloud.net:10486", "p12.simpfun.cn:8654"] + "address": ["43.248.116.142:10627","n2.akiracloud.net:10686","n2.akiracloud.net:10486", "p12.simpfun.cn:8654"] }, { "name": "CreateDustry", From 7a02230226ed8f11cfa408f843734fc3a6ea6d6e Mon Sep 17 00:00:00 2001 From: Atomic-Laboratory <146392884+Atomic-Laboratory@users.noreply.github.com> Date: Thu, 19 Oct 2023 01:47:51 -0400 Subject: [PATCH 3/5] Add Atomic PvP (#9176) A pvp server were (almost) all turrets have infinite ammo and cryo fluid. Maximize chaos. Hosted on Germany. --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 4b505bf6dc..411395eabf 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -258,6 +258,6 @@ }, { "name": "Atomic", - "address": ["atomic-lab.ddns.net:25709", "atomic-lab.ddns.net:25907"] + "address": ["atomic-lab.ddns.net:25709", "atomic-lab.ddns.net:25907", "atomic-de.ddns.net:35845"] } ] From 34782e943c09f31b6e6ecc32e5d47f884e8350e7 Mon Sep 17 00:00:00 2001 From: karlo292 <64750254+karlo292@users.noreply.github.com> Date: Thu, 19 Oct 2023 15:27:30 +0200 Subject: [PATCH 4/5] Update servers_v7.json (#9177) added new IP for crocraft network server --- servers_v7.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index 411395eabf..1504487bd0 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -233,8 +233,8 @@ "address": ["118.127.8.162:25617", "78.108.218.117:25640", "srv3.godlike.club:27246"] }, { - "name": "Vanilla CroCraft", - "address": ["130.61.175.47:6567", "41.216.188.223:5001"] + "name": "CroCraft Network", + "address": ["193.122.53.98:6567", "41.216.188.223:5001"] }, { "name": "Extra Utilities", From 2522b167383d628a779131c5e1d5f07680f4e324 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Thu, 19 Oct 2023 10:55:04 -0700 Subject: [PATCH 5/5] SoundEffect - An Effect that produces sound when created. (#9178) * SoundEffect * Add to ClassMap * Loading via prov does not work * MEEP, that's not how you random --- .../entities/effect/SoundEffect.java | 38 +++++++++++++++++++ core/src/mindustry/mod/ClassMap.java | 1 + 2 files changed, 39 insertions(+) create mode 100644 core/src/mindustry/entities/effect/SoundEffect.java diff --git a/core/src/mindustry/entities/effect/SoundEffect.java b/core/src/mindustry/entities/effect/SoundEffect.java new file mode 100644 index 0000000000..8ed0f74a20 --- /dev/null +++ b/core/src/mindustry/entities/effect/SoundEffect.java @@ -0,0 +1,38 @@ +package mindustry.entities.effect; + +import arc.*; +import arc.audio.*; +import arc.func.*; +import arc.graphics.*; +import arc.math.*; +import arc.struct.*; +import arc.util.*; +import mindustry.entities.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; + +/** Plays a sound effect when created and simultaneously renders an effect. */ +public class SoundEffect extends Effect{ + public Sound sound = Sounds.none; + public float minPitch = 0.8f; + public float maxPitch = 1.2f; + public float minVolume = 1f; + public float maxVolume = 1f; + public Effect effect; + + public SoundEffect(){ + } + + public SoundEffect(Sound sound, Effect effect){ + this.sound = sound; + this.effect = effect; + } + + @Override + public void create(float x, float y, float rotation, Color color, Object data){ + if(!shouldCreate()) return; + + sound.at(x, y, Mathf.random(minPitch, maxPitch), Mathf.random(minVolume, maxVolume)); + effect.create(x, y, rotation, color, data); + } +} diff --git a/core/src/mindustry/mod/ClassMap.java b/core/src/mindustry/mod/ClassMap.java index 5ddec905f5..db15ff5e89 100644 --- a/core/src/mindustry/mod/ClassMap.java +++ b/core/src/mindustry/mod/ClassMap.java @@ -66,6 +66,7 @@ public class ClassMap{ classes.put("ParticleEffect", mindustry.entities.effect.ParticleEffect.class); classes.put("RadialEffect", mindustry.entities.effect.RadialEffect.class); classes.put("SeqEffect", mindustry.entities.effect.SeqEffect.class); + classes.put("SoundEffect", mindustry.entities.effect.SoundEffect.class); classes.put("WaveEffect", mindustry.entities.effect.WaveEffect.class); classes.put("WrapEffect", mindustry.entities.effect.WrapEffect.class); classes.put("DrawPart", mindustry.entities.part.DrawPart.class);