Sync develop with main and resolve merge conflicts

.github/workflows/test.yml

@@ -0,0 +1,36 @@
+name: Run Unit Tests
+
+on:
+  push:
+    branches: [ main, develop ]
+  pull_request:
+    branches: [ main, develop ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pytest pytest-cov jsonschema
+
+    - name: Run tests with coverage
+      run: |
+        python -m pytest --verbose -vv --cov=src --cov-report=term-missing --cov-report=xml:cov.xml
+
+    - name: Upload coverage reports
+      uses: codecov/codecov-action@v4
+      with:
+        file: ./cov.xml
+        fail_ci_if_error: false
+      continue-on-error: true

.gitignore

@@ -1,4 +1,5 @@
 *.pyc
-data/*.json
+__pycache__/
+data/
 .coverage
 cov.xml

README.md

@@ -1,43 +1,17 @@
 # FishE
 
-This game allows you to explore a fishing village and perform actions in it.
-
-## UI Types
-
-FishE now supports two different user interface types:
-
-### Console UI (Default)
-Traditional text-based interface that runs in the terminal.
-```bash
-python3 src/fishE.py
-# or explicitly
-python3 src/fishE.py --ui console
-```
+[![Run Unit Tests](https://github.com/Stephenson-Software/FishE/actions/workflows/test.yml/badge.svg)](https://github.com/Stephenson-Software/FishE/actions/workflows/test.yml)
 
-### Pygame UI
-Windowed interface with graphics and visual styling.
-```bash
-python3 src/fishE.py --ui pygame
-```
+This game allows you to explore a fishing village and perform actions in it.
 
 ## Features
 
-Both interfaces provide identical game functionality:
-- Fish at the docks to catch fish and earn money
-- Visit the shop to sell fish and buy better bait
-- Go to the bank to deposit/withdraw money
-- Relax at the tavern (get drunk or gamble)
-- View your stats at home
-- Save/load game progress automatically
-
-## Requirements
-
-- Python 3.x
-- pygame (for windowed UI mode)
-
-Install pygame: `pip install pygame`
+### Multiple Save Files
+FishE supports multiple save files, allowing you to maintain different game progressions simultaneously. When you start the game, you'll see a save file manager that displays:
 
-## Development
+- **Existing Saves**: View all your saved games with their progress (Day, Money, Fish count, Last Modified)
+- **Create New Save**: Start a fresh game in a new save slot
+- **Delete Save**: Remove unwanted save files
+- **Quick Load**: Load any existing save file to continue your adventure
 
-Run tests: `./test.sh`
-Run demo: `python3 demo_ui.py`
+Each save file is stored in its own slot (slot_1, slot_2, etc.) in the `data/` directory, ensuring your saves never conflict with each other.

schemas/player.json

@@ -20,13 +20,19 @@
         "priceForBait": {
             "type": "number",
             "minimum": 0
+        },
+        "energy": {
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 100
         }
     },
     "required": [
         "fishCount",
         "money",
         "moneyInBank",
         "fishMultiplier",
-        "priceForBait"
+        "priceForBait",
+        "energy"
     ]
 }

src/config/config.py

@@ -0,0 +1,16 @@
+# @author Daniel McCoy Stephenson
+class Config:
+    def __init__(self):
+        # Save file paths
+        self.dataDirectory = "data"
+        self.playerSaveFile = "data/player.json"
+        self.statsSaveFile = "data/stats.json"
+        self.timeServiceSaveFile = "data/timeService.json"
+
+        # Initial player values
+        self.initialMoney = 20
+        self.initialEnergy = 100
+        self.initialFishCount = 0
+        self.initialMoneyInBank = 0.01
+        self.initialFishMultiplier = 1
+        self.initialPriceForBait = 50