Skip to content

Commit

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

Sprite update.

Animation and sprite update.

Minor update.

Minor update and bugs fixed.

Minor update and bugs fixed.

Animation maker update 1.4

- Change person function to accept more than 2. (Now default at 4)
- Increase effect and special sprite part number.
- Change body helper ui to be switchable between. different person with the person change button.

Animation maker update 1.4.1

- Minor bugs fixed.

Arcade Mode and Animation System 0.5.5.7

- Working on skill system and animation.
- Minor bugs fixed.

Animation maker update 1.4.2

- Minor bugs fixed.

Minor update.

Bugs fixed and code improvement.

TODO found memory leak issue that need fixing, likely related to animation sprite.

Animation maker update 1.4.3

- Minor bugs fixed.

Minor update

Arcade Mode and Animation System 0.5.5.7

- Working on skill system and animation.
- Minor bugs fixed.

Minor bugs fixed.

Code improvement
- Reduce some redundancy.

Animation and sprite update.

Fix various bugs and memory leak

Minor bugs fixed

Animation and sprite update.

Improve code structure and minor bugs fixed.

Minor update.
- Add troop number setting.

Bugs Fixed.

Arcade Mode and Animation System 0.5.5.8

- Working on skill system and animation.
- Various bugs fixed.

Bugs fixed.

Animation and sprite update.

Minor update.
- Add wheel ui.

Minor update.
- Add wheel ui.

Animation and sprite update.

Arcade Mode and Animation System 0.5.5.9
- Working on unit command wheel ui

Change game code structure.

- Separate most object functions into its own file.
- Improve overall code.
- Game may contain a lot of bugs right now.

Arcade Mode and Animation System 0.5.6

- Add unit formation line shift function.
- Improve code structure.
- Minor bugs fixed.

Animation and sprite update.

Minor bug fixed.

Minor update.

Minor bugs fixed.

Minor updates

Minor bugs fixed.

Minor update.

Animation and sprite update.

Arcade Mode and Animation System 0.5.6.1

- Minor bugs fixed.
- To make it a bit easier to know the current version. Will add version number in every update comment, including minor update, from now with the last version number indicating number of update in the version so far.

Arcade Mode and Animation System 0.5.6.2

- More work on formation change function.

Arcade Mode and Animation System 0.5.7

- Finish working on formation shift system.
- Start working on weapon changing system.

Arcade Mode and Animation System 0.5.7.1

- Finish working on weapon changing system.
- Animation system bugs fixed.
- Other minor bugs fixed.

Animation and sprite update.

- Minor bugs fixed for animation maker

Forgot to upload data update.

Arcade Mode and Animation System 0.5.7.2

- Rework element and armour system. Now all element damage types are separate.
- Code improvement involving subunit stat.
- Various bugs fixed.

Still contains a lot of new bugs.

Arcade Mode and Animation System 0.5.7.3

- Code improvement involving subunit stat.
- Various bugs fixed.

Still contains a lot of new bugs.

Animation and sprite update.

- More animation added
- Minor bugs fixed for animation maker

Animation and sprite update.

- More animation added
- Fix some sprite parts

Animation and sprite update.

- More animation added
- Add back human body for side direction
- Fix minor bug in animation maker

Animation and sprite update.

- More animation added
- Fix minor bug in animation maker

Arcade Mode and Animation System 0.5.7.4

- Various bugs fixed.

Still contains a lot of new bugs.

Arcade Mode and Animation System 0.5.7.5

- Various bugs fixed.

Still contains a lot of new bugs.

Animation and sprite update.

- Add all direction for horse body part
- Fix minor bug in animation maker

Arcade Mode and Animation System 0.5.7.6

- Improve encyclopedia data display.
- Various bugs fixed.

Still contains a lot of new bugs.

Arcade Mode and Animation System 0.5.7.8

- Merge weapon and armour data class into troop data
- Move equipment grade to as its own file and data dict
- Add game sprite cursor
- Various bugs fixed.

Still contains a lot of new bugs.

Animation and sprite update.

- Add more animation
- Fix minor bug in animation maker

Arcade Mode and Animation System 0.5.7.9

- More work on range attack control.

Animation and sprite update.

- Add more animation

Arcade Mode and Animation System 0.5.7.10

- Rework on sprite pool storage.
- Game can still crash when change horse walking direction since the animation for other directions are not done yet.

Animation and sprite update.

- Add more animation

Arcade Mode and Animation System 0.5.7.11

- Some code improvement and reduce redundancy.
- More work on range attack command

Animation and sprite update.

- Add more animation.
- Increase sideup horse sprite size a bit.

Arcade Mode and Animation System 0.5.7.12

- More work on range attack command
- Various minor bugs fixed.

Arcade Mode and Animation System 0.5.8

- Add shoot range condition to manual aim control.
- Change bullet sprite to use appropriate bullet to the shooting weapon.

Arcade Mode and Animation System 0.5.8.1

- Minor bugs fixed.
- Start working on combat for arcade mode.

Animation and sprite update.

- Add more animation.
- Improve horse sprite.
- Add club weapon sprite.

Arcade Mode and Animation System 0.5.8.2

- Separate default and user config.
- Add change to default setting in option menu.
- Now screen solution change without having to manually restarting game.

Animation and sprite update.

- Add sheath sprite for weapon and animation now use sheath when attach to back instead.
- Change colourise function a bit to keep white colour by default.
- Update various animation.

Arcade Mode and Animation System 0.5.8.3

- Change rangeattack class to general damage sprite class instead.
- Fix minor bugs.

Animation maker update 1.4.4

- Add mask detection for sprite part selection in showroom.
- History now saved for all animation frames.
- Various bugs fixed.

Arcade Mode and Animation System 0.5.8.4

- Fix minor bugs.

Animation and sprite update

- Change weapon sprite and animation to have separate base image for either main or sub weapon. This indicates the direction that player see the weapon (outward or inward).

Animation maker update 1.4.5

- Change default max number of frames to 20.
- Add help popup that explain button function.
- Minor bugs fixed.

Animation maker update 1.4.5.1

- Minor bugs fixed.

Animation and sprite update.

- Minor bugs fixed.

Animation and sprite update.

Arcade Mode and Animation System 0.5.8.5

- Improve weather system.
- Add day/night cycle effect.
- Fix minor bugs.

Animation and sprite update.

Animation maker update 1.4.5.2

- Add copy/paste selected parts for all frames function.

Animation maker update 1.4.5.3

- Minor bugs fixed.

Arcade Mode and Animation System 0.5.8.7

- Rework stat for troop and leader. The stat now should be simpler for input but more complex in calculation.
- Rework effect calculation.

Arcade Mode and Animation System 0.5.8.8

- Add auto swap weapon functions to change ranged/melee weapon set according to situation (for now just charge) and change back to last player selected when idle.
- Add nose to human face sprite.

Animation and sprite update

Animation and sprite update

Arcade Mode and Animation System 0.5.8.9

- Various bugs fixed.

Animation and sprite update

Arcade Mode and Animation System 0.5.8.10

- Text popup for button and leader name now properly.
- Minor bugs fixed.

Animation and sprite update

Animation and sprite update

Animation and sprite update

Animation and sprite update

Arcade Mode and Animation System 0.5.8.11

- Minor update

Animation and sprite update

Animation and sprite update

Animation and sprite update

Arcade Mode and Animation System 0.5.8.12

- Add game language system.
- Minor bugs fixed.

Animation and sprite update

Arcade Mode and Animation System 0.5.8.12

- Change all bow weapon to 1 hand weapon type for animation consistency.

Credit:

- For Ukrainian translation: JerryXd

Arcade Mode and Animation System 0.5.8.13

- More separation of text and stat files.
- Minor bugs fixed.

Animation maker update 1.4.5.4

- Add remove and add frame functions.

Arcade Mode and Animation System 0.5.8.14

- Improve option menu.
- Add fullscreen option.
- Add troop animation enable/disable function.

Arcade Mode and Animation System 0.5.8.15

- Various bugs fixed and improvements.

Animation and sprite update

Animation maker update 1.4.6
- Add animation name list filter function.

Animation maker update 1.4.6.1
- Minor bug fixed.

Create credit.md

Arcade Mode and Animation System 0.5.8.16

- Change bow weapon to use bow specific animation instead.

Animation maker update 1.4.6.2
- Add exclusion filter.

Animation maker update 1.4.6.3
- Bug fixed.

Arcade Mode and Animation System 0.5.8.17

- Various bugs fixed.

Animation and sprite update

Animation and sprite update

Animation and sprite update

Animation and sprite update

Update 0.6.3.5

- Improve code for compilation using pyinstaller.
- Update for arcade mode will now use main version number instead from now on.

Arcade Mode and Animation System 0.5.8.18

- Add another (still unfinished) function for command_ui for arcade mode. It now shows health bar and weapon set.
- Minor bugs fixed.

Update 0.6.3.7

- Forgot about the number version change.
- Disable editor for now.
- Animation and sprite update.

Update 0.6.3.8

- Add weapon icon for command ui equipment set.
- Various bugs fixed.

Update 0.6.3.9

- Change animation from accepting 10 generic special parts to 5 for each specific person instead (both in game and animation maker).
- Add skin and hair colouring to sprite including special parts.

Update 0.6.3.10

- Change subunit action related variables to use dict type instead.
- Add shoot while moving function for player character.
- Various bugs fixed.

Update 0.6.3.10a

- Animation update.

Update 0.6.3.11

- Improve damage sprite image scaling.
- Add size and speed to charge calculation.

Update 0.6.3.12

- Add ammo count to hero UI.

Update 0.6.3.11a

- Animation update.

Update 0.6.3.13

- Various bugs fixed and code improvements.

Update 0.6.3.14

- Improve drama popup.
- Add morale penalty from battle situation.
- Various bugs fixed.

Update 0.6.3.14

- Improve disable animation function.
- Improve encyclopedia section icons.

Update 0.6.3.16

- Wrong version number in the previous commit.
- Add more animation weapon hand checking for 2 handed weapon.

Update 0.6.3.16a

- Improve text input function.
- Animation update.

Update 0.6.3.16b

- Minor bugs fixed.

Update 0.6.3.16c

- Sprite update.

Update 0.6.3.16d

- Improve encyclopedia portrait and text.
- Animation update.

Update 0.6.3.16e

- Minor bugs fixed.

Update 0.6.3.16f

- Improve documentation.
- Improve coding.

Update 0.6.3.16g

- Move animation maker to main folder.
- Minor bugs fixed.

Update 0.6.3.16h

- Improve coding to make it more compatible with other OS.
- Reduce unnecessary list.
- Sprite update.

Update 0.6.3.16i

- Add permission for directory creation.

Update 0.6.3.16i2

- Make folder pathing compatible with linux.

Update 0.6.3.16j

- Minor bugs fixed.
- Sprite update.

Update 0.6.3.16k

- Sprite update.

Update 0.6.3.16l

- Update code to be workable for MacOS.

Update 0.6.3.16m

- Minor bugs fixed.

Update 0.6.3.16m2

- Minor bugs fixed.

Update 0.6.3.16m3

- Minor bugs fixed.

Update 0.6.3.16m4

- Minor bugs fixed.

Update 0.6.3.16m5

- Minor bugs fixed.

Update 0.6.3.16m6

- Minor bugs fixed.

Update 0.6.3.16m7

- Minor bugs fixed.

Update 0.6.3.16n

- Improve encyclopedia scaling.

Update 0.6.3.16n2

- Animation maker change animation size now adjust every part's position according to the new size.
- Various bugs fixed.

Update 0.6.3.16n4

- Various bugs fixed.

Update 0.6.3.16n5

- Improve weather function coding.
- Various bugs fixed.

Update 0.6.3.16n6

- Sprite update
- Change capital letter for part variant folders
- Minor bugs fixed.

Update 0.6.3.16n6

- Sprite update
- Change capital letter for part variant folders
- Minor bugs fixed.

Update 0.6.3.16n7

- Various bugs fixed.

Update 0.6.3.16n8

- Sprite update.

Update 0.6.3.16n9

- Improve error logging.

Update 0.6.3.16n10

- Improve error logging.
- Minor bugs fixed.

Update 0.6.3.16n11

- Various bugs fixed.

Update 0.6.3.16n12

- Add syntax function to encyclopedia paragraph reading.
- Various bugs fixed and improvements.

Update 0.6.3.16n13

- Add subsection tag information and function to encyclopedia.
- Add encyclopedia tag filter function.

Update 0.6.3.16n14

- Sprite update.

Update 0.6.3.16n14

- Sprite update.

Update 0.6.3.16n14

- Sprite update.

Update 0.6.3.16n15

- Add camera shake function.
- Add sprite surface transparent area cropping to reduce memory usage.
= Sprite update.

Update 0.6.3.16n15

- Add camera shake function.
- Add sprite surface transparent area cropping to reduce memory usage.
= Sprite update.

# This is the commit message #2:

Update 0.6.3.16n15

- Add camera shake function.
- Add sprite surface transparent area cropping to reduce memory usage.
= Sprite update.

# This is the commit message #3:

Update 0.6.3.16n16

- Minor bug fixed.

# This is the commit message #4:

Update 0.6.3.16m

- Animation and sprite update.
- Minor bug fixed.
  • Loading branch information
remance committed Jun 12, 2023
1 parent bced3bd commit df85c54
Show file tree
Hide file tree
Showing 60 changed files with 594 additions and 399 deletions.
3 changes: 2 additions & 1 deletion animation maker.py
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,8 @@ def edit_part(self, mouse_pos, edit_type, specific_frame=None):
except KeyError: # change side and not found part with same name
self.bodypart_list[edit_frame][part_index][2] = None
self.part_name_list[edit_frame][part_index][2] = None
self.animation_part_list[edit_frame][part_index][0] = None
if len(self.animation_part_list[edit_frame][part_index]) > 0:
self.animation_part_list[edit_frame][part_index][0] = None

elif edit_type == "undo" or edit_type == "redo":
for frame_num, _ in enumerate(self.animation_part_list):
Expand Down
168 changes: 108 additions & 60 deletions data/animation/generic/back.csv

Large diffs are not rendered by default.

254 changes: 151 additions & 103 deletions data/animation/generic/front.csv

Large diffs are not rendered by default.

216 changes: 132 additions & 84 deletions data/animation/generic/side.csv

Large diffs are not rendered by default.

168 changes: 96 additions & 72 deletions data/animation/generic/sidedown.csv

Large diffs are not rendered by default.

170 changes: 97 additions & 73 deletions data/animation/generic/sideup.csv

Large diffs are not rendered by default.

Binary file added data/sprite/effect/template/side/hamster.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/sprite/generic/weapon/Light Crossbow/Common/side/draw_1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
4 changes: 2 additions & 2 deletions gamescript/common/subunit/create_troop_sprite.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ def create_troop_sprite(animation_name, size, animation_part_list, troop_sprite_
animation_part_list[p + "body"][4]) # put on back
use_center = True
elif p + "sub_weapon" in layer: # sub weapon
if part[1] != "sheath": # change main weapon pos to hand, if part is not sheath
if "_Sub_" in animation_name and weapon[2][1] == 2: # two-handed sub weapon use same animation as main for attack, remove if different
if part[1] != "sheath": # change weapon pos to hand, if part is not sheath
if "_Sub_" in animation_name and weapon[2][1] == 2: # two-handed sub weapon use same animation as main for attack so put sub weapon in man hand, remove code if different
target = (animation_part_list[p + "r_hand"][3], animation_part_list[p + "r_hand"][4])
else:
target = (animation_part_list[p + "l_hand"][3], animation_part_list[p + "l_hand"][4])
Expand Down
2 changes: 1 addition & 1 deletion gamescript/common/utility.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ def rotation_xy(origin, point, angle):
def set_rotate(self, base_target):
"""
set base_target and new angle for sprite rotation
:param self: any object
:param self: any object with base_pos as position attribute
:param base_target: pos for target position to rotate to
:return: new angle
"""
Expand Down
1 change: 1 addition & 0 deletions gamescript/damagesprite.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ def update(self, unit_list, dt, camera_scale):
self.image_scale = (11 - self.camera_zoom) / 4
if self.image_scale <= 1:
self.image_scale = 1
self.image = self.image_original.copy()
else:
self.image = pygame.transform.smoothscale(self.image_original,
(int(self.image_original.get_width() / self.image_scale),
Expand Down
7 changes: 4 additions & 3 deletions gamescript/lorebook.py
Original file line number Diff line number Diff line change
Expand Up @@ -753,9 +753,10 @@ def lorebook_process(self, ui, mouse_up, mouse_down, mouse_scroll_up, mouse_scro

if close or esc_press:
ui.remove(self.encyclopedia_stuff) # remove encyclopedia related sprites
for name in self.subsection_name: # remove subsection name
name.kill()
del name
for group in (self.subsection_name, self.tag_filter_name):
for name in group: # remove subsection name
name.kill()
del name
command = "exit"

return command

0 comments on commit df85c54

Please sign in to comment.