From e7a0ddf0856f3e9d7f4bc878a53a48227e06b800 Mon Sep 17 00:00:00 2001
From: KahootChampion
Date: Mon, 25 Feb 2019 19:42:19 -0700
Subject: [PATCH] Small change to javadocs for shipwarfare
---
.idea/misc.xml | 2 +-
.idea/workspace.xml | 78 +++++++++++--------
out/production/TaipanClone/ShipWarfare.class | Bin 7272 -> 7522 bytes
src/ShipWarfare.java | 8 +-
4 files changed, 51 insertions(+), 37 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8466a13..479cb83 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1129f0e..dab5ad0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,8 +1,10 @@
-
+
+
+
@@ -32,7 +34,7 @@
-
+
@@ -40,8 +42,8 @@
-
-
+
+
@@ -49,8 +51,8 @@
-
-
+
+
@@ -62,8 +64,8 @@
-
-
+
+
@@ -129,6 +131,7 @@
loan();
player.getCargoSpace()
delayForSeconds(1)
+ delayForSeconds(1)
@@ -145,8 +148,8 @@
-
+
@@ -422,17 +425,24 @@
1551144715114
-
+
+ 1551148428427
+
+
+
+ 1551148428427
+
+
-
+
-
+
@@ -441,13 +451,13 @@
-
+
-
+
@@ -523,7 +533,8 @@
-
+
+
@@ -579,10 +590,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -590,24 +615,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -671,6 +682,7 @@
diff --git a/out/production/TaipanClone/ShipWarfare.class b/out/production/TaipanClone/ShipWarfare.class
index 78830e17cb7ef1c6449f19231ec6af7d3ed6ba03..0127a96af4a5c16e81b4c0b2201481b1cd016177 100644
GIT binary patch
literal 7522
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
diff --git a/src/ShipWarfare.java b/src/ShipWarfare.java
index 9ea3055..2beb1ae 100644
--- a/src/ShipWarfare.java
+++ b/src/ShipWarfare.java
@@ -14,6 +14,10 @@ public class ShipWarfare extends Player {
private String pirateName = "Liu Yen";
private Player player;
+ /**
+ * Class Constructor that takes in a type player as a parameter
+ * @param player object of the class Player
+ */
public ShipWarfare(Player player) {
Player playerDummy = new Player(player);
this.player = playerDummy;
@@ -23,7 +27,6 @@ public class ShipWarfare extends Player {
* setter method for player
* @param player object of the class Player
*/
-
public void setPlayer(Player player) {
Player playerDummy = new Player(player);
this.player = playerDummy;
@@ -33,7 +36,6 @@ public class ShipWarfare extends Player {
* getter method for obtaining a player object.
* @return returns player object
*/
-
public Player getPlayer() {
Player playerDummy = new Player(player);
return playerDummy;
@@ -204,10 +206,10 @@ public class ShipWarfare extends Player {
/**
* The user faces off against the litty ships and either prevails, dies, or runs away
+ * The loot for defeating a litty fleet is much higher than that of a peasant one
* @return true if the user wins, loses, or flees, it returns false otherwise
* @throws Exception in case of errors due to the delay
*/
- //The loot for defeating a litty fleet is much higher than that of a peasant one
public boolean destroyLittyShipsOrEscape() throws Exception {
int calculateLoot = 0;
int chanceOfEnemyRun = 0;