Implement Research Center, fix static maps (General Mike and starting…

… map) Fixes for General Mike, Initial map, Research Center functionality, Buying and using spells from Research Center Included also is a fix for fast_forward command as it wasn't running on some more timestamps in the player save Some new assets were included with this commit as well
AcidCaos · Dec 21, 2022 · 0dcb1c8 · 0dcb1c8
1 parent 0dcb5c5
commit 0dcb1c8
Showing 40 changed files with 4,685 additions and 4 deletions.
diff --git a/assets/characters_2/good_1_m_premium.swf b/assets/characters_2/good_1_m_premium.swf
diff --git a/assets/fx/p.avatarlance.swf b/assets/fx/p.avatarlance.swf
diff --git a/assets/fx/p.bigmissile.swf b/assets/fx/p.bigmissile.swf
diff --git a/assets/images/collectibles3.png b/assets/images/collectibles3.png
diff --git a/assets/thumbs/BOTON1_NINJA.jpg b/assets/thumbs/BOTON1_NINJA.jpg
diff --git a/assets/thumbs/BOTON2_NINJA.jpg b/assets/thumbs/BOTON2_NINJA.jpg
diff --git a/assets/thumbs/BOTON3_NINJA.jpg b/assets/thumbs/BOTON3_NINJA.jpg
diff --git a/assets/thumbs/BOTON4_NINJA.jpg b/assets/thumbs/BOTON4_NINJA.jpg
diff --git a/assets/thumbs/btn_1075_laser.jpg b/assets/thumbs/btn_1075_laser.jpg
diff --git a/assets/thumbs/btn_1075_misil.jpg b/assets/thumbs/btn_1075_misil.jpg
diff --git a/assets/thumbs/btn_1105_callDraggy.jpg b/assets/thumbs/btn_1105_callDraggy.jpg
diff --git a/assets/thumbs/btn_1105_metallicBalls.jpg b/assets/thumbs/btn_1105_metallicBalls.jpg
diff --git a/assets/thumbs/btn_1105_metallicBomb.jpg b/assets/thumbs/btn_1105_metallicBomb.jpg
diff --git a/assets/thumbs/btn_1105_metallicTornado.jpg b/assets/thumbs/btn_1105_metallicTornado.jpg
diff --git a/assets/thumbs/btn_1152_circle_shooting.jpg b/assets/thumbs/btn_1152_circle_shooting.jpg
diff --git a/assets/thumbs/btn_1152_deadly_turn.jpg b/assets/thumbs/btn_1152_deadly_turn.jpg
diff --git a/assets/thumbs/btn_1152_huge_laser.jpg b/assets/thumbs/btn_1152_huge_laser.jpg
diff --git a/assets/thumbs/btn_1152_missile_launch.jpg b/assets/thumbs/btn_1152_missile_launch.jpg
diff --git a/assets/thumbs/btn_1152_summon_drone_2.jpg b/assets/thumbs/btn_1152_summon_drone_2.jpg
diff --git a/assets/thumbs/btn_1152_whirlwind.jpg b/assets/thumbs/btn_1152_whirlwind.jpg
diff --git a/assets/thumbs/btn_1169_big_shot.jpg b/assets/thumbs/btn_1169_big_shot.jpg
diff --git a/assets/thumbs/btn_1169_spinning_attack.jpg b/assets/thumbs/btn_1169_spinning_attack.jpg
diff --git a/assets/thumbs/btn_celestial_mega_mech.jpg b/assets/thumbs/btn_celestial_mega_mech.jpg
diff --git a/assets/thumbs/btn_laser_punisher.jpg b/assets/thumbs/btn_laser_punisher.jpg
diff --git a/assets/thumbs/btn_misil_punisher.jpg b/assets/thumbs/btn_misil_punisher.jpg
diff --git a/assets/thumbs/btn_misile_storm.jpg b/assets/thumbs/btn_misile_storm.jpg
diff --git a/assets/thumbs/btn_optimus.jpg b/assets/thumbs/btn_optimus.jpg
diff --git a/assets/thumbs/btn_saw_attack.jpg b/assets/thumbs/btn_saw_attack.jpg
diff --git a/assets/thumbs/btn_special_rambo_grenade.jpg b/assets/thumbs/btn_special_rambo_grenade.jpg
diff --git a/assets/thumbs/btn_special_rambo_slash.jpg b/assets/thumbs/btn_special_rambo_slash.jpg
diff --git a/assets/thumbs/btn_special_terminator_bazooka.jpg b/assets/thumbs/btn_special_terminator_bazooka.jpg
diff --git a/assets/thumbs/metal_dragon_Boton01.jpg b/assets/thumbs/metal_dragon_Boton01.jpg
diff --git a/assets/thumbs/metal_dragon_Boton02.jpg b/assets/thumbs/metal_dragon_Boton02.jpg
diff --git a/assets/thumbs/metal_dragon_Boton03.jpg b/assets/thumbs/metal_dragon_Boton03.jpg
diff --git a/assets/thumbs/metal_dragon_Boton04.jpg b/assets/thumbs/metal_dragon_Boton04.jpg
diff --git a/command.py b/command.py
@@ -643,6 +643,33 @@ def do_command(USERID, map_id, cmd, args, resources_changed):
         map["resourceAlliesMarket"] = resource
         print("Set Allies Market resource")
 
+    elif cmd == "buy_mana_new":
+        print("Bought mana") # Nothing needs to be done here :)
+
+    elif cmd == "buy_magic":
+        magic_id = args[0]
+
+        privateState = save["privateState"]
+        magics = privateState["magics"]
+        if str(magic_id) in magics:
+            magics[str(magic_id)] += min(50, magics[str(magic_id)] + 1)
+        else:
+            magics[str(magic_id)] = 0
+
+        print("Bought magic spell")
+
+    elif cmd == "use_magic":
+        magic_id = args[0]
+
+        privateState = save["privateState"]
+        magics = privateState["magics"]
+        if str(magic_id) in magics:
+            magics[str(magic_id)] = min(50, magics[str(magic_id)] + 1)
+        else:
+            magics[str(magic_id)] = 0
+
+        print("Used magic spell")
+
     elif cmd == "fast_forward":
         seconds = args[0]
 
@@ -657,6 +684,8 @@ def do_command(USERID, map_id, cmd, args, resources_changed):
         privateState["timestampLastAllianceBonus"] = max(0, privateState["timestampLastAllianceBonus"] - seconds)
         # privateState["timeStampDartsReset"] = max(0, privateState["timeStampDartsReset"] - seconds) # don't process weekly things
         privateState["timeStampDartsNewFree"] = max(0, privateState["timeStampDartsNewFree"] - seconds)
+        privateState["tsAttacksReset"] = max(0, privateState["tsAttacksReset"] - seconds)
+        privateState["tsSpyingsReset"] = max(0, privateState["tsSpyingsReset"] - seconds)
 
         # research timers
         research_timers = privateState["timeStampDoResearch"]

diff --git a/version.py b/version.py
@@ -20,5 +20,9 @@ def migrate_loaded_save(save: dict):
         _changed = True
         privateState["deadHeroes"] = {}
         print(" [!] Applied hospital fix")
+    if type(privateState["magics"]) != dict:
+        _changed = True
+        privateState["magics"] = {}
+        print(" [!] Applied magics fix")
 
     return _changed
diff --git a/villages/General_Mike.json → villages/General_Mike_30.json b/villages/General_Mike.json → villages/General_Mike_30.json
@@ -4457,12 +4457,12 @@
         "attacksPack": 0,
         "spyings": [],
         "spyingsPack": 0,
-        "deadHeroes": [],
+        "deadHeroes": {},
         "timeStampEndPremium": 0,
         "unlockedSkins": null,
         "unlockedQuestIndex": 0,
         "questsRank": {},
-        "magics": null,
+        "magics": {},
         "timeStampDartsReset": 0,
         "timeStampDartsNewFree": 0,
         "dartsBalloonsShot": [],