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-08-14 10:58:12 +08:00
parent f46585264d
commit cf20f9733f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/state/level.py
View File

@ -333,8 +333,8 @@ class Level(tool.State):
return self.before_pause_time return self.before_pause_time
def initBowlingMap(self): def initBowlingMap(self):
for x in range(3, self.map.width): for x in range(3, self.map_x_len):
for y in range(self.map.height): for y in range(self.map_y_len):
self.map.setMapGridType(x, y, c.MAP_UNAVAILABLE) # 将坚果保龄球红线右侧设置为不可种植任何植物 self.map.setMapGridType(x, y, c.MAP_UNAVAILABLE) # 将坚果保龄球红线右侧设置为不可种植任何植物
def initState(self): def initState(self):
@ -632,8 +632,8 @@ class Level(tool.State):
def shovelRemovePlant(self, mouse_pos): def shovelRemovePlant(self, mouse_pos):
x, y = mouse_pos x, y = mouse_pos
map_x, map_y = self.map.getMapIndex(x, y) map_x, map_y = self.map.getMapIndex(x, y)
if ((map_y < 0) or (map_y >= self.map.height) if ((map_y < 0) or (map_y >= self.map_y_len)
or (map_x < 0) or (map_x >= self.map.width)): or (map_x < 0) or (map_x >= self.map_x_len)):
return return
for i in self.plant_groups[map_y]: for i in self.plant_groups[map_y]:
if (x >= i.rect.x and x <= i.rect.right and if (x >= i.rect.x and x <= i.rect.right and
@ -1085,7 +1085,7 @@ class Level(tool.State):
# 默认为最右侧的一个植物 # 默认为最右侧的一个植物
target_plant = max(attackable_common_plants, key=lambda i: i.rect.x) target_plant = max(attackable_common_plants, key=lambda i: i.rect.x)
map_x, map_y = self.map.getMapIndex(target_plant.rect.centerx, target_plant.rect.centery) map_x, map_y = self.map.getMapIndex(target_plant.rect.centerx, target_plant.rect.centery)
if not (map_x >= self.map.width or map_y >= self.map.height): if (0 <= map_x < self.map_x_len and 0 <= map_y < self.map_y_len):
if c.PUMPKINHEAD in self.map.map[map_y][map_x][c.MAP_PLANT]: if c.PUMPKINHEAD in self.map.map[map_y][map_x][c.MAP_PLANT]:
for actual_target_plant in self.plant_groups[i]: for actual_target_plant in self.plant_groups[i]:
# 检测同一格的其他植物 # 检测同一格的其他植物
@ -1472,8 +1472,8 @@ class Level(tool.State):
# 铲子接近植物时会高亮提示 # 铲子接近植物时会高亮提示
map_x, map_y = self.map.getMapIndex(x, y) map_x, map_y = self.map.getMapIndex(x, y)
surface.blit(self.shovel, self.shovel_rect) surface.blit(self.shovel, self.shovel_rect)
if ((map_y < 0) or (map_y >= self.map.height) if ((map_y < 0) or (map_y >= self.map_y_len)
or (map_x < 0) or (map_x >= self.map.width)): or (map_x < 0) or (map_x >= self.map_x_len)):
return return
for i in self.plant_groups[map_y]: for i in self.plant_groups[map_y]:
if (x >= i.rect.x and x <= i.rect.right and if (x >= i.rect.x and x <= i.rect.right and