加入部分咖啡豆素材

resources/data/entity/zombie.json

@@ -20,6 +20,11 @@
         "NewspaperZombieNoPaperAttack":{"x":48, "width":92},
         "NewspaperZombieLostHead":{"x":44, "width":96},
         "NewspaperZombieLostHeadAttack":{"x":48, "width":92},
-        "NewspaperZombieDie":{"x":0, "width":100}
+        "NewspaperZombieDie":{"x":0, "width":100},
+        "DukyTubeZombie":{"x":55, "width":105},
+        "DukyTubeZombieAttack":{"x":55, "width":105},
+        "DukyTubeZombieDie":{"x":55, "width":105},
+        "DukyTubeZombieLostHead":{"x":55, "width":105},
+        "DukyTubeZombieSwim":{"x":55, "width":105}
     }
 }

resources/data/map/level_0.json

@@ -4,7 +4,7 @@
     "shovel":1,
     "spawn_zombies":"list",
     "zombie_list":[
-        {"time":1000, "map_y":2, "name":"FootballZombie"},
+        {"time":1000, "map_y":2, "name":"DuckyTubeZombie"},
         {"time":60000, "map_y":2, "name":"Zombie"}
     ]
 }

source/component/zombie.py

@@ -4,7 +4,7 @@ from .. import constants as c
 
 
 class Zombie(pg.sprite.Sprite):
-    def __init__(self, x, y, name, head_group=None, helmetHealth=0, helmetType2Health=0, bodyHealth=c.NORMAL_HEALTH + c.LOSTHEAD_HEALTH, damage=c.ZOMBIE_ATTACK_DAMAGE):
+    def __init__(self, x, y, name, head_group=None, helmetHealth=0, helmetType2Health=0, bodyHealth=c.NORMAL_HEALTH + c.LOSTHEAD_HEALTH, damage=c.ZOMBIE_ATTACK_DAMAGE, canSwim=False):
         pg.sprite.Sprite.__init__(self)
 
         self.name = name
@@ -575,3 +575,34 @@ class FootballZombie(Zombie):
             self.loadFrames(frame_list[i], name)
 
         self.frames = self.helmet_walk_frames
+
+class DuckyTubeZombie(Zombie):
+    def __init__(self, x, y, head_group):
+        Zombie.__init__(self, x, y, c.DUCKY_TUBE_ZOMBIE, head_group, canSwim=True)
+
+    def loadImages(self):
+        self.walk_frames = []
+        self.swim_frames = []
+        self.attack_frames = []
+        self.losthead_walk_frames = []
+        self.losthead_attack_frames = []
+        self.die_frames = []
+        self.boomdie_frames = []
+
+        walk_name = self.name
+        swim_name = self.name + 'Swim'
+        attack_name = self.name + 'Attack'
+        losthead_walk_name = self.name + 'LostHead'
+        losthead_attack_name = self.name + 'LostHead'
+        die_name = self.name + 'Die'
+        boomdie_name = c.BOOMDIE
+
+        frame_list = [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 = [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.walk_frames

source/constants.py

@@ -141,6 +141,9 @@ MAP_POOL_OFFSET_Y = 115
 MAP_ROOF_OFFSET_X = 35  # 暂时还不清楚数据
 MAP_ROOF_OFFSET_Y = 105 # 暂时还不清楚数据
 
+# 泳池前端陆地部分
+MAP_POOL_FRONT_X = 770
+
 # 植物选择菜单栏、传送带菜单栏等类型设定
 CHOOSEBAR_TYPE = 'choosebar_type'
 CHOOSEBAR_STATIC = 0
@@ -277,6 +280,8 @@ BUCKETHEAD_ZOMBIE = 'BucketheadZombie'
 FLAG_ZOMBIE = 'FlagZombie'
 NEWSPAPER_ZOMBIE = 'NewspaperZombie'
 FOOTBALL_ZOMBIE = 'FootballZombie'
+DUCKY_TUBE_ZOMBIE = 'DuckyTubeZombie'
+
 BOOMDIE = 'BoomDie'
 
 # 对僵尸的攻击类型设置

source/state/level.py

@@ -657,6 +657,8 @@ class Level(tool.State):
             self.zombie_groups[map_y].add(zombie.NewspaperZombie(c.ZOMBIE_START_X + randint(-20, 20) + hugeWaveMove, y, self.head_group))
         elif name == c.FOOTBALL_ZOMBIE:
             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))
 
     # 能否种植物的判断：
     # 先判断位置是否合法 isValid(map_x, map_y)