diff --git a/README.md b/README.md index 5a8d832..f77ca92 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ **本项目为个人python语言学习的练习项目,仅供个人学习和研究使用,不得用于其他用途。如果这个游戏侵犯了版权,请联系我删除** * 已有的植物:向日葵,豌豆射手,坚果墙,寒冰射手,樱桃炸弹,三线射手,大嘴花,小喷菇,土豆雷,地刺,胆小菇,倭瓜,火爆辣椒,阳光菇,寒冰菇,魅惑菇,火炬树桩,睡莲,杨桃 -* 已有的僵尸:普通僵尸,旗帜僵尸,路障僵尸,铁桶僵尸,读报僵尸,橄榄球僵尸 +* 已有的僵尸:普通僵尸,旗帜僵尸,路障僵尸,铁桶僵尸,读报僵尸,橄榄球僵尸,鸭子救生圈僵尸 * 使用 JSON 格式的文件存储进度数据 (例如僵尸出现的位置和时间,背景信息) * 支持选择植物卡片 -* 支持白昼模式,夜晚模式,泳池模式(暂不完善),传送带模式和坚果保龄球模式 +* 支持白昼模式,夜晚模式,泳池模式,传送带模式和坚果保龄球模式 * 支持背景音乐播放 * 支持全屏模式 * 按`F`键进入全屏模式,按`U`键恢复至窗口模式 diff --git a/resources/data/entity/zombie.json b/resources/data/entity/zombie.json index 160195a..de540fc 100644 --- a/resources/data/entity/zombie.json +++ b/resources/data/entity/zombie.json @@ -25,6 +25,12 @@ "DukyTubeZombieAttack":{"x":55, "width":105}, "DukyTubeZombieDie":{"x":55, "width":105}, "DukyTubeZombieLostHead":{"x":55, "width":105}, - "DukyTubeZombieSwim":{"x":55, "width":105} + "DukyTubeZombieSwim":{"x":55, "width":105}, + "ConeheadDukyTubeZombie":{"x":55, "width":105}, + "ConeheadDukyTubeZombieAttack":{"x":55, "width":105}, + "ConeheadDukyTubeZombieSwim":{"x":55, "width":105}, + "BucketheadDukyTubeZombie":{"x":55, "width":105}, + "BucketheadDukyTubeZombieAttack":{"x":55, "width":105}, + "BucketheadDukyTubeZombieSwim":{"x":55, "width":105} } } \ No newline at end of file diff --git a/resources/data/map/level_0.json b/resources/data/map/level_0.json index 69ec35b..7a173d0 100644 --- a/resources/data/map/level_0.json +++ b/resources/data/map/level_0.json @@ -4,7 +4,8 @@ "shovel":1, "spawn_zombies":"list", "zombie_list":[ - {"time":0, "map_y":3, "name":"DuckyTubeZombie"}, + {"time":0, "map_y":3, "name":"BucketheadDuckyTubeZombie"}, + {"time":0, "map_y":2, "name":"ConeheadDuckyTubeZombie"}, {"time":60000, "map_y":2, "name":"Zombie"} ] } \ No newline at end of file diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_0.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_0.png new file mode 100644 index 0000000..bf05db9 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_0.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_1.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_1.png new file mode 100644 index 0000000..fbfe6b3 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_1.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_10.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_10.png new file mode 100644 index 0000000..f5afba4 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_10.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_11.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_11.png new file mode 100644 index 0000000..6c27c89 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_11.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_12.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_12.png new file mode 100644 index 0000000..f9c4a8d Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_12.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_13.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_13.png new file mode 100644 index 0000000..fa627e3 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_13.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_14.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_14.png new file mode 100644 index 0000000..5575c47 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_14.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_2.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_2.png new file mode 100644 index 0000000..b9584a3 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_2.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_3.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_3.png new file mode 100644 index 0000000..47bac59 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_3.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_4.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_4.png new file mode 100644 index 0000000..96ed1c9 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_4.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_5.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_5.png new file mode 100644 index 0000000..ef1f92b Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_5.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_6.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_6.png new file mode 100644 index 0000000..ef1f92b Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_6.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_7.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_7.png new file mode 100644 index 0000000..7cd0855 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_7.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_8.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_8.png new file mode 100644 index 0000000..8e2a322 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_8.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_9.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_9.png new file mode 100644 index 0000000..d77002b Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombie_9.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_0.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_0.png new file mode 100644 index 0000000..6586f29 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_0.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_1.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_1.png new file mode 100644 index 0000000..6e1c48f Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_1.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_10.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_10.png new file mode 100644 index 0000000..4a3b482 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_10.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_2.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_2.png new file mode 100644 index 0000000..75940aa Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_2.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_3.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_3.png new file mode 100644 index 0000000..464d055 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_3.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_4.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_4.png new file mode 100644 index 0000000..574d376 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_4.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_5.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_5.png new file mode 100644 index 0000000..574d376 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_5.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_6.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_6.png new file mode 100644 index 0000000..231fec6 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_6.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_7.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_7.png new file mode 100644 index 0000000..328a1b8 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_7.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_8.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_8.png new file mode 100644 index 0000000..5f37975 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_8.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_9.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_9.png new file mode 100644 index 0000000..5f37975 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieAttack/BucketheadDuckyTubeZombieAttack_9.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_0.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_0.png new file mode 100644 index 0000000..d5cf5cf Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_0.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_1.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_1.png new file mode 100644 index 0000000..5ce8320 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_1.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_10.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_10.png new file mode 100644 index 0000000..a1bd3ff Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_10.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_11.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_11.png new file mode 100644 index 0000000..a1bd3ff Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_11.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_12.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_12.png new file mode 100644 index 0000000..4bf9975 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_12.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_13.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_13.png new file mode 100644 index 0000000..60a9fc4 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_13.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_14.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_14.png new file mode 100644 index 0000000..16d5bb6 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_14.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_15.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_15.png new file mode 100644 index 0000000..16d5bb6 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_15.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_16.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_16.png new file mode 100644 index 0000000..b0a1cd7 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_16.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_17.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_17.png new file mode 100644 index 0000000..7bf28b6 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_17.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_18.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_18.png new file mode 100644 index 0000000..d5a255a Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_18.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_19.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_19.png new file mode 100644 index 0000000..d5a255a Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_19.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_2.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_2.png new file mode 100644 index 0000000..1b512a0 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_2.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_20.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_20.png new file mode 100644 index 0000000..84fd10f Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_20.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_21.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_21.png new file mode 100644 index 0000000..57ffc35 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_21.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_22.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_22.png new file mode 100644 index 0000000..2bfbdc2 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_22.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_23.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_23.png new file mode 100644 index 0000000..2bfbdc2 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_23.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_24.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_24.png new file mode 100644 index 0000000..f7625fa Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_24.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_25.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_25.png new file mode 100644 index 0000000..747dc87 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_25.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_26.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_26.png new file mode 100644 index 0000000..5d53090 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_26.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_27.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_27.png new file mode 100644 index 0000000..5d53090 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_27.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_28.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_28.png new file mode 100644 index 0000000..fdcbd2c Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_28.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_29.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_29.png new file mode 100644 index 0000000..89fc112 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_29.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_3.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_3.png new file mode 100644 index 0000000..661c31c Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_3.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_30.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_30.png new file mode 100644 index 0000000..1c18ee6 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_30.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_31.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_31.png new file mode 100644 index 0000000..1c18ee6 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_31.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_32.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_32.png new file mode 100644 index 0000000..e9716b2 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_32.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_33.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_33.png new file mode 100644 index 0000000..d6ff802 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_33.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_34.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_34.png new file mode 100644 index 0000000..323eb80 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_34.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_35.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_35.png new file mode 100644 index 0000000..323eb80 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_35.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_36.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_36.png new file mode 100644 index 0000000..f951315 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_36.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_4.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_4.png new file mode 100644 index 0000000..661c31c Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_4.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_5.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_5.png new file mode 100644 index 0000000..f62cb91 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_5.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_6.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_6.png new file mode 100644 index 0000000..2bd9bba Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_6.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_7.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_7.png new file mode 100644 index 0000000..9feaa10 Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_7.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_8.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_8.png new file mode 100644 index 0000000..24fa3fa Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_8.png differ diff --git a/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_9.png b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_9.png new file mode 100644 index 0000000..771103d Binary files /dev/null and b/resources/graphics/Zombies/BucketheadDuckyTubeZombie/BucketheadDuckyTubeZombieSwim/BucketheadDuckyTubeZombieSwim_9.png differ diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_0.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_0.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_0.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_0.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_1.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_1.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_1.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_1.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_10.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_10.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_10.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_10.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_11.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_11.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_11.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_11.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_12.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_12.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_12.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_12.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_13.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_13.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_13.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_13.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_14.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_14.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_14.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_14.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_15.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_15.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_15.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_15.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_2.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_2.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_2.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_2.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_3.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_3.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_3.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_3.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_4.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_4.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_4.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_4.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_5.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_5.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_5.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_5.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_6.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_6.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_6.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_6.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_7.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_7.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_7.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_7.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_8.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_8.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_8.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_8.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_9.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_9.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie/ConeheadDuckTubeZombie_9.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombie_9.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_0.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_0.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_0.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_0.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_1.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_1.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_1.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_1.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_10.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_10.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_10.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_10.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_2.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_2.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_2.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_2.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_3.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_3.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_3.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_3.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_4.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_4.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_4.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_4.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_5.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_5.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_5.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_5.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_6.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_6.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_6.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_6.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_7.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_7.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_7.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_7.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_8.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_8.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_8.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_8.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_9.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_9.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieAttack/ConeheadDuckTubeZombieAttack_9.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieAttack/ConeheadDuckyTubeZombieAttack_9.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_0.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_0.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_0.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_0.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_1.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_1.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_1.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_1.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_10.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_10.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_10.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_10.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_11.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_11.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_11.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_11.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_12.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_12.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_12.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_12.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_13.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_13.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_13.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_13.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_14.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_14.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_14.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_14.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_15.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_15.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_15.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_15.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_16.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_16.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_16.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_16.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_17.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_17.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_17.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_17.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_18.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_18.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_18.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_18.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_19.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_19.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_19.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_19.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_2.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_2.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_2.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_2.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_20.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_20.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_20.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_20.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_21.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_21.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_21.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_21.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_22.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_22.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_22.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_22.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_23.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_23.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_23.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_23.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_24.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_24.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_24.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_24.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_25.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_25.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_25.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_25.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_26.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_26.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_26.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_26.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_27.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_27.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_27.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_27.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_28.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_28.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_28.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_28.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_29.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_29.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_29.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_29.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_3.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_3.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_3.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_3.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_4.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_4.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_4.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_4.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_5.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_5.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_5.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_5.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_6.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_6.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_6.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_6.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_7.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_7.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_7.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_7.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_8.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_8.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_8.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_8.png diff --git a/resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_9.png b/resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_9.png similarity index 100% rename from resources/graphics/Zombies/ConeheadDuckTubeZombie/ConeheadDuckTubeZombieSwim/ConeheadDuckTubeZombieSwim_9.png rename to resources/graphics/Zombies/ConeheadDuckyTubeZombie/ConeheadDuckyTubeZombieSwim/ConeheadDuckyTubeZombieSwim_9.png diff --git a/source/component/zombie.py b/source/component/zombie.py index ea31d48..6441298 100755 --- a/source/component/zombie.py +++ b/source/component/zombie.py @@ -97,22 +97,72 @@ class Zombie(pg.sprite.Sprite): if self.checkToDie(self.losthead_walk_frames): return - if self.helmetHealth <= 0 and self.helmet: - self.changeFrames(self.walk_frames) - self.helmet = False - if self.helmetType2Health <= 0 and self.helmetType2: - self.changeFrames(self.walk_frames) - self.helmetType2 = False - if self.name == c.NEWSPAPER_ZOMBIE: - self.speed = 2.5 - + # 能游泳的僵尸 if self.canSwim: + # 在水池范围内 + # 在右侧岸左 if self.rect.right <= c.MAP_POOL_FRONT_X: - if not self.swimming: - self.changeFrames(self.swim_frames) - self.swimming = True - # 待写带有盔甲的水生僵尸丢盔甲的判断 - + # 在左侧岸右,左侧岸位置为预估 + if self.rect.x >= c.MAP_POOL_OFFSET_X: + # 还未进入游泳状态 + if not self.swimming: + self.swimming = True + self.changeFrames(self.swim_frames) + # 同样没有兼容双防具 + if self.helmet: + if self.helmetHealth <= 0: + self.helmet = False + else: + self.changeFrames(self.helmet_swim_frames) + if self.helmetType2: + if self.helmetType2Health <= 0: + self.helmetType2 = False + else: + self.changeFrames(self.helmet_swim_frames) + # 已经进入游泳状态 + else: + if self.helmet: + if self.helmetHealth <= 0: + self.changeFrames(self.swim_frames) + self.helmet = False + if self.helmetType2: + if self.helmetType2Health <= 0: + self.changeFrames(self.swim_frames) + self.helmetType2 = False + # 水生僵尸已经接近家门口并且上岸 + else: + if self.swimming: + self.changeFrames(self.walk_frames) + self.swimming = False + # 同样没有兼容双防具 + if self.helmet: + if self.helmetHealth <= 0: + self.helmet = False + else: + self.changeFrames(self.helmet_walk_frames) + if self.helmetType2: + if self.helmetType2Health <= 0: + self.helmetType2 = False + else: + self.changeFrames(self.helmet_walk_frames) + # 尚未进入水池 + else: + if self.helmetHealth <= 0 and self.helmet: + self.changeFrames(self.walk_frames) + self.helmet = False + if self.helmetType2Health <= 0 and self.helmetType2: + self.changeFrames(self.walk_frames) + self.helmetType2 = False + # 不能游泳的一般僵尸 + else: + if self.helmetHealth <= 0 and self.helmet: + self.changeFrames(self.walk_frames) + self.helmet = False + if self.helmetType2Health <= 0 and self.helmetType2: + self.changeFrames(self.walk_frames) + self.helmetType2 = False + if self.name == c.NEWSPAPER_ZOMBIE: + self.speed = 2.5 if (self.current_time - self.walk_timer) > (c.ZOMBIE_WALK_INTERVAL * self.getTimeRatio()): self.walk_timer = self.current_time if self.is_hypno: @@ -316,9 +366,21 @@ class Zombie(pg.sprite.Sprite): if self.canSwim: if self.rect.right <= c.MAP_POOL_FRONT_X: - self.changeFrames(self.swim_frames) self.swimming = True - # 待写带有盔甲的水生僵尸丢盔甲的判断 + self.changeFrames(self.swim_frames) + # 同样没有兼容双防具 + if self.helmet: + if self.helmetHealth <= 0: + self.changeFrames(self.swim_frames) + self.helmet = False + else: + self.changeFrames(self.helmet_swim_frames) + if self.helmetType2: + if self.helmetType2Health <= 0: + self.changeFrames(self.swim_frames) + self.helmetType2 = False + else: + self.changeFrames(self.helmet_swim_frames) def setAttack(self, prey, is_plant=True): self.prey = prey # prey can be plant or other zombies @@ -621,3 +683,78 @@ class DuckyTubeZombie(Zombie): self.loadFrames(frame_list[i], name) self.frames = self.walk_frames + +class ConeHeadDuckyTubeZombie(Zombie): + def __init__(self, x, y, head_group): + Zombie.__init__(self, x, y, c.CONEHEAD_DUCKY_TUBE_ZOMBIE, head_group, helmetHealth=c.CONEHEAD_HEALTH ,canSwim=True) + + def loadImages(self): + self.helmet_walk_frames = [] + self.walk_frames = [] + self.helmet_swim_frames = [] + self.swim_frames = [] + self.helmet_attack_frames = [] + self.attack_frames = [] + self.losthead_walk_frames = [] + self.losthead_attack_frames = [] + self.die_frames = [] + self.boomdie_frames = [] + + helmet_walk_name = self.name + helmet_swim_name = self.name + 'Swim' + helmet_attack_name = self.name + 'Attack' + walk_name = c.DUCKY_TUBE_ZOMBIE + swim_name = c.DUCKY_TUBE_ZOMBIE + 'Swim' + attack_name = c.DUCKY_TUBE_ZOMBIE + 'Attack' + losthead_walk_name = c.DUCKY_TUBE_ZOMBIE + 'LostHead' + losthead_attack_name = c.DUCKY_TUBE_ZOMBIE + 'LostHead' + die_name = c.DUCKY_TUBE_ZOMBIE + 'Die' + boomdie_name = c.BOOMDIE + + frame_list = [self.helmet_walk_frames, self.helmet_swim_frames, self.helmet_attack_frames, self.walk_frames, self.swim_frames, self.attack_frames, self.losthead_walk_frames, + self.losthead_attack_frames, self.die_frames, self.boomdie_frames] + name_list = [helmet_walk_name, helmet_swim_name, helmet_attack_name, walk_name, swim_name, attack_name, losthead_walk_name, + losthead_attack_name, die_name, boomdie_name] + + for i, name in enumerate(name_list): + self.loadFrames(frame_list[i], name) + + self.frames = self.helmet_walk_frames + + +class BucketHeadDuckyTubeZombie(Zombie): + def __init__(self, x, y, head_group): + Zombie.__init__(self, x, y, c.BUCKETHEAD_DUCKY_TUBE_ZOMBIE, head_group, helmetHealth=c.BUCKETHEAD_HEALTH ,canSwim=True) + + def loadImages(self): + self.helmet_walk_frames = [] + self.walk_frames = [] + self.helmet_swim_frames = [] + self.swim_frames = [] + self.helmet_attack_frames = [] + self.attack_frames = [] + self.losthead_walk_frames = [] + self.losthead_attack_frames = [] + self.die_frames = [] + self.boomdie_frames = [] + + helmet_walk_name = self.name + helmet_swim_name = self.name + 'Swim' + helmet_attack_name = self.name + 'Attack' + walk_name = c.DUCKY_TUBE_ZOMBIE + swim_name = c.DUCKY_TUBE_ZOMBIE + 'Swim' + attack_name = c.DUCKY_TUBE_ZOMBIE + 'Attack' + losthead_walk_name = c.DUCKY_TUBE_ZOMBIE + 'LostHead' + losthead_attack_name = c.DUCKY_TUBE_ZOMBIE + 'LostHead' + die_name = c.DUCKY_TUBE_ZOMBIE + 'Die' + boomdie_name = c.BOOMDIE + + frame_list = [self.helmet_walk_frames, self.helmet_swim_frames, self.helmet_attack_frames, self.walk_frames, self.swim_frames, self.attack_frames, self.losthead_walk_frames, + self.losthead_attack_frames, self.die_frames, self.boomdie_frames] + name_list = [helmet_walk_name, helmet_swim_name, helmet_attack_name, walk_name, swim_name, attack_name, losthead_walk_name, + losthead_attack_name, die_name, boomdie_name] + + for i, name in enumerate(name_list): + self.loadFrames(frame_list[i], name) + + self.frames = self.helmet_walk_frames \ No newline at end of file diff --git a/source/state/level.py b/source/state/level.py index 8ef51f8..e7a222c 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -108,10 +108,10 @@ class Level(tool.State): def convertZombieInPool(self, newZombie): if newZombie == c.NORMAL_ZOMBIE: return c.DUCKY_TUBE_ZOMBIE - # elif newZombie == c.CONEHEAD_ZOMBIE: - # return c.CONEHEAD_DUCKY_TUBE_ZOMBIE - # elif newZombie == c.BUCKETHEAD_ZOMBIE: - # return c.BUCKETHEAD_DUCKY_TUBE_ZOMBIE + elif newZombie == c.CONEHEAD_ZOMBIE: + return c.CONEHEAD_DUCKY_TUBE_ZOMBIE + elif newZombie == c.BUCKETHEAD_ZOMBIE: + return c.BUCKETHEAD_DUCKY_TUBE_ZOMBIE else: return newZombie @@ -148,7 +148,7 @@ class Level(tool.State): if (self.bar_type != c.CHOOSEBAR_STATIC): volume += 2 - if inevitableZombieDict and (str(wave) in inevitableZombieDict.keys()): + if inevitableZombieDict and (str(wave) in inevitableZombieDict): for newZombie in inevitableZombieDict[str(wave)]: zombieList.append(newZombie) volume -= self.createZombieInfo[newZombie][0] @@ -162,11 +162,9 @@ class Level(tool.State): # 有泳池的第四波设定上生成水生僵尸 if survivalRounds == 0 and wave == 4: newZombie = self.convertZombieInPool(newZombie) - # 等完成以后加入路障等的判断 elif survivalRounds > 0 or wave > 4: if randint(1, 4) == 1: # 1/4概率水上 newZombie = self.convertZombieInPool(newZombie) - # 等完成以后加入路障等的判断 if self.createZombieInfo[newZombie][0] <= volume: zombieList.append(newZombie) volume -= self.createZombieInfo[newZombie][0] @@ -686,6 +684,10 @@ class Level(tool.State): self.zombie_groups[map_y].add(zombie.FootballZombie(c.ZOMBIE_START_X + randint(-20, 20) + hugeWaveMove, y, self.head_group)) elif name == c.DUCKY_TUBE_ZOMBIE: self.zombie_groups[map_y].add(zombie.DuckyTubeZombie(c.ZOMBIE_START_X + randint(-20, 20) + hugeWaveMove, y, self.head_group)) + elif name == c.CONEHEAD_DUCKY_TUBE_ZOMBIE: + self.zombie_groups[map_y].add(zombie.ConeHeadDuckyTubeZombie(c.ZOMBIE_START_X + randint(-20, 20) + hugeWaveMove, y, self.head_group)) + elif name == c.BUCKETHEAD_DUCKY_TUBE_ZOMBIE: + self.zombie_groups[map_y].add(zombie.BucketHeadDuckyTubeZombie(c.ZOMBIE_START_X + randint(-20, 20) + hugeWaveMove, y, self.head_group)) # 能否种植物的判断: # 先判断位置是否合法 isValid(map_x, map_y)