[PR #29] [MERGED] Dev felix #29

Closed
opened 2026-05-06 12:17:26 +02:00 by BreizhHardware · 0 comments

📋 Pull Request Information

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

Base: devHead: dev_felix


📝 Commits (2)

  • e67d64d Feat(Exit Video) - Implement video playback on exit collision; add functionality to play a video and return to the menu, and update requirements for moviepy support
  • 3866a0b Feat(Level Design) - Update platform and enemy configurations in JSON files; modify platform IDs, positions, and textures, and add new enemy types with behaviors.

📊 Changes

20 files changed (+286 additions, -161 deletions)

View changed files

assets/map/checkpoints/checkpoint.png (+0 -0)
assets/map/checkpoints/checkpoint_uncheck.png (+0 -0)
assets/map/exit/Zeldo Motus.mp4 (+0 -0)
assets/sound/cinematic_voice.mp3 (+0 -0)
📝 map/levels/2.json (+120 -78)
📝 map/levels/3.json (+7 -7)
📝 requirements.txt (+8 -1)
📝 src/Database/CheckpointDB.py (+0 -2)
📝 src/Database/LevelDB.py (+0 -2)
📝 src/Entity/Checkpoint.py (+27 -4)
📝 src/Entity/Enemy.py (+3 -7)
📝 src/Entity/Entity.py (+12 -4)
📝 src/Entity/Exit.py (+40 -6)
📝 src/Entity/Player.py (+7 -6)
📝 src/Map/Editor/EditorSprites.py (+0 -1)
📝 src/Map/Editor/LevelEditor.py (+41 -25)
📝 src/Map/parser.py (+16 -9)
📝 src/game.py (+5 -6)
📝 src/handler.py (+0 -3)
temp_audio.mp3 (+0 -0)

📄 Description

This pull request includes significant updates to various game levels, entities, and database operations. The changes focus on enhancing level design, improving entity behavior, and cleaning up the codebase by removing unnecessary print statements.

Level Design Improvements:

  • Updated map/levels/2.json to adjust platform positions, textures, and add new enemies and platforms.
  • Changed background and platform positions in map/levels/3.json, and adjusted exit and spawn point coordinates. [1] [2] [3] [4]

Entity Enhancements:

  • Modified src/Entity/Checkpoint.py to load textures dynamically and update the checkpoint appearance upon activation. [1] [2]
  • Added functionality in src/Entity/Exit.py to play a video and return to the menu upon player exit. [1] [2]
  • Improved error handling for texture loading in src/Entity/Entity.py.

Database Operations:

  • Removed unnecessary print statements from src/Database/CheckpointDB.py and src/Database/LevelDB.py to clean up the code. [1] [2] [3] [4]

Code Cleanup:

  • Removed print statements and improved formatting in various files, including src/Entity/Enemy.py, src/Entity/Player.py, and src/Map/Editor/EditorSprites.py. [1] [2] [3] [4] [5] [6]

Level Editor Enhancements:

  • Added a new method update_hitboxes to src/Map/Editor/LevelEditor.py to update collision boxes for all sprites.
  • Improved the save_level method to include additional enemy data and adjusted player spawn point logic. [1] [2] [3]

🔄 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/29 **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 (2) - [`e67d64d`](https://github.com/BreizhHardware/project_sanic/commit/e67d64d0e3312bfe459415796553437db4c8fb7c) Feat(Exit Video) - Implement video playback on exit collision; add functionality to play a video and return to the menu, and update requirements for moviepy support - [`3866a0b`](https://github.com/BreizhHardware/project_sanic/commit/3866a0b48cebf3209b66ae93b36d22260219648e) Feat(Level Design) - Update platform and enemy configurations in JSON files; modify platform IDs, positions, and textures, and add new enemy types with behaviors. ### 📊 Changes **20 files changed** (+286 additions, -161 deletions) <details> <summary>View changed files</summary> ➕ `assets/map/checkpoints/checkpoint.png` (+0 -0) ➕ `assets/map/checkpoints/checkpoint_uncheck.png` (+0 -0) ➕ `assets/map/exit/Zeldo Motus.mp4` (+0 -0) ➕ `assets/sound/cinematic_voice.mp3` (+0 -0) 📝 `map/levels/2.json` (+120 -78) 📝 `map/levels/3.json` (+7 -7) 📝 `requirements.txt` (+8 -1) 📝 `src/Database/CheckpointDB.py` (+0 -2) 📝 `src/Database/LevelDB.py` (+0 -2) 📝 `src/Entity/Checkpoint.py` (+27 -4) 📝 `src/Entity/Enemy.py` (+3 -7) 📝 `src/Entity/Entity.py` (+12 -4) 📝 `src/Entity/Exit.py` (+40 -6) 📝 `src/Entity/Player.py` (+7 -6) 📝 `src/Map/Editor/EditorSprites.py` (+0 -1) 📝 `src/Map/Editor/LevelEditor.py` (+41 -25) 📝 `src/Map/parser.py` (+16 -9) 📝 `src/game.py` (+5 -6) 📝 `src/handler.py` (+0 -3) ➕ `temp_audio.mp3` (+0 -0) </details> ### 📄 Description This pull request includes significant updates to various game levels, entities, and database operations. The changes focus on enhancing level design, improving entity behavior, and cleaning up the codebase by removing unnecessary print statements. ### Level Design Improvements: * Updated `map/levels/2.json` to adjust platform positions, textures, and add new enemies and platforms. * Changed background and platform positions in `map/levels/3.json`, and adjusted exit and spawn point coordinates. [[1]](diffhunk://#diff-4f59d46cf6b4f2783243460af97509eb14dcd2754a7103c7437ccd3b3f560306L5-R11) [[2]](diffhunk://#diff-4f59d46cf6b4f2783243460af97509eb14dcd2754a7103c7437ccd3b3f560306L20-R20) [[3]](diffhunk://#diff-4f59d46cf6b4f2783243460af97509eb14dcd2754a7103c7437ccd3b3f560306L31-R32) [[4]](diffhunk://#diff-4f59d46cf6b4f2783243460af97509eb14dcd2754a7103c7437ccd3b3f560306L42-R42) ### Entity Enhancements: * Modified `src/Entity/Checkpoint.py` to load textures dynamically and update the checkpoint appearance upon activation. [[1]](diffhunk://#diff-5445feaae6ae0021aad39a2959f3ef78370314793289d0666226a4326be8b2b6R28-R44) [[2]](diffhunk://#diff-5445feaae6ae0021aad39a2959f3ef78370314793289d0666226a4326be8b2b6L38-R63) * Added functionality in `src/Entity/Exit.py` to play a video and return to the menu upon player exit. [[1]](diffhunk://#diff-14326ced12bc6a36c5aff4235931aac270e908099f2341040be58690d85c2f09R3-R4) [[2]](diffhunk://#diff-14326ced12bc6a36c5aff4235931aac270e908099f2341040be58690d85c2f09L56-R96) * Improved error handling for texture loading in `src/Entity/Entity.py`. ### Database Operations: * Removed unnecessary print statements from `src/Database/CheckpointDB.py` and `src/Database/LevelDB.py` to clean up the code. [[1]](diffhunk://#diff-ffd7d15fa6d73583aaaff634c4f75958f1a62b066c3660256b0243ac020ce1a4L51) [[2]](diffhunk://#diff-ffd7d15fa6d73583aaaff634c4f75958f1a62b066c3660256b0243ac020ce1a4L65) [[3]](diffhunk://#diff-7938779c11c060e23dd40a6da2992107a65cf0970e70617c38af493b0b9f7841L68) [[4]](diffhunk://#diff-7938779c11c060e23dd40a6da2992107a65cf0970e70617c38af493b0b9f7841L92) ### Code Cleanup: * Removed print statements and improved formatting in various files, including `src/Entity/Enemy.py`, `src/Entity/Player.py`, and `src/Map/Editor/EditorSprites.py`. [[1]](diffhunk://#diff-dad158efd8851dc4420df9210b13522c72a457342617642e1ea4f84814ad07fbL81-R82) [[2]](diffhunk://#diff-dad158efd8851dc4420df9210b13522c72a457342617642e1ea4f84814ad07fbL193-R192) [[3]](diffhunk://#diff-c0effc013092db6988c4774ca8aa3c2ca0c1b1890ffeed5401b98d17d217acc2L369) [[4]](diffhunk://#diff-c0effc013092db6988c4774ca8aa3c2ca0c1b1890ffeed5401b98d17d217acc2L590-R589) [[5]](diffhunk://#diff-c0effc013092db6988c4774ca8aa3c2ca0c1b1890ffeed5401b98d17d217acc2L599-R600) [[6]](diffhunk://#diff-2323cb382027020b2b9cf3baeeb746933ea4889fa6fb455c349ac2392477471aL41) ### Level Editor Enhancements: * Added a new method `update_hitboxes` to `src/Map/Editor/LevelEditor.py` to update collision boxes for all sprites. * Improved the `save_level` method to include additional enemy data and adjusted player spawn point logic. [[1]](diffhunk://#diff-48e1f85f3f1215800a32e3af59ff7703da2f4a48e19aa2eb1ea72595b30887d1L229-R229) [[2]](diffhunk://#diff-48e1f85f3f1215800a32e3af59ff7703da2f4a48e19aa2eb1ea72595b30887d1L244-R244) [[3]](diffhunk://#diff-48e1f85f3f1215800a32e3af59ff7703da2f4a48e19aa2eb1ea72595b30887d1R365) --- <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:26 +02:00
Sign in to join this conversation.
No labels
pull-request
No milestone
No project
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#29
No description provided.