Adventure - Quest fixes

Correction for empty dialog textboxes displaying on what should be silent quest triggers Bugfixes within Library Of Varsil dungeon
jjayers99 · Jan 8, 2024 · f9fd8a7 · f9fd8a7
1 parent 3c25f32
commit f9fd8a7
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 21 deletions.
diff --git a/forge-gui-mobile/src/forge/adventure/util/AdventureQuestController.java b/forge-gui-mobile/src/forge/adventure/util/AdventureQuestController.java
@@ -226,6 +226,13 @@ public void displayNextDialog(MapStage stage){
 
         DialogData data = dialogQueue.remove();
         MapDialog dialog = new MapDialog(data, stage, -1, null);
+
+        if (data.options == null || data.options.length == 0) {
+            dialog.setEffects(data.action);
+            displayNextDialog(stage);
+            return;
+        }
+
         stage.showDialog();
         dialog.activate();
         ChangeListener listen = new ChangeListener() {

diff --git a/forge-gui/res/adventure/Shandalar/world/quests.json b/forge-gui/res/adventure/Shandalar/world/quests.json
@@ -10033,8 +10033,8 @@
                 "name": "Locate The Research",
                 "description": "Search $(poi_1) for research about the mechanics of summoning spells",
                 "mapFlag": "foundLibraryOfVarsilResearch",
+				"anyPOI": true,
                 "mapFlagValue": 1,
-                "here": true,
                 "objective": "QuestFlag",
                 "prologue": {
                     "text": "The structure before you is enormous, looking more like an ancient fortress than a library.",

diff --git a/forge-gui/res/adventure/common/maps/map/main_story_explore/library_of_varsil_3.tmx b/forge-gui/res/adventure/common/maps/map/main_story_explore/library_of_varsil_3.tmx
@@ -93,19 +93,26 @@
   <object id="26" template="../../obj/dialog.tx" x="144" y="240">
    <properties>
     <property name="dialog">[
-{
-   &quot;text&quot;: &quot;'Shandalaar’s Most Burnable Cities'. Well, this one sounds like light reading...&quot;,
-   &quot;options&quot;: [{
-      &quot;name&quot;: &quot;(Continue)&quot;, &quot;action&quot;: [{&quot;deleteMapObject&quot;:-1},
-      &quot;action&quot;: [{
-         &quot;grantRewards&quot;: [{
-            &quot;type&quot;: &quot;card&quot;,
-            &quot;count&quot;: 1,
-            &quot;cardName&quot;: &quot;Fireball&quot;
-         }]
-      }]
-   }]
-}
+    {
+        &quot;text&quot;: &quot;'Shandalaar’s Most Burnable Cities'. Well, this one sounds like light reading...&quot;,
+        &quot;options&quot;: [
+            {
+                &quot;name&quot;: &quot;(Continue)&quot;,
+                &quot;action&quot;: [
+                    {
+                        &quot;deleteMapObject&quot;: -1,
+                        &quot;grantRewards&quot;: [
+                            {
+                                &quot;type&quot;: &quot;card&quot;,
+                                &quot;count&quot;: 1,
+                                &quot;cardName&quot;: &quot;Fireball&quot;
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    }
 ]</property>
    </properties>
   </object>
@@ -275,7 +282,7 @@
                 &quot;getQuestFlag&quot;: {
                     &quot;key&quot;: &quot;exploreShand1&quot;,
                     &quot;op&quot;: &quot;=&quot;,
-                    &quot;val&quot;: 5
+                    &quot;val&quot;: 4
                 }
             },
             {

diff --git a/forge-gui/res/adventure/common/maps/map/main_story_explore/library_of_varsil_4.tmx b/forge-gui/res/adventure/common/maps/map/main_story_explore/library_of_varsil_4.tmx
@@ -40,14 +40,14 @@
   <object id="27" template="../../obj/enemy.tx" x="232" y="172">
    <properties>
     <property name="defeatDialog">[{
-   &quot;condition&quot;: [{&quot;getQuestFlag&quot;: {&quot;key&quot;: &quot;exploreShand1&quot;, &quot;op&quot;:&quot;=&quot;, &quot;val&quot;: 5}}, {&quot;checkQuestFlag&quot;: &quot;foundLibraryOfVarsilResearch&quot;, &quot;not&quot;: true}],
+   &quot;condition&quot;: [{&quot;getQuestFlag&quot;: {&quot;key&quot;: &quot;exploreShand1&quot;, &quot;op&quot;:&quot;=&quot;, &quot;val&quot;: 4}}, {&quot;checkQuestFlag&quot;: &quot;foundLibraryOfVarsilResearch&quot;, &quot;not&quot;: true}],
    &quot;text&quot;: &quot;With this monstrous machine out of action, defeating its (relatively) smaller companions could be left to lesser adventurers, but you still haven't found the documents Sir Donovan wanted. They must be somewhere downstairs.&quot;,
    &quot;options&quot;: [{
       &quot;name&quot;: &quot;(Continue)&quot;, 
       &quot;action&quot;: [{&quot;setQuestFlag&quot;: {&quot;key&quot;:&quot;defeatedLibraryOfVarsilBoss&quot;, &quot;val&quot;: 1} }, {&quot;deleteMapObject&quot;: -1}]
    }]
 },{
-   &quot;condition&quot;: [{&quot;getQuestFlag&quot;: {&quot;key&quot;: &quot;exploreShand1&quot;, &quot;op&quot;:&quot;=&quot;, &quot;val&quot;: 5}}, {&quot;checkQuestFlag&quot;: &quot;foundLibraryOfVarsilResearch&quot;}],
+   &quot;condition&quot;: [{&quot;getQuestFlag&quot;: {&quot;key&quot;: &quot;exploreShand1&quot;, &quot;op&quot;:&quot;=&quot;, &quot;val&quot;: 4}}, {&quot;checkQuestFlag&quot;: &quot;foundLibraryOfVarsilResearch&quot;}],
    &quot;text&quot;: &quot;With this monstrous machine out of action, defeating its (relatively) smaller companions could be left to lesser adventurers. You've already found the documents Sir Donovan wanted and can report back to him now or go back down and explore further first.&quot;,
    &quot;options&quot;: [{
       &quot;name&quot;: &quot;(Continue)&quot;, 
@@ -64,14 +64,14 @@
   <object id="28" template="../../obj/enemy.tx" x="232" y="162">
    <properties>
     <property name="defeatDialog">[{
-   &quot;condition&quot;: [{&quot;getQuestFlag&quot;: {&quot;key&quot;: &quot;exploreShand1&quot;, &quot;op&quot;:&quot;=&quot;, &quot;val&quot;: 5}}, {&quot;checkQuestFlag&quot;: &quot;foundLibraryOfVarsilResearch&quot;, &quot;not&quot;: true}],
+   &quot;condition&quot;: [{&quot;getQuestFlag&quot;: {&quot;key&quot;: &quot;exploreShand1&quot;, &quot;op&quot;:&quot;=&quot;, &quot;val&quot;: 4}}, {&quot;checkQuestFlag&quot;: &quot;foundLibraryOfVarsilResearch&quot;, &quot;not&quot;: true}],
    &quot;text&quot;: &quot;With this monstrous machine out of action, defeating its (relatively) smaller companions could be left to lesser adventurers, but you still haven't found the documents Sir Donovan wanted. They must be somewhere downstairs.&quot;,
    &quot;options&quot;: [{
       &quot;name&quot;: &quot;(Continue)&quot;, 
       &quot;action&quot;: [{&quot;setQuestFlag&quot;: {&quot;key&quot;:&quot;defeatedLibraryOfVarsilBoss&quot;, &quot;val&quot;: 1} }, {&quot;deleteMapObject&quot;: -1}]
    }]
 },{
-   &quot;condition&quot;: [{&quot;getQuestFlag&quot;: {&quot;key&quot;: &quot;exploreShand1&quot;, &quot;op&quot;:&quot;=&quot;, &quot;val&quot;: 5}}, {&quot;checkQuestFlag&quot;: &quot;foundLibraryOfVarsilResearch&quot;}],
+   &quot;condition&quot;: [{&quot;getQuestFlag&quot;: {&quot;key&quot;: &quot;exploreShand1&quot;, &quot;op&quot;:&quot;=&quot;, &quot;val&quot;: 4}}, {&quot;checkQuestFlag&quot;: &quot;foundLibraryOfVarsilResearch&quot;}],
    &quot;text&quot;: &quot;With this monstrous machine out of action, defeating its (relatively) smaller companions could be left to lesser adventurers. You've already found the documents Sir Donovan wanted and can report back to him now or go back down and explore further first.&quot;,
    &quot;options&quot;: [{
       &quot;name&quot;: &quot;(Continue)&quot;, 
@@ -90,14 +90,14 @@
   <object id="29" template="../../obj/enemy.tx" x="232" y="152">
    <properties>
     <property name="defeatDialog">[{
-   &quot;condition&quot;: [{&quot;getQuestFlag&quot;: {&quot;key&quot;: &quot;exploreShand1&quot;, &quot;op&quot;:&quot;=&quot;, &quot;val&quot;: 5}}, {&quot;checkQuestFlag&quot;: &quot;foundLibraryOfVarsilResearch&quot;, &quot;not&quot;: true}],
+   &quot;condition&quot;: [{&quot;getQuestFlag&quot;: {&quot;key&quot;: &quot;exploreShand1&quot;, &quot;op&quot;:&quot;=&quot;, &quot;val&quot;: 4}}, {&quot;checkQuestFlag&quot;: &quot;foundLibraryOfVarsilResearch&quot;, &quot;not&quot;: true}],
    &quot;text&quot;: &quot;With this monstrous machine out of action, defeating its (relatively) smaller companions could be left to lesser adventurers, but you still haven't found the documents Sir Donovan wanted. They must be somewhere downstairs.&quot;,
    &quot;options&quot;: [{
       &quot;name&quot;: &quot;(Continue)&quot;, 
       &quot;action&quot;: [{&quot;setQuestFlag&quot;: {&quot;key&quot;:&quot;defeatedLibraryOfVarsilBoss&quot;, &quot;val&quot;: 1} }, {&quot;deleteMapObject&quot;: -1}]
    }]
 },{
-   &quot;condition&quot;: [{&quot;getQuestFlag&quot;: {&quot;key&quot;: &quot;exploreShand1&quot;, &quot;op&quot;:&quot;=&quot;, &quot;val&quot;: 5}}, {&quot;checkQuestFlag&quot;: &quot;foundLibraryOfVarsilResearch&quot;}],
+   &quot;condition&quot;: [{&quot;getQuestFlag&quot;: {&quot;key&quot;: &quot;exploreShand1&quot;, &quot;op&quot;:&quot;=&quot;, &quot;val&quot;: 4}}, {&quot;checkQuestFlag&quot;: &quot;foundLibraryOfVarsilResearch&quot;}],
    &quot;text&quot;: &quot;With this monstrous machine out of action, defeating its (relatively) smaller companions could be left to lesser adventurers. You've already found the documents Sir Donovan wanted and can report back to him now or go back down and explore further first.&quot;,
    &quot;options&quot;: [{
       &quot;name&quot;: &quot;(Continue)&quot;,