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

删除部分冗余结构

Browse Source
This commit is contained in:
星外之神 2022-09-13 21:21:20 +08:00
parent 37d8b29f60
commit 60911bebdd
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/component/plant.py
View File

@ -241,7 +241,6 @@ class Plant(pg.sprite.Sprite):
self.health = health self.health = health
self.state = c.IDLE self.state = c.IDLE
self.bullet_group = bullet_group self.bullet_group = bullet_group
self.can_sleep = False
self.animate_timer = 0 self.animate_timer = 0
self.animate_interval = 70 # 帧播放间隔 self.animate_interval = 70 # 帧播放间隔
self.hit_timer = 0 self.hit_timer = 0
@ -670,7 +669,6 @@ class Chomper(Plant):
class PuffShroom(Plant): class PuffShroom(Plant):
def __init__(self, x, y, bullet_group): def __init__(self, x, y, bullet_group):
Plant.__init__(self, x, y, c.PUFFSHROOM, c.PLANT_HEALTH, bullet_group) Plant.__init__(self, x, y, c.PUFFSHROOM, c.PLANT_HEALTH, bullet_group)
self.can_sleep = True
self.shoot_timer = 0 self.shoot_timer = 0
def loadImages(self, name, scale): def loadImages(self, name, scale):
@ -945,7 +943,6 @@ class Jalapeno(Plant):
class ScaredyShroom(Plant): class ScaredyShroom(Plant):
def __init__(self, x, y, bullet_group): def __init__(self, x, y, bullet_group):
Plant.__init__(self, x, y, c.SCAREDYSHROOM, c.PLANT_HEALTH, bullet_group) Plant.__init__(self, x, y, c.SCAREDYSHROOM, c.PLANT_HEALTH, bullet_group)
self.can_sleep = True
self.shoot_timer = 0 self.shoot_timer = 0
self.cry_x_range = c.GRID_X_SIZE * 1.5 self.cry_x_range = c.GRID_X_SIZE * 1.5
@ -999,7 +996,6 @@ class ScaredyShroom(Plant):
class SunShroom(Plant): class SunShroom(Plant):
def __init__(self, x, y, sun_group): def __init__(self, x, y, sun_group):
Plant.__init__(self, x, y, c.SUNSHROOM, c.PLANT_HEALTH, None) Plant.__init__(self, x, y, c.SUNSHROOM, c.PLANT_HEALTH, None)
self.can_sleep = True
self.animate_interval = 140 self.animate_interval = 140
self.sun_timer = 0 self.sun_timer = 0
self.sun_group = sun_group self.sun_group = sun_group
@ -1043,7 +1039,6 @@ class SunShroom(Plant):
class IceShroom(Plant): class IceShroom(Plant):
def __init__(self, x, y): def __init__(self, x, y):
Plant.__init__(self, x, y, c.ICESHROOM, c.PLANT_HEALTH, None) Plant.__init__(self, x, y, c.ICESHROOM, c.PLANT_HEALTH, None)
self.can_sleep = True
self.orig_pos = (x, y) self.orig_pos = (x, y)
self.start_boom = False self.start_boom = False
self.boomed = False self.boomed = False
@ -1114,7 +1109,6 @@ class IceShroom(Plant):
class HypnoShroom(Plant): class HypnoShroom(Plant):
def __init__(self, x, y): def __init__(self, x, y):
Plant.__init__(self, x, y, c.HYPNOSHROOM, c.PLANT_HEALTH, None) Plant.__init__(self, x, y, c.HYPNOSHROOM, c.PLANT_HEALTH, None)
self.can_sleep = True
self.animate_interval = 80 self.animate_interval = 80
self.zombie_to_hypno = None self.zombie_to_hypno = None
@ -1381,7 +1375,7 @@ class CoffeeBean(Plant):
if self.frame_index >= self.frame_num: if self.frame_index >= self.frame_num:
self.map_content[c.MAP_SLEEP] = False self.map_content[c.MAP_SLEEP] = False
for plant in self.plant_group: for plant in self.plant_group:
if plant.can_sleep: if plant.name in c.CAN_SLEEP_PLANTS:
if plant.state == c.SLEEP: if plant.state == c.SLEEP:
plant_map_x, _ = self.map.getMapIndex(plant.rect.centerx, plant.rect.bottom) plant_map_x, _ = self.map.getMapIndex(plant.rect.centerx, plant.rect.bottom)
if plant_map_x == self.map_x: if plant_map_x == self.map_x:
@ -1409,7 +1403,6 @@ class CoffeeBean(Plant):
class SeaShroom(Plant): class SeaShroom(Plant):
def __init__(self, x, y, bullet_group): def __init__(self, x, y, bullet_group):
Plant.__init__(self, x, y, c.SEASHROOM, c.PLANT_HEALTH, bullet_group) Plant.__init__(self, x, y, c.SEASHROOM, c.PLANT_HEALTH, bullet_group)
self.can_sleep = True
self.shoot_timer = 0 self.shoot_timer = 0
def loadImages(self, name, scale): def loadImages(self, name, scale):
@ -1532,7 +1525,6 @@ class TangleKlep(Plant):
class DoomShroom(Plant): class DoomShroom(Plant):
def __init__(self, x, y, map_plant_set, explode_y_range): def __init__(self, x, y, map_plant_set, explode_y_range):
Plant.__init__(self, x, y, c.DOOMSHROOM, c.PLANT_HEALTH, None) Plant.__init__(self, x, y, c.DOOMSHROOM, c.PLANT_HEALTH, None)
self.can_sleep = True
self.map_plant_set = map_plant_set self.map_plant_set = map_plant_set
self.bomb_timer = 0 self.bomb_timer = 0
self.explode_y_range = explode_y_range self.explode_y_range = explode_y_range
@ -1707,7 +1699,6 @@ class GraveBuster(Plant):
class FumeShroom(Plant): class FumeShroom(Plant):
def __init__(self, x, y, bullet_group, zombie_group): def __init__(self, x, y, bullet_group, zombie_group):
Plant.__init__(self, x, y, c.FUMESHROOM, c.PLANT_HEALTH, bullet_group) Plant.__init__(self, x, y, c.FUMESHROOM, c.PLANT_HEALTH, bullet_group)
self.can_sleep = True
self.shoot_timer = 0 self.shoot_timer = 0
self.show_attack_frames = True self.show_attack_frames = True
self.zombie_group = zombie_group self.zombie_group = zombie_group

3
source/state/level.py
View File

@ -927,7 +927,8 @@ class Level(tool.State):
new_plant = plant.GiantWallNut(x, y) new_plant = plant.GiantWallNut(x, y)
if new_plant.can_sleep and self.background_type in c.DAYTIME_BACKGROUNDS: if ((new_plant.name in c.CAN_SLEEP_PLANTS)
and (self.background_type in c.DAYTIME_BACKGROUNDS)):
new_plant.setSleep() new_plant.setSleep()
mushroom_sleep = True mushroom_sleep = True
else: else: