diff --git a/src/main/java/DCourt/Screens/Areas/Forest/arGuild.java b/src/main/java/DCourt/Screens/Areas/Forest/arGuild.java index 2c84b46..48553c2 100644 --- a/src/main/java/DCourt/Screens/Areas/Forest/arGuild.java +++ b/src/main/java/DCourt/Screens/Areas/Forest/arGuild.java @@ -141,20 +141,23 @@ public boolean action(Event e, Object o) { i++; } else if (h.getMoney() >= this.cost[i]) { h.subMoney(this.cost[i]); - switch (i) { - case 0: - next = joinGuild(h); - break; - case 1: - next = addFight(h); - break; - case 2: - next = addMagic(h); - break; - case 3: - next = addThief(h); - break; + if(i == 0){ + next = joinGuild(h); + break; } + if(i == 1){ + next = addFight(h); + break; + } + if(i == 2){ + next = addMagic(h); + break; + } + if(i == 3){ + next = addThief(h); + break; + } + break; } } Tools.setRegion(next); diff --git a/src/main/java/DCourt/Screens/Areas/Hills/arMagicShop.java b/src/main/java/DCourt/Screens/Areas/Hills/arMagicShop.java index dcbca0e..5f50498 100644 --- a/src/main/java/DCourt/Screens/Areas/Hills/arMagicShop.java +++ b/src/main/java/DCourt/Screens/Areas/Hills/arMagicShop.java @@ -81,6 +81,6 @@ public int costSpecial() { @Override // DCourt.Screens.Template.Shop public int stockValue(Item it) { - return stockValue(it) * 2; + return super.stockValue(it) * 2; } } diff --git a/src/main/java/DCourt/Screens/Areas/Mound/arGoblin.java b/src/main/java/DCourt/Screens/Areas/Mound/arGoblin.java index ecf2870..aca42e0 100644 --- a/src/main/java/DCourt/Screens/Areas/Mound/arGoblin.java +++ b/src/main/java/DCourt/Screens/Areas/Mound/arGoblin.java @@ -157,7 +157,7 @@ public void addTools() { public void updateTools() { boolean inBar = this.bar_shop.getCurrent() == this.bar; int cash = Screen.getHero().getMoney(); - updateTools(); + super.updateTools(); hideTools(inBar ? 2 : 1); for (int i = 0; i < this.tools.length; i++) { this.tools[i].enable(cash >= cost[i]); @@ -193,17 +193,19 @@ public boolean action(Event e, Object o) { ix++; } else if (Screen.getMoney() >= cost[ix]) { Screen.subMoney(cost[ix]); - switch (ix) { - case 0: + if(ix == 0){ Tools.setRegion(Screen.tryToExit(this, Constants.MOUND, cost[ix])); break; - case 1: + } + if(ix == 1){ Tools.setRegion(rumors()); break; - case 2: + } + if(ix == 2){ Tools.setRegion(Screen.tryToExit(this, Constants.COT, cost[ix])); break; } + break; } } } diff --git a/src/main/java/DCourt/Screens/Wilds/arCastle.java b/src/main/java/DCourt/Screens/Wilds/arCastle.java index c5cb089..b06a26a 100644 --- a/src/main/java/DCourt/Screens/Wilds/arCastle.java +++ b/src/main/java/DCourt/Screens/Wilds/arCastle.java @@ -130,7 +130,7 @@ public boolean needsLight(int loc) { @Override // DCourt.Screens.Template.WildsScreen public void goQuesting(int loc) { if (loc < 2) { - goQuesting(loc); + super.goQuesting(loc); } else if (testAdvance(loc)) { if (!Tools.contest(Screen.getWits(), FIND_OCEAN)) { Tools.setRegion( @@ -138,11 +138,11 @@ public void goQuesting(int loc) { this, DOCKS_FAILURE.concat(String.valueOf(String.valueOf(Tools.select(oceans)))))); Screen.getHero().addFatigue(1); } else if (Screen.packCount("Rutter for Shangala") > 0 && Tools.percent(70)) { - goQuesting(4); + super.goQuesting(4); } else if (Screen.packCount("Rutter for Hie Brasil") <= 0 || !Tools.percent(70)) { - goQuesting(2); + super.goQuesting(2); } else { - goQuesting(3); + super.goQuesting(3); } } } diff --git a/src/main/java/DCourt/Tools/Tools.java b/src/main/java/DCourt/Tools/Tools.java index 378e0cf..4ec25c5 100644 --- a/src/main/java/DCourt/Tools/Tools.java +++ b/src/main/java/DCourt/Tools/Tools.java @@ -88,13 +88,13 @@ public static boolean isLoading(int stage) { } public static void prepareFonts() { - courtF = new Font(primeFont, Font.ITALIC + Font.BOLD, 14); - questF = new Font(primeFont, Font.ITALIC, 14); - statusF = new Font(primeFont, 0, 18); - fieldF = new Font(primeFont, Font.ITALIC + Font.BOLD, 16); - fightF = new Font(primeFont, 0, 16); - boldF = new Font(primeFont, Font.BOLD, 14); - textF = new Font(primeFont, 0, 14); + courtF = new Font(primeFont, Font.ITALIC + Font.BOLD, 12); + questF = new Font(primeFont, Font.ITALIC, 12); + statusF = new Font(primeFont, 0, 16); + fieldF = new Font(primeFont, Font.ITALIC + Font.BOLD, 14); + fightF = new Font(primeFont, 0, 14); + boldF = new Font(primeFont, Font.BOLD, 12); + textF = new Font(primeFont, 0, 12); bigF = new Font(primeFont, Font.BOLD, 36); giantF = new Font(primeFont, Font.BOLD, 75); }