50 Commits

Author SHA1 Message Date
KahootChampion
4d09891665 Added to my javadocs a bit 2019-03-10 23:03:30 -06:00
KahootChampion
ba16ea1809 Completed javadocs for shipwarfare GUI 2019-03-10 22:58:43 -06:00
KahootChampion
c6df980f8e Fixed ShipWarfare bug about one-shotting. 2019-03-10 22:43:46 -06:00
Vikram
89f9e47921 some changes... 2019-03-10 22:42:40 -06:00
Vikram
ffb77b14a0 some changes... 2019-03-10 21:49:50 -06:00
KahootChampion
df372522e4 Probably should upload 2019-03-10 20:12:01 -06:00
KahootChampion
4fd40af606 Completed ShipWarfareGUI 2019-03-10 20:01:20 -06:00
KahootChampion
664d194d7b Completed SHipWarfareGUI 2019-03-10 20:00:36 -06:00
KahootChampion
2198fffbd5 A lot of errors but easily fixable SHipwarfareGUI 2019-03-10 19:41:43 -06:00
KahootChampion
888d8a1c92 Fined minor bugs in shipwarfareGUI including the "gun frustration" variable 2019-03-10 12:10:33 -06:00
KahootChampion
42c4534f52 Fixed probability of ships running away 2019-03-10 12:00:00 -06:00
KahootChampion
a07d633ff9 Basic functionality of buttons completed, think all I have to do now is to find a way to break the code when the user wins, loses or runs away. 2019-03-10 11:26:54 -06:00
KahootChampion
d558e7cf0c Fixed the loot system a bit 2019-03-10 01:44:02 -07:00
KahootChampion
36aa789590 Fixed numOfShips method for ShipWarfareGUI 2019-03-10 01:14:37 -07:00
KahootChampion
9feac6e90e Forces you to fight in ShipWarfareGUI unfortunately 2019-03-09 22:52:30 -07:00
KahootChampion
1bb00d0d01 Super broken but fight button is in progress for shipwarfare 2019-03-09 22:32:45 -07:00
KahootChampion
80102eabee Please find error 2019-03-09 20:03:51 -07:00
KahootChampion
5a7d1e7c34 Missed one statement that I needed to encapsulate 2019-03-09 18:33:33 -07:00
KahootChampion
5c78f561d8 Added fight stuff 2019-03-09 16:13:36 -07:00
507fe4debd Fixed some little problems with documenting. 2019-02-25 23:42:27 -07:00
KahootChampion
1295d625fb KK 2019-02-25 20:07:21 -07:00
KahootChampion
27ac100618 Test this Vikram 2019-02-25 20:01:21 -07:00
KahootChampion
e7a0ddf085 Small change to javadocs for shipwarfare 2019-02-25 19:42:19 -07:00
KahootChampion
70b698c22e Java Docs BOIZ for ShipWarafare 2019-02-25 19:35:50 -07:00
Vikram
6b379bae3a minor changes. Still in progress. 2019-02-25 18:42:48 -07:00
Vikram
d1c3fe0f7e minor changes. Still in progress. 2019-02-25 18:31:54 -07:00
Vikram
83057e863f the comment somehow made it so that I couldn't compile (using the command line i couldn't compile, i could compile file using intellij) Also, you the file extended player, which is not necessary. You also were calling gameOver() and getName() directly, you needed "player." before all those methods. 2019-02-25 07:39:57 -07:00
Vikram
0bed08ec23 linked all the classes together. The project is functional. 2019-02-24 19:03:53 -07:00
Vikram
5e64bc95dc bunch of revisions, still in progress 2019-02-24 19:00:38 -07:00
Vikram
622c4ab672 bunch of revisions, still in progress 2019-02-24 16:55:01 -07:00
Vikram
0f20b9a8ec bunch of revisions, still in progress 2019-02-24 16:53:45 -07:00
Vikram
210f64cb2f bunch of revisions, still in progress 2019-02-24 15:58:17 -07:00
KahootChampion
f2f1212436 Added a few comments to ShipWarfare 2019-02-23 13:49:29 -07:00
KahootChampion
6b3112dfbb Added a few comments to ShipWarfare 2019-02-23 13:49:13 -07:00
KahootChampion
0bcdbd1af8 Fixed like 3 naming/logical errors in ShipWarfare 2019-02-22 00:20:57 -07:00
KahootChampion
f9435e7309 Sloppy but completed ShipWarfare class 2019-02-21 23:44:30 -07:00
KahootChampion
3bd9f58fb1 Added loot. Still need to have ships escape sometimes and Liu yen 2019-02-21 21:39:24 -07:00
KahootChampion
b4b2d3377b Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot) 2019-02-20 09:47:51 -07:00
KahootChampion
73f757890a Perhaps done basic ship warfare? 2019-02-20 07:47:04 -07:00
KahootChampion
fe03244b6c Vikram, these are the types of changes Harkey and I meant for you to establish. 2019-02-18 22:35:29 -07:00
Vikram
5cb0237ef8 the shop now uses the player class as a parent class. 2019-02-18 19:55:32 -07:00
Vikram
058c745db3 the shop now uses the player class as a parent class. 2019-02-18 19:53:25 -07:00
Vikram
a5cc88e5ec the shop now uses the player class as a parent class. 2019-02-18 19:47:42 -07:00
KahootChampion
5c41bf5b7c Added retreat option (not perfected) 2019-02-18 19:05:14 -07:00
a5cbc87906 Created Player class 2019-02-18 18:56:45 -07:00
509a587447 Created Player class 2019-02-18 18:47:00 -07:00
53a5115f01 Created Core class 2019-02-18 18:38:01 -07:00
KahootChampion
bd4ddd767a Added troll comments 2019-02-17 20:00:07 -07:00
ced54afefe This should fix the ShipWarfare file and bring it up to date with the rest of the file. 2019-02-17 19:54:29 -07:00
1111601c09 new updated project 2019-02-17 19:13:24 -07:00