Skip to content

Commit

Permalink
# This is a combination of 3 commits.
Browse files Browse the repository at this point in the history
# This is the 1st commit message:

Update 0.6.3.17a

- Add Landsknecht armour side direction armour (see the latest update in readme.md).
- Improve various animation frames.
- Various bugs fixed.

# This is the commit message #2:

Update 0.6.3.17b

- Implement sound effect system.
- Various bug fixes.

# This is the commit message #3:

Update 0.6.3.17c

- Move target calculation for range attack to Subunit's attack method.
- Various bug fixes.
  • Loading branch information
remance committed Jun 12, 2023
1 parent 131e959 commit aef4f0f
Show file tree
Hide file tree
Showing 147 changed files with 2,236 additions and 2,878 deletions.
17 changes: 12 additions & 5 deletions animation maker.py
Original file line number Diff line number Diff line change
Expand Up @@ -1060,11 +1060,18 @@ def generate_body(self, bodypart_list):
try:
armour = self.armour[key + "_armour"].split("/")
gear_image = gen_armour_sprite_pool[head_race][armour[0]][armour[1]][head_side]["head"][
bodypart_list[key + "_head"][2]].copy()
bodypart_list[key + "_head"][2]]

gear_image_sprite = pygame.Surface(gear_image.get_size(), pygame.SRCALPHA)
rect = head_sprite_surface.get_rect(
center=(gear_image_sprite.get_width() / 2, gear_image_sprite.get_height() / 2))
gear_image_sprite.blit(head_sprite_surface, rect)

rect = gear_image.get_rect(
center=(head_sprite_surface.get_width() / 2, head_sprite_surface.get_height() / 2))
head_sprite_surface.blit(gear_image, rect)
p_head_sprite_surface[key] = head_sprite_surface
center=(gear_image_sprite.get_width() / 2, gear_image_sprite.get_height() / 2))
gear_image_sprite.blit(gear_image, rect)

p_head_sprite_surface[key] = gear_image_sprite

except KeyError: # skip part that not exist
pass
Expand Down Expand Up @@ -2723,7 +2730,7 @@ def play(self, surface, position, play_list):
for index, helper in enumerate(helper_list):
if helper != helper_click:
helper.select_part(None, False, True)
elif ctrl_press and tuple(model.mask_part_list.keys()).index(this_part) in model.part_selected:
elif this_part is not None and ctrl_press and tuple(model.mask_part_list.keys()).index(this_part) in model.part_selected:
model.part_selected.remove(tuple(model.mask_part_list.keys()).index(this_part)) # clear old list first
for index, helper in enumerate(helper_list): # add selected part to model selected
if helper.part_selected:
Expand Down
580 changes: 290 additions & 290 deletions data/animation/generic/back.csv

Large diffs are not rendered by default.

348 changes: 174 additions & 174 deletions data/animation/generic/front.csv

Large diffs are not rendered by default.

438 changes: 219 additions & 219 deletions data/animation/generic/side.csv

Large diffs are not rendered by default.

130 changes: 65 additions & 65 deletions data/animation/generic/sidedown.csv

Large diffs are not rendered by default.

202 changes: 101 additions & 101 deletions data/animation/generic/sideup.csv

Large diffs are not rendered by default.

126 changes: 0 additions & 126 deletions data/leader/commander_skill.csv

This file was deleted.

126 changes: 0 additions & 126 deletions data/leader/commander_skill_lore_en.csv

This file was deleted.

9 changes: 0 additions & 9 deletions data/leader/leader_class.csv

This file was deleted.

0 comments on commit aef4f0f

Please sign in to comment.