diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_0.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_0.png index 7397d63..104d626 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_0.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_0.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_1.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_1.png index e598e99..12287ee 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_1.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_1.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_10.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_10.png index b95ddf5..a915aae 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_10.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_10.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_11.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_11.png index b7d71d3..a58a998 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_11.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_11.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_12.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_12.png index b7d71d3..a58a998 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_12.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_12.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_13.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_13.png index 896cd51..d7dd33f 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_13.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_13.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_14.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_14.png index 4f94a78..c7d41f8 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_14.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_14.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_15.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_15.png index 9ecd760..9030e06 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_15.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_15.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_2.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_2.png index 0a6e084..615e6b0 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_2.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_2.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_3.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_3.png index c6e0d02..e012093 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_3.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_3.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_4.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_4.png index e0637cc..6e9f089 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_4.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_4.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_5.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_5.png index 6c400e9..604f31e 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_5.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_5.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_6.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_6.png index 6448b05..31df849 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_6.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_6.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_7.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_7.png index f5e0925..627f3ba 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_7.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_7.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_8.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_8.png index 2d977b1..6c9caf7 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_8.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_8.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_9.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_9.png index 98fa952..ac7487e 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_9.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_9.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_0.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_0.png index fbcd4f2..b18a6c2 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_0.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_0.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_1.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_1.png index 019d730..74a7646 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_1.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_1.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_10.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_10.png index eaf1306..67e7ddd 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_10.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_10.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_11.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_11.png index eaf1306..67e7ddd 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_11.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_11.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_12.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_12.png index 8f05e31..637a23c 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_12.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_12.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_13.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_13.png index 112a8cf..a97be81 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_13.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_13.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_2.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_2.png index 4a23beb..ac9e0a4 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_2.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_2.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_3.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_3.png index 5d62fe3..7ea9430 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_3.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_3.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_4.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_4.png index 2c4ed30..c2c2c52 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_4.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_4.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_5.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_5.png index 640d139..ba9fc6c 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_5.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_5.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_6.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_6.png index 71fc582..f974f01 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_6.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_6.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_7.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_7.png index 30a8b9b..99fa0d2 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_7.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_7.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_8.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_8.png index 1c30eb1..fd156a9 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_8.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_8.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_9.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_9.png index 25594c2..63e837c 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_9.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_9.png differ diff --git a/source/component/map.py b/source/component/map.py index 1f65f97..e4c1ea5 100755 --- a/source/component/map.py +++ b/source/component/map.py @@ -52,9 +52,7 @@ class Map(): return True else: return False - if ((c.HOLE in self.map[map_y][map_x][c.MAP_PLANT]) or - (c.ICE_FROZEN_PLOT in self.map[map_y][map_x][c.MAP_PLANT]) or - (c.GRAVE in self.map[map_y][map_x][c.MAP_PLANT])): + if any((i in {c.HOLE, c.ICE_FROZEN_PLOT, c.GRAVE}) for i in self.map[map_y][map_x][c.MAP_PLANT]): return False if self.map[map_y][map_x][c.MAP_PLOT_TYPE] == c.MAP_GRASS: # 草地 # 首先需要判断植物是否是水生植物,水生植物不能种植在陆地上 diff --git a/source/state/level.py b/source/state/level.py index cfca7db..fb1a099 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -1251,12 +1251,18 @@ class Level(tool.State): def checkPlant(self, plant, i): zombie_len = len(self.zombie_groups[i]) - # 没有攻击状态的植物 - if plant.name in { c.WALLNUTBOWLING, c.REDWALLNUTBOWLING, + # 不用检查攻击状况的情况 + if plant.name in { # 单独指定攻击状态的植物 + c.WALLNUTBOWLING, c.REDWALLNUTBOWLING, + # 没有攻击状态的植物 c.WALLNUT, c.TALLNUT, c.TORCHWOOD, c.SUNFLOWER, c.SUNSHROOM, c.COFFEEBEAN, - c.GRAVEBUSTER, c.LILYPAD}: + c.GRAVEBUSTER, c.LILYPAD, + c.HYPNOSHROOM, + # 非植物类 + c.HOLE, c.GRAVE, + c.ICE_FROZEN_PLOT}: pass elif plant.name == c.THREEPEASHOOTER: if plant.state == c.IDLE: