yaclty/pypvz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复大蒜的大量bug

Browse Source
This commit is contained in:
星外之神 2022-06-04 19:26:04 +08:00
parent 1e86ad16ea
commit 1ff2d1a6f6
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/component/zombie.py
View File

@ -196,8 +196,8 @@ class Zombie(pg.sprite.Sprite):
self.changeFrames(self.walk_frames) self.changeFrames(self.walk_frames)
self.helmetType2 = False self.helmetType2 = False
if ((self.current_time - self.walk_timer) > (c.ZOMBIE_WALK_INTERVAL * self.getTimeRatio()) if (self.current_time - self.walk_timer) > (c.ZOMBIE_WALK_INTERVAL * self.getTimeRatio()):
and self.handleGarlicYChange()): self.handleGarlicYChange()
self.walk_timer = self.current_time self.walk_timer = self.current_time
if self.is_hypno: if self.is_hypno:
self.rect.x += 1 self.rect.x += 1
@ -206,33 +206,31 @@ class Zombie(pg.sprite.Sprite):
def handleGarlicYChange(self): def handleGarlicYChange(self):
if self.targetYChange < 0: if self.targetYChange < 0:
self.setWalk()
if self.rect.bottom > self.originalY + self.targetYChange: # 注意这里加的是负数 if self.rect.bottom > self.originalY + self.targetYChange: # 注意这里加的是负数
self.rect.bottom -= 2 self.rect.bottom -= 3
# 过半时换行 # 过半时换行
if ((self.toChangeGroup) and if ((self.toChangeGroup) and
(self.rect.bottom >= self.originalY + 0.5*self.targetYChange)): (self.rect.bottom >= self.originalY + 0.5*self.targetYChange)):
self.level.zombie_groups[self.mapY].remove(self) self.level.zombie_groups[self.mapY].remove(self)
self.level.zombie_groups[self.targetMapY].add(self) self.level.zombie_groups[self.targetMapY].add(self)
self.toChangeGroup = False
else: else:
self.rect.bottom = self.originalY + self.targetYChange self.rect.bottom = self.originalY + self.targetYChange
self.originalY = self.rect.bottom
self.targetYChange = 0 self.targetYChange = 0
return None
elif self.targetYChange > 0: elif self.targetYChange > 0:
self.setWalk()
if self.rect.bottom < self.originalY + self.targetYChange: # 注意这里加的是负数 if self.rect.bottom < self.originalY + self.targetYChange: # 注意这里加的是负数
self.rect.bottom += 2 self.rect.bottom += 3
# 过半时换行 # 过半时换行
if ((self.toChangeGroup) and if ((self.toChangeGroup) and
(self.rect.bottom <= self.originalY + 0.5*self.targetYChange)): (self.rect.bottom <= self.originalY + 0.5*self.targetYChange)):
self.level.zombie_groups[self.mapY].remove(self) self.level.zombie_groups[self.mapY].remove(self)
self.level.zombie_groups[self.targetMapY].add(self) self.level.zombie_groups[self.targetMapY].add(self)
self.toChangeGroup = False
else: else:
self.rect.bottom = self.originalY + self.targetYChange self.rect.bottom = self.originalY + self.targetYChange
self.originalY = self.rect.bottom
self.targetYChange = 0 self.targetYChange = 0
return None
else:
return True
def attacking(self): def attacking(self):
if self.checkToDie(self.losthead_attack_frames): if self.checkToDie(self.losthead_attack_frames):
@ -715,8 +713,8 @@ class NewspaperZombie(Zombie):
self.helmetType2 = False self.helmetType2 = False
# 触发报纸撕裂音效 # 触发报纸撕裂音效
pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "newspaperRip.ogg")).play() pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "newspaperRip.ogg")).play()
if ((self.current_time - self.walk_timer) > (c.ZOMBIE_WALK_INTERVAL * self.getTimeRatio()) if ((self.current_time - self.walk_timer) > (c.ZOMBIE_WALK_INTERVAL * self.getTimeRatio())):
and self.handleGarlicYChange()): self.handleGarlicYChange()
self.walk_timer = self.current_time self.walk_timer = self.current_time
if self.frames == self.lostnewspaper_frames: if self.frames == self.lostnewspaper_frames:
pass pass
@ -1178,6 +1176,9 @@ class SnorkelZombie(Zombie):
self.frames = self.walk_frames self.frames = self.walk_frames
def walking(self): def walking(self):
if self.checkToDie(self.losthead_walk_frames):
return
# 在水池范围内 # 在水池范围内
# 在右侧岸左 # 在右侧岸左
if self.rect.centerx <= c.MAP_POOL_FRONT_X - 25: if self.rect.centerx <= c.MAP_POOL_FRONT_X - 25:
@ -1199,8 +1200,8 @@ class SnorkelZombie(Zombie):
if self.swimming: if self.swimming:
self.changeFrames(self.walk_frames) self.changeFrames(self.walk_frames)
self.swimming = False self.swimming = False
if ((self.current_time - self.walk_timer) > (c.ZOMBIE_WALK_INTERVAL * self.getTimeRatio()) if (self.current_time - self.walk_timer) > (c.ZOMBIE_WALK_INTERVAL * self.getTimeRatio()):
and self.handleGarlicYChange()): self.handleGarlicYChange()
self.walk_timer = self.current_time self.walk_timer = self.current_time
# 正在上浮或者下潜不用移动 # 正在上浮或者下潜不用移动
if (self.frames == self.float_frames) or (self.frames == self.sink_frames): if (self.frames == self.float_frames) or (self.frames == self.sink_frames):

6
source/state/level.py
View File

@ -1132,6 +1132,9 @@ class Level(tool.State):
elif targetPlant.name == c.REDWALLNUTBOWLING: elif targetPlant.name == c.REDWALLNUTBOWLING:
if targetPlant.state == c.IDLE: if targetPlant.state == c.IDLE:
targetPlant.setAttack() targetPlant.setAttack()
elif zombie.targetYChange:
# 大蒜作用正在生效的僵尸不进行传递
continue
elif targetPlant.name == c.GARLIC: elif targetPlant.name == c.GARLIC:
zombie.setAttack(targetPlant) zombie.setAttack(targetPlant)
# 向吃过大蒜的僵尸传入level # 向吃过大蒜的僵尸传入level
@ -1394,7 +1397,8 @@ class Level(tool.State):
def checkLose(self): def checkLose(self):
for i in range(self.map_y_len): for i in range(self.map_y_len):
for zombie in self.zombie_groups[i]: for zombie in self.zombie_groups[i]:
if zombie.rect.right < -20 and (not zombie.lostHead) and zombie.state != c.DIE: if zombie.rect.right < -20 and (not zombie.lostHead) and (zombie.state != c.DIE):
print(zombie.rect.right, zombie.lostHead, zombie.state,zombie.name)
return True return True
return False return False