RecentRunner/TaipanClone
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Compare commits

base: RecentRunner:4.1
Branches Tags
RecentRunner:master RecentRunner:legacy
RecentRunner:4.2 RecentRunner:4.1 RecentRunner:4.0 RecentRunner:3.1 RecentRunner:3.0 RecentRunner:2.0 RecentRunner:2.1 RecentRunner:1.3 RecentRunner:1.2 RecentRunner:1.1 RecentRunner:1.0
...
compare: RecentRunner:master
Branches Tags
RecentRunner:master RecentRunner:legacy
RecentRunner:4.2 RecentRunner:4.1 RecentRunner:4.0 RecentRunner:3.1 RecentRunner:3.0 RecentRunner:2.0 RecentRunner:2.1 RecentRunner:1.3 RecentRunner:1.2 RecentRunner:1.1 RecentRunner:1.0

2 Commits
4.1 ... master

Author SHA1 Message Date
Solargale
340a118ef4 Fixed shipwarfare 2019-04-12 14:08:16 -06:00
Solargale
8c5f0b1f95 Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts. 2019-04-12 10:45:19 -06:00
2 changed files with 2 additions and 2 deletions
Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -9,7 +9,7 @@
<component name="ProjectKey"> <component name="ProjectKey">
<option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" /> <option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_141" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
<component name="SvnBranchConfigurationManager"> <component name="SvnBranchConfigurationManager">

2
src/gui/ShipWarfareGUI.java
View File

@@ -239,7 +239,7 @@ public class ShipWarfareGUI extends Player {
if (exitValue == 1) { if (exitValue == 1) {
wipe(); wipe();
calculateLoot = logic.calculateLoot(); calculateLoot = logic.calculateLoot();
super.setMoney(logic.getMoney()); setMoney(calculateLoot+ getPlayer().getMoney());
report.setText(String.format("Our firm has earned $%,d in loot! ", calculateLoot)); report.setText(String.format("Our firm has earned $%,d in loot! ", calculateLoot));
continueButton.setVisible(true); continueButton.setVisible(true);
completeWipe(); completeWipe();