diff --git a/README.md b/README.md index 37300ec..ce3c0e7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ **本项目为个人python语言学习的练习项目,仅供个人学习和研究使用,不得用于其他用途。如果这个游戏侵犯了版权,请联系我删除** * 已有的植物:向日葵,豌豆射手,坚果墙,寒冰射手,樱桃炸弹,双发射手,三线射手,大嘴花,小喷菇,土豆雷,地刺,胆小菇,倭瓜,火爆辣椒,阳光菇,寒冰菇,魅惑菇,火炬树桩,睡莲,杨桃,咖啡豆,海蘑菇,高坚果,缠绕水草,毁灭菇,墓碑吞噬者,大喷菇 -* 已有的僵尸:普通僵尸,旗帜僵尸,路障僵尸,铁桶僵尸,读报僵尸,橄榄球僵尸,鸭子救生圈僵尸,铁门僵尸,撑杆跳僵尸 +* 已有的僵尸:普通僵尸,旗帜僵尸,路障僵尸,铁桶僵尸,读报僵尸,橄榄球僵尸,鸭子救生圈僵尸,铁门僵尸,撑杆跳僵尸,冰车僵尸 * 使用 JSON 文件记录关卡信息数据 * 支持选择植物卡片 * 支持白昼模式,夜晚模式,泳池模式,传送带模式和坚果保龄球模式 @@ -46,10 +46,10 @@ python main.py * 使用鼠标收集阳光,种植植物 * 你可以通过更改`source/constants.py`中的`START_LEVEL_NUM`的数值来更改冒险模式的起始关卡,更改`START_LITTLE_GAME_NUM`的数值来更改小游戏的起始关卡: * 冒险模式: - * 1 和 2:白昼模式 + * 1和2:白昼模式 * 3:夜晚模式 - * 4:泳池模式 - * 5: 浓雾模式(暂时没有雾) + * 4和5:泳池模式 + * 6: 浓雾模式(暂时没有雾) * 小游戏模式: * 1:传送带模式 * 2:坚果保龄球模式 diff --git a/resources/data/map/level_5.json b/resources/data/map/level_5.json index 6e87a73..54ee331 100644 --- a/resources/data/map/level_5.json +++ b/resources/data/map/level_5.json @@ -1,9 +1,9 @@ { - "background_type":3, + "background_type":2, "init_sun_value":50, "shovel":1, "spawn_zombies":"auto", - "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie", "FootballZombie"], - "inevitable_zombie_list":{"20":["BucketheadZombie"], "30":["FootballZombie"]}, - "num_flags":4 + "included_zombies":["Zombie", "Zomboni"], + "inevitable_zombie_list":{"30":["Zomboni"]}, + "num_flags":3 } diff --git a/resources/data/map/level_6.json b/resources/data/map/level_6.json new file mode 100644 index 0000000..6e87a73 --- /dev/null +++ b/resources/data/map/level_6.json @@ -0,0 +1,9 @@ +{ + "background_type":3, + "init_sun_value":50, + "shovel":1, + "spawn_zombies":"auto", + "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie", "FootballZombie"], + "inevitable_zombie_list":{"20":["BucketheadZombie"], "30":["FootballZombie"]}, + "num_flags":4 +} diff --git a/resources/graphics/Plants/IceFrozenPlot/IceFrozenPlot_0.png b/resources/graphics/Plants/IceFrozenPlot/IceFrozenPlot_0.png index cd48b3f..4c6cd1d 100644 Binary files a/resources/graphics/Plants/IceFrozenPlot/IceFrozenPlot_0.png and b/resources/graphics/Plants/IceFrozenPlot/IceFrozenPlot_0.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_0.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_0.png index af67ff7..8e3fdfd 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_0.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_0.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_1.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_1.png index 662f59b..d976dc1 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_1.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_1.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_10.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_10.png index f6d817f..0edf041 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_10.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_10.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_11.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_11.png index d2009d1..013a835 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_11.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_11.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_12.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_12.png index 2c137ae..794f59c 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_12.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_12.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_13.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_13.png index 19eb4e5..5da559b 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_13.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_13.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_14.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_14.png index 3d90fcb..dbbfc42 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_14.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_14.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_15.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_15.png index 73f289d..9b767e0 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_15.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_15.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_2.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_2.png index 649bb49..bf21e31 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_2.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_2.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_3.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_3.png index 0f58d8e..4d084b0 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_3.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_3.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_4.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_4.png index c8f4a70..936d073 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_4.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_4.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_5.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_5.png index 3b813b0..dfb51de 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_5.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_5.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_6.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_6.png index bcc0f67..d4e255d 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_6.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_6.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_7.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_7.png index a1460ef..e47203b 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_7.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_7.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_8.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_8.png index 170de93..7b18cf3 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_8.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_8.png differ diff --git a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_9.png b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_9.png index 91b9924..9ff3e0c 100644 Binary files a/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_9.png and b/resources/graphics/Zombies/Zomboni/ZomboniBoomDie/ZomboniBoomDie_9.png differ diff --git a/source/component/zombie.py b/source/component/zombie.py index 8db0d5a..8bb0172 100755 --- a/source/component/zombie.py +++ b/source/component/zombie.py @@ -939,6 +939,8 @@ class Zomboni(Zombie): self.plant_group = plant_group self.map = map self.IceFrozenPlot = IceFrozenPlot + self.die_animate_interval = 100 + self.boomDie_animate_interval = 150 def loadImages(self): self.walk_frames = [] @@ -1000,12 +1002,9 @@ class Zomboni(Zombie): plant.setDamage(8000, self) # 造冰 - mapX, mapY = self.map.getMapIndex(self.rect.right, self.rect.bottom) + mapX, mapY = self.map.getMapIndex(self.rect.right - 20, self.rect.bottom) if 0 <= mapX < c.GRID_X_LEN: if c.ICE_FROZEN_PLOT not in self.map.map[mapY][mapX]: x, y = self.map.getMapGridPos(mapX, mapY) self.plant_group.add(self.IceFrozenPlot(x, y)) - - - def handleState(self): - self.walking() \ No newline at end of file + self.map.map[mapY][mapX][c.MAP_PLANT].add(c.ICE_FROZEN_PLOT) diff --git a/source/state/level.py b/source/state/level.py index 6dcd527..cfca7db 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -434,6 +434,7 @@ class Level(tool.State): c.BUCKETHEAD_DUCKY_TUBE_ZOMBIE:(4, 0), # 作为变种,不主动生成 c.SCREEN_DOOR_ZOMBIE:(4, 3500), c.POLE_VAULTING_ZOMBIE:(2, 2000), + c.ZOMBONI:(7, 2000), } # 将僵尸与水上变种对应 self.convertZombieInPool = {c.NORMAL_ZOMBIE:c.DUCKY_TUBE_ZOMBIE, @@ -839,7 +840,7 @@ class Level(tool.State): # 撑杆跳生成位置不同 self.zombie_groups[map_y].add(zombie.PoleVaultingZombie(c.ZOMBIE_START_X + randint(70, 80) + hugeWaveMove, y, self.head_group)) elif name == c.ZOMBONI: - self.zombie_groups[map_y].add(zombie.Zomboni(c.ZOMBIE_START_X + randint(0, 20) + hugeWaveMove, y, self.plant_groups[map_y], self.map, plant.IceFrozenPlot)) + self.zombie_groups[map_y].add(zombie.Zomboni(c.ZOMBIE_START_X + randint(55, 65) + hugeWaveMove, y, self.plant_groups[map_y], self.map, plant.IceFrozenPlot)) # 能否种植物的判断: # 先判断位置是否合法 isValid(map_x, map_y)