Commit Graph

291 Commits

Author SHA1 Message Date
ab596f60b0 Fixed money updating after fighting for loot 2019-04-07 11:23:01 -06:00
ae8cac6595 Fixed problem with HP and Gun amount not carrying over 2019-04-07 11:05:09 -06:00
KahootChampion
5a77f8c4e8 Doesnt take healtha way when user wins 2019-04-07 10:52:42 -06:00
KahootChampion
cb4e13b888 For some reason, the setHp method works only in shipwarfareGUI but does not transfer to TaipanShopGUI 2019-04-06 23:16:41 -06:00
KahootChampion
233521b6a7 Have logic and ShipWarfareGUI sufficiently separated 2019-04-06 22:50:54 -06:00
KahootChampion
8786e5d3c6 WIP ShipWarFareLogic GUI made it so that I can start form scratch at combining logic with GUI 2019-04-06 22:28:23 -06:00
KahootChampion
b11db35eb0 Must fix issues with logic for shipGui still 2019-04-06 22:23:57 -06:00
KahootChampion
f8ee683728 Before abandoning destroyLittyShipsOrEscape separation 2019-04-06 21:50:54 -06:00
5d0e349ffb I DON'T KNOW WHAT I DID, BUT IT WORKED A LITTLE BIT 2019-04-06 18:09:04 -06:00
KahootChampion
256706377d Mesed with ship and litterally accomplished nothing 2019-04-06 17:44:11 -06:00
9959de99f6 Fixed up problem where you don't get cash from ships. 2019-04-06 16:56:08 -06:00
KahootChampion
8d07d531de Helath not lowering anymore 2019-04-06 16:24:47 -06:00
05c25c01e0 Fixed issue with Shipwarfare not loading up 2019-04-06 15:44:10 -06:00
KahootChampion
92cd1db4f5 Failed attempt at separating logic and GUI but saving just in case I need it later 2019-04-06 15:21:53 -06:00
KahootChampion
6bbd852c8b Failed attempt at separating logic and GUI but saving just in case I need it later 2019-04-04 22:13:17 -06:00
Vikramb987
9c17adfb38 Create TaipanShopLogic.java 2019-04-02 18:52:51 -06:00
Vikramb987
bd162428a5 Create TaipanShopText.java 2019-04-02 18:52:17 -06:00
Vikramb987
9ee378279b Update TaipanShopGUI.java 2019-04-02 18:49:59 -06:00
KahootChampion
61ba606e89 Playing with miss animation 2019-03-29 08:20:56 -06:00
KahootChampion
02efa7a9ba Fixed an issue with ShipWarfareGUI with the ships running away label 2019-03-25 18:32:17 -06:00
KahootChampion
7e9ba348b2 Ship Warfare "dang it" issue fixed 2019-03-25 13:35:11 -06:00
a96de93b13 Added libraries to the file 2019-03-25 13:31:01 -06:00
4cf4bc3cb9 Merge remote-tracking branch 'origin/master' 2019-03-25 13:26:20 -06:00
55214ce652 Made it so that randomEventGUI looks normal on Linux 2019-03-25 13:26:01 -06:00
Vikramb987
19134408a8 Update FileSaving.java
changes to how we deal with saving when it comes to the terminal
2019-03-25 13:18:16 -06:00
Vikramb987
77e43f0fd2 Update TaipanShopGUI.java
saving changes
2019-03-25 13:17:43 -06:00
Vikramb987
1d970b201c Update BankGUI.java
changed some text.
2019-03-25 13:07:03 -06:00
Vikramb987
fd921053d3 Update LoanSharkGUI.java
changed some text
2019-03-25 13:01:16 -06:00
Vikramb987
283e51c375 Update TravelGUI.java
fixed formatting
2019-03-25 12:52:53 -06:00
Vikramb987
db0d8ec2db Update TaipanShopGUI.java
fixed formatting
2019-03-25 12:51:59 -06:00
Vikramb987
45d6d794f9 Update ShipWarfareGUI.java
added title
2019-03-25 12:49:43 -06:00
dc28fb504d Finished PlayerTest 2019-03-25 12:48:13 -06:00
5a43adf7ad Merge remote-tracking branch 'origin/master' 2019-03-25 12:29:56 -06:00
290dce81db Player Test 2019-03-25 12:28:51 -06:00
Vikramb987
6e43912b2e Update ShipWarfareGUI.java
fixed error with terminal
2019-03-25 12:25:59 -06:00
Vikramb987
3ac1087741 Update TravelGUI.java
epicchanges
2019-03-25 12:19:05 -06:00
Vikramb987
c008a68166 Update TaipanShopGUI.java
epic final changes boi
2019-03-25 12:18:11 -06:00
Vikramb987
85b2043ebf Update TaipanShopGUI.java
fixed some formatting
2019-03-25 12:14:34 -06:00
KahootChampion
61f88c0a86 Completed ShipWarfareGUI 2019-03-25 11:06:39 -06:00
KahootChampion
5caca9c9e3 Fixed silk issue 2019-03-25 11:03:16 -06:00
24cb7ea70e Pushed the fix for ship repair while 100 hp 2019-03-25 00:08:40 -06:00
0f56a515c1 Fixed some of the code related with Liu Yuen and fixed some of the javadocing 2019-03-24 23:31:05 -06:00
Siddhant Dewani
4d8265ea79 added javadocs 2019-03-24 22:45:58 -06:00
Siddhant Dewani
0d548442d4 Merge remote-tracking branch 'origin/master' 2019-03-24 22:45:25 -06:00
f0b1d42892 Merge remote-tracking branch 'origin/master' 2019-03-24 22:32:49 -06:00
bf53113834 Made it so that the user doesn't get pushed into travel if they press enter while buying something 2019-03-24 22:21:15 -06:00
Siddhant Dewani
ffc2000c70 Added javadocs 2019-03-24 22:20:00 -06:00
Vikramb987
016b765e3a Update Player.java
completed javadocs
2019-03-24 22:10:30 -06:00
384a874e09 Merge remote-tracking branch 'origin/master' 2019-03-24 22:08:05 -06:00
d82ac891f1 Commented a bit of Random Event 2019-03-24 22:07:48 -06:00