← Back to team overview

mudlet-makers team mailing list archive

[Merge] lp:~mudlet-makers/mudlet/prospectiveMapChanges into lp:~mudlet-makers/mudlet/mapper-lua

 

Timothy Sartin has proposed merging lp:~mudlet-makers/mudlet/prospectiveMapChanges into lp:~mudlet-makers/mudlet/mapper-lua.

Requested reviews:
  Mudlet Makers (mudlet-makers)

For more details, see:
https://code.launchpad.net/~mudlet-makers/mudlet/prospectiveMapChanges/+merge/85805

Added some triggers for Imperian tracking, edited the Imperian Parse wholist trigger as well as the mmp_parse_wholist. As for the script I changed it to catch "who person" as well as caps. Also added a rubble message. More to come, lost a few things after the last update.
-- 
https://code.launchpad.net/~mudlet-makers/mudlet/prospectiveMapChanges/+merge/85805
Your team Mudlet Makers is requested to review the proposed merge of lp:~mudlet-makers/mudlet/prospectiveMapChanges into lp:~mudlet-makers/mudlet/mapper-lua.
=== modified file 'mudlet-mapper.xml'
--- mudlet-mapper.xml	2011-12-13 20:29:59 +0000
+++ mudlet-mapper.xml	2011-12-15 07:44:24 +0000
@@ -58,6 +58,7 @@
                 <colorTriggerBgColor>#000000</colorTriggerBgColor>
                 <regexCodeList>
                     <string>You begin to slowly clamber over the rubble that blocks your way.</string>
+                    <string>You begin to slowly clamber over a pile of rubble that blocks your way.</string>
                 </regexCodeList>
                 <regexCodePropertyList>
                     <integer>3</integer>
@@ -1202,7 +1203,7 @@
                     <colorTriggerFgColor>#000000</colorTriggerFgColor>
                     <colorTriggerBgColor>#000000</colorTriggerBgColor>
                     <regexCodeList>
-                        <string>.+ - (.+?) - (.+)</string>
+                        <string>.+( \- [A-Z].+?\s*?) \- (.+)</string>
                     </regexCodeList>
                     <regexCodePropertyList>
                         <integer>1</integer>
@@ -1280,6 +1281,69 @@
                     <regexCodePropertyList>
                         <integer>3</integer>
                     </regexCodePropertyList>
+                                        <Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
+                        <name>Scout</name>
+                        <script>mmp.roomEcho(matches[3]) </script>
+                        <triggerType>0</triggerType>
+                        <conditonLineDelta>0</conditonLineDelta>
+                        <mStayOpen>0</mStayOpen>
+                        <mCommand></mCommand>
+                        <packageName></packageName>
+                        <mFgColor>#ff0000</mFgColor>
+                        <mBgColor>#ffff00</mBgColor>
+                        <mSoundFile></mSoundFile>
+                        <colorTriggerFgColor>#000000</colorTriggerFgColor>
+                        <colorTriggerBgColor>#000000</colorTriggerBgColor>
+                        <regexCodeList>
+                            <string>^   (.+) at (.+)$</string>
+                        </regexCodeList>
+                        <regexCodePropertyList>
+                            <integer>1</integer>
+                        </regexCodePropertyList>
+                    </Trigger>
+                    <Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
+                        <name>Scent</name>
+                        <script>mmp.roomEcho(matches[2]) </script>
+                        <triggerType>0</triggerType>
+                        <conditonLineDelta>0</conditonLineDelta>
+                        <mStayOpen>0</mStayOpen>
+                        <mCommand></mCommand>
+                        <packageName></packageName>
+                        <mFgColor>#ff0000</mFgColor>
+                        <mBgColor>#ffff00</mBgColor>
+                        <mSoundFile></mSoundFile>
+                        <colorTriggerFgColor>#000000</colorTriggerFgColor>
+                        <colorTriggerBgColor>#000000</colorTriggerBgColor>
+                        <regexCodeList>
+                            <string>^You detect traces of scent from (.+)\.$</string>
+                        </regexCodeList>
+                        <regexCodePropertyList>
+                            <integer>1</integer>
+                        </regexCodePropertyList>
+                    </Trigger>
+                    <Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
+                        <name>Hunt</name>
+                        <script>selectCurrentLine()
+replace(&quot;&quot;)
+cecho(&quot;&lt;chocolate&gt;&quot; .. matches[2] .. &quot;&lt;grey&gt; moved to &lt;sienna&gt;&quot; .. matches[3] .. &quot;, &lt;white&gt;&quot; ..matches[4])
+mmp.roomEcho(matches[3]) </script>
+                        <triggerType>0</triggerType>
+                        <conditonLineDelta>0</conditonLineDelta>
+                        <mStayOpen>0</mStayOpen>
+                        <mCommand></mCommand>
+                        <packageName></packageName>
+                        <mFgColor>#ff0000</mFgColor>
+                        <mBgColor>#ffff00</mBgColor>
+                        <mSoundFile></mSoundFile>
+                        <colorTriggerFgColor>#000000</colorTriggerFgColor>
+                        <colorTriggerBgColor>#000000</colorTriggerBgColor>
+                        <regexCodeList>
+                            <string>^You sense that (\w+) has entered (.+)\, (.+)\.$</string>
+                        </regexCodeList>
+                        <regexCodePropertyList>
+                            <integer>1</integer>
+                        </regexCodePropertyList>
+                    </Trigger>
                 </Trigger>
             </TriggerGroup>
             <TriggerGroup isActive="yes" isFolder="yes" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
@@ -3591,8 +3655,10 @@
                 <name>mmp_parse_wholist</name>
                 <packageName></packageName>
                 <script>disableTrigger(&quot;Parse wholist&quot;)
+
 function mmp_parse_wholist(_, cmd)
-  if cmd ~= &quot;who&quot; then return end
+
+  if string.cut(cmd,3):lower() ~= &quot;who&quot; then return end
   
   enableTrigger(&quot;Parse wholist&quot;)
   tempTimer(10, [[disableTrigger'Parse wholist']])


Follow ups