From b72186c8a2c54ed7d50f1bf42581e04cef7417f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E5=A4=96=E4=B9=8B=E7=A5=9E?= Date: Sat, 30 Apr 2022 11:47:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=87=E5=AE=9A=E6=B3=A2?= =?UTF-8?q?=E6=95=B0=E7=94=9F=E6=88=90=E5=83=B5=E5=B0=B8=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/data/map/level_3.json | 1 + resources/data/map/level_4.json | 1 + resources/data/map/littleGame_1.json | 1 + resources/data/map/littleGame_2.json | 1 + source/state/level.py | 4 ++-- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/data/map/level_3.json b/resources/data/map/level_3.json index 00ad792..cabc6dd 100644 --- a/resources/data/map/level_3.json +++ b/resources/data/map/level_3.json @@ -4,6 +4,7 @@ "shovel":1, "spawn_zombies":"auto", "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie"], + "inevitable_zombie_list":{"20":["BucketheadZombie"]}, "num_flags":3, "zombie_list":[ {"time":20000, "name":"Zombie"}, diff --git a/resources/data/map/level_4.json b/resources/data/map/level_4.json index 2675ff3..1df1e0c 100644 --- a/resources/data/map/level_4.json +++ b/resources/data/map/level_4.json @@ -4,6 +4,7 @@ "shovel":1, "spawn_zombies":"auto", "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie", "FootballZombie"], + "inevitable_zombie_list":{"20":["BucketheadZombie"], "30":["FootballZombie"]}, "num_flags":4, "zombie_list":[ {"time":20000, "name":"Zombie"}, diff --git a/resources/data/map/littleGame_1.json b/resources/data/map/littleGame_1.json index 93595ae..91fb2ba 100644 --- a/resources/data/map/littleGame_1.json +++ b/resources/data/map/littleGame_1.json @@ -5,6 +5,7 @@ "spawn_zombies":"auto", "num_flags":4, "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie"], + "inevitable_zombie_list":{"20":["BucketheadZombie"]}, "card_pool":[ {"name":"Peashooter"}, {"name":"SnowPea"}, diff --git a/resources/data/map/littleGame_2.json b/resources/data/map/littleGame_2.json index dc56264..c84fd75 100644 --- a/resources/data/map/littleGame_2.json +++ b/resources/data/map/littleGame_2.json @@ -5,6 +5,7 @@ "spawn_zombies":"auto", "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie"], "num_flags":4, + "inevitable_zombie_list":{"20":["BucketheadZombie"]}, "card_pool":[ {"name":"WallNutBowling"}, {"name":"RedWallNutBowling"} diff --git a/source/state/level.py b/source/state/level.py index 16e4401..dc4a07b 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -124,8 +124,8 @@ class Level(tool.State): volume = int(volume*2.5) zombieList = [] - if inevitableZombieDict and (wave in inevitableZombieDict.keys()): - for newZombie in inevitableZombieDict[wave]: + if inevitableZombieDict and (str(wave) in inevitableZombieDict.keys()): + for newZombie in inevitableZombieDict[str(wave)]: zombieList.append(newZombie) volume -= self.createZombieInfo[newZombie][0] if volume < 0: