Merge pull request #15 from 11BelowStudio/develop

Version 1.3.1
11BelowStudio · Jun 26, 2024 · a476632 · a476632
2 parents fc22148 + db36932
commit a476632
Show file tree

Hide file tree

Showing 23 changed files with 381 additions and 347 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.3.1
+
+*26/6/2024*
+
+* Added some code to make MUDKIP clean up after itself after it gets uninstalled.
+* Stamina is now displayed as 0 if you get permadeathed in the ways which bypass stamina.
+* Some refactorings have happened.
+* Removed some deprecated legacy code.
+
 ## 1.3.0
 
 *18/6/2024*

diff --git a/README.md b/README.md
@@ -90,11 +90,11 @@ if you wish to contribute to the development of *MUDKIP*.
 
 ## CHANGELOG
 
-* **1.3.0** (`18/6/2024`)
-  * The output of `map` is now on 3 lines (not 11) and is now ***CLICKABLE!*** so you can go in a certain direction *without* needing to type stuff in (just click on the appropriate thingy!)
-    * Remember that MUD2 allows you to use `auto map` to automagically send a `map` command whenever you move to a new room!
-    * (note: only the most recent `map` output has clickable directions, to avoid potential misclicks whilst scrolling up)
-  * also added a couple more typo-correction aliases
+* **1.3.1** (`26/6/2024`)
+  * Added some code to make MUDKIP clean up after itself after it gets uninstalled.
+  * Stamina is now displayed as 0 if you get permadeathed in the ways which bypass stamina.
+  * Some refactorings have happened.
+  * Removed some deprecated legacy code.
 
 See [CHANGELOG.md](https://github.com/11BelowStudio/MUDKIP_Mud2/blob/main/CHANGELOG.md) for the full changelog.
 

diff --git a/mfile b/mfile
@@ -1,6 +1,6 @@
 {
   "package": "MUDKIP_Mud2",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "author": "11BelowStudio",
   "title": "Multi User Dungeon Kool Informational Package (for playing MUD2 with Mudlet)",
   "outputFile": true,

diff --git a/src/aliases/MUDKIP_Mud2/aliases.json b/src/aliases/MUDKIP_Mud2/aliases.json
@@ -1,9 +1,4 @@
 [
-  {
-    "name": "semi_auto_fes",
-    "regex": "^.+$",
-    "isActive": "false"
-  },
   {
     "name": "say_dreamword",
     "regex": "^d[Ww][Oo]([Rr][Dd]?)?$",
@@ -17,6 +12,6 @@
   {
     "name":"emotes_with_s",
     "isActive":"true",
-    "regex":"(?i)^(?<emote>bay|bark|blink|cackle|cheer|chuckle|drool|duck|flip|frown|gasp|giggle|glare|grimace|grin|groan|growl|gurgle|howl|laugh|leer|nod|point|ponder|pounce|pucker|purr|quack|roar|scream|shake|shiver|shout|shrug|sing|smile|smirk|spin|stammer|think|twiddle|wait|(re)?wave|whisper|wink|woof|yodel|yawn)s$"
+    "regex":"(?i)^(?<emote>bay|bark|blink|cackle|cheer|chuckle|drool|duck|flip|frown|gasp|giggle|glare|grimace|grin|groan|growl|gurgle|howl|laugh|leer|meow|nod|point|ponder|pounce|pucker|purr|quack|roar|scream|shake|shiver|shout|shrug|sing|smile|smirk|spin|stammer|think|twiddle|wait|(re)?wave|whisper|wink|wobble|woof|yodel|yawn)s$"
   }
 ]
diff --git a/src/aliases/MUDKIP_Mud2/say_dreamword.lua b/src/aliases/MUDKIP_Mud2/say_dreamword.lua
@@ -1,9 +1,9 @@
 
 if MUDKIP_Mud2:isInGame() then
-  local dword = MUDKIP_Mud2:getDreamword()
+  local dword = MUDKIP_Mud2.stats:getDreamword()
   if dword ~= "" then
     send('say ' .. dword)
-    MUDKIP_Mud2:clearDreamword()
+    MUDKIP_Mud2.stats:clearDreamword()
   else
     MUDKIP_Mud2:mcecho("Cannot say an unknown dreamword!","warn")
   end

diff --git a/src/aliases/MUDKIP_Mud2/say_dreamword_uppercase.lua b/src/aliases/MUDKIP_Mud2/say_dreamword_uppercase.lua
@@ -1,8 +1,8 @@
 if MUDKIP_Mud2:isInGame() then
-  local dword = MUDKIP_Mud2:getDreamword()
+  local dword = MUDKIP_Mud2.stats:getDreamword()
   if dword ~= "" then
     send('say ' .. string.upper(dword))
-    MUDKIP_Mud2:clearDreamword()
+    MUDKIP_Mud2.stats:clearDreamword()
   else
     MUDKIP_Mud2:mcecho("Cannot say an unknown dreamword!","warn")
   end

diff --git a/src/aliases/MUDKIP_Mud2/semi_auto_fes.lua b/src/aliases/MUDKIP_Mud2/semi_auto_fes.lua