Merge branch 'release/1.0.0'

.github/workflows/pylint.yml

@@ -31,7 +31,7 @@ jobs:
       uses: Silleellie/pylint-github-action@v2
       with:
         # The path, relative to the root of the repo, of the package(s) or pyton file(s) to lint
-        lint-path: danmaku
+        lint-path: danmaku/**/*.py
         # Python version which will install all dependencies and lint package(s)
         python-version: "3.10"
         # The path, relative to the root of the repo, of the requirements to install

README.md

@@ -1,10 +1,31 @@
 # 弾幕 (Danmaku)
-![pylint](https://img.shields.io/badge/PyLint-9.71-yellow?logo=python&logoColor=white)
+![pylint](https://img.shields.io/badge/PyLint-9.95-yellow?logo=python&logoColor=white)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
 ## Goal
 To create a bullet hell game similar to TouHou Project, Undertale, etc.
 
+## How to build
+
+```
+poetry shell
+poetry install
+```
+or
+```
+python3 -m venv .venv
+.\.venv\Scripts\activate
+pip install --upgrade -r .\requirements.txt
+```
+Then,
+```
+.\build
+```
+
+## For developers
+
+Most important things is written down [here](./docs/mecs.md)
+
 ## Refactoring
 - [x] main.py
 - [x] bullet.py
@@ -18,7 +39,7 @@ To create a bullet hell game similar to TouHou Project, Undertale, etc.
 
 - [x] Game mechanics
   - [x] Drops
-      - [ ] HP (?)
+    - [ ] HP (?)
     - [x] XP
     - [x] Powerups
     - [ ] Coins (?)
@@ -38,13 +59,13 @@ To create a bullet hell game similar to TouHou Project, Undertale, etc.
   - [ ] Effects (particles)
   - [ ] Scaling
   - [ ] Fullscreen
-  - [ ] Boss HP bar
+  - [x] Boss HP bar
   - [x] Player HP/Bomb info
   - [x] Player points info
-  - [ ] UI
+  - [x] UI
     - [x] Main menu
       - [x] Main menu style
-      - [ ] Background
+      - [x] Background
     - [x] Leaderboard
     - [x] Settings
       - [x] DB
@@ -66,6 +87,6 @@ To create a bullet hell game similar to TouHou Project, Undertale, etc.
   - [x] Replace resource path strings with constants from db
 - [x] Sounds
   - [x] Death
-  - [ ] Shoot
-  - [ ] Hit
+  - [x] Shoot
+  - [x] Hit
 - [x] Music

danmaku/database/construct.py

@@ -16,8 +16,8 @@
 
 basic_enemy = EnemyTypes.create(
     name="basic enemy",
-    texture_file="basic_enemy_2.png;basic_enemy_1.png;"
-    "basic_enemy_2.png;basic_enemy_3.png",
+    texture_file="basic_enemy_down_static_2.png;basic_enemy_down_1.png;"
+    "basic_enemy_down_static_2.png;basic_enemy_down_3.png",
     texture_size_width=50,
     texture_size_height=65,
     speed=30,
@@ -31,8 +31,8 @@
 
 strong_enemy = EnemyTypes.create(
     name="strong enemy",
-    texture_file="strong_enemy_2.png;strong_enemy_1.png;"
-    "strong_enemy_2.png;strong_enemy_3.png",
+    texture_file="strong_enemy_down_static_2.png;strong_enemy_down_1.png;"
+    "strong_enemy_down_static_2.png;strong_enemy_down_3.png",
     texture_size_width=50,
     texture_size_height=65,
     speed=20,
@@ -46,8 +46,8 @@
 
 boss = EnemyTypes.create(
     name="boss",
-    texture_file="strong_enemy_2.png;strong_enemy_1.png;"
-    "strong_enemy_2.png;strong_enemy_3.png",
+    texture_file="strong_enemy_down_static_2.png;strong_enemy_down_1.png;"
+    "strong_enemy_down_static_2.png;strong_enemy_down_3.png",
     texture_size_width=60,
     texture_size_height=85,
     speed=10,
@@ -128,7 +128,7 @@
     texture_size_height=50,
     speed=200,
     shoot_v=250,
-    hp=1300,
+    hp=500,
     dm=10,
     endurance=1,
     hitbox_radius=10,

danmaku/database/database.py

@@ -88,43 +88,63 @@ def get_saved_objects() -> list:
 
 def get_saved_game() -> dict:
     """Get saved game from database
-    Returns dict: {"score", "level", "power"}
+    Returns dict: {"score", "level", "power", "bombs"}
     """
     game = tuple(iter(SavedGame.select().dicts()))[-1]
     return game
 
 
-def get_game_history() -> list:
+def get_game_history() -> list[dict[str, int]]:
     """Get game history from database
-    Returns list: [{"score", "level"}]
+    Returns list: [{"score", "level", "time"}]
     """
     games = tuple(iter(SavedGame.select()))
     res = []
     for i in games:
-        objects = {
-            "score": i.score,
-            "level": i.level,
-        }
+        objects = {"score": i.score, "level": i.level, "time": i.time}
         res.append(objects)
     return res
 
 
+def delete_last_game():
+    """Remove last game record from database"""
+    games = list(iter(SavedGame.select()))
+    SavedGame.delete_by_id(games[-1])
+    SavedGame.update()
+
+
 def set_saved_objects(name: str, objects: Iterable) -> None:
     """Set saved objects to database"""
     for e in objects:
+        if hasattr(e, "my_type"):
+            my_type = e.my_type
+        else:
+            my_type = ""
+        if hasattr(e, "health"):
+            health = e.health
+        else:
+            health = 0
+        if hasattr(e, "damage"):
+            damage = e.damage
+        else:
+            damage = 0
         n = SavedObjects.create(
             object=name,
-            object_type=e.my_type,
+            object_type=my_type,
             object_position=f"{e.x}, {e.y}",
-            object_hp=e.health,
-            object_damage=e.damage,
+            object_hp=health,
+            object_damage=damage,
         )
         n.save()
 
 
-def set_saved_game(cur_level: int, score: int, power: int) -> None:
+def set_saved_game(
+    cur_level: int, score: int, power: int, bombs: int, time: float
+) -> None:
     """Set saved game to database"""
-    n = SavedGame.create(score=score, level=cur_level, power=power)
+    n = SavedGame.create(
+        score=score, level=cur_level, power=power, bombs=bombs, time=time
+    )
     n.save()
 
 
@@ -136,14 +156,15 @@ def delete_saved_objects() -> None:
 
 
 def get_settings() -> dict:
+    """Get all settings"""
     settings = {}
     for setting in Settings.select():
         match setting.type:
             case "int":
                 value = int(setting.value)
                 possible_values = list(map(int, setting.possible_values.split(";")))
             case "bool":
-                value = bool(setting.value)
+                value = setting.value == "True"
                 possible_values = [True, False]
             case "str":
                 value = setting.value
@@ -159,17 +180,15 @@ def get_settings() -> dict:
 
 
 def delete_settings():
+    """Delete all settings"""
     for setting in Settings.select():
         Settings.delete_by_id(setting)
         Settings.update()
 
 
 def set_settings(settings: dict) -> None:
+    """Set settings from dictionary"""
     for key, value in settings.items():
         s = Settings.get(Settings.name == key)
         s.value = value
         s.save()
-
-
-if __name__ == "__main__":
-    print(get_saved_game())

danmaku/database/models.py

@@ -6,14 +6,15 @@
     CharField,
     IntegerField,
     BooleanField,
+    FloatField,
 )
 from danmaku.utils import resource_path
 
 # look for database file in the same folder, not folder of execution
 db = SqliteDatabase(resource_path("DataBase.db"))
 
 
-# pylint: disable=missing-class-docstring
+# pylint: disable=missing-class-docstring,too-few-public-methods
 
 
 class BaseModel(Model):
@@ -71,6 +72,8 @@ class SavedGame(BaseModel):
     level = IntegerField()
     score = IntegerField()
     power = IntegerField()
+    bombs = IntegerField()
+    time = FloatField()
 
 
 class Settings(BaseModel):