From ef7ab50fb27c1c282a253f077373961e0cfdeb49 Mon Sep 17 00:00:00 2001 From: wszqkzqk Date: Sun, 24 Jul 2022 00:31:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8D=97=E7=93=9C=E5=A4=B4?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=83=BD=E7=A7=8D=E6=A4=8D=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/component/map.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/source/component/map.py b/source/component/map.py index 2631478..62ab286 100755 --- a/source/component/map.py +++ b/source/component/map.py @@ -63,7 +63,9 @@ class Map(): if not self.map[map_y][map_x][c.MAP_PLANT]: # 没有植物肯定可以种植 return True elif (all((i in {'花盆（未实现）', c.PUMPKINHEAD}) for i in self.map[map_y][map_x][c.MAP_PLANT]) - and (plantName not in self.map[map_y][map_x][c.MAP_PLANT])): # 例外植物：集合中填花盆和南瓜头，只要这里没有这种植物就能种植；判断方法：并集 + and (plantName not in self.map[map_y][map_x][c.MAP_PLANT])): # 例外植物：集合中填花盆和南瓜头，只要这里没有这种植物就能种植 + return True + elif (plantName == c.PUMPKINHEAD) and (c.PUMPKINHEAD not in self.map[map_y][map_x][c.MAP_PLANT]): # 没有南瓜头就能种南瓜头 return True else: return False @@ -74,11 +76,15 @@ class Map(): if plantName not in c.WATER_PLANTS: if '花盆（未实现）' in self.map[map_y][map_x][c.MAP_PLANT]: if (all((i in {'花盆（未实现）', c.PUMPKINHEAD}) for i in self.map[map_y][map_x][c.MAP_PLANT]) - and (plantName not in self.map[map_y][map_x][c.MAP_PLANT])): # 例外植物：集合中填花盆和南瓜头，只要这里没有这种植物就能种植；判断方法：并集 + and (plantName not in self.map[map_y][map_x][c.MAP_PLANT])): # 例外植物：集合中填花盆和南瓜头，只要这里没有这种植物就能种植 if plantName in {c.SPIKEWEED}: # 不能在花盆上种植的植物 return False else: return True + elif (plantName == c.PUMPKINHEAD) and (c.PUMPKINHEAD not in self.map[map_y][map_x][c.MAP_PLANT]): # 有花盆且没有南瓜头就能种南瓜头 + return True + else: + return False elif plantName == '花盆（未实现）': # 这一格本来没有花盆而且新来的植物是花盆，可以种 return True else: @@ -99,6 +105,8 @@ class Map(): return False else: return True + elif (plantName == c.PUMPKINHEAD) and (c.PUMPKINHEAD not in self.map[map_y][map_x][c.MAP_PLANT]): # 在睡莲上且没有南瓜头就能种南瓜头 + return True else: return False else: