BreizhHardware/project_sanic
1
0
Fork 0
mirror of https://github.com/BreizhHardware/project_sanic.git synced 2026-05-09 08:15:51 +02:00
Code Issues Projects Packages Wiki Activity

[PR #28] [MERGED] Dev felix #28

New issue
Closed
opened 2026-05-06 12:17:25 +02:00 by BreizhHardware · 0 comments
BreizhHardware commented 2026-05-06 12:17:25 +02:00
Owner
Copy link

📋 Pull Request Information

Original PR: https://github.com/BreizhHardware/project_sanic/pull/28
Author: @BreizhHardware
Created: 4/7/2025
Status: ✅ Merged
Merged: 4/7/2025
Merged by: @ClementHVT

Base: dev ← Head: dev_felix

📝 Commits (3)

  • f57e9e1 Feat(Level Design) - Update platform textures in 1.json; modify textures for various platforms and enhance checkpoint handling in handler.py for infinite mode
  • 5287f84 Feat(Enemy Animation) - Implement GIF support for turret enemies; update enemy sprite handling and enhance enemy generation in InfiniteMapGenerator
  • 9916f96 Update src/Map/parser.py

📊 Changes

11 files changed (+186 additions, -51 deletions)

View changed files

➕ assets/map/enemy/boss.gif (+0 -0)
➕ assets/map/enemy/turret.gif (+0 -0)
➖ assets/map/enemy/turret_enemy.png (+0 -0)
📝 map/levels/1.json (+14 -22)
📝 requirements.txt (+3 -1)
📝 src/Entity/Enemy.py (+56 -10)
📝 src/Map/Editor/LevelEditor.py (+3 -7)
📝 src/Map/Infinite/InfiniteMapGenerator.py (+30 -2)
📝 src/Map/parser.py (+67 -2)
📝 src/Menu/Menu.py (+1 -5)
📝 src/handler.py (+12 -2)

📄 Description

This pull request includes various changes to the map/levels/1.json, src/Entity/Enemy.py, src/Map/Editor/LevelEditor.py, src/Map/Infinite/InfiniteMapGenerator.py, src/Map/parser.py, src/Menu/Menu.py, and src/handler.py files. The changes primarily focus on updating textures, adding new features for enemies, and modifying the game map and editor functionalities.

Texture Updates:

  • Changed texture paths for several platforms in map/levels/1.json from .jpg to .png or other textures. [1] [2] [3] [4]
  • Updated the sprite sheet for the turret enemy to use a .gif file.

Enemy Enhancements:

  • Added support for loading and animating GIF frames for turret enemies in src/Entity/Enemy.py. [1] [2] [3] [4]
  • Updated the LevelEditor and InfiniteMapGenerator to handle new enemy attributes and animations. [1] [2] [3]

Game Map and Editor Modifications:

  • Removed the speed boost collectible from map/levels/1.json and updated the collectible types in the LevelEditor and InfiniteMapGenerator. [1] [2] [3] [4]
  • Added a cinematic sequence for level 1 in src/Map/parser.py. [1] [2] [3] [4]

Menu and Handler Updates:

  • Changed the game title in the menu to "Sanic et la princesse Zeldo".
  • Added logic to handle infinite mode in the game state handler. [1] [2]

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/BreizhHardware/project_sanic/pull/28 **Author:** [@BreizhHardware](https://github.com/BreizhHardware) **Created:** 4/7/2025 **Status:** ✅ Merged **Merged:** 4/7/2025 **Merged by:** [@ClementHVT](https://github.com/ClementHVT) **Base:** `dev` ← **Head:** `dev_felix` --- ### 📝 Commits (3) - [`f57e9e1`](https://github.com/BreizhHardware/project_sanic/commit/f57e9e1620e2df4ce1a10bd9dadb300cf892d1e8) Feat(Level Design) - Update platform textures in 1.json; modify textures for various platforms and enhance checkpoint handling in handler.py for infinite mode - [`5287f84`](https://github.com/BreizhHardware/project_sanic/commit/5287f84c904cca441b9012b89108bf1efb45ddc9) Feat(Enemy Animation) - Implement GIF support for turret enemies; update enemy sprite handling and enhance enemy generation in InfiniteMapGenerator - [`9916f96`](https://github.com/BreizhHardware/project_sanic/commit/9916f96a0faf846f98d02f44c20314ce12e3c784) Update src/Map/parser.py ### 📊 Changes **11 files changed** (+186 additions, -51 deletions) <details> <summary>View changed files</summary> ➕ `assets/map/enemy/boss.gif` (+0 -0) ➕ `assets/map/enemy/turret.gif` (+0 -0) ➖ `assets/map/enemy/turret_enemy.png` (+0 -0) 📝 `map/levels/1.json` (+14 -22) 📝 `requirements.txt` (+3 -1) 📝 `src/Entity/Enemy.py` (+56 -10) 📝 `src/Map/Editor/LevelEditor.py` (+3 -7) 📝 `src/Map/Infinite/InfiniteMapGenerator.py` (+30 -2) 📝 `src/Map/parser.py` (+67 -2) 📝 `src/Menu/Menu.py` (+1 -5) 📝 `src/handler.py` (+12 -2) </details> ### 📄 Description This pull request includes various changes to the `map/levels/1.json`, `src/Entity/Enemy.py`, `src/Map/Editor/LevelEditor.py`, `src/Map/Infinite/InfiniteMapGenerator.py`, `src/Map/parser.py`, `src/Menu/Menu.py`, and `src/handler.py` files. The changes primarily focus on updating textures, adding new features for enemies, and modifying the game map and editor functionalities. ### Texture Updates: * Changed texture paths for several platforms in `map/levels/1.json` from `.jpg` to `.png` or other textures. [[1]](diffhunk://#diff-def01abb71e5ea27f55492647891b628a2d1ffef438266596139c14ec920afc4L14-R30) [[2]](diffhunk://#diff-def01abb71e5ea27f55492647891b628a2d1ffef438266596139c14ec920afc4L39-R39) [[3]](diffhunk://#diff-def01abb71e5ea27f55492647891b628a2d1ffef438266596139c14ec920afc4L57-R57) [[4]](diffhunk://#diff-def01abb71e5ea27f55492647891b628a2d1ffef438266596139c14ec920afc4L75-R75) * Updated the sprite sheet for the turret enemy to use a `.gif` file. ### Enemy Enhancements: * Added support for loading and animating GIF frames for turret enemies in `src/Entity/Enemy.py`. [[1]](diffhunk://#diff-dad158efd8851dc4420df9210b13522c72a457342617642e1ea4f84814ad07fbR2-R3) [[2]](diffhunk://#diff-dad158efd8851dc4420df9210b13522c72a457342617642e1ea4f84814ad07fbL10-R42) [[3]](diffhunk://#diff-dad158efd8851dc4420df9210b13522c72a457342617642e1ea4f84814ad07fbL48-R86) [[4]](diffhunk://#diff-dad158efd8851dc4420df9210b13522c72a457342617642e1ea4f84814ad07fbR98-R105) * Updated the `LevelEditor` and `InfiniteMapGenerator` to handle new enemy attributes and animations. [[1]](diffhunk://#diff-48e1f85f3f1215800a32e3af59ff7703da2f4a48e19aa2eb1ea72595b30887d1R351) [[2]](diffhunk://#diff-48e1f85f3f1215800a32e3af59ff7703da2f4a48e19aa2eb1ea72595b30887d1R369) [[3]](diffhunk://#diff-4b12e16775d22dea8d6bdbda74643886abf25c6f838187bdd5980ced5334b684R123-R165) ### Game Map and Editor Modifications: * Removed the speed boost collectible from `map/levels/1.json` and updated the collectible types in the `LevelEditor` and `InfiniteMapGenerator`. [[1]](diffhunk://#diff-def01abb71e5ea27f55492647891b628a2d1ffef438266596139c14ec920afc4L146-L153) [[2]](diffhunk://#diff-48e1f85f3f1215800a32e3af59ff7703da2f4a48e19aa2eb1ea72595b30887d1L603-R605) [[3]](diffhunk://#diff-48e1f85f3f1215800a32e3af59ff7703da2f4a48e19aa2eb1ea72595b30887d1L615-L620) [[4]](diffhunk://#diff-4b12e16775d22dea8d6bdbda74643886abf25c6f838187bdd5980ced5334b684R123-R165) * Added a cinematic sequence for level 1 in `src/Map/parser.py`. [[1]](diffhunk://#diff-b7d012db5b4cdd07e07d6f78dda95be51706a586fd88f44d2e2d0e9ffa228fafR4-R12) [[2]](diffhunk://#diff-b7d012db5b4cdd07e07d6f78dda95be51706a586fd88f44d2e2d0e9ffa228fafR24-R48) [[3]](diffhunk://#diff-b7d012db5b4cdd07e07d6f78dda95be51706a586fd88f44d2e2d0e9ffa228fafL111-R141) [[4]](diffhunk://#diff-b7d012db5b4cdd07e07d6f78dda95be51706a586fd88f44d2e2d0e9ffa228fafR192-R233) ### Menu and Handler Updates: * Changed the game title in the menu to "Sanic et la princesse Zeldo". * Added logic to handle infinite mode in the game state handler. [[1]](diffhunk://#diff-87e072956b3498cea1c9c03f2d500bf062c0d59e2f74fba337a39118c7ea9188R149-R158) [[2]](diffhunk://#diff-87e072956b3498cea1c9c03f2d500bf062c0d59e2f74fba337a39118c7ea9188R490-R491) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
BreizhHardware 2026-05-06 12:17:25 +02:00
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
main
BreizhHardware-patch-1
dev
dev_table_basse
dev_felix
dev_clement
No results found.
Labels
Clear labels   
pull-request
Mirrored from GitHub Pull Request

No labels
pull-request
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
BreizhHardware/project_sanic#28
No description provided.