Merge pull request #20 from 11BelowStudio/develop

1.3.6 - fixing something which could have caused a major whoopsie.

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 1.3.6
+
+*10/10/2024*
+
+* Changed the blanked-out line placeholder to be something that MUD2 genuinely cannot comprehend (I think) but hopefully won't accidentally cause mishaps to happen
+* (theoretically) added support for being invisible
+
 ## 1.3.5
 
 *20/9/2024*

README.md

@@ -82,10 +82,9 @@ Consider taking a look at the documentation of muddler if you wish to contribute
 
 ## CHANGELOG
 
-* **1.3.5** (`20/9/2024`)
-  * Fixed bug that made MUDKIP not respond to `qs` when using a persona who has magic.
-  * Added a couple of triggers to (hopefully) update one's stats after using a spell.
-  * (I have a persona who has magic again so I've only just noticed and fixed these issues xd)
+* **1.3.6** (`10/10/2024`)
+  * Changed the blanked-out line placeholder to be something that MUD2 genuinely cannot comprehend (I think) but hopefully won't accidentally cause mishaps to happen
+  * (theoretically) added support for being invisible
 
 See [CHANGELOG.md](https://github.com/11BelowStudio/MUDKIP_Mud2/blob/main/CHANGELOG.md) for the full changelog.
 

mfile

@@ -1,6 +1,6 @@
 {
   "package": "MUDKIP_Mud2",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "author": "11BelowStudio",
   "title": "Multi User Dungeon Kool Informational Package (for playing MUD2 with Mudlet)",
   "outputFile": true,

src/scripts/MUDKIP_Mud2/init.lua

@@ -104,7 +104,7 @@ if not MUDKIP_Mud2 then
   end
 
   -- hopefully nobody is going to be able to output this exact line.
-  MUDKIP_Mud2._BLANK = '!!~MUDKIPBLANK~!! ".fo.qq. ".fo.qq.$!!~MUDKIPBLANK~!!'
+  MUDKIP_Mud2._BLANK = '¬¬¬¬¬¬¬¬¬¬mudkipblank¬¬¬¬¬¬¬¬¬¬¬'
 
   function MUDKIP_Mud2:getBlankReplacePlaceholder()
     return self._BLANK

src/triggers/MUDKIP_Mud2/MUDKIP_Mud2_on_prompt.lua

@@ -1,4 +1,5 @@
-if copy2decho() ~= "<0,0,255:0,0,0>*<r>" then
+local c2d = copy2decho()
+if not ((c2d == "<0,0,255:0,0,0>*<r>") or (c2d == "<0,0,255:0,0,0>(*)<r>")) then
   return
 end
 

src/triggers/MUDKIP_Mud2/triggers.json

@@ -52,7 +52,7 @@
     "isActive": "yes",
     "patterns": [
       {
-        "pattern":"^(?<prefix>\\*?)(?<sta>\\d+) (?<maxSta>\\d+) (?<effStr>\\d+) (?<str>\\d+) (?<effDex>\\d+) (?<dex>\\d+) (?<mag>\\d+) (?<maxMag>\\d+) (?<pts>\\d+) (?<blind>[YN]) (?<deaf>[YN]) (?<crip>[YN]) (?<dumb>[YN]) (?<mins>\\d+) (?<weather>\\w+)$",
+        "pattern":"^(?<prefix>(\\(?\\*\\)?)?)(?<sta>\\d+) (?<maxSta>\\d+) (?<effStr>\\d+) (?<str>\\d+) (?<effDex>\\d+) (?<dex>\\d+) (?<mag>\\d+) (?<maxMag>\\d+) (?<pts>\\d+) (?<blind>[YN]) (?<deaf>[YN]) (?<crip>[YN]) (?<dumb>[YN]) (?<mins>\\d+) (?<weather>\\w+)$",
         "type": "regex"
       }
     ]
@@ -78,8 +78,8 @@
     "isActive": "yes",
     "patterns": [
       {
-        "pattern":"*",
-        "type": "exactMatch"
+        "pattern":"\\(?\\*\\)?",
+        "type": "regex"
       }
     ]
   },
@@ -120,11 +120,11 @@
     "isActive": "yes",
     "patterns": [
       {
-        "pattern":"^(\\*)?\\(Persona saved on (?<pts>\\d+(,\\d+)*)\\).$",
+        "pattern":"^(\\(?\\*\\)?)?\\(Persona saved on (?<pts>\\d+(,\\d+)*)\\).$",
         "type": "regex"
       },
       {
-        "pattern":"^(\\*)?\\(Persona saved on [-+]\\d+(,\\d+)* = (?<pts>\\d+(,\\d+)*)\\).$",
+        "pattern":"^(\\(?\\*\\)?)?\\(Persona saved on [-+]\\d+(,\\d+)* = (?<pts>\\d+(,\\d+)*)\\).$",
         "type": "regex"
       }
     ]
@@ -134,7 +134,7 @@
     "isActive": "yes",
     "patterns": [
       {
-        "pattern":"^(\\*)?eff str (?<effStr>\\d+)\\h*eff dex (?<effDex>\\d+)\\h*sta (?<sta>\\d+)\/(?<maxSta>\\d+)\\h*(mag (?<mag>\\d+)\\h*)?pts (?<pts>\\d+(,\\d+)*).*$",
+        "pattern":"^(\\(?\\*\\)?)?eff str (?<effStr>\\d+)\\h*eff dex (?<effDex>\\d+)\\h*sta (?<sta>\\d+)\/(?<maxSta>\\d+)\\h*(mag (?<mag>\\d+)\\h*)?pts (?<pts>\\d+(,\\d+)*).*$",
         "type": "regex"
       }
     ]
@@ -144,15 +144,15 @@
     "isActive": "yes",
     "patterns": [
       {
-        "pattern":"^(\\*)?Your stamina has fallen from \\d+ to (?<stam>\\d+)\\.$",
+        "pattern":"^(\\(?\\*\\)?)?Your stamina has fallen from \\d+ to (?<stam>\\d+)\\.$",
         "type": "regex"
       },
       {
-        "pattern":"^(\\*)?Stamina=(?<stam>\\d+)\/(?<maxStam>\\d+)\\.$",
+        "pattern":"^(\\(?\\*\\)?)?Stamina=(?<stam>\\d+)\/(?<maxStam>\\d+)\\.$",
         "type": "regex"
       },
       {
-        "pattern":"^(\\*)?Your stamina is (?<stam>\\d+)\\.$",
+        "pattern":"^(\\(?\\*\\)?)?Your stamina is (?<stam>\\d+)\\.$",
         "type": "regex"
       },
       {