[Merged PRs] Merged a few PRs. The other PRs will be on their own release.

Author: majordoobie

coc/static/supers.json

@@ -1 +1 @@
-{"IceHound": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [4], "Original": ["AirDefenceSeeker"], "Replacement": ["Ice Hound"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "InfernoDragon": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [5], "Original": ["BabyDragon"], "Replacement": ["InfernoDragon"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperArcher": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [7], "Original": ["Archer"], "Replacement": ["EliteArcher"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperBalloon": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [7], "Original": ["Balloon"], "Replacement": ["HastyBalloon"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperBarbarian": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [7], "Original": ["Barbarian"], "Replacement": ["EliteBarbarian"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperBowler": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [3], "Original": ["Bowler"], "Replacement": ["Super Bowler"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperDragon": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [6], "Original": ["Dragon"], "Replacement": ["Super Dragon"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperGiant": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [8], "Original": ["Giant"], "Replacement": ["EliteGiant"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperGoblin": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [6], "Original": ["Goblin"], "Replacement": ["EliteGoblin"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperMinion": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [7], "Original": ["Gargoyle"], "Replacement": ["Super Minion"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperValkyrie": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [6], "Original": ["Warrior Girl"], "Replacement": ["EliteValkyrie"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperWallbreaker": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [6], "Original": ["Wall Breaker"], "Replacement": ["EliteWallBreaker"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperWitch": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [4], "Original": ["Warlock"], "Replacement": ["Head Witch"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperWizard": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [8], "Original": ["Wizard"], "Replacement": ["Super Wizard"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperMiner": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [7], "Original": ["Miner"], "Replacement": ["Super Miner"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}}
+{"IceHound": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [4], "Original": ["AirDefenceSeeker"], "Replacement": ["Ice Hound"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "InfernoDragon": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [5], "Original": ["BabyDragon"], "Replacement": ["InfernoDragon"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperArcher": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [7], "Original": ["Archer"], "Replacement": ["EliteArcher"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperBalloon": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [7], "Original": ["Balloon"], "Replacement": ["HastyBalloon"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperBarbarian": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [7], "Original": ["Barbarian"], "Replacement": ["EliteBarbarian"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperBowler": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [3], "Original": ["Bowler"], "Replacement": ["Super Bowler"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperDragon": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [6], "Original": ["Dragon"], "Replacement": ["Super Dragon"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperGiant": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [8], "Original": ["Giant"], "Replacement": ["EliteGiant"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperGoblin": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [6], "Original": ["Goblin"], "Replacement": ["EliteGoblin"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperMinion": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [7], "Original": ["Gargoyle"], "Replacement": ["Super Minion"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperValkyrie": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [6], "Original": ["Warrior Girl"], "Replacement": ["EliteValkyrie"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperWallbreaker": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [6], "Original": ["Wall Breaker"], "Replacement": ["EliteWallBreaker"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperWitch": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [4], "Original": ["Warlock"], "Replacement": ["Head Witch"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}, "SuperWizard": {"CooldownH": [72], "DurationH": [72], "MinOriginalLevel": [8], "Original": ["Wizard"], "Replacement": ["Super Wizard"], "Resource": ["DarkElixir"], "ResourceCost": [25000]}}

coc/static/update_static.py

@@ -16,6 +16,7 @@
     ("pets.json", None),
     ("spells.json", None),
     ("supers.json", None),
+    ("townhall_levels.json", None),
     ("lang/texts_EN.json", "texts_EN.json"),
 ]
 

tests/test_troop_levels.py

@@ -16,7 +16,6 @@
                 }
             ]
         },
-
     "Wall Wrecker":
         {
             "release": 12,