Conversation
Added: - New map folder with a copy of the map - Added a new layer for the water in tiled map - Extracted water tiles and added to a new folder in images - Extracted coast animation tiles and added to images - Added a new class AnimatedSpites and began testing animations
Added: - Animation speed to the settings file
Added: - Animation speed in the sprites file - Replaced the digit with the variabel Animation speed
Added: - Coast object layer to the tiled map
Added: - new coast_importer method into the support file
Added: - logic in the method - print statement to check if everything works correctly
Added: - coast variabel into the world_frames - using the new method, reaching the coast image
Fixed: - small bug in coast_importer
Finished: - logic for drawing the coast animation onto the islands
Added: - Coast in the setup method - Made coast animated - Fixed bug with the coast in tiled map
Changed: - sea from the whole see animated to chunks of the sea animated - fixed the coast being drawn outside the island instead of on top of the island - changed the animation speed to 4
Added: - the sea into the setup/drawing the sea
Changed: - the color of the sea - the tiles that are used for animation
- experimenting with scaling of the map
Fixed: - offest not scaling correctly - camera not centering on the player
Added: - coasts to two more islands
Added: - dictionary named world layers in settings.py
Added: - player ship sprite with animation for the water - new method in support - new dict in world frames
Adding: - more logic into the new method for extracting the images for the characters - temporary print statement to check if everything works
Added: - new method in support for importing the single ship image
Finished: - the method for extracting information on each individual image in the sprite sheet
Added: - simple image of the ship into the game - this image has no animations yet - the image has no sense of direction yet
Added: - method for animating the player
Added: - logic to the method - update method
Added: - calling the animation method in the update method for the player
Added: - adding a new method in Entity class for getting the state of the player. For example right or left
Replaced: - player ship.png because it had not all the rows it needed - added player_sloop.png
Added: - when going a direction the animation will be applied for that direction
Finished: - the logic for getting the state of the player
Fixed: - camera not focusing on the player
Removed: - old offset code
Added: - direction vector to player class
Refactored: - movement to use direction vector so that the state updates it correctly and shows the correct direction of the ship
Fixed: - Ship texture issue, where the top of the ship was cut off
…sion-(Issue-59)
Resovled: - some merge conflicts and fixed some issues after the merge
Fixed: - type lint issue
Fixed: - small lint issue
…sion-(Issue-59)
Fixed: - issues after merge
ultimateownsz
left a comment
There was a problem hiding this comment.
Hi @Davidek523,
Thank you for submitting this pull request. It’s clear that you’ve put effort into enhancing the map and animations, and I appreciate the work done to replace the red rectangle with a proper ship sprite—it’s a definite improvement in presentation. However, I noticed some issues that I’d like to address.
Observed issues
- Player movement sprite bug
- When moving in certain directions, the player's sprite doesn't behave as espected:
-
Loss of player directional feedback
- The new animations are visually appealing, they seem to interfere with the player's directional feedback. The previous "ghost image" functionality that indicated direction is no longer working, making it unclear where the player is heading.
-
New issues #90
- Additionally, the behavior described in #90 also occurs during testing. When the player sprite moves, it triggers unexpected or incorrect behaviors. This was also happening prior before the new animations.
-
Scope of the changes
- This PR addresses the enhancements from #57 but may have introduced breaking changes that are impact related issues #58, #59 , and potentially #90. Could you clarify whether these issues are within the intended scope of this PR?
Questions for clarification
- Is this PR meant to address only #57 , or should it resolve #58 , #59 , and #90 as well?
- How do you plan to handle the directional feedback regression caused by the new animations?
- Would it be possible to isolate the new animations so they don't interfere with the existing sprite mechanics?
Suggestion for improvement
- Player sprite direction: the player’s direction is clearly indicated should remain a priority. Could you revise the animation logic to preserve directional feedback while incorporating the new animations?
- Investigate whether the changes in this PR might be causing or exacerbating the behavior described in #90.
- If this PR is only partially addressing the linked issues, please update the description to reflect that and clearly define what is within scope.
Added: - myself to the credits because danilo did not bother to do so smh
Changed: - commented out the ghost preview due to new movement methods and problems with ghost preview
…sion-(Issue-59)
ultimateownsz
left a comment
There was a problem hiding this comment.
Minor adjustments to the ship sprite and sea animation.
Looking good, minor things I noticed:
- Can you revert the ship sprite to the red square as it was before? Open a separate PR to address it with a new sprite, referring to issue #75. (might have to change the issue too or open a new one if none is existing).
- The ship movement is still broken, but that's unrelated to your PR, no need to address it in this scope (could be because with your current ship sprite it doesn't turn correctly when changing movements across the board).
Sea layer feedback:
- The current animation for the sea layer is a step in the right direction, but could you make the animation less wavy? It would be better if the motion was more subdued.
- Ideally, we could look into triggering sea animations only during turn transitions later on. This would reduce the animation activity and improve clarity during gameplay.
What do you think of this? @Davidek523
Thanks for the work so far—it's looking great!
|
@ultimateownsz I have seen your feedback. The ship sprite I think is not a major issue, it will take only one line of code to change (i hope so) as for the waves. Its not a easy task to do because we dont have other sprites in the assets that we are working with. Most of these sprites are 3 tiles of animation thats why it may seem as choppy and laggy. Unless you're asking me to make brand new assets for the waves and such, I can't fix this EDIT: |
Reverting: - Ship sprite to red rectangle because I dont know why but it must happen for some extrordinary reason smh
Added: - a temporary replacement for our water animations because current water animation tileset sucks ass apparently
Replaced: - the texture of the old water animation
Added: - new temporary water texture because the other one maaay blended in with the shallow water texture
Removed: - the old texture
Renamed the image for clarity
ultimateownsz
left a comment
There was a problem hiding this comment.
The changes look good, the camera movement doesn't work optimal yet like we priorly discussed but this is still not your fault and we pick it up in a new issue!
commit 41c6b53 Merge: 0bd7ab8 6b3d80a Author: Davidek523 <davidov520@wp.pl> Date: Tue Feb 18 12:27:36 2025 +0100 Map revision (issue 59) (#97) <!-- INSTRUCTIONS: - Briefly describe the purpose of this pull request. --> This PR <!-- adds|modifies|fixes --> ... <!-- Briefly explain what the PR changes. --> addresses the issue of the incomplete map and the lack of animations. In this pr I revise the map by remaking the layers in Tiled and showing more layers in pygame/the game itself. I also extract the tiles that are ment to be used for animation and use the in the game. Also I took a ship, made it into a png file and replaced the red rectangle for player with the actual ship. <!-- INSTRUCTIONS: - Mention related issue numbers here. - Example: "Fixes #123, Closes #456." --> Map Revission issue #57 This PR <!-- fixes|closes|addresses --> issue(s) <!-- (e.g., Fixes #123, Closes #456) --> closes issue #57 --- <!-- ## Media section. --> - [x] 🛠️ I have tested my code, and it works as expected (e.g., game runs without errors). - [x] 📝 I have made sure that the code follows the project's formatting and style guidelines. Optional: - [x] 💬 Code is commented (if applicable) --- <!-- INSTRUCTIONS: - Add labels to describe the purpose of this PR. - Examples: - **Type**: - `type: enhancement` – For improving existing functionality. - `type: bug fix` – For fixing issues in the code. - `type: refactor` – For optimizing or cleaning up code. - `type: feature` – For adding new features. - **Area**: - `area: gameplay` – For changes affecting core game mechanics. - `area: assets` – For updates to sprites, textures, or UI. - `area: audio` – For sound effects or music updates. - **Game**: - `game: mechanics` – For changes to combat, movement, or game systems. - `game: UI` – For updates to the user interface or HUD. - `game: animations` – For animation-related changes. --> - `type: ...` - `area: ...` - `game: ...` commit 6b3d80a Author: Davidek523 <davidov520@wp.pl> Date: Tue Feb 18 11:17:06 2025 +0100 Renamed the image Renamed the image for clarity commit 13d54c2 Author: Davidek523 <davidov520@wp.pl> Date: Tue Feb 18 11:16:24 2025 +0100 Removed the old texture Removed: - the old texture commit 3be1185 Author: Davidek523 <davidov520@wp.pl> Date: Tue Feb 18 11:15:55 2025 +0100 Added new texture Added: - new temporary water texture because the other one maaay blended in with the shallow water texture commit 1e7ceb8 Author: Davidek523 <davidov520@wp.pl> Date: Tue Feb 18 11:13:18 2025 +0100 Replaced the texture Replaced: - the texture of the old water animation commit 3aeb897 Author: Davidek523 <davidov520@wp.pl> Date: Tue Feb 18 11:11:39 2025 +0100 Added new texture Added: - a temporary replacement for our water animations because current water animation tileset sucks ass apparently commit 6e1df77 Author: Davidek523 <davidov520@wp.pl> Date: Tue Feb 18 11:05:01 2025 +0100 Reverting sprite Reverting: - Ship sprite to red rectangle because I dont know why but it must happen for some extrordinary reason smh commit 2fd4bac Merge: 20c24de 0bd7ab8 Author: Davidek523 <davidov520@wp.pl> Date: Mon Feb 17 22:07:17 2025 +0100 Merge branch 'main' of https://github.com/PyCeas/Pyceas into Map-revision-(Issue-59) commit 20c24de Author: Davidek523 <davidov520@wp.pl> Date: Mon Feb 17 22:05:09 2025 +0100 Removing ghost preview Changed: - commented out the ghost preview due to new movement methods and problems with ghost preview commit 54c77a7 Author: Davidek523 <davidov520@wp.pl> Date: Mon Feb 17 12:00:21 2025 +0100 Update credits Added: - myself to the credits because danilo did not bother to do so smh commit 81bbfb0 Author: Davidek523 <davidov520@wp.pl> Date: Sun Feb 9 13:37:28 2025 +0100 Small fixes Fixed: - issues after merge commit dfe6daf Merge: 48fce93 60004a7 Author: Davidek523 <davidov520@wp.pl> Date: Sun Feb 9 13:37:15 2025 +0100 Merge branch 'main' of https://github.com/PyCeas/Pyceas into Map-revision-(Issue-59) commit 48fce93 Author: Davidek523 <davidov520@wp.pl> Date: Sun Feb 9 13:07:38 2025 +0100 Fixed lint Fixed: - small lint issue commit c4921f2 Author: Davidek523 <davidov520@wp.pl> Date: Sun Feb 9 11:56:36 2025 +0100 Fixed issue Fixed: - type lint issue commit 600c5dd Author: Davidek523 <davidov520@wp.pl> Date: Sun Feb 9 11:44:22 2025 +0100 Merge conflicts Resovled: - some merge conflicts and fixed some issues after the merge commit 1517799 Merge: f8288d5 b694eca Author: Davidek523 <davidov520@wp.pl> Date: Sun Feb 9 11:43:50 2025 +0100 Merge branch 'main' of https://github.com/PyCeas/Pyceas into Map-revision-(Issue-59) commit f8288d5 Author: Davidek523 <davidov520@wp.pl> Date: Sun Feb 9 11:08:25 2025 +0100 Fixed ship texture Fixed: - Ship texture issue, where the top of the ship was cut off commit f0eb57e Author: Davidek523 <davidov520@wp.pl> Date: Fri Jan 10 17:18:54 2025 +0100 Refactored movement Refactored: - movement to use direction vector so that the state updates it correctly and shows the correct direction of the ship commit b034513 Author: Davidek523 <davidov520@wp.pl> Date: Fri Jan 10 17:05:01 2025 +0100 Add direction vector Added: - direction vector to player class commit 065448c Author: Davidek523 <davidov520@wp.pl> Date: Fri Jan 10 16:56:31 2025 +0100 Removing old code Removed: - old offset code commit eb5d68e Author: Davidek523 <davidov520@wp.pl> Date: Fri Jan 10 16:56:01 2025 +0100 Fixed small issue Fixed: - camera not focusing on the player commit c70ecb7 Author: Davidek523 <davidov520@wp.pl> Date: Fri Jan 10 16:46:45 2025 +0100 Remove 5 Removed: - all drag logic in the gameloop commit 605ed6a Author: Davidek523 <davidov520@wp.pl> Date: Fri Jan 10 16:46:12 2025 +0100 Remove 4 Removed: - dragging method for player commit f1bca83 Author: Davidek523 <davidov520@wp.pl> Date: Fri Jan 10 16:45:42 2025 +0100 Remove 3 Removed: - cemter on player method commit a78b58e Author: Davidek523 <davidov520@wp.pl> Date: Fri Jan 10 16:45:19 2025 +0100 Remove 2 Removed: - camera drag method commit e8ad607 Author: Davidek523 <davidov520@wp.pl> Date: Fri Jan 10 16:44:52 2025 +0100 Removed 1 Removed: - start drag method commit c6412f4 Author: Davidek523 <davidov520@wp.pl> Date: Fri Jan 10 16:44:28 2025 +0100 Commenting out code Commented out: - code for dragging the camera commit a36a959 Author: Davidek523 <davidov520@wp.pl> Date: Sat Dec 28 23:01:00 2024 +0100 Introducing drag for player Added: - drag system for the player's ship commit 5ea3bab Author: Davidek523 <davidov520@wp.pl> Date: Sat Dec 28 20:00:07 2024 +0100 Handling camera drag Using: - the camera drag method is now used in gameloop commit 3a727cf Author: Davidek523 <davidov520@wp.pl> Date: Sat Dec 28 19:52:55 2024 +0100 Camera drag method Added: - camera drag method in AllSprites class commit 406540d Author: Davidek523 <davidov520@wp.pl> Date: Sat Dec 28 19:48:45 2024 +0100 Old code Removing: - old code commit 402d4d9 Author: Davidek523 <davidov520@wp.pl> Date: Sat Dec 28 14:39:04 2024 +0100 Fixing islands Fixed: - islands drawing beneath the water animation commit 9bea1c6 Author: Davidek523 <davidov520@wp.pl> Date: Sat Dec 28 14:27:52 2024 +0100 Adding shallow water Added: - shallow water into the game - refurbishing the position where the animated water will spawn commit 619a6bf Author: Davidek523 <davidov520@wp.pl> Date: Sat Dec 28 14:14:37 2024 +0100 Water fix Fixed: - animated water doesnt spawn on top of the player anymore commit 6fa9959 Author: Davidek523 <davidov520@wp.pl> Date: Sat Dec 28 14:02:02 2024 +0100 Layers in gameloop Added: - world layers as a parameter in setup method commit 95dfbc5 Author: Davidek523 <davidov520@wp.pl> Date: Sat Dec 28 13:54:41 2024 +0100 Adding layers Added: - world layers variabel into sprite and animated sprite clases commit 9a5520b Author: Davidek523 <davidov520@wp.pl> Date: Sat Dec 28 13:45:46 2024 +0100 Old code Removed: - old commented out code from gameloop that didn't serve much purpose commit ee62280 Author: Davidek523 <davidov520@wp.pl> Date: Sat Dec 28 00:07:18 2024 +0100 Finishing logic Finished: - the logic for getting the state of the player commit bf914f5 Author: Davidek523 <davidov520@wp.pl> Date: Sat Dec 28 00:03:49 2024 +0100 Logic for movement Added: - when going a direction the animation will be applied for that direction commit 56cbd4c Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 23:58:02 2024 +0100 Replacing old images Replaced: - player ship.png because it had not all the rows it needed - added player_sloop.png commit cae0703 Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 17:18:52 2024 +0100 Adding new method Added: - adding a new method in Entity class for getting the state of the player. For example right or left commit 57b34ca Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 17:14:12 2024 +0100 Updating animation Added: - calling the animation method in the update method for the player commit 91a49d0 Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 17:07:23 2024 +0100 Logic and update Added: - logic to the method - update method commit f93cd8e Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 17:05:27 2024 +0100 Adding animation method Added: - method for animating the player commit 30655c8 Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 17:03:35 2024 +0100 Added simple image Added: - simple image of the ship into the game - this image has no animations yet - the image has no sense of direction yet commit 7d3e56b Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 16:42:18 2024 +0100 Finishing method Finished: - the method for extracting information on each individual image in the sprite sheet commit ee33577 Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 16:35:17 2024 +0100 New method in support Added: - new method in support for importing the single ship image commit 02566d0 Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 16:32:13 2024 +0100 New method logic Adding: - more logic into the new method for extracting the images for the characters - temporary print statement to check if everything works commit bd0a7eb Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 16:14:57 2024 +0100 Adding new things Added: - player ship sprite with animation for the water - new method in support - new dict in world frames commit 3dc47f8 Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 14:35:10 2024 +0100 World layers Added: - dictionary named world layers in settings.py commit 0a69b02 Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 14:22:58 2024 +0100 Adding coasts Added: - coasts to two more islands commit f2cb5f3 Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 13:56:47 2024 +0100 Fixed scale bug Fixed: - offest not scaling correctly - camera not centering on the player commit a9fafe1 Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 13:48:00 2024 +0100 Scaling of map - experimenting with scaling of the map commit 9ba4044 Author: Davidek523 <davidov520@wp.pl> Date: Fri Dec 27 13:41:01 2024 +0100 Changes in map Changed: - the color of the sea - the tiles that are used for animation commit a9e941a Author: Davidek523 <davidov520@wp.pl> Date: Thu Dec 26 22:12:06 2024 +0100 Adding sea Added: - the sea into the setup/drawing the sea commit 2fe476b Author: Davidek523 <davidov520@wp.pl> Date: Thu Dec 26 22:02:10 2024 +0100 Changing sea Changed: - sea from the whole see animated to chunks of the sea animated - fixed the coast being drawn outside the island instead of on top of the island - changed the animation speed to 4 commit f6b5a8c Author: Davidek523 <davidov520@wp.pl> Date: Thu Dec 26 21:53:06 2024 +0100 Small fix Fixed: - the direction of the coast facing the islands commit 0a51499 Author: Davidek523 <davidov520@wp.pl> Date: Thu Dec 26 21:27:44 2024 +0100 Adding coast Added: - Coast in the setup method - Made coast animated - Fixed bug with the coast in tiled map commit 8fd4185 Author: Davidek523 <davidov520@wp.pl> Date: Thu Dec 26 21:07:07 2024 +0100 Expanding logic Finished: - logic for drawing the coast animation onto the islands commit 65c5725 Author: Davidek523 <davidov520@wp.pl> Date: Thu Dec 26 20:57:28 2024 +0100 Fixed small bug Fixed: - small bug in coast_importer commit cefb891 Author: Davidek523 <davidov520@wp.pl> Date: Thu Dec 26 20:49:35 2024 +0100 Adding coast to world frames Added: - coast variabel into the world_frames - using the new method, reaching the coast image commit b87c3b3 Author: Davidek523 <davidov520@wp.pl> Date: Thu Dec 26 20:44:39 2024 +0100 Adding logic Added: - logic in the method - print statement to check if everything works correctly commit c575674 Author: Davidek523 <davidov520@wp.pl> Date: Thu Dec 26 20:42:30 2024 +0100 Adding function Added: - new coast_importer method into the support file commit cee9473 Author: Davidek523 <davidov520@wp.pl> Date: Thu Dec 26 20:40:38 2024 +0100 Adding coast Added: - Coast object layer to the tiled map commit d764004 Author: Davidek523 <davidov520@wp.pl> Date: Thu Dec 26 20:25:10 2024 +0100 Adding to sprites Added: - Animation speed in the sprites file - Replaced the digit with the variabel Animation speed commit d13edbc Author: Davidek523 <davidov520@wp.pl> Date: Thu Dec 26 20:23:30 2024 +0100 Animation speed Added: - Animation speed to the settings file commit ebff280 Author: Davidek523 <davidov520@wp.pl> Date: Sun Dec 1 22:32:47 2024 +0100 New map file, new folder, new class Added: - New map folder with a copy of the map - Added a new layer for the water in tiled map - Extracted water tiles and added to a new folder in images - Extracted coast animation tiles and added to images - Added a new class AnimatedSpites and began testing animations



Code Pull Request Template
Summary
This PR ... addresses the issue of the incomplete map and the lack of animations. In this pr I revise the map by remaking the layers in Tiled and showing more layers in pygame/the game itself. I also extract the tiles that are ment to be used for animation and use the in the game. Also I took a ship, made it into a png file and replaced the red rectangle for player with the actual ship.
Related Issues
Map Revission issue #57
This PR issue(s) closes issue #57
✅ Checklist:
Optional:
🏷️ Labels:
type: ...area: ...game: ...