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

Proposed by Timothy Sartin
Status: Merged
Merged at revision: 74
Proposed branch: lp:~mudlet-makers/mudlet/prospectiveMapChanges
Merge into: lp:~mudlet-makers/mudlet/mapper-lua
Diff against target: 102 lines (+68/-2)
1 file modified
mudlet-mapper.xml (+68/-2)
To merge this branch: bzr merge lp:~mudlet-makers/mudlet/prospectiveMapChanges
Reviewer Review Type Date Requested Status
Vadim Peretokin Approve
Review via email: mp+85805@code.launchpad.net

Commit message

Merged Timothy's Imperian improvements

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Vadim Peretokin (vperetokin) wrote :

Looks fine, thanks! Looking forward to more contributions.

review: Approve
Revision history for this message
Vadim Peretokin (vperetokin) wrote :

Er missed this, but you need to have an equal number of regexCodePropertyList tags for each line. Otherwise importing errors out with a crash, even.

Revision history for this message
Timothy Sartin (tsartin2010) wrote :

Alright, I see where I missed adding the tags. I was manually copy pasting
lines in and must have forgotten to add that one. I actually have a
question about something similar. I was editing in mudlet rather than a
text editor for those triggers, I was wondering if there was a way to
export the whole package into one file, rather than just the script or just
triggers. Or would be easier to just edit in an editor and import the
changes to mudlet?

On Fri, Dec 16, 2011 at 2:47 PM, Vadim Peretokin <email address hidden>wrote:

> Er missed this, but you need to have an equal number of
> regexCodePropertyList tags for each line. Otherwise importing errors out
> with a crash, even.
> --
>
> https://code.launchpad.net/~mudlet-makers/mudlet/prospectiveMapChanges/+merge/85805
> You proposed lp:~mudlet-makers/mudlet/prospectiveMapChanges for merging.
>

Revision history for this message
Vadim Peretokin (vperetokin) wrote :

Using the recent test4b, you can import the single xml as a module. This'll
cause Mudlet not to embed the script in the profile, but instead save it
back to the xml when you save the profile - this is what I use, and it
helps. But you still edit in Mudlet, not an external editor - can't do do
the reloading the other way yet.

Revision history for this message
Timothy Sartin (tsartin2010) wrote :

How would I import them as a module instead of just normal importing?

Revision history for this message
Vadim Peretokin (vperetokin) wrote :

In latest Mudlet release, Toolbox -> Module manager is available.

Revision history for this message
Timothy Sartin (tsartin2010) wrote :

Great, thank you.

On Fri, Dec 16, 2011 at 9:31 PM, Vadim Peretokin <email address hidden>wrote:

> In latest Mudlet release, Toolbox -> Module manager is available.
>
> --
>
> https://code.launchpad.net/~mudlet-makers/mudlet/prospectiveMapChanges/+merge/85805
> You proposed lp:~mudlet-makers/mudlet/prospectiveMapChanges for merging.
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mudlet-mapper.xml'
2--- mudlet-mapper.xml 2011-12-13 20:29:59 +0000
3+++ mudlet-mapper.xml 2011-12-15 07:44:24 +0000
4@@ -58,6 +58,7 @@
5 <colorTriggerBgColor>#000000</colorTriggerBgColor>
6 <regexCodeList>
7 <string>You begin to slowly clamber over the rubble that blocks your way.</string>
8+ <string>You begin to slowly clamber over a pile of rubble that blocks your way.</string>
9 </regexCodeList>
10 <regexCodePropertyList>
11 <integer>3</integer>
12@@ -1202,7 +1203,7 @@
13 <colorTriggerFgColor>#000000</colorTriggerFgColor>
14 <colorTriggerBgColor>#000000</colorTriggerBgColor>
15 <regexCodeList>
16- <string>.+ - (.+?) - (.+)</string>
17+ <string>.+( \- [A-Z].+?\s*?) \- (.+)</string>
18 </regexCodeList>
19 <regexCodePropertyList>
20 <integer>1</integer>
21@@ -1280,6 +1281,69 @@
22 <regexCodePropertyList>
23 <integer>3</integer>
24 </regexCodePropertyList>
25+ <Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
26+ <name>Scout</name>
27+ <script>mmp.roomEcho(matches[3]) </script>
28+ <triggerType>0</triggerType>
29+ <conditonLineDelta>0</conditonLineDelta>
30+ <mStayOpen>0</mStayOpen>
31+ <mCommand></mCommand>
32+ <packageName></packageName>
33+ <mFgColor>#ff0000</mFgColor>
34+ <mBgColor>#ffff00</mBgColor>
35+ <mSoundFile></mSoundFile>
36+ <colorTriggerFgColor>#000000</colorTriggerFgColor>
37+ <colorTriggerBgColor>#000000</colorTriggerBgColor>
38+ <regexCodeList>
39+ <string>^ (.+) at (.+)$</string>
40+ </regexCodeList>
41+ <regexCodePropertyList>
42+ <integer>1</integer>
43+ </regexCodePropertyList>
44+ </Trigger>
45+ <Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
46+ <name>Scent</name>
47+ <script>mmp.roomEcho(matches[2]) </script>
48+ <triggerType>0</triggerType>
49+ <conditonLineDelta>0</conditonLineDelta>
50+ <mStayOpen>0</mStayOpen>
51+ <mCommand></mCommand>
52+ <packageName></packageName>
53+ <mFgColor>#ff0000</mFgColor>
54+ <mBgColor>#ffff00</mBgColor>
55+ <mSoundFile></mSoundFile>
56+ <colorTriggerFgColor>#000000</colorTriggerFgColor>
57+ <colorTriggerBgColor>#000000</colorTriggerBgColor>
58+ <regexCodeList>
59+ <string>^You detect traces of scent from (.+)\.$</string>
60+ </regexCodeList>
61+ <regexCodePropertyList>
62+ <integer>1</integer>
63+ </regexCodePropertyList>
64+ </Trigger>
65+ <Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
66+ <name>Hunt</name>
67+ <script>selectCurrentLine()
68+replace(&quot;&quot;)
69+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])
70+mmp.roomEcho(matches[3]) </script>
71+ <triggerType>0</triggerType>
72+ <conditonLineDelta>0</conditonLineDelta>
73+ <mStayOpen>0</mStayOpen>
74+ <mCommand></mCommand>
75+ <packageName></packageName>
76+ <mFgColor>#ff0000</mFgColor>
77+ <mBgColor>#ffff00</mBgColor>
78+ <mSoundFile></mSoundFile>
79+ <colorTriggerFgColor>#000000</colorTriggerFgColor>
80+ <colorTriggerBgColor>#000000</colorTriggerBgColor>
81+ <regexCodeList>
82+ <string>^You sense that (\w+) has entered (.+)\, (.+)\.$</string>
83+ </regexCodeList>
84+ <regexCodePropertyList>
85+ <integer>1</integer>
86+ </regexCodePropertyList>
87+ </Trigger>
88 </Trigger>
89 </TriggerGroup>
90 <TriggerGroup isActive="yes" isFolder="yes" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
91@@ -3591,8 +3655,10 @@
92 <name>mmp_parse_wholist</name>
93 <packageName></packageName>
94 <script>disableTrigger(&quot;Parse wholist&quot;)
95+
96 function mmp_parse_wholist(_, cmd)
97- if cmd ~= &quot;who&quot; then return end
98+
99+ if string.cut(cmd,3):lower() ~= &quot;who&quot; then return end
100
101 enableTrigger(&quot;Parse wholist&quot;)
102 tempTimer(10, [[disableTrigger'Parse wholist']])

Subscribers

People subscribed via source and target branches