multiplayern'n't

sk7725 · Jan 19, 2021 · 369b155 · 369b155
1 parent 4084ea6
commit 369b155
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties
@@ -74,6 +74,7 @@ stat.dphealth = {0}*payload health*distance(blocks)
 # Settings
 setting.slimeeffect.name = Animated Slime [lightgray](requires animated shields)[]
 setting.correctview.name = Top-down Payload View
+setting.accelballs.name = Animated Accelerators 
 
 # UI
 ui.teamalert = Team {0} was attacked by team {1}!

diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties
@@ -1,5 +1,5 @@
 mod.betamindy.name = [accent]Beta[][white]Mindy[] [lightgray]\uBCA0\uD0C0\uBBFC\uB514[]
-mod.betamindy.short = [#b59e72]\uD63C\uB3C8\uC758 \uB370\uBAA8[]
+mod.betamindy.short = [#b59e72]Demo of Chaos Itself[]
 mod.betamindy.description = \uCCAB [accent]Java[] \uBAA8\uB4DC \uC2E0\uC791! [cyan]sk7725/Commandblocks[]\uACFC \uBE44\uACAC\uB420 \uB9CC\uD55C \uD63C\uB3C8!\n\n[green]\uAE30\uC5EC\uC790[]: \uC601\uAC10, \uB808\uC774\uD3EC\uC2A4, GlennFolker, EyeofDarkness, Voz-Duh
 
 # Pistons
@@ -76,6 +76,7 @@ stat.dphealth = {0}x\uD654\uBB3C \uCCB4\uB825x\uBE44\uAC70\uB9AC(\uBE14\uB85D)
 # Settings
 setting.slimeeffect.name = \uC2AC\uB77C\uC784 \uC560\uB2C8\uBA54\uC774\uC158 \uD6A8\uACFC [lightgray](\uBCF4\uD638\uB9C9 \uC560\uB2C8\uBA54\uC774\uC158 \uD544\uC694)[]
 setting.correctview.name = \uC704\uC5D0\uC11C \uBCF8 \uD654\uBB3C
+setting.accelballs.name = \uC6C0\uC9C1\uC774\uB294 \uAC00\uC18D\uB3C4\uACC4 
 
 # UI
 ui.teamalert = \uD300 {0}\uC774 \uD300 {1}\uC5D0\uAC8C \uACF5\uACA9\uB2F9\uD588\uC2B5\uB2C8\uB2E4!

diff --git a/src/betamindy/BetaMindy.java b/src/betamindy/BetaMindy.java
@@ -13,6 +13,7 @@
 
 public class BetaMindy extends Mod{
     public static final String githubURL = "https://github.com/sk7725/BetaMindy";
+    public static final String shortName = "[#b59e72]Demo of Chaos Itself[]"; //do not use bundles unless you want to region-lock the multiplayer experience
     public static SettingAdder settingAdder = new SettingAdder();
     public static XeloUtil pushUtil = new XeloUtil();
     public static MobileFunctions mobileUtil = new MobileFunctions();
@@ -34,7 +35,7 @@ public BetaMindy() {
             MindySounds.dispose();
         });
 
-        Core.settings.defaults("slimeeffect", true, "correctview", false);
+        Core.settings.defaults("slimeeffect", true, "correctview", false, "accelballs", true);
         Events.on(ClientLoadEvent.class, e -> {
             settingAdder.init();
         });
@@ -44,16 +45,18 @@ public BetaMindy() {
     public void init(){
         Vars.enableConsole = true;
 
+        LoadedMod mod = Vars.mods.locateMod("betamindy");
         if(!Vars.headless){
             //Partial credits to ProjectUnity
-            LoadedMod mod = Vars.mods.locateMod("betamindy");
+
             Func<String, String> stringf = value -> Core.bundle.get("mod." + value);
 
             mod.meta.displayName = stringf.get(mod.meta.name + ".name");
             mod.meta.description = stringf.get(mod.meta.name + ".description");
-            mod.meta.version = mod.meta.version + "\n" + stringf.get(mod.meta.name + ".short");
+
             mod.meta.author = "[royal]" + mod.meta.author + "[]";
         }
+        mod.meta.version = mod.meta.version + "\n" + shortName;
     }
 
     @Override

diff --git a/src/betamindy/content/SettingAdder.java b/src/betamindy/content/SettingAdder.java
@@ -13,6 +13,7 @@ public void init(){
         Core.settings.put("uiscalechanged", false);
 
         addGraphicSetting("slimeeffect");
+        addGraphicSetting("accelballs");
         addGraphicSetting("correctview");
 
         Core.settings.put("uiscalechanged", tmp);

diff --git a/src/betamindy/world/blocks/power/AccelBlock.java b/src/betamindy/world/blocks/power/AccelBlock.java
@@ -1,5 +1,6 @@
 package betamindy.world.blocks.power;
 
+import arc.Core;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.Geometry;
@@ -51,9 +52,12 @@ public class AccelBuild extends Building {
         @Override
         public void draw(){
             Draw.rect(baseRegion[rotation % 2], x, y);
-            int back = lastback ? 2 : 0;
-            float off = Mathf.clamp((ballTicks - ballTimer.getTime(ballid)) / ballTicks);
-            Draw.rect(ballRegion, x + Geometry.d4x[rotation % 2 + back] * 3f * off, y + Geometry.d4y[rotation % 2 + back] * 3f * off);
+            if(Core.settings.getBool("accelballs")){
+                int back = lastback ? 2 : 0;
+                float off = Mathf.clamp((ballTicks - ballTimer.getTime(ballid)) / ballTicks);
+                Draw.rect(ballRegion, x + Geometry.d4x[rotation % 2 + back] * 3f * off, y + Geometry.d4y[rotation % 2 + back] * 3f * off);
+            }
+            else Draw.rect(ballRegion, x, y);
         }
 
         public boolean wasMoved(int n){