diff --git a/source/component/plant.py b/source/component/plant.py index c34015e..f1b4ca7 100755 --- a/source/component/plant.py +++ b/source/component/plant.py @@ -40,7 +40,7 @@ class Car(pg.sprite.Sprite): # 豌豆及孢子类普通子弹 class Bullet(pg.sprite.Sprite): - def __init__(self, x, start_y, dest_y, name, damage, effect=False, passedTorchWood=None): + def __init__(self, x, start_y, dest_y, name, damage, effect=None, passedTorchWood=None): pg.sprite.Sprite.__init__(self) self.name = name @@ -412,7 +412,7 @@ class PeaShooter(Plant): self.shoot_timer = self.current_time - 700 elif (self.current_time - self.shoot_timer) >= 1400: self.bullet_group.add(Bullet(self.rect.right - 15, self.rect.y, self.rect.y, - c.BULLET_PEA, c.BULLET_DAMAGE_NORMAL, effect=False)) + c.BULLET_PEA, c.BULLET_DAMAGE_NORMAL, effect=None)) self.shoot_timer = self.current_time # 播放发射音效 pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "shoot.ogg")).play() @@ -436,14 +436,14 @@ class RepeaterPea(Plant): elif (self.current_time - self.shoot_timer >= 1400): self.firstShot = True self.bullet_group.add(Bullet(self.rect.right - 15, self.rect.y, self.rect.y, - c.BULLET_PEA, c.BULLET_DAMAGE_NORMAL, effect=False)) + c.BULLET_PEA, c.BULLET_DAMAGE_NORMAL, effect=None)) self.shoot_timer = self.current_time # 播放发射音效 pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "shoot.ogg")).play() elif self.firstShot and (self.current_time - self.shoot_timer) > 100: self.firstShot = False self.bullet_group.add(Bullet(self.rect.right - 15, self.rect.y, self.rect.y, - c.BULLET_PEA, c.BULLET_DAMAGE_NORMAL, effect=False)) + c.BULLET_PEA, c.BULLET_DAMAGE_NORMAL, effect=None)) # 播放发射音效 pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "shoot.ogg")).play() @@ -478,7 +478,7 @@ class ThreePeaShooter(Plant): else: dest_y = self.rect.y + (i - 1) * c.GRID_Y_SIZE + offset_y self.bullet_groups[tmp_y].add(Bullet(self.rect.right - 15, self.rect.y, dest_y, - c.BULLET_PEA, c.BULLET_DAMAGE_NORMAL, effect=False)) + c.BULLET_PEA, c.BULLET_DAMAGE_NORMAL, effect=None)) self.shoot_timer = self.current_time # 播放发射音效 pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "shoot.ogg")).play() @@ -674,7 +674,7 @@ class PuffShroom(Plant): self.shoot_timer = self.current_time - 700 elif (self.current_time - self.shoot_timer) >= 1400: self.bullet_group.add(Bullet(self.rect.right, self.rect.y + 10, self.rect.y + 10, - c.BULLET_MUSHROOM, c.BULLET_DAMAGE_NORMAL, effect=False)) + c.BULLET_MUSHROOM, c.BULLET_DAMAGE_NORMAL, effect=None)) self.shoot_timer = self.current_time # 播放音效 pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "puff.ogg")).play() @@ -946,7 +946,7 @@ class ScaredyShroom(Plant): self.shoot_timer = self.current_time - 700 elif (self.current_time - self.shoot_timer) >= 1400: self.bullet_group.add(Bullet(self.rect.right - 15, self.rect.y + 40, self.rect.y + 40, - c.BULLET_MUSHROOM, c.BULLET_DAMAGE_NORMAL, effect=False)) + c.BULLET_MUSHROOM, c.BULLET_DAMAGE_NORMAL, effect=None)) self.shoot_timer = self.current_time # 播放音效 pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "puff.ogg")).play() @@ -1254,7 +1254,7 @@ class TorchWood(Plant): if i.passedTorchWood != self.rect.centerx: if abs(i.rect.centerx - self.rect.centerx) <= 20: self.bullet_group.add(Bullet(i.rect.x, i.rect.y, i.rect.y, - c.BULLET_PEA, c.BULLET_DAMAGE_NORMAL, effect=False, passedTorchWood=self.rect.centerx)) + c.BULLET_PEA, c.BULLET_DAMAGE_NORMAL, effect=None, passedTorchWood=self.rect.centerx)) i.kill() class StarFruit(Plant): @@ -1367,7 +1367,7 @@ class SeaShroom(Plant): self.shoot_timer = self.current_time - 700 elif (self.current_time - self.shoot_timer) >= 1400: self.bullet_group.add(Bullet(self.rect.right, self.rect.y + 50, self.rect.y + 50, - c.BULLET_SEASHROOM, c.BULLET_DAMAGE_NORMAL, effect=False)) + c.BULLET_SEASHROOM, c.BULLET_DAMAGE_NORMAL, effect=None)) self.shoot_timer = self.current_time # 播放发射音效 pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "puff.ogg")).play() diff --git a/source/component/zombie.py b/source/component/zombie.py index c4b0ca2..8df8481 100755 --- a/source/component/zombie.py +++ b/source/component/zombie.py @@ -310,7 +310,7 @@ class Zombie(pg.sprite.Sprite): if (self.current_time - self.ice_slow_timer) > c.ICE_SLOW_TIME: self.ice_slow_ratio = 1 - def setDamage(self, damage, effect=False, damageType=c.ZOMBIE_COMMON_DAMAGE): + def setDamage(self, damage, effect=None, damageType=c.ZOMBIE_COMMON_DAMAGE): # 冰冻减速效果 if effect == c.BULLET_EFFECT_ICE: if damageType == c.ZOMBIE_DEAFULT_DAMAGE: # 寒冰射手不能穿透二类防具进行减速 diff --git a/source/state/level.py b/source/state/level.py index 68ba268..51758aa 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -1023,7 +1023,7 @@ class Level(tool.State): if bullet.name == c.BULLET_FIREBALL: for rangeZombie in self.zombie_groups[i]: if abs(rangeZombie.rect.x - bullet.rect.x) <= (c.GRID_X_SIZE // 2): - rangeZombie.setDamage(c.BULLET_DAMAGE_FIREBALL_RANGE, effect=False, damageType=c.ZOMBIE_DEAFULT_DAMAGE) + rangeZombie.setDamage(c.BULLET_DAMAGE_FIREBALL_RANGE, effect=None, damageType=c.ZOMBIE_DEAFULT_DAMAGE) break @@ -1143,7 +1143,7 @@ class Level(tool.State): if car.dead: self.cars.remove(car) - def boomZombies(self, x, map_y, y_range, x_range, effect=False): + def boomZombies(self, x, map_y, y_range, x_range, effect=None): for i in range(self.map_y_len): if abs(i - map_y) > y_range: continue