diff --git a/Game/build/cliGame/Analysis-00.toc b/Game/build/cliGame/Analysis-00.toc index 43f063e..81f0c6a 100644 --- a/Game/build/cliGame/Analysis-00.toc +++ b/Game/build/cliGame/Analysis-00.toc @@ -543,13 +543,13 @@ ('multiprocessing', 'C:\\Program Files\\Python310\\lib\\multiprocessing\\__init__.py', 'PYMODULE'), - ('stringprep', - 'C:\\Program Files\\Python310\\lib\\stringprep.py', - 'PYMODULE'), + ('_py_abc', 'C:\\Program Files\\Python310\\lib\\_py_abc.py', 'PYMODULE'), ('tracemalloc', 'C:\\Program Files\\Python310\\lib\\tracemalloc.py', 'PYMODULE'), - ('_py_abc', 'C:\\Program Files\\Python310\\lib\\_py_abc.py', 'PYMODULE'), + ('stringprep', + 'C:\\Program Files\\Python310\\lib\\stringprep.py', + 'PYMODULE'), ('LogicCodes.heroRole', 'D:\\College\\5th Semester\\Object-Oriented ' 'Programming\\TubesPBO\\Main\\LogicCodes\\heroRole.py', @@ -619,10 +619,10 @@ 'D:\\College\\5th Semester\\Object-Oriented ' 'Programming\\TubesPBO\\Main\\cliUI\\loginCLI.py', 'PYMODULE')], - [('python310.dll', 'C:\\Program Files\\Python310\\python310.dll', 'BINARY'), - ('VCRUNTIME140.dll', + [('VCRUNTIME140.dll', 'C:\\Program Files\\Python310\\VCRUNTIME140.dll', 'BINARY'), + ('python310.dll', 'C:\\Program Files\\Python310\\python310.dll', 'BINARY'), ('_multiprocessing', 'C:\\Program Files\\Python310\\DLLs\\_multiprocessing.pyd', 'EXTENSION'), @@ -643,12 +643,12 @@ ('_lzma', 'C:\\Program Files\\Python310\\DLLs\\_lzma.pyd', 'EXTENSION'), ('_bz2', 'C:\\Program Files\\Python310\\DLLs\\_bz2.pyd', 'EXTENSION'), ('_ctypes', 'C:\\Program Files\\Python310\\DLLs\\_ctypes.pyd', 'EXTENSION'), - ('libcrypto-1_1.dll', - 'C:\\Program Files\\Python310\\DLLs\\libcrypto-1_1.dll', - 'BINARY'), ('libssl-1_1.dll', 'C:\\Program Files\\Python310\\DLLs\\libssl-1_1.dll', 'BINARY'), + ('libcrypto-1_1.dll', + 'C:\\Program Files\\Python310\\DLLs\\libcrypto-1_1.dll', + 'BINARY'), ('libffi-7.dll', 'C:\\Program Files\\Python310\\DLLs\\libffi-7.dll', 'BINARY')], diff --git a/Game/build/cliGame/COLLECT-00.toc b/Game/build/cliGame/COLLECT-00.toc index 6ed98d7..6a6e9db 100644 --- a/Game/build/cliGame/COLLECT-00.toc +++ b/Game/build/cliGame/COLLECT-00.toc @@ -2,10 +2,10 @@ 'D:\\College\\5th Semester\\Object-Oriented ' 'Programming\\TubesPBO\\Main\\build\\cliGame\\cliGame.exe', 'EXECUTABLE'), - ('python310.dll', 'C:\\Program Files\\Python310\\python310.dll', 'BINARY'), ('VCRUNTIME140.dll', 'C:\\Program Files\\Python310\\VCRUNTIME140.dll', 'BINARY'), + ('python310.dll', 'C:\\Program Files\\Python310\\python310.dll', 'BINARY'), ('_multiprocessing', 'C:\\Program Files\\Python310\\DLLs\\_multiprocessing.pyd', 'EXTENSION'), @@ -26,12 +26,12 @@ ('_lzma', 'C:\\Program Files\\Python310\\DLLs\\_lzma.pyd', 'EXTENSION'), ('_bz2', 'C:\\Program Files\\Python310\\DLLs\\_bz2.pyd', 'EXTENSION'), ('_ctypes', 'C:\\Program Files\\Python310\\DLLs\\_ctypes.pyd', 'EXTENSION'), - ('libcrypto-1_1.dll', - 'C:\\Program Files\\Python310\\DLLs\\libcrypto-1_1.dll', - 'BINARY'), ('libssl-1_1.dll', 'C:\\Program Files\\Python310\\DLLs\\libssl-1_1.dll', 'BINARY'), + ('libcrypto-1_1.dll', + 'C:\\Program Files\\Python310\\DLLs\\libcrypto-1_1.dll', + 'BINARY'), ('libffi-7.dll', 'C:\\Program Files\\Python310\\DLLs\\libffi-7.dll', 'BINARY'), diff --git a/Game/build/cliGame/EXE-00.toc b/Game/build/cliGame/EXE-00.toc index d23b29b..3cf9bf9 100644 --- a/Game/build/cliGame/EXE-00.toc +++ b/Game/build/cliGame/EXE-00.toc @@ -57,7 +57,7 @@ [], False, False, - 1642389974, + 1642390649, [('run.exe', 'C:\\Users\\alfin\\AppData\\Roaming\\Python\\Python310\\site-packages\\PyInstaller\\bootloader\\Windows-64bit\\run.exe', 'EXECUTABLE')]) diff --git a/Game/build/cliGame/PYZ-00.pyz b/Game/build/cliGame/PYZ-00.pyz index d6450c3..8143f09 100644 Binary files a/Game/build/cliGame/PYZ-00.pyz and b/Game/build/cliGame/PYZ-00.pyz differ diff --git a/Game/build/cliGame/PYZ-00.toc b/Game/build/cliGame/PYZ-00.toc index cd560a0..0921cbe 100644 --- a/Game/build/cliGame/PYZ-00.toc +++ b/Game/build/cliGame/PYZ-00.toc @@ -512,13 +512,13 @@ ('multiprocessing', 'C:\\Program Files\\Python310\\lib\\multiprocessing\\__init__.py', 'PYMODULE'), - ('stringprep', - 'C:\\Program Files\\Python310\\lib\\stringprep.py', - 'PYMODULE'), + ('_py_abc', 'C:\\Program Files\\Python310\\lib\\_py_abc.py', 'PYMODULE'), ('tracemalloc', 'C:\\Program Files\\Python310\\lib\\tracemalloc.py', 'PYMODULE'), - ('_py_abc', 'C:\\Program Files\\Python310\\lib\\_py_abc.py', 'PYMODULE'), + ('stringprep', + 'C:\\Program Files\\Python310\\lib\\stringprep.py', + 'PYMODULE'), ('LogicCodes.heroRole', 'D:\\College\\5th Semester\\Object-Oriented ' 'Programming\\TubesPBO\\Main\\LogicCodes\\heroRole.py', diff --git a/Game/build/cliGame/base_library.zip b/Game/build/cliGame/base_library.zip index d00b168..3c85cdb 100644 Binary files a/Game/build/cliGame/base_library.zip and b/Game/build/cliGame/base_library.zip differ diff --git a/Game/build/cliGame/cliGame.exe b/Game/build/cliGame/cliGame.exe index b452810..d08effa 100644 Binary files a/Game/build/cliGame/cliGame.exe and b/Game/build/cliGame/cliGame.exe differ diff --git a/Game/build/cliGame/cliGame.pkg b/Game/build/cliGame/cliGame.pkg index b034845..83aaf9c 100644 Binary files a/Game/build/cliGame/cliGame.pkg and b/Game/build/cliGame/cliGame.pkg differ diff --git a/Game/build/cliGame/warn-cliGame.txt b/Game/build/cliGame/warn-cliGame.txt index 39e035a..8c7364b 100644 --- a/Game/build/cliGame/warn-cliGame.txt +++ b/Game/build/cliGame/warn-cliGame.txt @@ -20,7 +20,6 @@ excluded module named _frozen_importlib - imported by importlib (optional), impo missing module named pep517 - imported by importlib.metadata (delayed) missing module named _scproxy - imported by urllib.request (conditional) missing module named termios - imported by tty (top-level), getpass (optional) -missing module named 'org.python' - imported by copy (optional), xml.sax (delayed, conditional) missing module named 'java.lang' - imported by platform (delayed, optional), xml.sax._exceptions (conditional) missing module named multiprocessing.BufferTooShort - imported by multiprocessing (top-level), multiprocessing.connection (top-level) missing module named multiprocessing.AuthenticationError - imported by multiprocessing (top-level), multiprocessing.connection (top-level) @@ -29,11 +28,12 @@ missing module named vms_lib - imported by platform (delayed, optional) missing module named java - imported by platform (delayed) missing module named _winreg - imported by platform (delayed, optional) missing module named readline - imported by cmd (delayed, conditional, optional), code (delayed, conditional, optional), pdb (delayed, optional) -missing module named org - imported by pickle (optional) +missing module named 'org.python' - imported by pickle (optional), xml.sax (delayed, conditional) missing module named pwd - imported by posixpath (delayed, conditional), shutil (delayed, optional), tarfile (optional), pathlib (delayed, optional), subprocess (delayed, conditional, optional), http.server (delayed, optional), webbrowser (delayed), netrc (delayed, conditional), getpass (delayed), distutils.util (delayed, conditional, optional) missing module named grp - imported by shutil (delayed, optional), tarfile (optional), pathlib (delayed, optional), subprocess (delayed, conditional, optional) missing module named posix - imported by os (conditional, optional), shutil (conditional), importlib._bootstrap_external (conditional) missing module named resource - imported by posix (top-level), test.support (delayed, conditional, optional) +missing module named org - imported by copy (optional) missing module named _posixsubprocess - imported by subprocess (optional), multiprocessing.util (delayed) missing module named multiprocessing.get_context - imported by multiprocessing (top-level), multiprocessing.pool (top-level), multiprocessing.managers (top-level), multiprocessing.sharedctypes (top-level) missing module named multiprocessing.TimeoutError - imported by multiprocessing (top-level), multiprocessing.pool (top-level) diff --git a/Game/build/cliGame/xref-cliGame.html b/Game/build/cliGame/xref-cliGame.html index 51abfd2..481ab8f 100644 --- a/Game/build/cliGame/xref-cliGame.html +++ b/Game/build/cliGame/xref-cliGame.html @@ -277,7 +277,7 @@

modulegraph cross reference for cliGame.py, pyi_rth_inspect.py, pyi_rth_mult 'org.python' MissingModule
imported by: - copy + pickle • xml.sax
@@ -3194,8 +3194,8 @@

modulegraph cross reference for cliGame.py, pyi_rth_inspect.py, pyi_rth_mult copy SourceModule
imports: - 'org.python' - • copyreg + copyreg + • org • types • weakref @@ -8777,7 +8777,7 @@

modulegraph cross reference for cliGame.py, pyi_rth_inspect.py, pyi_rth_mult org MissingModule
imported by: - pickle + copy
@@ -9007,7 +9007,8 @@

modulegraph cross reference for cliGame.py, pyi_rth_inspect.py, pyi_rth_mult pickle SourceModule
imports: - _compat_pickle + 'org.python' + • _compat_pickle • _pickle • codecs • copyreg @@ -9015,7 +9016,6 @@

modulegraph cross reference for cliGame.py, pyi_rth_inspect.py, pyi_rth_mult • functools • io • itertools - • org • pprint • re • struct diff --git a/Game/dist/cliGame/base_library.zip b/Game/dist/cliGame/base_library.zip index d00b168..3c85cdb 100644 Binary files a/Game/dist/cliGame/base_library.zip and b/Game/dist/cliGame/base_library.zip differ diff --git a/Game/dist/cliGame/cliGame.exe b/Game/dist/cliGame/cliGame.exe index b452810..d08effa 100644 Binary files a/Game/dist/cliGame/cliGame.exe and b/Game/dist/cliGame/cliGame.exe differ diff --git a/Main/LogicCodes/__pycache__/enemyClass.cpython-310.pyc b/Main/LogicCodes/__pycache__/enemyClass.cpython-310.pyc index 6c61084..ec89134 100644 Binary files a/Main/LogicCodes/__pycache__/enemyClass.cpython-310.pyc and b/Main/LogicCodes/__pycache__/enemyClass.cpython-310.pyc differ diff --git a/Main/cliUI/__pycache__/combatCLI.cpython-310.pyc b/Main/cliUI/__pycache__/combatCLI.cpython-310.pyc index 11a442a..42ae6de 100644 Binary files a/Main/cliUI/__pycache__/combatCLI.cpython-310.pyc and b/Main/cliUI/__pycache__/combatCLI.cpython-310.pyc differ diff --git a/Main/cliUI/__pycache__/mainMenuCLI.cpython-310.pyc b/Main/cliUI/__pycache__/mainMenuCLI.cpython-310.pyc index 2952f96..1fc1d6b 100644 Binary files a/Main/cliUI/__pycache__/mainMenuCLI.cpython-310.pyc and b/Main/cliUI/__pycache__/mainMenuCLI.cpython-310.pyc differ diff --git a/Main/cliUI/__pycache__/startCLI.cpython-310.pyc b/Main/cliUI/__pycache__/startCLI.cpython-310.pyc index 2ba852a..89cd4dc 100644 Binary files a/Main/cliUI/__pycache__/startCLI.cpython-310.pyc and b/Main/cliUI/__pycache__/startCLI.cpython-310.pyc differ diff --git a/Main/cliUI/combatCLI.py b/Main/cliUI/combatCLI.py index 574d028..305cfc1 100644 --- a/Main/cliUI/combatCLI.py +++ b/Main/cliUI/combatCLI.py @@ -208,8 +208,8 @@ def gameCombat(inHero, enemy, level, round): print("You got unconscious. You then wake up in the town. It seems you managed to stay alive.") print(f"But you lose some gold, you now only have {inHero.money} Gold left.") print("======================================") - inHero.setHPCurrent(hero.getHPMax()*0.2) - inHero.energyCurrent = hero.energyMax*0.2 + inHero.setHPCurrent(int(hero.getHPMax()*0.2)) + inHero.energyCurrent = int(hero.energyMax*0.2) inHero.inventory = hero.inventory input("\n<>") return 1, inHero diff --git a/Main/cliUI/mainMenuCLI.py b/Main/cliUI/mainMenuCLI.py index 4d0496c..afb06f7 100644 --- a/Main/cliUI/mainMenuCLI.py +++ b/Main/cliUI/mainMenuCLI.py @@ -35,9 +35,7 @@ def gameMenu(hero, stageProgress, storyProgress): print("============= DUNGEON ================") print("Dungeon stage selection:") for stage in range(stageProgress): - if stage == 8: - pass - elif stage <= 7: + if stage <= 6: print(f"{stage+1}. Stage {stage+1}") print("8. Exit Dungeon") stageInput = input("\nPress the keys to continue >> ")