Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feedback #1

Open
wants to merge 148 commits into
base: feedback
Choose a base branch
from
Open
Changes from 8 commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
16a4b2d
Setting up GitHub Classroom Feedback
github-classroom[bot] Apr 26, 2024
f8c5b46
feat: Shop and Currency (Base Code)
Cirrofy May 1, 2024
da3103c
Delete shop_currency.py
19623238-Favian May 1, 2024
9cd1271
feat: Shop and Currency Function (V0.1)
19623238-Favian May 1, 2024
d81ad26
feat: Shop and Currency Function (V0.1)
19623238-Favian May 1, 2024
01a65bd
refactor: Memindahkan file ke folder src
19623238-Favian May 1, 2024
02dca4c
feat: .csv parser Function
19623238-Favian May 3, 2024
88cbaf8
fix: Memperbaiki csvParser.py
19623238-Favian May 3, 2024
4f881f4
feat: Menambah fungsi csv Parser lengkap dan F10&F12 (V0.5)
19623238-Favian May 3, 2024
0d82bb8
feat: Random Number Generator
echaa0018 May 10, 2024
8687de2
feat: Random Number Generator
echaa0018 May 10, 2024
631b8ab
Merge pull request #2 from Labpro-21/feat/RNG
AbuDzarAlGhifari17 May 10, 2024
cc6ddd2
docs: file monster_shop.csv
usernamedarren May 11, 2024
173f006
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
usernamedarren May 11, 2024
e0a3d5e
refactor: Updating and Changing Variables of ShopCurrency and csvParser
19623238-Favian May 15, 2024
7a5f4a5
feat: csvParser
19623238-Favian May 15, 2024
e762f16
Merge pull request #3 from Labpro-21/feat/ShopCurrency
19623238-Favian May 15, 2024
57d7f65
Merge Pull Request CSV Parser
19623238-Favian May 15, 2024
6cf64ac
fix: Delete old shop_currency.py file
19623238-Favian May 15, 2024
58d00bf
feat: combine everything
AbuDzarAlGhifari17 May 15, 2024
b49aa67
feat : combine everything
AbuDzarAlGhifari17 May 15, 2024
82b5e27
feat: Exit (F16)
19623238-Favian May 15, 2024
67c2e33
Exit feature Pull Request
19623238-Favian May 15, 2024
78564d8
Exit feature Pull Request
19623238-Favian May 15, 2024
3271b6a
refactor: edit input dan file path
echaa0018 May 15, 2024
365c59f
refactor: tambah monster
echaa0018 May 15, 2024
2f0e521
refactor: tambah monster
echaa0018 May 15, 2024
eeb3dd0
Update monster.csv
echaa0018 May 15, 2024
81c2cb4
refactor: tambah monster
echaa0018 May 15, 2024
3f1eb9b
feat: Update shopCurrency Function
19623238-Favian May 16, 2024
8966cf3
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
19623238-Favian May 16, 2024
aaff96e
refactor: Changing ',' to ';' on csv files
19623238-Favian May 16, 2024
232771b
feat :recombine evenrything
AbuDzarAlGhifari17 May 16, 2024
89df123
fix: update coin
usernamedarren May 17, 2024
44b78a4
fix: allow lowercase input
usernamedarren May 17, 2024
8343532
fix: allow lowercased input
usernamedarren May 17, 2024
489cb78
feat: Jackpot feature
usernamedarren May 17, 2024
032febc
fix: break & update jackpot prize
usernamedarren May 17, 2024
1485386
fix: fix some bug
AbuDzarAlGhifari17 May 17, 2024
a9d2582
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
AbuDzarAlGhifari17 May 17, 2024
edee809
fix:some bug
AbuDzarAlGhifari17 May 17, 2024
b9deb44
fix: some bug again
AbuDzarAlGhifari17 May 17, 2024
1fc857c
fix: Memperbaiki shop menegamenet
19623238-Favian May 17, 2024
46b6200
feat : save function
AbuDzarAlGhifari17 May 17, 2024
a54fc11
feat : add exit functioon
AbuDzarAlGhifari17 May 17, 2024
16d82a0
fix: fix some bug in ubah&hapus monster
AbuDzarAlGhifari17 May 17, 2024
9722d7c
refacture: menambah komentar pada kode
echaa0018 May 17, 2024
352244b
refactor: tambah komen
echaa0018 May 17, 2024
c4e740c
refactor: fix comment
echaa0018 May 17, 2024
99e68de
refactor: fix file path
echaa0018 May 17, 2024
a69a3f4
fix
echaa0018 May 17, 2024
6be8997
fix: file path lagi
echaa0018 May 17, 2024
093414c
fix: fix a bug in save
AbuDzarAlGhifari17 May 17, 2024
cc6017b
fix:fix an error in ubah monster
AbuDzarAlGhifari17 May 17, 2024
de8c7dd
feat: add and connect monstermanagement function
AbuDzarAlGhifari17 May 17, 2024
3f917d1
fix: fix an error at monster shop
AbuDzarAlGhifari17 May 17, 2024
b0c1019
fix: fix an error when adding monster
AbuDzarAlGhifari17 May 17, 2024
f29e05d
fix&style:membentulkan beberapa eror dan mempercantik tampilan
AbuDzarAlGhifari17 May 18, 2024
25f739b
refactor: Change variables name
usernamedarren May 18, 2024
0397034
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
usernamedarren May 18, 2024
9b701db
Update jackpot.py
usernamedarren May 18, 2024
cadbecf
rename file
usernamedarren May 18, 2024
7280114
fix: rename monster_inventory.csv
AbuDzarAlGhifari17 May 18, 2024
343d95f
fix: fix an error in load
AbuDzarAlGhifari17 May 18, 2024
4919c1a
fix: put return coin in jackpot
AbuDzarAlGhifari17 May 18, 2024
b010a03
refactor: change variables name
usernamedarren May 18, 2024
252df6d
refactor: change variables name
usernamedarren May 18, 2024
3dd605c
Rename variabel
AbuDzarAlGhifari17 May 18, 2024
c547fe3
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
usernamedarren May 18, 2024
9cac799
resolve conflict
usernamedarren May 18, 2024
084a8a3
fix:fix some little errors
AbuDzarAlGhifari17 May 18, 2024
6ae48b8
refactor: menambahkan .lower() untuk validasi input
echaa0018 May 18, 2024
c3c45e0
feat: add damagetaken and damagedealt variable
AbuDzarAlGhifari17 May 18, 2024
c52eb66
feat: add jackpot in help
AbuDzarAlGhifari17 May 18, 2024
b6b3ec3
fix: fix an error with the coin variable
AbuDzarAlGhifari17 May 18, 2024
37e7dc5
fix&feat: fix eror saat input tidak benar dan add comment
AbuDzarAlGhifari17 May 18, 2024
f6561c5
rename potionnumber variavle to itemnumber
AbuDzarAlGhifari17 May 18, 2024
a45bfe0
fix&feat: fix a validation error and add comment
AbuDzarAlGhifari17 May 18, 2024
9b0287a
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
usernamedarren May 18, 2024
7685c79
refactor: change inventoryy variable name
usernamedarren May 18, 2024
ae7c7e4
refactor: change inventoryy variable name
usernamedarren May 18, 2024
e54b059
fix:turn every stat to integer(round number)
AbuDzarAlGhifari17 May 18, 2024
26dd5ed
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
AbuDzarAlGhifari17 May 18, 2024
e4f69d3
remove unnecessary files
AbuDzarAlGhifari17 May 18, 2024
b875803
feat: add comment in potion.py
AbuDzarAlGhifari17 May 18, 2024
bb0ae43
refactor: change variables name
usernamedarren May 18, 2024
731569a
refactor: change variables name
usernamedarren May 18, 2024
bdc65eb
refactor: change variables name
usernamedarren May 18, 2024
4c0ea0c
refactor: change variables name
usernamedarren May 18, 2024
b721804
refactor: change variable names
usernamedarren May 18, 2024
8ae7c56
refactor: change variables name
usernamedarren May 18, 2024
aaa0b93
refactor: change variables name
usernamedarren May 18, 2024
3be1b3e
feat: add input validation and comment in shop function
AbuDzarAlGhifari17 May 18, 2024
6922e06
testing
AbuDzarAlGhifari17 May 18, 2024
73f0127
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
AbuDzarAlGhifari17 May 18, 2024
edf4898
fix: fix merging error with battle.py
AbuDzarAlGhifari17 May 18, 2024
f69c167
feat: add fix reward perstage
AbuDzarAlGhifari17 May 18, 2024
ea9c0e0
fix : penambahan komen pada fungsi login dan register
refinormdhn May 19, 2024
5e48871
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
refinormdhn May 19, 2024
16053dd
fix & refactor: validate & change variables name
usernamedarren May 19, 2024
b2cd14e
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
usernamedarren May 19, 2024
57659f7
fix : penambahan komen pada fungsi help
refinormdhn May 19, 2024
0bfd626
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
refinormdhn May 19, 2024
ef1a79a
fix:fix a variable error
AbuDzarAlGhifari17 May 19, 2024
96dff1e
feat : monster art
refinormdhn May 19, 2024
930790f
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
refinormdhn May 19, 2024
2718b59
feat: add validation and comment to shopmanagement
AbuDzarAlGhifari17 May 19, 2024
98ad13a
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
AbuDzarAlGhifari17 May 19, 2024
62da694
remove unnecessary lines
AbuDzarAlGhifari17 May 19, 2024
7602497
remove unnecessary condition
AbuDzarAlGhifari17 May 19, 2024
1081edc
feat: add one helper line
AbuDzarAlGhifari17 May 19, 2024
ab3fa1e
feat : add login success line for admin
AbuDzarAlGhifari17 May 19, 2024
3248735
Move main.py outside src folder
AbuDzarAlGhifari17 May 19, 2024
9679be2
Move main.py outside src folder
AbuDzarAlGhifari17 May 19, 2024
56f14f3
correction of wrong pic
usernamedarren May 19, 2024
a456962
style : mempercantik tampilan awal battle dan arena
AbuDzarAlGhifari17 May 19, 2024
9ad7e59
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
AbuDzarAlGhifari17 May 19, 2024
f844995
style: change login input text
usernamedarren May 19, 2024
67b25a9
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
usernamedarren May 19, 2024
ff9bffb
refactor: remove not used variables laboratory command
usernamedarren May 19, 2024
30f2cac
refactor: change variables name & add comments
usernamedarren May 19, 2024
035e8a0
style & refactor: change some input text & change logout command code
usernamedarren May 19, 2024
16b7886
style & refactor: change input text & change logout command code (admin)
usernamedarren May 19, 2024
f29b49e
style: change output text
usernamedarren May 19, 2024
a4571ff
style: change output text
usernamedarren May 19, 2024
50f223a
feat:add small changes
AbuDzarAlGhifari17 May 19, 2024
6514b59
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
AbuDzarAlGhifari17 May 19, 2024
022c42b
change a massage
AbuDzarAlGhifari17 May 19, 2024
dc10d81
feat:add small detail
AbuDzarAlGhifari17 May 19, 2024
e68a38e
remove unnecessary line
AbuDzarAlGhifari17 May 19, 2024
c7ae25b
feat:add small massage
AbuDzarAlGhifari17 May 20, 2024
22ced04
feat: add validation for negative number
AbuDzarAlGhifari17 May 20, 2024
54fbfa8
fix: input error bug
usernamedarren May 20, 2024
21f4b95
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
usernamedarren May 20, 2024
c521303
fix : fix an error in exit
AbuDzarAlGhifari17 May 20, 2024
373a301
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
AbuDzarAlGhifari17 May 20, 2024
bf84dcc
feat: add small detail
AbuDzarAlGhifari17 May 20, 2024
cc75ea0
style: change wrong output text at strength potion
usernamedarren May 20, 2024
e4711be
refactor: remove doubled program at healing potion
usernamedarren May 20, 2024
a92fac3
style: change jackpot reward output text
usernamedarren May 20, 2024
93b6082
feat: add detai;
AbuDzarAlGhifari17 May 20, 2024
c658cc3
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
AbuDzarAlGhifari17 May 20, 2024
9a05408
docs: Uploaded Form MoM Asistensi 1 dan 2
19623238-Favian May 20, 2024
8e3fe25
docs: Updating Readme.md file
19623238-Favian May 20, 2024
0a98626
style: remove testing command
usernamedarren May 20, 2024
0c84702
Merge branch 'main' of https://github.com/Labpro-21/if1210-2024-tubes…
usernamedarren May 20, 2024
9d8e988
add laporan pdf
usernamedarren May 20, 2024
0bcf313
docs: Uploaded Laporan Tugas Besar
19623238-Favian May 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added blank.py
Empty file.
6 changes: 6 additions & 0 deletions data/item_inventory.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
user_id;type;quantity
2;strength;5
2;resilience;3
3;resilience;7
4;healing;3
5;strength;20
4 changes: 4 additions & 0 deletions data/item_shop.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type;stock;price
strength;10;50
resilience;5;30
healing;3;20
6 changes: 6 additions & 0 deletions data/monster.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
id;type;atk_power;def_power;hp
1;Pikachow;125;10;600
2;Bulbu;50;50;1200
3;Zeze;300;10;100
4;Zuko;100;25;800
5;Chacha;80;30;700
6 changes: 6 additions & 0 deletions data/monster_inventory.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
user_id;monster_id;level
2;1;1
3;2;2
3;3;1
4;4;1
5;5;5
6 changes: 6 additions & 0 deletions data/user.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
id;username;password;role;oc
1;Mr_Monogram;monogrammer77;admin;0
2;Asep_Spakbor;asepwow123;agent;9999
3;Agen_P;platypus123;agent;9999
4;B4ngk1dd0ssss;bangkitganteng;agent;1337
5;Kenny_agen_rahasia;kribogeming55;agent;6699
2 changes: 1 addition & 1 deletion src/inventory.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
def inventoryy(userinventory,yourmonsterdata,monsterdata,role,coin) :
def inventory(userinventory,yourmonsterdata,monsterdata,role,coin) :
if role=='admin': #jika role player adalah admin
print("Maaf! Anda tidak memiliki akses sebagai admin")
else :
2 changes: 1 addition & 1 deletion src/main.py
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@
coin += arenaCoin
userData[id][4] = str(coin)
elif command.lower() == 'inventory' :
inventoryy(userInv, yourMonsInv, monsterData, role, coin)
inventory(userInv, yourMonsInv, monsterData, role, coin)
elif command.lower() == 'logout' :
t=0
while True :