From 4c10c02a7a9d8a4e5e554459f26e1e5420b5ab6a Mon Sep 17 00:00:00 2001
From: Andrea Gilmozzi <agilmozzi@gmail.com>
Date: Sun, 11 May 2025 01:14:12 +0200
Subject: [PATCH 1/3] add tarot universe meropis exits

---
 mudlet-mapper.xml | 83 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 30 deletions(-)

diff --git a/mudlet-mapper.xml b/mudlet-mapper.xml
index c88add1..b21568b 100644
--- a/mudlet-mapper.xml
+++ b/mudlet-mapper.xml
@@ -7299,36 +7299,59 @@ function mmp.addWingsAchaea()
     end
   end
   --universe tarot
-  if mmp.settings.universe and mmp.oncontinent(area, "Main") then
-    local tarotLocations =
-      {
-        azdun = 1772,
-        blackrock = 10573,
-        bitterfork = 25093,
-        genji = 10091,
-        manusha = 8730,
-        newthera = 20386,
-        caerwitrin = 17678,
-        shastaan = 2855,
-        mannaseh = 1745,
-        manara = 9124,
-        brasslantern = 30383,
-        mhojave = 39103,
-        thraasi = 35703,
-        newhope = 25581,
-      }
-    for village, roomnum in pairs(tarotLocations) do
-      mmp.tempSpecialExit(
-        roomnum,
-        [=[script:
-        mmp.customwalkdelay(4.5)
-        send("fling universe at ground",false)
-        tempTimer(4,[[send("touch ]=] ..
-        village ..
-        [=[",false)]])
-        ]=],
-        10
-      )
+  if mmp.settings.universe then
+    if mmp.oncontinent(area, "Main") then
+      local tarotLocations =
+        {
+          azdun = 1772,
+          blackrock = 10573,
+          bitterfork = 25093,
+          genji = 10091,
+          manusha = 8730,
+          newthera = 20386,
+          caerwitrin = 17678,
+          shastaan = 2855,
+          mannaseh = 1745,
+          manara = 9124,
+          brasslantern = 30383,
+          mhojave = 39103,
+          thraasi = 35703,
+          newhope = 25581,
+        }
+      for village, roomnum in pairs(tarotLocations) do
+        mmp.tempSpecialExit(
+          roomnum,
+          [=[script:
+          mmp.customwalkdelay(4.5)
+          send("fling universe at ground",false)
+          tempTimer(4,[[send("touch ]=] ..
+          village ..
+          [=[",false)]])
+          ]=],
+          10
+        )
+      end
+    elseif mmp.oncontinent(area, "Meropis") then
+      local tarotLocations =
+        {
+          rageteeth = 1226,
+          seleucar  = 29755,
+          judgement = 35450,
+          yggdrasil = 12207,
+        }
+      for village, roomnum in pairs(tarotLocations) do
+        mmp.tempSpecialExit(
+          roomnum,
+          [=[script:
+          mmp.customwalkdelay(4.5)
+          send("fling universe at ground",false)
+          tempTimer(4,[[send("touch ]=] ..
+          village ..
+          [=[",false)]])
+          ]=],
+          10
+        )
+      end
     end
   end
   --gare

From f84db1156d785dac4f8073e5f24e7fa31b4dcb45 Mon Sep 17 00:00:00 2001
From: Andrea Gilmozzi <agilmozzi@gmail.com>
Date: Sun, 11 May 2025 18:12:08 +0200
Subject: [PATCH 2/3] refactor tarot universe logic

---
 mudlet-mapper.xml | 72 ++++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 42 deletions(-)

diff --git a/mudlet-mapper.xml b/mudlet-mapper.xml
index b21568b..f7a8575 100644
--- a/mudlet-mapper.xml
+++ b/mudlet-mapper.xml
@@ -7187,8 +7187,31 @@ registerAnonymousEventHandler("mmp clear externals", "mmp.removeWings")</script>
 					<name>Achaea</name>
 					<packageName></packageName>
 					<script>registerAnonymousEventHandler("mmp link externals", "mmp.addWingsAchaea")
-
-
+        
+local universeLocations = {
+  ['Main'] = {
+    azdun = 1772,
+    blackrock = 10573,
+    bitterfork = 25093,
+    genji = 10091,
+    manusha = 8730,
+    newthera = 20386,
+    caerwitrin = 17678,
+    shastaan = 2855,
+    mannaseh = 1745,
+    manara = 9124,
+    brasslantern = 30383,
+    mhojave = 39103,
+    thraasi = 35703,
+    newhope = 25581,
+  },
+  ['Meropis'] = {
+    rageteeth = 1226,
+    seleucar  = 29755,
+    judgement = 35450,
+    yggdrasil = 12207,
+  }
+}
 
 function mmp.addWingsAchaea()
   --Trimmed down version of the original function, meant to only be used for wings. (Where the command varies based on several MCONFIGS)
@@ -7300,46 +7323,11 @@ function mmp.addWingsAchaea()
   end
   --universe tarot
   if mmp.settings.universe then
-    if mmp.oncontinent(area, "Main") then
-      local tarotLocations =
-        {
-          azdun = 1772,
-          blackrock = 10573,
-          bitterfork = 25093,
-          genji = 10091,
-          manusha = 8730,
-          newthera = 20386,
-          caerwitrin = 17678,
-          shastaan = 2855,
-          mannaseh = 1745,
-          manara = 9124,
-          brasslantern = 30383,
-          mhojave = 39103,
-          thraasi = 35703,
-          newhope = 25581,
-        }
-      for village, roomnum in pairs(tarotLocations) do
-        mmp.tempSpecialExit(
-          roomnum,
-          [=[script:
-          mmp.customwalkdelay(4.5)
-          send("fling universe at ground",false)
-          tempTimer(4,[[send("touch ]=] ..
-          village ..
-          [=[",false)]])
-          ]=],
-          10
-        )
-      end
-    elseif mmp.oncontinent(area, "Meropis") then
-      local tarotLocations =
-        {
-          rageteeth = 1226,
-          seleucar  = 29755,
-          judgement = 35450,
-          yggdrasil = 12207,
-        }
-      for village, roomnum in pairs(tarotLocations) do
+    local continent = mmp.getareacontinents(area)[1]
+    
+    local universeExits = universeLocations[continent]
+    if universeExits then
+      for village, roomnum in pairs(universeExits) do
         mmp.tempSpecialExit(
           roomnum,
           [=[script:

From 8d9fb1d132fa8585adccce46698656d996ca249a Mon Sep 17 00:00:00 2001
From: Andrea Gilmozzi <agilmozzi@gmail.com>
Date: Tue, 13 May 2025 23:24:22 +0200
Subject: [PATCH 3/3] support multiple continent in same area

---
 mudlet-mapper.xml | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/mudlet-mapper.xml b/mudlet-mapper.xml
index f7a8575..c3815d7 100644
--- a/mudlet-mapper.xml
+++ b/mudlet-mapper.xml
@@ -7323,22 +7323,24 @@ function mmp.addWingsAchaea()
   end
   --universe tarot
   if mmp.settings.universe then
-    local continent = mmp.getareacontinents(area)[1]
+    local continents = mmp.getareacontinents(area)
     
-    local universeExits = universeLocations[continent]
-    if universeExits then
-      for village, roomnum in pairs(universeExits) do
-        mmp.tempSpecialExit(
-          roomnum,
-          [=[script:
-          mmp.customwalkdelay(4.5)
-          send("fling universe at ground",false)
-          tempTimer(4,[[send("touch ]=] ..
-          village ..
-          [=[",false)]])
-          ]=],
-          10
-        )
+    for _, continent in ipairs(continents) do
+      local universeExits = universeLocations[continent]
+      if universeExits then
+        for village, roomnum in pairs(universeExits) do
+          mmp.tempSpecialExit(
+            roomnum,
+            [=[script:
+            mmp.customwalkdelay(4.5)
+            send("fling universe at ground",false)
+            tempTimer(4,[[send("touch ]=] ..
+            village ..
+            [=[",false)]])
+            ]=],
+            10
+          )
+        end
       end
     end
   end