Integration of Achievement and clear all unecessary.

Raymo111 · Jun 15, 2018 · 906c18d · 906c18d
1 parent 6a1d1c5
commit 906c18d
Show file tree

Hide file tree

Showing 33 changed files with 822 additions and 988 deletions.
diff --git a/Char1.txt b/Char1.txt
diff --git a/README.TXT b/README.TXT
@@ -0,0 +1,34 @@
+Benny Shen, Raymond Li, David Tuck, Martin Xu
+Mr. Anandarajan
+ICS4U1
+June 14, 2018
+
+Battleship
+
+------------
+Instructions
+------------
+
+-Login
+Users may login to the game by running system.java in 
+
+------
+Images
+------
+
+
+
+Used Image References:
+
+achievementBgi.jpg
+https://www.pinterest.ca/pin/37647346857672149/?lp=true
+
+bgi.jpg
+http://halo.wikia.com/wiki/File:Conceptart3.jpg
+
+rankBgi.jpg
+https://xcom.com/news/entries/en-xcom-2-patch-now-live
+
+materials for making loginBgi.png
+https://worldofwarships.asia/en/news/specials-and-events/uk-battleship-sale/
+
diff --git a/Research.txt b/Research.txt
@@ -1 +1 @@
-http://www.datagenetics.com/blog/december32011/index.html
+http://www.datagenetics.com/blog/december32011/index.html
diff --git a/User1 b/User1
@@ -12,12 +12,12 @@ null
 null
 null
 null
-null
 0
 0
+26309
 7 6
 16
-6102
+6502
 0
 0 1 2 3 4
 null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null

diff --git a/User2 b/User2
@@ -12,9 +12,9 @@ null
 null
 null
 null
-null
 0
 0
+11621
 0 0
 1
 0
@@ -26,7 +26,7 @@ null null null null null null null null null null null null null null null null
 false
 100
 false false false false false false false false false false false
-false false false false false false false false false false false false false false false false false false false false false false false false false false
+false false false false false false false false false false false false false false
 0
 0
 0

diff --git a/User3 b/User3
diff --git a/aGetReward.png b/aGetReward.png
diff --git a/L.png → aLocked.png b/L.png → aLocked.png
diff --git a/achievementList.txt b/achievementList.txt
@@ -1,31 +1,14 @@
-Chicken dinner|win 1 battle
-Too young, too simple, sometimes naive|win 100 battles
-I'm bald, I'm strong|win 1000 battles
-Omae wa mou shindeiru|win 2000 battles
-Main heroine of Asadora|lose 10 battles
-Letter from 1976|lose 100 battles
-Kimochi warui|lose 1000 battles
-AAAHHHHH!!! Boku no o no chikara ga!!!!!|lose 2000 battles
-Potato aiming|miss 100 times
-Do u no dewae|miss 1000 times
-Chinese national men’s soccer team|miss 5000 times
-______________________________________________________
-Somebody toucha my spaghet|fight 10 battles
-Dormammu i've come to bargain|fight 100 battles
-This is Sparta!|fight 1000 battles
-Battleships: Infinity War|fight 2018 battles
-Performance Artist|fight 5000 battles
-24|total 24 hours played
-El psy congroo|total 2036 hours played
-Jinrui Hokan|Complete all other achievements
-_____________________________________________________
-Wintergarten|build 50 times
-BUILD 100|build 100 times
-Never gonna give you up|build 1000 times
-Senpai noticed me|one character intimacy achieve 100%
-Bad romance|dismantle 10 characters
-A snap of fingers|dismantle 50 characters
-It's bigger from the inside|expand capacity by 100
-
-
-_____________________________________________________
+Chicken Dinner
+Too young, too simple, sometimes naive
+I'm bald, I'm strong
+Omae wa mou shindeiru
+Letter from 1976
+Kimochi Warui
+AAAHHHHH!!! Boku no o no chikara ga!!!!!
+Potato aiming
+Do u no dewae
+Fernando Torres
+Somebody toucha my spaghet
+Dormammu i've come to bargain
+True Boss of this Gym
+El psy congroo
diff --git a/achievementRequirement.txt b/achievementRequirement.txt
@@ -0,0 +1,14 @@
+win 1 battle
+win 100 battles
+win 1000 battles
+win 2000 battles
+lose 100 battles
+lose 1000 battles
+lose 2000 battles
+miss 100 times
+miss 1000 times
+miss 5000 times
+fight 10 battles
+fight 100 battles
+fight 5000 battles
+total 2036 hours played
diff --git a/achievementRewardList.txt b/achievementRewardList.txt
@@ -1,28 +1,14 @@
-10 0
-50 0
-100 1
-500 5
-75 0
-100 0
-0 10
-10 3
-50 1
-100 0
-500 0
-������������
-10 1
-50 0
-10 10
-1000 6
-300 10
-240 4
-150 10
-777 7
-������������
-100 0
-0 10
-200 20
-10 1
-1 5
-100 5
-150 9
+100
+100
+1000
+2000
+100
+1000
+2000
+100
+1000
+5000
+10
+100
+5000
+2036
diff --git a/bkgBasic.png b/bkgBasic.png
diff --git a/bkgBasicBW.png b/bkgBasicBW.png
diff --git a/bkgBasicBWNoShadow.png b/bkgBasicBWNoShadow.png
diff --git a/bkgBasicNoShadow.png b/bkgBasicNoShadow.png
diff --git a/characterList.txt b/characterList.txt
diff --git a/factoryBgi.jpg b/factoryBgi.jpg
diff --git a/rankC.txt b/rankC.txt
@@ -1,2 +1,2 @@
-1 3 2
-0 -1 -1
+1 2 3 
+0 -1 -1 
diff --git a/rankL.txt b/rankL.txt
@@ -1,2 +1,2 @@
-1 3 2
-14 1 1
+1 2 3 
+16 1 1 
diff --git a/rankW.txt b/rankW.txt
@@ -1,2 +1,2 @@
-1 3 2
-4 0 0
+1 2 3 
+6 0 0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		http://www.datagenetics.com/blog/december32011/index.html
		http://www.datagenetics.com/blog/december32011/index.html
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,12 +12,12 @@ null @@
     null
     null
     null
-    null
 6
 1 2 3 4
     null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null null
@@ Expand Down @@