Nathan Lum
|
123d329bbf
|
Add files via upload
|
2019-02-22 14:10:15 -07:00 |
|
Nathan Lum
|
01acec2b16
|
Update Player.java
|
2019-02-22 13:28:06 -07:00 |
|
KahootChampion
|
0bcdbd1af8
|
Fixed like 3 naming/logical errors in ShipWarfare
|
2019-02-22 00:20:57 -07:00 |
|
KahootChampion
|
4b047f46c4
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/ShipWarfare.java
# src/TaipanShop.java
|
2019-02-21 23:44:57 -07:00 |
|
KahootChampion
|
f9435e7309
|
Sloppy but completed ShipWarfare class
|
2019-02-21 23:44:30 -07:00 |
|
Vikramb987
|
b78ba180f5
|
Update Travel.java
|
2019-02-21 22:08:26 -07:00 |
|
Vikramb987
|
1540323985
|
Update ShipWarfare.java
|
2019-02-21 22:08:11 -07:00 |
|
Vikramb987
|
0a93de3354
|
Update TaipanShop.java
|
2019-02-21 22:07:51 -07:00 |
|
Vikramb987
|
2395eb3298
|
Update Player.java
|
2019-02-21 22:07:27 -07:00 |
|
Vikramb987
|
0a4968998c
|
Create main.java
the main file
|
2019-02-21 22:07:08 -07:00 |
|
KahootChampion
|
3bd9f58fb1
|
Added loot. Still need to have ships escape sometimes and Liu yen
|
2019-02-21 21:39:24 -07:00 |
|
siddhantdewani
|
5c5aff2ae0
|
Update Player.java
|
2019-02-21 20:55:23 -07:00 |
|
siddhantdewani
|
f3721c016e
|
Add files via upload
|
2019-02-21 20:18:11 -07:00 |
|
KahootChampion
|
03b08e4de3
|
Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot)
|
2019-02-20 16:07:44 -07:00 |
|
KahootChampion
|
4598d219c7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/workspace.xml
# src/ShipWarfare.java
# src/TaipanShop.java
|
2019-02-20 09:48:19 -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
|
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.
|
2019-02-20 07:31:39 -07:00 |
|
|
|
f99880d2ae
|
Merge remote-tracking branch 'origin/master'
|
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
|
2019-02-19 19:03:51 -07:00 |
|
siddhantdewani
|
1fb47b1dcb
|
Add files via upload
|
2019-02-19 17:53:43 -07:00 |
|
|
|
297a58551b
|
Merge remote-tracking branch 'origin/master'
|
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
|
2019-02-19 17:49:09 -07:00 |
|
Vikram
|
b324cea280
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/workspace.xml
# src/TaipanShop.java
|
2019-02-19 10:10:11 -07:00 |
|
Vikram
|
5156547ad0
|
now fully uses the player class
|
2019-02-19 10:08:52 -07:00 |
|
|
|
c40fd5e713
|
Added some stuff for the Travel Class
|
2019-02-19 04:25:12 -07:00 |
|
KahootChampion
|
6c36073e87
|
Added GameOver() Method to Player class, btw System.out.flush just straight up Thanos's the terminal at the time (clears it).
|
2019-02-18 22:50:24 -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
|
8b020427fa
|
Merge remote-tracking branch 'origin/master'
|
2019-02-18 19:48:42 -07:00 |
|
Vikram
|
a5cc88e5ec
|
the shop now uses the player class as a parent class.
|
2019-02-18 19:47:42 -07:00 |
|
|
|
08edd6069b
|
Created Player class
|
2019-02-18 19:36:03 -07:00 |
|
KahootChampion
|
534b8728a5
|
Used Harkamal's dumb extended class thingy cuz he begged me tod do it.
|
2019-02-18 19:13:39 -07:00 |
|
KahootChampion
|
5c41bf5b7c
|
Added retreat option (not perfected)
|
2019-02-18 19:05:14 -07:00 |
|
|
|
1a06ba4c0e
|
Fixed the setters to be greater than 0
|
2019-02-18 19:02:31 -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 |
|
|
|
f419834f79
|
Merge remote-tracking branch 'origin/master'
|
2019-02-18 18:38:24 -07:00 |
|
|
|
53a5115f01
|
Created Core class
|
2019-02-18 18:38:01 -07:00 |
|
Vikramb987
|
be8eddaa5c
|
minor fixes
just some minor text fixes
|
2019-02-18 17:59:13 -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 |
|
|
|
ee071d5267
|
deleting old files before adding updated project
|
2019-02-17 19:11:07 -07:00 |
|
KahootChampion
|
15a040c256
|
Removed "AYYYYYYYY"
|
2019-02-17 17:04:22 -07:00 |
|
|
|
af6211fcc7
|
Fixed up the project folder
|
2019-02-17 16:57:12 -07:00 |
|
