Skip to content

Commit

Permalink
v1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
alfinata committed Jan 17, 2022
1 parent d49eb71 commit 6711bc2
Show file tree
Hide file tree
Showing 18 changed files with 29 additions and 31 deletions.
18 changes: 9 additions & 9 deletions Game/build/cliGame/Analysis-00.toc
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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'),
Expand All @@ -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')],
Expand Down
8 changes: 4 additions & 4 deletions Game/build/cliGame/COLLECT-00.toc
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand All @@ -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'),
Expand Down
2 changes: 1 addition & 1 deletion Game/build/cliGame/EXE-00.toc
Original file line number Diff line number Diff line change
Expand Up @@ -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')])
Binary file modified Game/build/cliGame/PYZ-00.pyz
Binary file not shown.
8 changes: 4 additions & 4 deletions Game/build/cliGame/PYZ-00.toc
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Binary file modified Game/build/cliGame/base_library.zip
Binary file not shown.
Binary file modified Game/build/cliGame/cliGame.exe
Binary file not shown.
Binary file modified Game/build/cliGame/cliGame.pkg
Binary file not shown.
4 changes: 2 additions & 2 deletions Game/build/cliGame/warn-cliGame.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions Game/build/cliGame/xref-cliGame.html
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ <h1>modulegraph cross reference for cliGame.py, pyi_rth_inspect.py, pyi_rth_mult
<a target="code" href="" type="text/plain"><tt>'org.python'</tt></a>
<span class="moduletype">MissingModule</span> <div class="import">
imported by:
<a href="#copy">copy</a>
<a href="#pickle">pickle</a>
&#8226; <a href="#xml.sax">xml.sax</a>

</div>
Expand Down Expand Up @@ -3194,8 +3194,8 @@ <h1>modulegraph cross reference for cliGame.py, pyi_rth_inspect.py, pyi_rth_mult
<a target="code" href="///C:/Program%20Files/Python310/lib/copy.py" type="text/plain"><tt>copy</tt></a>
<span class="moduletype">SourceModule</span> <div class="import">
imports:
<a href="#'org.python'">'org.python'</a>
&#8226; <a href="#copyreg">copyreg</a>
<a href="#copyreg">copyreg</a>
&#8226; <a href="#org">org</a>
&#8226; <a href="#types">types</a>
&#8226; <a href="#weakref">weakref</a>

Expand Down Expand Up @@ -8777,7 +8777,7 @@ <h1>modulegraph cross reference for cliGame.py, pyi_rth_inspect.py, pyi_rth_mult
<a target="code" href="" type="text/plain"><tt>org</tt></a>
<span class="moduletype">MissingModule</span> <div class="import">
imported by:
<a href="#pickle">pickle</a>
<a href="#copy">copy</a>

</div>

Expand Down Expand Up @@ -9007,15 +9007,15 @@ <h1>modulegraph cross reference for cliGame.py, pyi_rth_inspect.py, pyi_rth_mult
<a target="code" href="///C:/Program%20Files/Python310/lib/pickle.py" type="text/plain"><tt>pickle</tt></a>
<span class="moduletype">SourceModule</span> <div class="import">
imports:
<a href="#_compat_pickle">_compat_pickle</a>
<a href="#'org.python'">'org.python'</a>
&#8226; <a href="#_compat_pickle">_compat_pickle</a>
&#8226; <a href="#_pickle">_pickle</a>
&#8226; <a href="#codecs">codecs</a>
&#8226; <a href="#copyreg">copyreg</a>
&#8226; <a href="#doctest">doctest</a>
&#8226; <a href="#functools">functools</a>
&#8226; <a href="#io">io</a>
&#8226; <a href="#itertools">itertools</a>
&#8226; <a href="#org">org</a>
&#8226; <a href="#pprint">pprint</a>
&#8226; <a href="#re">re</a>
&#8226; <a href="#struct">struct</a>
Expand Down
Binary file modified Game/dist/cliGame/base_library.zip
Binary file not shown.
Binary file modified Game/dist/cliGame/cliGame.exe
Binary file not shown.
Binary file modified Main/LogicCodes/__pycache__/enemyClass.cpython-310.pyc
Binary file not shown.
Binary file modified Main/cliUI/__pycache__/combatCLI.cpython-310.pyc
Binary file not shown.
Binary file modified Main/cliUI/__pycache__/mainMenuCLI.cpython-310.pyc
Binary file not shown.
Binary file modified Main/cliUI/__pycache__/startCLI.cpython-310.pyc
Binary file not shown.
4 changes: 2 additions & 2 deletions Main/cliUI/combatCLI.py
Original file line number Diff line number Diff line change
Expand Up @@ -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<<Press enter to continue>>")
return 1, inHero
Expand Down
4 changes: 1 addition & 3 deletions Main/cliUI/mainMenuCLI.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 >> ")
Expand Down

0 comments on commit 6711bc2

Please sign in to comment.