9a15f6bc63
Merged TaipanShop and Warehouse. Just need to add functionality to warehouse.
Solargale2019-03-10 18:28:59 -06:00
680225550f
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-03-10 18:23:48 -06:00
a0e0ab517d
Merged Travel and Ship warfare
Solargale2019-03-10 17:35:46 -06:00
5e33374e3c
Add files via upload
Nathan Lum
2019-03-10 17:27:17 -06:00
325c4127dd
Fix bunch of issues with Travel and Taipanshop, also merged Main, Shop, Travel and Start. Now attempting to merge in ship.
Solargale2019-03-10 16:06:48 -06:00
fde76a5bfb
Just checking
KahootChampion
2019-03-10 15:45:31 -06:00
888d8a1c92
Fined minor bugs in shipwarfareGUI including the "gun frustration" variable
KahootChampion
2019-03-10 12:10:33 -06:00
42c4534f52
Fixed probability of ships running away
KahootChampion
2019-03-10 12:00:00 -06:00
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.
KahootChampion
2019-03-10 11:26:54 -06:00
b4e0e18d20
Completely ruined shipWarfare with a previous edit, fixed it and added a better loot feature for peasant ships
KahootChampion
2019-03-10 03:30:28 -06:00
d558e7cf0c
Fixed the loot system a bit
KahootChampion
2019-03-10 01:44:02 -07:00
36aa789590
Fixed numOfShips method for ShipWarfareGUI
KahootChampion
2019-03-10 01:14:37 -07:00
e7a0ddf085
Small change to javadocs for shipwarfare
KahootChampion
2019-02-25 19:42:19 -07:00
70b698c22e
Java Docs BOIZ for ShipWarafare
KahootChampion
2019-02-25 19:33:48 -07:00
4cc9ac5d26
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-02-25 19:16:09 -07:00
c66e3d5d70
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-02-25 19:06:02 -07:00
40ba6b0c9b
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-02-25 18:53:51 -07:00
2ae60073c0
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-02-25 18:52:07 -07:00
6b379bae3a
minor changes. Still in progress.
Vikram
2019-02-25 18:42:48 -07:00
67ddc34c65
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-02-25 18:42:40 -07:00
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.
Vikram
2019-02-25 07:39:57 -07:00
ae0e9c4659
Changed the timing in ShipWarfare
KahootChampion
2019-02-24 23:06:05 -07:00
f6f0c960ea
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-02-24 22:03:32 -07:00
1959f63821
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-02-24 22:01:02 -07:00
081892ea6d
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-02-24 21:57:53 -07:00
e31587ecdc
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-02-24 21:47:05 -07:00
d50058f056
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-02-24 21:39:01 -07:00
9f84e23a10
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-02-24 21:34:01 -07:00
5d9c371e84
Really small change in Sid's code that no one will probably ever notice lol
KahootChampion
2019-02-24 21:40:20 -07:00
e495f6e1bb
Sneaky bug in shipWarfare regarding having 0 guns is now fixed.
KahootChampion
2019-02-24 21:33:20 -07:00
3ecc99a879
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
Siddhant Dewani
2019-02-24 21:24:45 -07:00
9f23ec187c
Forgot a try catch in warehouse
KahootChampion
2019-02-24 20:38:00 -07:00
c59f06b127
Small thing, changed an output of warehouse a bit, shows user its the warehosue they are concerned with.
KahootChampion
2019-02-24 20:30:47 -07:00
1be615fcc4
Think I fixed Sid's code
KahootChampion
2019-02-24 20:26:05 -07:00
5f1e566c8f
Worked On Sid's class a bit
KahootChampion
2019-02-24 19:56:16 -07:00
0bed08ec23
linked all the classes together. The project is functional.
Vikram
2019-02-24 19:03:53 -07:00
5e64bc95dc
bunch of revisions, still in progress
Vikram
2019-02-24 19:00:38 -07:00
Solargale
Siddhant Dewani