From 6bc57ba54ea93531038e96c112b6ef4bb30c33f2 Mon Sep 17 00:00:00 2001 From: OMGeeky Date: Sat, 16 Mar 2024 23:43:52 +0100 Subject: [PATCH] Handle Signs and Keys like Scripts where no dialog will be opened when no message is there --- .../src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java | 8 -------- .../com/gpl/rpg/AndorsTrail/activity/MainActivity.java | 2 -- .../com/gpl/rpg/AndorsTrail/controller/MapController.java | 6 ++++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java index f67d98631..75a0e1c4e 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java @@ -66,14 +66,6 @@ public final class Dialogs { CustomDialogFactory.show(d); } - public static void showKeyArea(final MainActivity currentActivity, final ControllerContext context, String phraseID) { - showConversation(currentActivity, context, phraseID, null); - } - - public static void showMapSign(final MainActivity currentActivity, final ControllerContext context, String phraseID) { - showConversation(currentActivity, context, phraseID, null); - } - public static void showMapScriptMessage(final MainActivity currentActivity, final ControllerContext context, String phraseID) { showConversation(currentActivity, context, phraseID, null, false); } diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/MainActivity.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/MainActivity.java index 17bb2c7dc..3ca1b476e 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/MainActivity.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/MainActivity.java @@ -397,12 +397,10 @@ public final class MainActivity @Override public void onPlayerSteppedOnMapSignArea(MapObject area) { - Dialogs.showMapSign(this, controllers, area.id); } @Override public void onPlayerSteppedOnKeyArea(MapObject area) { - Dialogs.showKeyArea(this, controllers, area.id); } @Override diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MapController.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MapController.java index 3d3eb7dfc..123a96112 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MapController.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MapController.java @@ -68,6 +68,7 @@ public final class MapController { case sign: if (o.id == null || o.id.length() <= 0) return; worldEventListeners.onPlayerSteppedOnMapSignArea(o); + runScriptInArea(o); break; case newmap: if (o.map == null || o.place == null) return; @@ -79,7 +80,7 @@ public final class MapController { steppedOnRestArea(o); break; case script: - runScriptArea(o); + runScriptInArea(o); break; } } @@ -93,7 +94,7 @@ public final class MapController { return true; } - private void runScriptArea(MapObject o) { + private void runScriptInArea(MapObject o) { Resources res = controllers.getResources(); mapScriptExecutor.proceedToPhrase(res, o.id, true, true); controllers.mapController.applyCurrentMapReplacements(res, true); @@ -164,6 +165,7 @@ public final class MapController { return true; } worldEventListeners.onPlayerSteppedOnKeyArea(area); + runScriptInArea(area); return false; }