Commit Graph

  • 0b20f2b62d Update Warehouse.java siddhantdewani 2019-02-24 18:08:05 -07:00
  • 915c58bcc5 Update Warehouse.java siddhantdewani 2019-02-24 17:23:00 -07:00
  • 622c4ab672 bunch of revisions, still in progress Vikram 2019-02-24 16:55:01 -07:00
  • 0f20b9a8ec bunch of revisions, still in progress Vikram 2019-02-24 16:53:45 -07:00
  • 210f64cb2f bunch of revisions, still in progress Vikram 2019-02-24 15:58:17 -07:00
  • dabedd8a72 fixed the player object not retaining the changes that were applied Vikram 2019-02-21 21:50:50 -07:00
  • 8de19f35e4 Add files via upload Nathan Lum 2019-02-24 15:38:51 -07:00
  • b17a52ceb8 Add files via upload siddhantdewani 2019-02-24 00:15:25 -07:00
  • ba2ac1565d Update Warehouse.java siddhantdewani 2019-02-24 00:13:01 -07:00
  • fee8309822 Update Bank.java siddhantdewani 2019-02-24 00:12:14 -07:00
  • c9936e2a34 Update Bank.java siddhantdewani 2019-02-23 17:45:45 -07:00
  • 5dee1686a1 Cited where I learned about Time Unit KahootChampion 2019-02-23 14:08:56 -07:00
  • eed1ab1432 Update main.java Vikramb987 2019-02-23 13:51:07 -07:00
  • f2f1212436 Added a few comments to ShipWarfare KahootChampion 2019-02-23 13:49:29 -07:00
  • 6b3112dfbb Added a few comments to ShipWarfare KahootChampion 2019-02-23 13:49:13 -07:00
  • 36f3b84eb8 Brought back Vikram's changes Solargale 2019-02-22 16:44:52 -07:00
  • 7a947a87c2 Update Start.java Nathan Lum 2019-02-22 15:05:43 -07:00
  • 123d329bbf Add files via upload Nathan Lum 2019-02-22 14:10:15 -07:00
  • 01acec2b16 Update Player.java Nathan Lum 2019-02-22 13:28:06 -07:00
  • 0bcdbd1af8 Fixed like 3 naming/logical errors in ShipWarfare KahootChampion 2019-02-22 00:20:57 -07:00
  • 4b047f46c4 Merge remote-tracking branch 'origin/master' KahootChampion 2019-02-21 23:44:57 -07:00
  • f9435e7309 Sloppy but completed ShipWarfare class KahootChampion 2019-02-21 23:44:30 -07:00
  • b78ba180f5 Update Travel.java Vikramb987 2019-02-21 22:08:26 -07:00
  • 1540323985 Update ShipWarfare.java Vikramb987 2019-02-21 22:08:11 -07:00
  • 0a93de3354 Update TaipanShop.java Vikramb987 2019-02-21 22:07:51 -07:00
  • 2395eb3298 Update Player.java Vikramb987 2019-02-21 22:07:27 -07:00
  • 0a4968998c Create main.java Vikramb987 2019-02-21 22:07:08 -07:00
  • 3bd9f58fb1 Added loot. Still need to have ships escape sometimes and Liu yen KahootChampion 2019-02-21 21:39:24 -07:00
  • 5c5aff2ae0 Update Player.java siddhantdewani 2019-02-21 20:55:23 -07:00
  • f3721c016e Add files via upload siddhantdewani 2019-02-21 20:18:11 -07:00
  • 03b08e4de3 Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot) KahootChampion 2019-02-20 16:07:44 -07:00
  • 4598d219c7 Merge remote-tracking branch 'origin/master' KahootChampion 2019-02-20 09:48:19 -07:00
  • b4b2d3377b Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot) KahootChampion 2019-02-20 09:47:51 -07:00
  • 73f757890a Perhaps done basic ship warfare? KahootChampion 2019-02-20 07:47:04 -07:00
  • 8f324ac967 I think I got the basic battling system down. Would appreciate i some of you guys beta tested it though and let me know the errors if there are any. KahootChampion 2019-02-20 07:31:39 -07:00
  • f99880d2ae Merge remote-tracking branch 'origin/master' Solargale 2019-02-19 19:04:57 -07:00
  • 945021459e Fixed a bunch of stuff inside of Travel, but also discovered a MASSIVE problem with our code Solargale 2019-02-19 19:03:51 -07:00
  • 1fb47b1dcb Add files via upload siddhantdewani 2019-02-19 17:53:43 -07:00
  • 297a58551b Merge remote-tracking branch 'origin/master' Solargale 2019-02-19 17:49:30 -07:00
  • 568f2b5b9d Added disasters as well as removing a bug from the flee method in Haris's code Solargale 2019-02-19 17:49:09 -07:00
  • 8d64fd95fe now fully uses the player class Vikram 2019-02-19 10:11:20 -07:00
  • b324cea280 Merge remote-tracking branch 'origin/master' Vikram 2019-02-19 10:10:11 -07:00
  • 5156547ad0 now fully uses the player class Vikram 2019-02-19 10:08:52 -07:00
  • c40fd5e713 Added some stuff for the Travel Class Solargale 2019-02-19 04:25:12 -07:00
  • 6c36073e87 Added GameOver() Method to Player class, btw System.out.flush just straight up Thanos's the terminal at the time (clears it). KahootChampion 2019-02-18 22:50:24 -07:00
  • fe03244b6c Vikram, these are the types of changes Harkey and I meant for you to establish. KahootChampion 2019-02-18 22:35:29 -07:00
  • 5cb0237ef8 the shop now uses the player class as a parent class. Vikram 2019-02-18 19:55:32 -07:00
  • 058c745db3 the shop now uses the player class as a parent class. Vikram 2019-02-18 19:53:25 -07:00
  • 8b020427fa Merge remote-tracking branch 'origin/master' Vikram 2019-02-18 19:48:42 -07:00
  • a5cc88e5ec the shop now uses the player class as a parent class. Vikram 2019-02-18 19:47:42 -07:00
  • 08edd6069b Created Player class Solargale 2019-02-18 19:36:03 -07:00
  • 534b8728a5 Used Harkamal's dumb extended class thingy cuz he begged me tod do it. KahootChampion 2019-02-18 19:13:39 -07:00
  • 5c41bf5b7c Added retreat option (not perfected) KahootChampion 2019-02-18 18:32:56 -07:00
  • 1a06ba4c0e Fixed the setters to be greater than 0 Solargale 2019-02-18 19:02:31 -07:00
  • a5cbc87906 Created Player class Solargale 2019-02-18 18:56:45 -07:00
  • 509a587447 Created Player class Solargale 2019-02-18 18:47:00 -07:00
  • f419834f79 Merge remote-tracking branch 'origin/master' Solargale 2019-02-18 18:38:24 -07:00
  • 53a5115f01 Created Core class Solargale 2019-02-18 18:38:01 -07:00
  • be8eddaa5c minor fixes Vikramb987 2019-02-18 17:59:13 -07:00
  • bd4ddd767a Added troll comments KahootChampion 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. Solargale 2019-02-17 19:54:29 -07:00
  • 33515e9cfe deleting old files before adding updated project Solargale 2019-02-17 19:48:52 -07:00
  • 1111601c09 new updated project Solargale 2019-02-17 19:13:24 -07:00
  • ee071d5267 deleting old files before adding updated project Solargale 2019-02-17 19:11:07 -07:00
  • 15a040c256 Removed "AYYYYYYYY" KahootChampion 2019-02-17 17:04:22 -07:00
  • af6211fcc7 Fixed up the project folder Solargale 2019-02-17 16:57:12 -07:00
  • 25766ca13b Fixed up the project folder Solargale 2019-02-17 16:56:38 -07:00
  • 525fce5fbc Fixed Instance variables being used directly inside ship warfare and replaced them with set methods, also asked for userInput as to whether to fight or retreat. KahootChampion 2019-02-17 16:46:03 -07:00
  • 66a97330b6 Added ShipWarfare (Unfinished) KahootChampion 2019-02-17 16:01:53 -07:00
  • 0c99725a09 Add files via upload Vikramb987 2019-02-16 20:37:56 -07:00
  • 7d0e6f4d62 Create README.md Solargale 2019-02-04 15:49:01 -07:00