diff --git a/resources/data/map/level_1.json b/resources/data/map/level_1.json index a6c40b3..0883186 100644 --- a/resources/data/map/level_1.json +++ b/resources/data/map/level_1.json @@ -4,20 +4,5 @@ "shovel": 1, "spawn_zombies":"auto", "included_zombies":["Zombie"], - "num_flags":2, - "zombie_list": [ - { "time": 20000, "name": "Zombie" }, - { "time": 40000, "name": "FlagZombie" }, - { "time": 50000, "name": "Zombie" }, - { "time": 70000, "name": "Zombie" }, - { "time": 72000, "name": "FlagZombie" }, - { "time": 74000, "name": "Zombie" }, - { "time": 90000, "name": "Zombie" }, - { "time": 91000, "name": "FlagZombie" }, - { "time": 92000, "name": "Zombie" }, - { "time": 93000, "name": "FlagZombie" }, - { "time": 94000, "name": "Zombie" }, - { "time": 95000, "name": "FlagZombie" }, - { "time": 96000, "name": "Zombie" } - ] + "num_flags":2 } \ No newline at end of file diff --git a/resources/data/map/level_2.json b/resources/data/map/level_2.json index d53d136..3b5e70a 100644 --- a/resources/data/map/level_2.json +++ b/resources/data/map/level_2.json @@ -4,20 +4,5 @@ "shovel":1, "spawn_zombies":"auto", "included_zombies":["Zombie", "ConeheadZombie"], - "num_flags":3, - "zombie_list":[ - {"time":20000, "name":"Zombie"}, - {"time":40000, "name":"FlagZombie"}, - {"time":50000, "name":"ConeheadZombie"}, - {"time":70000, "name":"ConeheadZombie"}, - {"time":72000, "name":"FlagZombie"}, - {"time":74000, "name":"ConeheadZombie"}, - {"time":90000, "name":"FlagZombie"}, - {"time":91000, "name":"ConeheadZombie"}, - {"time":92000, "name":"Zombie"}, - {"time":93000, "name":"ConeheadZombie"}, - {"time":94000, "name":"Zombie"}, - {"time":95000, "name":"FlagZombie"}, - {"time":96000, "name":"ConeheadZombie"} - ] + "num_flags":3 } \ No newline at end of file diff --git a/resources/data/map/level_3.json b/resources/data/map/level_3.json index cabc6dd..a038a80 100644 --- a/resources/data/map/level_3.json +++ b/resources/data/map/level_3.json @@ -5,21 +5,5 @@ "spawn_zombies":"auto", "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie"], "inevitable_zombie_list":{"20":["BucketheadZombie"]}, - "num_flags":3, - "zombie_list":[ - {"time":20000, "name":"Zombie"}, - {"time":40000, "name":"ConeheadZombie"}, - {"time":50000, "name":"BucketheadZombie"}, - {"time":70000, "name":"BucketheadZombie"}, - {"time":72000, "name":"FlagZombie"}, - {"time":74000, "name":"ConeheadZombie"}, - {"time":90000, "name":"BucketheadZombie"}, - {"time":91000, "name":"ConeheadZombie"}, - {"time":92000, "name":"Zombie"}, - {"time":93000, "name":"BucketheadZombie"}, - {"time":94000, "name":"Zombie"}, - {"time":95000, "name":"FlagZombie"}, - {"time":96000, "name":"BucketheadZombie"}, - {"time":97000, "name":"FlagZombie"} - ] + "num_flags":3 } diff --git a/resources/data/map/level_4.json b/resources/data/map/level_4.json index 1df1e0c..e044e90 100644 --- a/resources/data/map/level_4.json +++ b/resources/data/map/level_4.json @@ -5,21 +5,5 @@ "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"}, - {"time":40000, "name":"ConeheadZombie"}, - {"time":50000, "name":"BucketheadZombie"}, - {"time":70000, "name":"BucketheadZombie"}, - {"time":72000, "name":"FlagZombie"}, - {"time":74000, "name":"ConeheadZombie"}, - {"time":90000, "name":"BucketheadZombie"}, - {"time":91000, "name":"ConeheadZombie"}, - {"time":92000, "name":"Zombie"}, - {"time":93000, "name":"BucketheadZombie"}, - {"time":94000, "name":"Zombie"}, - {"time":95000, "name":"FlagZombie"}, - {"time":96000, "name":"BucketheadZombie"}, - {"time":97000, "name":"FootballZombie"} - ] + "num_flags":4 } diff --git a/resources/data/map/littleGame_1.json b/resources/data/map/littleGame_1.json index 91fb2ba..c7bd901 100644 --- a/resources/data/map/littleGame_1.json +++ b/resources/data/map/littleGame_1.json @@ -14,33 +14,5 @@ {"name":"RepeaterPea"}, {"name":"Chomper"}, {"name":"PotatoMine"} - ], - "zombie_list":[ - {"time": 1000, "name":"Zombie"}, - {"time": 6000, "name":"FlagZombie"}, - {"time":10000, "name":"ConeheadZombie"}, - {"time":14000, "name":"NewspaperZombie"}, - {"time":18000, "name":"BucketheadZombie"}, - {"time":22000, "name":"Zombie"}, - {"time":26000, "name":"BucketheadZombie"}, - {"time":30000, "name":"Zombie"}, - {"time":32000, "name":"NewspaperZombie"}, - {"time":34000, "name":"FlagZombie"}, - {"time":36000, "name":"ConeheadZombie"}, - {"time":38000, "name":"BucketheadZombie"}, - {"time":40000, "name":"ConeheadZombie"}, - {"time":42000, "name":"NewspaperZombie"}, - {"time":60000, "name":"Zombie"}, - {"time":61000, "name":"NewspaperZombie"}, - {"time":62000, "name":"FlagZombie"}, - {"time":63000, "name":"Zombie"}, - {"time":64000, "name":"BucketheadZombie"}, - {"time":65000, "name":"ConeheadZombie"}, - {"time":66000, "name":"Zombie"}, - {"time":67000, "name":"BucketheadZombie"}, - {"time":68000, "name":"NewspaperZombie"}, - {"time":69000, "name":"FlagZombie"}, - {"time":70000, "name":"BucketheadZombie"}, - {"time":71000, "name":"FlagZombie"} ] } \ No newline at end of file diff --git a/resources/data/map/littleGame_2.json b/resources/data/map/littleGame_2.json index c84fd75..19b408a 100644 --- a/resources/data/map/littleGame_2.json +++ b/resources/data/map/littleGame_2.json @@ -9,30 +9,5 @@ "card_pool":[ {"name":"WallNutBowling"}, {"name":"RedWallNutBowling"} - ], - "zombie_list":[ - {"time": 1000, "name":"Zombie"}, - {"time":10000, "name":"FlagZombie"}, - {"time":12000, "name":"ConeheadZombie"}, - {"time":14000, "name":"NewspaperZombie"}, - {"time":18000, "name":"BucketheadZombie"}, - {"time":22000, "name":"Zombie"}, - {"time":26000, "name":"BucketheadZombie"}, - {"time":30000, "name":"Zombie"}, - {"time":32000, "name":"NewspaperZombie"}, - {"time":34000, "name":"FlagZombie"}, - {"time":36000, "name":"ConeheadZombie"}, - {"time":40000, "name":"ConeheadZombie"}, - {"time":42000, "name":"NewspaperZombie"}, - {"time":50000, "name":"Zombie"}, - {"time":54000, "name":"NewspaperZombie"}, - {"time":58000, "name":"FlagZombie"}, - {"time":62000, "name":"Zombie"}, - {"time":64000, "name":"ConeheadZombie"}, - {"time":66000, "name":"Zombie"}, - {"time":68000, "name":"NewspaperZombie"}, - {"time":70000, "name":"FlagZombie"}, - {"time":72000, "name":"BucketheadZombie"}, - {"time":74000, "name":"FlagZombie"} ] } \ No newline at end of file diff --git a/source/state/level.py b/source/state/level.py index f04bb88..d15be0e 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -169,12 +169,20 @@ class Level(tool.State): self.waveZombies = self.waves[self.waveNum - 1] self.numZombie = len(self.waveZombies) return - if (current_time - self.waveTime >= 25000 + randint(0, 6000)) or (self.bar_type != c.CHOOSEBAR_STATIC and current_time - self.waveTime >= 12500 + randint(0, 3000)): - self.waveNum += 1 - self.waveTime = current_time - self.waveZombies = self.waves[self.waveNum - 1] - self.numZombie = len(self.waveZombies) - return + if (self.waveNum % 10 != 9): + if ((current_time - self.waveTime >= 25000 + randint(0, 6000)) or (self.bar_type != c.CHOOSEBAR_STATIC and current_time - self.waveTime >= 12500 + randint(0, 3000))): + self.waveNum += 1 + self.waveTime = current_time + self.waveZombies = self.waves[self.waveNum - 1] + self.numZombie = len(self.waveZombies) + return + else: + if ((current_time - self.waveTime >= 45000) or (self.bar_type != c.CHOOSEBAR_STATIC and current_time - self.waveTime >= 25000)): + self.waveNum += 1 + self.waveTime = current_time + self.waveZombies = self.waves[self.waveNum - 1] + self.numZombie = len(self.waveZombies) + return numZombies = 0 for i in range(self.map_y_len): numZombies += len(self.zombie_groups[i]) @@ -472,6 +480,7 @@ class Level(tool.State): self.createZombie(data[1]) self.zombie_list.remove(data) else: + # 新僵尸生成方式 self.refreshWaves(self.current_time) for i in self.waveZombies: self.createZombie(i)