Skip to content

improved cyclomatic complexity of 2 functions in component/map.py (Map.drawBackground and drawBackgroundHex) #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eleazar22nd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

improved cyclomatic complexity of 2 functions in component/map.py (Map.drawBackground and drawBackgroundHex) #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 16 additions & 20 deletions source/component/map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,16 +180,14 @@ def drawBackground(self, surface):

for y in range(self.height):
for x in range(self.width):
if self.bg_map[y][x] == c.BG_EMPTY:
color = c.LIGHTYELLOW
elif self.bg_map[y][x] == c.BG_ACTIVE:
color = c.SKY_BLUE
elif self.bg_map[y][x] == c.BG_RANGE:
color = c.NAVYBLUE
elif self.bg_map[y][x] == c.BG_SELECT:
color = c.GREEN
elif self.bg_map[y][x] == c.BG_ATTACK:
color = c.GOLD
colors = {
c.BG_EMPTY: c.LIGHTYELLOW,
c.BG_ACTIVE: c.SKY_BLUE,
c.BG_RANGE: c.NAVYBLUE,
c.BG_SELECT: c.GREEN,
c.BG_ATTACK: c.GOLD
}
color = colors[self.bg_map[y][x]]
pg.draw.rect(surface, color, (x * c.REC_SIZE, y * c.REC_SIZE,
c.REC_SIZE, c.REC_SIZE))

Expand Down Expand Up @@ -228,16 +226,14 @@ def drawBackgroundHex(self, surface):

for y in range(self.height):
for x in range(self.width):
if self.bg_map[y][x] == c.BG_EMPTY:
color = c.LIGHTYELLOW
elif self.bg_map[y][x] == c.BG_ACTIVE:
color = c.SKY_BLUE
elif self.bg_map[y][x] == c.BG_RANGE:
color = c.NAVYBLUE
elif self.bg_map[y][x] == c.BG_SELECT:
color = c.GREEN
elif self.bg_map[y][x] == c.BG_ATTACK:
color = c.GOLD
colors = {
c.BG_EMPTY: c.LIGHTYELLOW,
c.BG_ACTIVE: c.SKY_BLUE,
c.BG_RANGE: c.NAVYBLUE,
c.BG_SELECT: c.GREEN,
c.BG_ATTACK: c.GOLD
}
color = colors[self.bg_map[y][x]]

base_x, base_y = tool.getHexMapPos(x, y)
points = [(base_x, base_y + Y_LEN//2 + Y_LEN), (base_x, base_y + Y_LEN//2),
Expand Down