Merge pull request #31 from sheenhm/main

Sync with main
PurpleBananass · Oct 20, 2023 · a0071a9 · a0071a9
2 parents 15656ab + cd6c6b9
commit a0071a9
Show file tree

Hide file tree

Showing 72 changed files with 2,129 additions and 672 deletions.
diff --git a/.gitignore b/.gitignore
@@ -179,3 +179,5 @@ outg
 .idea/
 *.iml
 out/
+scores_1p
+scores_2p
diff --git a/requirements/currency.md b/requirements/currency.md
@@ -10,11 +10,11 @@
     - To contribute to the whole project and not be a hindrance
 
 ### Role of each team member:
-        Fabian Tran: Revive with Currency
-        Josia Santoso: Bonus money when highscore
-        Tian Jiming: Money is collectible as drops when killing enemies
-        Qi Haiyue: Conversion Logic(bonus money at the end based on score achieved)
-        Xing Ruitong: Display money real time ingame
+        Fabian Tran: Login
+        Josia Santoso: Login Bonus and Item Shop
+        Tian Jiming: Writing comments and conversion logic
+        Qi Haiyue: Writing comments and conversion logic(bonus money at the end based on score achieved)
+        Xing Ruitong: Writing comments and conversion logic
 
 ## Detail Requirements/Features:
     - Revive with Currency
@@ -51,4 +51,4 @@
 #### Request
 - Pictures from items to display in item shop
 - Information of item
-- You guys use the information of us that the player bought an item to give him an advantage
+- You guys use the information of us that the player bought an item to give him an advantage
diff --git a/res/graphics b/res/graphics
@@ -1,4 +1,5 @@
 00001111000111110001111100011111000111110111111111111111011111110001111100011111000111110001111100001111
+00001111000111110001111100011111000111110111111111111111011111110001111100011111000111110001111100001111
 00000100000000010001001100000011000001111011001100001111001011110000001100101111010010010000010000000011
 100001111110000
 000011111100001
@@ -10,4 +11,6 @@
 000000000000000000011001001110100110110111111010111110100110110100111010000110010000000000000000
 0000100000110000111100110111011111011111001110100111111011111101110100111110001111100110111001111000011000000100
 0001000100100101000100010100100000101000100000000010001010000010010100010001010010010001000
-0001000100100101000100010100100000101000100000000010001010000010010100010001010010010001000
+111101111
+0111000111110001111100011111011111011111000111000
+000000000000000000000000000011000001110011111000111110000001110000001100000000000000000000000000
diff --git a/res/scores_1p b/res/scores_1p
@@ -1,2 +1,6 @@
+AAA
+2030
+AAA
+1930
 BBB
 -30
diff --git a/res/scores_2p b/res/scores_2p
diff --git a/res/settings b/res/settings
@@ -2,22 +2,6 @@ Volume
 80
 BGM
 1
-LEFT
-0x25
-RIGHT
-0x27
-UP
-0x26
-7
-0x37
-8
-0x38
-0
-0x30
-9
-0x39
-ENTER
-0x0A
 A
 0x41
 D
@@ -33,4 +17,20 @@ W
 3
 0x33
 BACK QUOTE
-0xC0
+0xC0
+LEFT
+0x25
+RIGHT
+0x27
+UP
+0x26
+7
+0x37
+8
+0x38
+0
+0x30
+9
+0x39
+ENTER
+0x0A
-Original file line number
+Diff line change
@@ Expand Up / @@ -179,3 +179,5 @@ outg @@
     .idea/
     *.iml
     out/
+    scores_1p
+    scores_2p