From 3df7efd33f89bcc0eba42e0c91a387499899c7be Mon Sep 17 00:00:00 2001
From: TropiiDev <colinbassett28@proton.me>
Date: Thu, 27 Feb 2025 12:45:36 -0500
Subject: [PATCH] Implement an updated load_options function

---
 .DS_Store    | Bin 0 -> 6148 bytes
 CHANGELOG.md |   2 +-
 api/sql.py   |   4 ----
 functions.py |  11 +++++++----
 main.py      |   8 ++++++--
 5 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..44176da3e9720e67f884b591e5cb065bfecc31c6
GIT binary patch
literal 6148
zcmeHKOHKko5Pb~<QCP5aV=^b0#2X9<Q4>Fj9sn8eL&8@e(cSF5gIDl;uJl!RN0^UW
zW3(!%dObZ=U0rX|-O~U}dp$e^ngD84!O9*@fyjH&oRoZz#2Gur0DTPbfLru(-rAuI
zC<DKZ0a?3suGSvrc;?#Otl!@0cs7W~vzQ*TJ+!FdhZVMfGJWS5rM=91#;fYQ5X$&z
zUpwOK)`$%p;e@>xI7Sy|xFm*{V3>|8-Dh&tF=Un%HKs1P`-JR?x1(H^jpYap++mF=
zYhGc58C%Q3S-xem?QlkYMof#m%|XU{7gwyMg$~Y%1=ZwOXyTC-EI7B3ZB6(z<s4;p
zD?DMfT^BdrmrTYgJr@`k&My0P7^?Db8Q_^MQmZ>us|+Xu%D@)`vOfe=!N_Cc&~6<x
z_6k6(u-gjT^0Oc@fyc;W;*f7B#)T4HsPR_}<HFe=c)!SF;?RY|_{)d!nT@}p7@M8r
z2i6@Xa;R1rPzKTrl-*-f&j0TB_y2T|J}Cprz@K8kR65t4HcRqnYpyssYXj;HRYd#}
mhc<-9AIG*KNAW(@3f~3NAVwY&hwP!~kAS5?jWY0~4159;$eiu~

literal 0
HcmV?d00001

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e41799..c3b2789 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,5 +2,5 @@
 ## VER: Alpha #8
 
 ## What's new?
-- Added an update to the UserBase model to add weapons, pickaxes, and upgrades to the users inventory
+- Updated the UserModel class to remove the ability to have weapons, upgrades, & pickaxes.
 - Started work on the load_options functions that will allow the user to choose specific options for the game
diff --git a/api/sql.py b/api/sql.py
index e0b47f4..9fe9f15 100644
--- a/api/sql.py
+++ b/api/sql.py
@@ -1,6 +1,5 @@
 # Imports
 from typing import Annotated
-from typing import List
 from fastapi import Depends
 from sqlmodel import Field, Session, SQLModel, create_engine
 from pydantic import BaseModel
@@ -10,9 +9,6 @@ class HeroBase(SQLModel):
     name: str
     gold: int | None = Field(default=0)
     health: int | None = Field(default=100)
-    weapons: List[str] | None = Field(default=["basic_sword"])
-    pickaxe: List[str] | None = Field(default=["basic_pickaxe"])
-    upgrades: List[str] | None = Field(default=[])
 
 # The main hero class. It inherits the name, gold, and health
 class Hero(HeroBase, table=True):
diff --git a/functions.py b/functions.py
index 2ba613e..7b9345d 100644
--- a/functions.py
+++ b/functions.py
@@ -18,7 +18,7 @@ def create_account(name: str, email: str, password: str) -> Any | None:
     else:
         return False
 
-def login(email, password):
+def login(email: str, password: str):
     data = {
         "email": email,
         "password": password
@@ -35,9 +35,12 @@ def login(email, password):
 def load_options() -> int:
     print("""
 Here are the available options:
-* To select an option just enter its number *
-1. Home - View the inventory
+* To select an option, just enter its number *
+1. Home - View the inventory, Save Progress, or View gold and health, Quit
+2. Cave - Mine for gold
+3. Shop - Buy weapons, pickaxes, or upgrades
+4. Arena - Fight monsters for more gold.
     """)
 
     option = int(input(""))
-    return option
\ No newline at end of file
+    return option
diff --git a/main.py b/main.py
index 7b5c365..0ca7c4f 100644
--- a/main.py
+++ b/main.py
@@ -1,8 +1,9 @@
+# Imports
 from functions import *
 
 import requests
 
-
+# The user object
 user = None
 
 # Does the user have an active account?
@@ -35,4 +36,7 @@ else:
 
 while user is not None:
     print(f"Welcome {user['name']}!")
-    break
\ No newline at end of file
+    options = load_options()
+
+    print(options)
+    break