diff --git a/script.toml b/script.toml index db60fc7..be370fc 100644 --- a/script.toml +++ b/script.toml @@ -1,11 +1,22 @@ Type = "lua" -Desc = "" +Intro = "" +Desc = "\n指令列表:\n\n1.任务命令:\nstart 师门任务\n\n#assist 协助任务机器人。\n关于协助任务，help quest\n两个id停在同一个地方\n低exp的id,把高exp的id设置在can_accept,比如set can_accept bao,然后#assist\n而高exp的id,#assist 低exp的id,比如 #assist mrbao\n\n#caxie 擦鞋机器人\n#beiqi 做备齐任务\n#letter 送信\n#fish 钓鱼\n#liandan 炼丹\n#stop 停止任务\n#dutable 读石桌\n#canwu 参悟洗髓经\n#dazuo 打坐内力\n#lian 练习技能\n\t格式如下:\n\t#lian dodge,parry,sword book 练习dodge,parry,读sword book\n\t#lian dodge>start 练习满dodge后执行start\n\t#lian dodge.feiyan-zoubi,dodge.shenxing-baibian<100 分别激活feiyan-zoubi和shenxing-baibian练习dodge,shenxing-baibian不超过100lv\n\t#lian dodge.feiyan-zoubi,parry book>#to 2046\n#kill 杀npc\n\t格式:#kill xxx或者 #kill xxx@123\n\n#make 做药\n\t格式:#make xxx 20\n\n2.其他命令:\n#to loc 到达某个地点,loc请参考rooms_all.\n#to npc 到达某个npc处.支持npc 中文名/id.具体信息储存在npcs.ini\nspwk 强制停止.\n#kl npc名 城市名 在xx城市杀xx npc\n\n\n\n变量列表:\n1.skilllist:技能列表，具体格式如下:\n技能(学习指令-npc名字-位置)\n其中除了 技能 都可以省略\n学习指令在80w exp前默认为xue,80w以后默认为yanjiu\n范例：\nliterate(xue-zhu xi) 朱熹处学习liteate\nforce 80w前师傅那里学force/80w后研究force\nhiggling(xue-戚长发-26)在26(客店) 向戚长发学习 higgling\ndodge(yanjiu) 研究dodge\n\n\n目前支持的学习指令包括:\nxue,yanjiu,jingxiu,closed,ask,lian\n\n\n\n\n2.goldmin: 数字,最少带多少黄金\n3.flylist: miss的列表,格式为: 命令%当成多少步计算:位置, 比如 miss sword:26%5,指miss sword可以到达26,同时这个动作在计算路径时当5步计算. 可以使用多个命令,每个都必须带 , 号.\n4.potmax: 多少pot去学习.0为不学习\n5.qixuemin:多少气血%去治疗\n6.neilinmin:低与多少内力去休息。\n7.tihuimax多少体会去汲取\n8.weapon 使用的武器 如果是zhenwu jian 之类的特殊门派武器，会自动ask\n9.weapon2 要磨的武器\n10.fightcuff kill后的用的空手技能，比如yun suck。\n11.jinlimin:最低精力\n12 killcmd :等信的时候执行的命令\n13 nuqimin 最小怒气,超过3000自动爆发.\n\n\n14.configfile:制定特别的config文件。\n默认是config.ini\n\n15.fight_preper: 战斗准备技能\n\n可以设成 config-dfcs.ini 东方传说\n\n遥控：\n把遥控者的id设为can_tell\n\n命令为do xxxx\n\n比如 tell bao do #fish\n\n\n解毒:\n\n自动吃聊天室地上的丹药解毒.\n以及budai of here里的9z。\n\n正常情况下，用本机器liandan 或者quest得到的gift会自动丢在相应位置。\n\n" OnOpen = "" OnClose = "" OnConnect = "" OnDisconnect = "on_disconnect" -OnBroadcast="on_broadcast" -Channel="helllua" +OnBroadcast = "on_broadcast" +OnFocus = "" +OnKeyUp = "" +OnHUDClick = "" +OnResponse = "" +OnAssist = "" +OnBuffer = "" +OnSubneg = "" +OnBufferMin = 0 +OnBufferMax = 5 +Channel = "helllua" + [[Triggers]] ID = "d1d3be7okrbkfu6eh7d37" Name = "status_onjifa" @@ -223,6 +234,37 @@ Channel="helllua" Italic = false Variable = "" +[[Triggers]] + ID = "d1d3be7okrbtkm7eh7d3e" + Name = "room1noexit" + Enabled = true + Match = "^(> )* 这里没有任何明显的出路(.*)$" + Send = "" + ColourChangeType = 0 + Colour = 0 + Wildcard = 0 + SoundFileName = "" + SoundIfInactive = false + Script = "walk_on_room1" + SendTo = 0 + Sequence = 100 + ExpandVariables = false + Temporary = false + OneShot = false + Regexp = true + Repeat = false + MultiLine = false + LinesToMatch = 0 + WildcardLowerCase = false + Group = "system" + IgnoreCase = false + KeepEvaluating = true + OmitFromLog = false + OmitFromOutput = false + Inverse = false + Italic = false + Variable = "" + [[Triggers]] ID = "d1d3be7okrburv6eh7d3f" Name = "walk_npc2" @@ -351,7 +393,7 @@ Channel="helllua" ID = "d1d3be7okrc6486eh7d3l" Name = "info_fail" Enabled = false - Match = "^(> )*(船夫)(摇摇头，说道：没听说过。|疑惑地看着你，摇了摇头。|睁大眼睛望着你，显然不知道你在说什么。|耸了耸肩，很抱歉地说：无可奉告。|说道：嗯....这我可不清楚，你最好问问别人吧。|想了一会儿，说道：对不起，你问的事我实在没有印象。)" + Match = "^(> )*(店小二)(摇摇头，说道：没听说过。|疑惑地看着你，摇了摇头。|睁大眼睛望着你，显然不知道你在说什么。|耸了耸肩，很抱歉地说：无可奉告。|说道：嗯....这我可不清楚，你最好问问别人吧。|想了一会儿，说道：对不起，你问的事我实在没有印象。)" Send = "" ColourChangeType = 0 Colour = 0 @@ -382,7 +424,7 @@ Channel="helllua" ID = "d1d3be7okrc7b46eh7d3m" Name = "info_retry" Enabled = false - Match = "^(> )*(船夫)说道：(阿嚏！有点感冒，不好意思。|等...等等，你说什么？没听清楚。|嗯，稍等啊，就好... 好了，你刚才说啥？|这个... 这个... 哦，好了，啊？你问我呢？|唉呦！... 不好意思，是你问我么？|就好... 就好... 好了，你说啥？|你干啥？没看我忙着呢么？|!)" + Match = "^(> )*(店小二)说道：(阿嚏！有点感冒，不好意思。|等...等等，你说什么？没听清楚。|嗯，稍等啊，就好... 好了，你刚才说啥？|这个... 这个... 哦，好了，啊？你问我呢？|唉呦！... 不好意思，是你问我么？|就好... 就好... 好了，你说啥？|你干啥？没看我忙着呢么？|!)" Send = "" ColourChangeType = 0 Colour = 0 @@ -505,7 +547,7 @@ Channel="helllua" [[Triggers]] ID = "d1d3be7okrcd7u6eh7d3r" Name = "steppath_fail" - Enabled = true + Enabled = false Match = "^(> )*(你看着浩瀚的太湖，心里不禁打了个突，没敢乱来。|你觉得湖面太宽，没有十足的把握跃过去。|打手一把抓住了你，说道:“这里不是女人该来的地方，你别进去。”|你一抬足，发现地上有毒，忙抽腿退回。)" Send = "" ColourChangeType = 0 @@ -785,7 +827,7 @@ Channel="helllua" ID = "d1d3be7okrcp7g6eh7d45" Name = "status_onfamily" Enabled = false - Match = "^(> )*◎HELL.DE◎ 目前江湖中的 \\((.*)\\) 玩家有：" + Match = "^(> )*◎终极地狱◎ 目前江湖中的 \\((.*)\\) 玩家有：" Send = "" ColourChangeType = 0 Colour = 0 @@ -847,7 +889,7 @@ Channel="helllua" ID = "d1d3be7okrcri56eh7d47" Name = "beiqi_infook" Enabled = false - Match = "^(> )*店小二说道：据说(.*)的黄衣卫士急需一批(.*)。嘿！你说他想干什么？$" + Match = "^(> )*店小二说道：据说(.*)的西夏兵急需一批(.*)。嘿！你说他想干什么？$" Send = "" ColourChangeType = 0 Colour = 0 @@ -878,7 +920,7 @@ Channel="helllua" ID = "d1d3be7okrcsmn6eh7d48" Name = "letter_quest" Enabled = false - Match = "^(> )*洪七公吩咐你在.*之前把信件送到(.*)手中，取回执交差。\\n据闻不久前此人曾经在(.*)。$" + Match = "^(> )*张三丰吩咐你在.*之前把信件送到(.*)手中，取回执交差。\\n据闻不久前此人曾经在(.*)。$" Send = "" ColourChangeType = 0 Colour = 0 @@ -1121,6 +1163,7 @@ Channel="helllua" Inverse = false Italic = false Variable = "" + [[Triggers]] ID = "d1d3be7okrdc7u6eh7d4g" Name = "walk_slfail" @@ -1151,6 +1194,7 @@ Channel="helllua" Inverse = false Italic = false Variable = "" + [[Triggers]] ID = "d1d3be7okrddeh6eh7d4h" Name = "system_onfight" @@ -1589,7 +1633,7 @@ Channel="helllua" ID = "d1d3be7okre6856eh7d51" Name = "status_oncha" Enabled = false - Match = "^(□| )(.+)\\s*\\(([a-z-]+)\\)\\s*-\\s*(\\d+)/\\s*(\\d+)%" + Match = "^│(□| )(.+)\\s*\\(([a-z-]+)\\)\\s*-\\s*【.+】\\s*(\\d+)/\\s*(\\d+)\\s*│$" Send = "" ColourChangeType = 0 Colour = 0 @@ -1682,7 +1726,7 @@ Channel="helllua" ID = "d1d3be7okre9o96eh7d54" Name = "status_onhpjinqi" Enabled = false - Match = "^【 精 气 】\\s*(\\d+)\\s*/\\s*(\\d+)\\s*\\(\\s*(\\d+)%\\)\\s*【 精 力 】\\s*(\\d+)\\s*/\\s*(\\d+)\\s*\\(\\s*\\+(\\d+)\\)" + Match = "^│【精气】\\s*(\\d+)\\s*/\\s*(\\d+)\\s*\\[\\s*(\\d+)%\\]\\s*│\\s*【精力】\\s*(\\d+)\\s*/\\s*(\\d+)\\s*\\(\\+\\s*(\\d+)\\)\\s*│$" Send = "" ColourChangeType = 0 Colour = 0 @@ -1713,7 +1757,7 @@ Channel="helllua" ID = "d1d3be7okreasp6eh7d55" Name = "status_onhpqixue" Enabled = false - Match = "^【 气 血 】\\s*(\\d+)\\s*/\\s*(\\d+)\\s*\\(\\s*(\\d+)%\\)\\s*【 内 力 】\\s*(\\d+)\\s*/\\s*(\\d+)\\s*\\(\\s*\\+(\\d+)\\)" + Match = "^│【气血】\\s*(\\d+)\\s*/\\s*(\\d+)\\s*\\[\\s*(\\d+)%\\]\\s*│\\s*【内力】\\s*(\\d+)\\s*/\\s*(\\d+)\\s*\\(\\+\\s*(\\d+)\\)\\s*│$" Send = "" ColourChangeType = 0 Colour = 0 @@ -1744,7 +1788,7 @@ Channel="helllua" ID = "d1d3be7okrec0q6eh7d56" Name = "status_onhpfood" Enabled = false - Match = "^【 食 物 】\\s*(\\d+)/\\s*(\\d+)\\s*【 潜 能 】\\s*(\\d+)$" + Match = "^│【食物】\\s*(\\d+)\\s*/\\s*(\\d+)\\s*\\[.+\\]\\s+│【潜能】\\s*(\\d+)\\s*│$" Send = "" ColourChangeType = 0 Colour = 0 @@ -1775,7 +1819,7 @@ Channel="helllua" ID = "d1d3be7okred5j6eh7d57" Name = "status_onhpwater" Enabled = false - Match = "^【 饮 水 】\\s*(\\d+)/\\s*(\\d+)\\s*【 经 验 】\\s*(\\d+)$" + Match = "^│【饮水】\\s*(\\d+)\\s*/\\s*(\\d+)\\s*\\[.+\\]\\s+│【经验】\\s*(\\d+)\\s*│$" Send = "" ColourChangeType = 0 Colour = 0 @@ -1865,7 +1909,69 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkko9k71jkrj8g" + ID = "d1f1k6r7o1quij73qe0jk0" + Name = "status_onteachernew" + Enabled = true + Match = "^│性别：(\\S+)\\s*伴侣：\\S+\\s*│师承：(\\S+)\\s*│$" + Send = "" + ColourChangeType = 0 + Colour = 0 + Wildcard = 0 + SoundFileName = "" + SoundIfInactive = false + Script = "status_onteachernew" + SendTo = 0 + Sequence = 100 + ExpandVariables = false + Temporary = false + OneShot = false + Regexp = true + Repeat = false + MultiLine = false + LinesToMatch = 0 + WildcardLowerCase = false + Group = "system" + IgnoreCase = false + KeepEvaluating = false + OmitFromLog = false + OmitFromOutput = false + Inverse = false + Italic = false + Variable = "" + +[[Triggers]] + ID = "d1f1l1jgo9fmus73qfhq81" + Name = "on_obj" + Enabled = false + Match = "^ ([^()]+)\\(([A-Za-z0-9_ ]+)\\)(\\s*[\\<\\[].+[\\>\\]]){0,1}$" + Send = "" + ColourChangeType = 0 + Colour = 0 + Wildcard = 0 + SoundFileName = "" + SoundIfInactive = false + Script = "on_obj" + SendTo = 0 + Sequence = 100 + ExpandVariables = false + Temporary = false + OneShot = false + Regexp = true + Repeat = false + MultiLine = false + LinesToMatch = 0 + WildcardLowerCase = false + Group = "roomobj" + IgnoreCase = false + KeepEvaluating = false + OmitFromLog = false + OmitFromOutput = false + Inverse = false + Italic = false + Variable = "" + +[[Triggers]] + ID = "d1f1l2jc7ss49n73qfkkp3" Name = "remote" Enabled = true Match = "^(> )*[^~].{1,4}\\((.*)\\)告诉你：do (.+)" @@ -1896,7 +2002,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqklf1i71jkrj8h" + ID = "d1f1l2jc7sskmt73qfkkp4" Name = "cantell" Enabled = false Match = "^can_tell\\s*\"(.+)\"" @@ -1927,7 +2033,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqklo5871jkrj8i" + ID = "d1f1l2jc7ssslo73qfkkp5" Name = "canaccept" Enabled = false Match = "^can_accept\\s*\"(.+)\"" @@ -1958,9 +2064,9 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqklvm471jkrj8j" + ID = "d1f1l2jc7st30f73qfkkp6" Name = "mqletter" - Enabled = true + Enabled = false Match = "^(> )*(突然一位|忽听“嗖”的一声|你转身一看|你一回头|你正欲离开|只见你刚想离开|只听扑倏扑倏几声)(.*)(弟子急急忙忙地跑了上来，拍拍你的肩膀|一件暗器从你背后飞来|竟见到一只灰点信鸽飞至身旁，你赶紧|只见一位同门装束的弟子满头大汗地跑了过来|忽然发现不远处的地上一块石头上刻着些什么|一位同门装束的弟子追了上来|一只白鸽飞了过来，落在你肩头)" Send = "" ColourChangeType = 0 @@ -1989,10 +2095,10 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkm77871jkrj8k" + ID = "d1f1l2jc7st7ve73qfkkp7" Name = "block_onnpc" Enabled = true - Match = "^(> )*(.*)(喝道：这位.*休走！|上前挡住你，朗声说道：这位|喝道：“威……武……。”|挡住了你：|伸手拦住你白眼一翻说道：千年以来|拦住你|迈步挡在你身前，双手合什说道：|大声喝道：他奶奶的，你要干嘛？|拦住你道：没有王爷的吩咐，谁也不能进去。|挡住你|一把抓住了你，说道：“咱们这里是有规矩的地方，不准带武器进入。”飞身挡住你的去路，脸上一丝表情也没有！|扭身挡住，脸上没有一点笑容！|笑嘻嘻地挡住你的去路：再玩玩才走啦。气得你半死！|一把拦住你：瞎窜什么，过来吧你给我！|一把拦住你：要上楼，先过了我这关！|哈哈一笑：这里还没打过呢，就想上楼|俏眼一瞪：没看见本姑娘在这里吗？|大喝一声：哪里走？滚下来！|冷哼一声：想走？放着十二郎在这你就给我留下来！|大吼一声：我有九条命，你有几条？放马过来！|大吼一声，执鞭拦在楼梯口！|长刀一摆，挡住你的去路，一言不发！|吹着白胡子，挡在楼梯口|用冷森森的眼光扫了你一眼，你迈向楼梯的脚吓了一哆嗦|长剑电闪，一下就刺到了楼梯口|对你道：对不起，不是我们华山派的人请勿入本派重地。)" + Match = "^(> )*(.*)(拦住你道|上前挡住你，朗声说道：|一把拦住你，喝道：|美目一挑，想走，没门！|喝道：“威……武……|向你喝道：什么人|拦住了你的去路|伸手拦住你说道|喝道：别乱逛|拦住你说：此处乃明教重地|对你道：对不起|喝道：这位|伸手拦住你白眼一翻说道|拦住你说道|迈步挡在你身前|一把拦住你|哈哈一笑|俏眼一瞪|大喝一声|冷哼一声|大吼一声|长刀一摆|飞身挡住你的去路|扭身挡住|笑嘻嘻地挡住你的去路|吹着白胡子|用冷森森的眼光扫了你一眼|长剑电闪|对你道：善哉，后殿|说道: 你未经许可|大声喝道：他奶奶的，你要干嘛|挡住了你：我的小妞可不是给你们邪派弟子准备的！)" Send = "" ColourChangeType = 0 Colour = -1 @@ -2020,7 +2126,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkmhf071jkrj8l" + ID = "d1f1l2jc7stdbb73qfkkp8" Name = "mqlettercontent" Enabled = false Match = "^(> )*“字谕弟子(.*?)：(得闻恶贼|武林人士|得闻所谓大侠)(.*?)(屡次和我派作对|打家劫舍|所为甚是讨厌)(.*)\\n(.*)出没，正是大好机会将他除去" @@ -2038,8 +2144,8 @@ Channel="helllua" OneShot = false Regexp = true Repeat = false - MultiLine = false - LinesToMatch = 0 + MultiLine = true + LinesToMatch = 2 WildcardLowerCase = false Group = "mqletter" IgnoreCase = false @@ -2051,10 +2157,10 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkpau071jkrj99" + ID = "d1f1l2jc7svdfd73qfkkps" Name = "mqletterquest" Enabled = false - Match = "^(> )*苏星河吩咐你在(.*)之前割下(.*)的人头，回(.*)交差。\\n据说此人前不久曾经在(.*)出没。" + Match = "^(> )*洪七公吩咐你在(.*)之前割下(.*)的人头，回(.*)交差。\\n据说此人前不久曾经在(.*)出没。" Send = "" ColourChangeType = 0 Colour = -1 @@ -2069,8 +2175,8 @@ Channel="helllua" OneShot = false Regexp = true Repeat = false - MultiLine = false - LinesToMatch = 0 + MultiLine = true + LinesToMatch = 2 WildcardLowerCase = false Group = "mqletterquest" IgnoreCase = false @@ -2082,7 +2188,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkq1oj71jkrj9a" + ID = "d1f1l2jc7svlpg73qfkkpt" Name = "mqquestnum" Enabled = false Match = "^师长交给你的任务，你已经连续完成了\\s*(\\d*)\\s*个。" @@ -2113,9 +2219,9 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkq9gl71jkrj9b" + ID = "d1f1l2jc7svrfs73qfkkpu" Name = "mqlettertimeout" - Enabled = true + Enabled = false Match = "^(> )*你(皱了皱眉，道：“我还是不去了，你让师傅|摇了摇头，将信函随手一撕。)" Send = "" ColourChangeType = 0 @@ -2144,7 +2250,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkqfrj71jkrj9c" + ID = "d1f1l2jc7t00ch73qfkkpv" Name = "unwield" Enabled = true Match = "^(> )*练.*必须空手。" @@ -2175,7 +2281,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkqmjo71jkrj9d" + ID = "d1f1l2jc7t04vk73qfkkq0" Name = "sell_broken" Enabled = true Match = "^(> )*唐楠随手一扔，道：(.*)一文不值！" @@ -2206,7 +2312,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkqu0c71jkrj9e" + ID = "d1f1l2jc7t0a2g73qfkkq1" Name = "pick_full" Enabled = false Match = "^(> )*((.*)对你而言太重了。|你身上的东西实在是太多了，没法再拿东西了。)" @@ -2237,7 +2343,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkr4sd71jkrj9f" + ID = "d1f1l2jc7t0frf73qfkkq2" Name = "walk_boatout" Enabled = true Match = "^(> )*(少女说: “到啦，上岸吧。”，随即一点竹篙，把舟泊好。|艄公说“到啦，上岸吧”，随即把一块踏脚板搭上堤岸。)" @@ -2268,7 +2374,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkrsi471jkrj9g" + ID = "d1f1l2jc7t0kn773qfkkq3" Name = "walk_taihucrossfail" Enabled = true Match = "^(> )*(你觉得湖面太宽，没有十足的把握跃过去。|你看着浩瀚的太湖，心里不禁打了个突，没敢乱来。|你使劲儿一蹦，离瀑布顶还有数丈远就掉了下来，摔的鼻青)" @@ -2299,7 +2405,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqks3ts71jkrj9h" + ID = "d1f1l2jc7t0pa473qfkkq4" Name = "kanbush" Enabled = true Match = "^(> )*不用武器恐怕不行吧|要刺墙不用家伙恐怕不行吧！" @@ -2330,7 +2436,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqksa0i71jkrj9i" + ID = "d1f1l2jc7t0u5a73qfkkq5" Name = "walk_gwriver" Enabled = true Match = "^(> )*(你觉得河面太宽，没有十足的把握跃过去。|你看着奔腾不息的白河，心里有点紧张，不敢乱来。|船厂里走出一个船夫，瞪着眼看着你|船夫在旁边拿眼瞪着你看)" @@ -2361,7 +2467,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqksgkv71jkrj9j" + ID = "d1f1l2jc7t138q73qfkkq6" Name = "mqletterflee" Enabled = false Match = "^(不好了，(.*)在|你刚想离开，突然(.*)喊道)" @@ -2392,7 +2498,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqksnfo71jkrj9k" + ID = "d1f1l2jc7t17l173qfkkq7" Name = "giftbaoguofail" Enabled = false Match = "^(> )*(包裹|布袋)里面的东西实在是太多了，你先好好整理整理吧。" @@ -2423,10 +2529,10 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqksuk471jkrj9l" + ID = "d1f1l2jc7t1c1a73qfkkq8" Name = "giftbaoguoheavy" Enabled = false - Match = "^(> )*([^`].(..){1,4})对包裹而言太重了。" + Match = "^(> )*([^`].(..){1,7})对包裹而言太重了。" Send = "" ColourChangeType = 0 Colour = -1 @@ -2454,7 +2560,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkt4t671jkrj9m" + ID = "d1f1l2jc7t1gm573qfkkq9" Name = "enterchatfail" Enabled = false Match = "^(> )*(没有这个聊天室。|人家不欢迎你，你还是别去扫兴了。)" @@ -2485,7 +2591,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqktbei71jkrj9n" + ID = "d1f1l2jc7t1lfs73qfkkqa" Name = "mudvar_chatroom" Enabled = false Match = "^chatroom\\s*=\\s*(.+)" @@ -2516,7 +2622,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkthfr71jkrj9o" + ID = "d1f1l2jc7t1qer73qfkkqb" Name = "mudvar_eatjz" Enabled = false Match = "^eat9z\\s*=\\s*(.+)" @@ -2547,7 +2653,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkto6d71jkrj9p" + ID = "d1f1l2jc7t1vkt73qfkkqc" Name = "mudvar_dragon" Enabled = false Match = "^dragon\\s*=\\s*(.+)" @@ -2578,7 +2684,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqktv7e71jkrj9q" + ID = "d1f1l2jc7t24th73qfkkqd" Name = "mudvar_nopowerup" Enabled = false Match = "^nopowerup\\s*=\\s*(.+)" @@ -2609,10 +2715,10 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqku61g71jkrj9r" + ID = "d1f1l2jc7t297u73qfkkqe" Name = "mqhelper1" Enabled = false - Match = "^(> )*樊译(大声喝道：“好一个|忽然撮舌吹哨，你听了不禁微微一愣。|一声长啸，声音绵泊不绝，远远的传了开去。)" + Match = "^(> )*bao(大声喝道：“好一个|忽然撮舌吹哨，你听了不禁微微一愣。|一声长啸，声音绵泊不绝，远远的传了开去。)" Send = "" ColourChangeType = 0 Colour = -1 @@ -2640,7 +2746,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkucsa71jkrj9s" + ID = "d1f1l2jc7t2ekp73qfkkqf" Name = "mqhelper" Enabled = false Match = "^(> )*说时迟，那时快！突然转出(.*)个人，一起冲上前来，看来是早有防备！$" @@ -2671,7 +2777,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkukum71jkrj9t" + ID = "d1f1l2jc7t2jt273qfkkqg" Name = "l_2369" Enabled = false Match = "^ 这是一片空地，四周都是乱石，杂草丛生。北边是一间小屋。南" @@ -2702,7 +2808,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkurhi71jkrj9u" + ID = "d1f1l2jc7t2oo273qfkkqh" Name = "l_1733" Enabled = false Match = "^ 这是一片茂密的青竹林，一走进来，你仿佛迷失了方向。" @@ -2733,7 +2839,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkv3qo71jkrj9v" + ID = "d1f1l2jc7t2tkf73qfkkqi" Name = "l_2366" Enabled = false Match = "^ 这里就是神龙岛了。南边是一望无际的大海；" @@ -2764,9 +2870,9 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkva1771jkrja0" + ID = "d1f1l2jc7t32ar73qfkkqj" Name = "on_partyhelp" - Enabled = true + Enabled = false Match = "^(> )*【(明教|天地会)】.{1,4}\\[(.*)\\]：helllua-help-(.*)-(.*)" Send = "" ColourChangeType = 0 @@ -2795,9 +2901,9 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkvgfc71jkrja1" + ID = "d1f1l2jc7t373i73qfkkqk" Name = "on_partyfind" - Enabled = true + Enabled = false Match = "^(> )*【(明教|天地会)】.{1,4}\\[(.*)\\]：helllua.find-(.*)-(.*)-(.*)-(.*)" Send = "" ColourChangeType = 0 @@ -2826,7 +2932,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkvmnl71jkrja2" + ID = "d1f1l2jc7t3bj673qfkkql" Name = "event_dragonfind" Enabled = false Match = "^(> )*【(明教|天地会)】.{1,4}\\[(.*)\\]：helllua.dragon-(.*)-(.*)-(.*)" @@ -2857,7 +2963,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqkvt0a71jkrja3" + ID = "d1f1l2jc7t3ged73qfkkqm" Name = "event_dragonfind2" Enabled = false Match = "^(> )*【(明教|天地会)】.{1,4}\\[(.*)\\]：Dragon：()().+\\.(.*)" @@ -2888,7 +2994,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql0c5q71jkrja5" + ID = "d1f1l2jc7t3shl73qfkkqo" Name = "study_fail" Enabled = false Match = "^(> )*(你今天太累了，结果什么也没有研究成。|然而你今天太累了|也许是缺乏实战经验|你要向谁求教？|你的.*火候不够|你的.*水平有限|这项技能你的程度已经不输你师父了。|这项技能你恐怕必须找别人学了|[^a-zA-Z0-9、 ()【】.。,，:：;；?？!！]+说：嗯.... 你的.*功力已经是非同凡响了，我就不再教你，你自己多研究吧。|你对.*的掌握程度还未到研究的程度。)" @@ -2919,7 +3025,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql0r4371jkrja6" + ID = "d1f1l2jc7t46q573qfkkqp" Name = "status_onrank" Enabled = false Match = "^(> )*你现在的江湖头衔：(.*)" @@ -2950,10 +3056,10 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql11hu71jkrja7" + ID = "d1f1l2jc7t4c3u73qfkkqq" Name = "status_onname" Enabled = false - Match = "^(> )*【 少 女 】.*( |」)((..){1,4})\\(\\w+\\)$" + Match = "^(> )*rank.*( |」)((..){1,4})\\(\\w+\\)$" Send = "" ColourChangeType = 0 Colour = -1 @@ -2981,7 +3087,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql17f471jkrja8" + ID = "d1f1l2jc7t4hbp73qfkkqr" Name = "mqinfosl" Enabled = false Match = "^(最近)(.*)(在)(.*)作恶多端，你去把他除了，提头来见。”" @@ -3012,7 +3118,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql1e1e71jkrja9" + ID = "d1f1l2jc7t4mr373qfkkqs" Name = "systemlogdelay" Enabled = true Match = "^你不能在 .* 秒钟之内连续重新连线。" @@ -3043,7 +3149,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql1jg671jkrjaa" + ID = "d1f1l2jc7t4rgm73qfkkqt" Name = "npc_killme" Enabled = true Match = "^(> )*(.{1,4})(一见到你|和你一碰面|对著你大喝：「可恶|喝道：「你|一眼瞥见你|和你仇人相见分外眼红)" @@ -3074,7 +3180,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql1q2b71jkrjab" + ID = "d1f1l2jc7t500673qfkkqu" Name = "walk_busy" Enabled = true Match = "^(> )*(你的动作还没有完成，不能移动|你逃跑失败|你被拦住了去路|你突然发现眼前的景象有些迷乱|你太累了，还是休息一会儿吧|你的内力不够，还是休息一下再说吧|现在白雕正忙着|只听得湖面上隐隐传来：“就来了啦……”|只听得湖面上隐隐传来：“别急嘛，这儿正忙着呐……”)" @@ -3105,7 +3211,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql20r071jkrjac" + ID = "d1f1l2jc7t549q73qfkkqv" Name = "l_1136" Enabled = false Match = "^ 这里是少林寺前的广场，整个广场由大块的青石铺成，极为" @@ -3136,7 +3242,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql26a971jkrjad" + ID = "d1f1l2jc7t593f73qfkkr0" Name = "l_1673" Enabled = false Match = "^ 这里是六和塔的底层。窗\\(window\\)外是浓妆淡抹的西子湖" @@ -3167,7 +3273,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql2c5j71jkrjae" + ID = "d1f1l2jc7t5e2n73qfkkr1" Name = "l_2298" Enabled = false Match = "^ 这里是六和塔的二层。窗\\(window\\)外是浓妆淡抹的西子湖" @@ -3198,7 +3304,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql2het71jkrjaf" + ID = "d1f1l2jc7t5iee73qfkkr2" Name = "l_2299" Enabled = false Match = "^ 这里是六和塔的三层。窗\\(window\\)外是浓妆淡抹的西子湖" @@ -3229,7 +3335,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql2mup71jkrjag" + ID = "d1f1l2jc7t5mrt73qfkkr3" Name = "l_2300" Enabled = false Match = "^ 这里是六和塔的四层。窗\\(window\\)外是浓妆淡抹的西子湖" @@ -3260,7 +3366,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql2s9e71jkrjah" + ID = "d1f1l2jc7t5r4773qfkkr4" Name = "l_2301" Enabled = false Match = "^ 这里是六和塔的五层。窗\\(window\\)外是浓妆淡抹的西子湖" @@ -3291,7 +3397,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql32p171jkrjai" + ID = "d1f1l2jc7t5vv873qfkkr5" Name = "l_2302" Enabled = false Match = "^ 这里是六和塔的六层。窗\\(window\\)外是浓妆淡抹的西子湖" @@ -3322,7 +3428,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql37v271jkrjaj" + ID = "d1f1l2jc7t64b573qfkkr6" Name = "l_2303" Enabled = false Match = "^ 这里是六和塔的七层。窗\\(window\\)外是浓妆淡抹的西子湖" @@ -3353,7 +3459,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql3d3j71jkrjak" + ID = "d1f1l2jc7t68t773qfkkr7" Name = "l_2304" Enabled = false Match = "^ 这里是六和塔的八层。窗\\(window\\)外是浓妆淡抹的西子湖" @@ -3384,7 +3490,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql3i9b71jkrjal" + ID = "d1f1l2jc7t6di973qfkkr8" Name = "l_2305" Enabled = false Match = "^ 这里是六和塔的九层。窗\\(window\\)外是浓妆淡抹的西子湖" @@ -3415,7 +3521,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql3ndk71jkrjam" + ID = "d1f1l2jc7t6i0p73qfkkr9" Name = "l_26" Enabled = false Match = "^ 这是一家价钱低廉的客栈，生意非常兴隆。外地游客多选择这里落脚，你" @@ -3446,7 +3552,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql3uns71jkrjan" + ID = "d1f1l2jc7t6ncm73qfkkra" Name = "l_54" Enabled = false Match = "^ 这是南城门，城墙被当成了广告牌，贴满了花花绿绿各行各业的广告，" @@ -3477,7 +3583,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql442971jkrjao" + ID = "d1f1l2jc7t6ru973qfkkrb" Name = "l_34" Enabled = false Match = "^ 这是北城门，因为曾经失火，到现在城墙还是黑乎乎的，因此白纸" @@ -3508,7 +3614,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql49os71jkrjap" + ID = "d1f1l2jc7t70c473qfkkrc" Name = "jiqu_fail" Enabled = true Match = "^(> )*(你的实战经验太浅，还无法领会通过实战获得的心得。|你感觉自己的实战经验还有欠缺，还无法领会更高境界的武学修养。|你现在精神不济，难以抓住实战体会中的秘要！|你现在没有充足的体力用来吸收实战的心得。)" @@ -3539,10 +3645,10 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql4g6u71jkrjaq" + ID = "d1f1l2jc7t74iu73qfkkrd" Name = "study_needweapon" Enabled = false - Match = "^(> )*你必须先找一.*才能练.*法。" + Match = "^(> )*你必须先找一.*才能.*法。" Send = "" ColourChangeType = 0 Colour = -1 @@ -3570,7 +3676,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql4m5871jkrjar" + ID = "d1f1l2jc7t79h573qfkkre" Name = "items_onbagsstart" Enabled = false Match = "^(> )*设定环境变数：no_more = \"getbag-(.+)\"$" @@ -3601,7 +3707,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql4sam71jkrjas" + ID = "d1f1l2jc7t7e4673qfkkrf" Name = "items_onbagsend" Enabled = false Match = "^(> )*设定环境变数：no_more = \"getbagend\"$" @@ -3632,7 +3738,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql52bf71jkrjat" + ID = "d1f1l2jc7t7je673qfkkrg" Name = "walk_maxstep" Enabled = true Match = "^(> )*设定环境变数：no_more = \"maxstep\"$" @@ -3663,7 +3769,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql5et771jkrjau" + ID = "d1f1l2jc7t7sa673qfkkrh" Name = "items_onbagitems" Enabled = false Match = "^ ([^a-z!@#$%\\^&*()\\\\/.,<> ]+)\\((\\w*\\s{0,1}\\w+)\\)$" @@ -3694,7 +3800,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql5kga71jkrjav" + ID = "d1f1l2jc7t811173qfkkri" Name = "heal_danbusy" Enabled = false Match = "^(> )*你的内力不足，无法运满一个周天。$" @@ -3725,7 +3831,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql5qdn71jkrjb0" + ID = "d1f1l2jc7t86ie73qfkkrj" Name = "heal_neilifail" Enabled = false Match = "^(> )*你刚服用过药，需药性发挥完效用以后才能继续服用。$" @@ -3756,10 +3862,10 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql609f71jkrjb1" + ID = "d1f1l2jc7t8bjl73qfkkrk" Name = "status_onhptihui" Enabled = false - Match = "^(【 平 和 】|【 愤 怒 】)\\s*([^/ ]*).*【 体 会 】(.*)$" + Match = "^│\\s*│【体会】\\s*(\\d+)\\s*│$" Send = "" ColourChangeType = 0 Colour = -1 @@ -3787,7 +3893,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql66kk71jkrjb2" + ID = "d1f1l2jc7t8fod73qfkkrl" Name = "on_getweapon" Enabled = true Match = "^(> )*你手腕一麻，手中(.*)不由脱手而出！" @@ -3818,7 +3924,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql6c0l71jkrjb3" + ID = "d1f1l2jc7t8k7473qfkkrm" Name = "study_gold" Enabled = false Match = "^(> )*(朱熹|厨娘|戚长发)(说道：您太客气了，这怎么敢当？|笑着说道：您见笑了，我这点雕虫小技怎够资格「指点」您什么？|像是受宠若惊一样，说道：请教？这怎么敢当？)" @@ -3849,7 +3955,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql6hd571jkrjb4" + ID = "d1f1l2jc7t8p2f73qfkkrn" Name = "askyouok" Enabled = false Match = "^(> )*游讯嘿嘿奸笑两声，对你小声道：“没有问题，不过得要50两黄金，不二价！”" @@ -3880,7 +3986,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql6n0a71jkrjb5" + ID = "d1f1l2jc7t8udd73qfkkro" Name = "makeyao_buy" Enabled = false Match = "^(> )*你点了点药材，发现(.*)的分量还不够。" @@ -3911,7 +4017,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql6t4t71jkrjb6" + ID = "d1f1l2jc7t93m573qfkkrp" Name = "makeyao_fail" Enabled = false Match = "^(> )*你还不会配这种药啊！" @@ -3942,7 +4048,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql72k871jkrjb7" + ID = "d1f1l2jc7t986p73qfkkrq" Name = "makeyao_ok" Enabled = false Match = "^(> )*你把「%%%」成功的制好了！" @@ -3973,7 +4079,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql78gb71jkrjb8" + ID = "d1f1l2jc7t9cir73qfkkrr" Name = "mqassistkill" Enabled = false Match = "^(> )*你对著sss喝道：" @@ -4004,7 +4110,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql7ejg71jkrjb9" + ID = "d1f1l2jc7t9mt373qfkkrs" Name = "mqassister" Enabled = false Match = "^(> )*([^`].(..){1,3})决定帮助你一同完成任务，你是否同意\\(right\\|refuse (.+)\\)？" @@ -4035,7 +4141,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql7ksa71jkrjba" + ID = "d1f1l2jc7t9sb273qfkkrt" Name = "mqassistor" Enabled = false Match = "^(> )*([^`].(..){1,3})愿意接受你的帮助。" @@ -4066,7 +4172,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql7r1971jkrjbb" + ID = "d1f1l2jc7ta2a773qfkkru" Name = "mqassistreport" Enabled = false Match = "^(> )*你告诉ssss\\(Ddddd\\)" @@ -4097,7 +4203,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql81ih71jkrjbc" + ID = "d1f1l2jc7ta76a73qfkkrv" Name = "mqassistnpc" Enabled = false Match = "^(> )*ssss\\(Ddddd\\)告诉你：npckill\\.(.*)\\.(.*)\\.(.*)" @@ -4128,7 +4234,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql87bn71jkrjbd" + ID = "d1f1l2jc7tac0o73qfkks0" Name = "mqassistok" Enabled = false Match = "^(> )*ssss\\(Ddddd\\)告诉你：npckillok" @@ -4159,7 +4265,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql8der71jkrjbe" + ID = "d1f1l2jc7tagmn73qfkks1" Name = "walk_onnoweapon" Enabled = true Match = "^(> )*(张翠山道：“各色人等，到解剑岩都需解剑，千百年来概无例外！”你慑于武当山规，|王五上前挡住你，朗声说道：这位)" @@ -4190,7 +4296,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql8k5871jkrjbf" + ID = "d1f1l2jc7tal6a73qfkks2" Name = "item_needfill" Enabled = true Match = "^(> )*你从.*那里买下了(一|二|三|四|五|六|七|八|九|十|百)+..牛皮水袋。" @@ -4221,7 +4327,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql8v4271jkrjbh" + ID = "d1f1l2jc7taubv73qfkks4" Name = "system_login" Enabled = true Match = "目前共有 \\d* 位巫师、\\d* 位玩家在线上，以及 \\d* 位使用者尝试连线中。" @@ -4252,7 +4358,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql95sp71jkrjbi" + ID = "d1f1l2jc7tb3f273qfkks5" Name = "status_testtouch" Enabled = false Match = "^(> )*你轻轻一弹.*，长吟道：“别来无恙乎？|你轻轻抚过.*，感慨良深，作古风一首，.*铃铃作响，似以和之。|你抓着.*，沉思良久。" @@ -4283,7 +4389,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql9blb71jkrjbj" + ID = "d1f1l2jc7tb92973qfkks6" Name = "missok" Enabled = true Match = "^(> )*你口中念念有词，转瞬天际一道长虹划过，你驾彩虹而走。" @@ -4314,7 +4420,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql9hes71jkrjbk" + ID = "d1f1l2jc7tbdpq73qfkks7" Name = "walkdogkill" Enabled = true Match = "^(> )*看起来(.*)想杀死你！" @@ -4345,7 +4451,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql9nh671jkrjbl" + ID = "d1f1l2jc7tbi0573qfkks8" Name = "flyfail" Enabled = true Match = "^(> )*^(> )*(你已经超过17岁了，无法再使用这个指令回到客店了。|你身上带著密函，不能施展。|你要召唤什么物品？|你不知道如何召唤这个物品|你已经在扬州客店了。|你摸着.*，发了半天的呆。|你觉得.*的感觉相当飘忽，看来精力不济，难以感应。|你瞪着.*，看啥？|你摸着.*，发了半天的呆。)" @@ -4376,7 +4482,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aql9ts171jkrjbm" + ID = "d1f1l2jc7tbml273qfkks9" Name = "lianrest" Enabled = false Match = "^(> )*(你的内力不够练.*。|你现在太累了，结果一行也没有看下去。)$" @@ -4407,69 +4513,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqla3l771jkrjbn" - Name = "on_objend" - Enabled = true - Match = "^(> )+" - Send = "" - ColourChangeType = 0 - Colour = -1 - Wildcard = 0 - SoundFileName = "" - SoundIfInactive = false - Script = "on_objend" - SendTo = 0 - Sequence = 100 - ExpandVariables = false - Temporary = false - OneShot = false - Regexp = true - Repeat = false - MultiLine = false - LinesToMatch = 0 - WildcardLowerCase = false - Group = "roomobj" - IgnoreCase = false - KeepEvaluating = true - OmitFromLog = false - OmitFromOutput = false - Inverse = false - Italic = false - Variable = "" - -[[Triggers]] - ID = "d1d3ic3aqlaao271jkrjbo" - Name = "on_obj" - Enabled = true - Match = "^ (.+)\\(([A-Za-z0-9_ ]+)\\)$" - Send = "" - ColourChangeType = 0 - Colour = -1 - Wildcard = 0 - SoundFileName = "" - SoundIfInactive = false - Script = "on_obj" - SendTo = 0 - Sequence = 100 - ExpandVariables = false - Temporary = false - OneShot = false - Regexp = true - Repeat = false - MultiLine = false - LinesToMatch = 0 - WildcardLowerCase = false - Group = "roomobj" - IgnoreCase = false - KeepEvaluating = true - OmitFromLog = false - OmitFromOutput = false - Inverse = false - Italic = false - Variable = "" - -[[Triggers]] - ID = "d1d3ic3aqlah1k71jkrjbp" + ID = "d1f1l2jc7tbrt773qfkksa" Name = "on_drunk2" Enabled = true Match = "^(> )*你觉得脑中昏昏沉沉，身子轻飘飘地，大概是醉了。$" @@ -4500,7 +4544,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlamv471jkrjbq" + ID = "d1f1l2jc7tc0db73qfkksb" Name = "on_drunk" Enabled = true Match = "^(> )*你觉得一阵酒意上冲，眼皮有些沉重了。$" @@ -4531,7 +4575,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlat0q71jkrjbr" + ID = "d1f1l2jc7tc4li73qfkksc" Name = "dazuofull" Enabled = false Match = "^(> )*你的内力修为似乎已经达到了瓶颈。$" @@ -4562,7 +4606,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlb2ul71jkrjbs" + ID = "d1f1l2jc7tc9gm73qfkksd" Name = "lianwield" Enabled = false Match = "^(> )*你使用的武器不对。$" @@ -4593,7 +4637,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlb8lt71jkrjbt" + ID = "d1f1l2jc7tcelu73qfkkse" Name = "event_acceptrecon" Enabled = false Match = "^(> )*你还是把眼前的敌人放倒再说吧！$" @@ -4624,7 +4668,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlbej871jkrjbu" + ID = "d1f1l2jc7tcjlh73qfkksf" Name = "event_acceptretry" Enabled = false Match = "^(> )*你现在正忙，等有空了再说吧！|你等会儿，在大宗师面前抢什么茬儿？$" @@ -4655,7 +4699,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlbl9q71jkrjbv" + ID = "d1f1l2jc7tcobh73qfkksg" Name = "event_accepting" Enabled = false Match = "^(> )*你正在应战呢！$" @@ -4686,7 +4730,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlbr0071jkrjc0" + ID = "d1f1l2jc7tctb773qfkksh" Name = "event_acceptname" Enabled = false Match = "^(> )*【东拉西扯】%1[%2]：(.*)少要猖狂，我来了！$" @@ -4717,7 +4761,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlc08l71jkrjc1" + ID = "d1f1l2jc7td1ud73qfkksi" Name = "event_acceptwin" Enabled = false Match = "^(> )*%1身子一退，掉下(.*)！$" @@ -4748,7 +4792,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlc5os71jkrjc2" + ID = "d1f1l2jc7td6kh73qfkksj" Name = "dragoncome" Enabled = true Match = "^(> )*【神话传说】(不及多想|玉帝大怒|噢呦|牛魔王道)" @@ -4779,7 +4823,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlcbdb71jkrjc3" + ID = "d1f1l2jc7tdb1773qfkksk" Name = "dragonflee" Enabled = false Match = "^(> )*【东拉西扯】(北海谪龙|东海三太子|南海恶蛟|牛头怪)\\[(King of dragon|Prince of dragon|Monster dragon|Niutou guai)\\]：(天哪！这年头，看来是没有我立足的地方了！|呀！想不到凡人也有如此厉害的！|啊呀！不好，看来这次出师不利，待我回南海修炼上几年再说！)" @@ -4810,7 +4854,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlcgle71jkrjc4" + ID = "d1f1l2jc7tdg0t73qfkksl" Name = "on_accept" Enabled = true Match = "^(> )*(黄裳|南海神尼|独孤求败|葵花太监)告诉你：你何不出手应战\\(accept\\)？扬我中华武林威风！$" @@ -4841,7 +4885,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlcmiv71jkrjc5" + ID = "d1f1l2jc7tdkel73qfkksm" Name = "event_storygift" Enabled = true Match = "^(> )*“啪”的一声(.*)掉到你面前。$" @@ -4872,7 +4916,7 @@ Channel="helllua" Variable = "" [[Triggers]] - ID = "d1d3ic3aqlcsdp71jkrjc6" + ID = "d1f1l2jc7tdp4473qfkksn" Name = "wieldtest" Enabled = false Match = "(> )*你并没有装备这样东西作为武器。$" @@ -4902,13 +4946,44 @@ Channel="helllua" Italic = false Variable = "" +[[Triggers]] + ID = "d1f1l1fo8s3alq73qfhg8c" + Name = "on_objend" + Enabled = false + Match = "^.*$" + Send = "" + ColourChangeType = 0 + Colour = 0 + Wildcard = 0 + SoundFileName = "" + SoundIfInactive = false + Script = "on_objend" + SendTo = 0 + Sequence = 200 + ExpandVariables = false + Temporary = false + OneShot = false + Regexp = true + Repeat = false + MultiLine = false + LinesToMatch = 0 + WildcardLowerCase = false + Group = "roomobj" + IgnoreCase = false + KeepEvaluating = true + OmitFromLog = false + OmitFromOutput = false + Inverse = false + Italic = false + Variable = "" + [[Timers]] ID = "d1d3be7okrf0eb6eh7d5m" Name = "on_steptimeout" Enabled = true Hour = 0 Minute = 0 - Second = 4 + Second = 4.0 Send = "" Script = "on_steptimeout" AtTime = false @@ -4922,12 +4997,12 @@ Channel="helllua" OmitFromOutput = false [[Aliases]] - ID = "d1d3ic3aqkn1iu71jkrj8m" - Name = "alias_start" + ID = "d1d3ic3aqkn74872jkrj8n" + Name = "alias_fight" Enabled = true - Match = "^start\\s{0,1}(.*)$" + Match = "^#fight\\s{0,1}(.*)$" Send = "" - Script = "alias_start" + Script = "alias_fight" SendTo = 0 Sequence = 0 ExpandVariables = false @@ -4945,12 +5020,12 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqkn74871jkrj8n" - Name = "alias_kill" + ID = "d1f1l2jc7stpmq73qfkkp9" + Name = "alias_start" Enabled = true - Match = "^#kill\\s{0,1}(.*)$" + Match = "^start\\s{0,1}(.*)$" Send = "" - Script = "alias_kill" + Script = "alias_start" SendTo = 0 Sequence = 0 ExpandVariables = false @@ -4966,13 +5041,14 @@ Channel="helllua" ReverseSpeedwalk = false OmitFromOutput = false OmitFromCommandHistory = false + [[Aliases]] - ID = "d1d3ic3aqkn74872jkrj8n" - Name = "alias_fight" + ID = "d1f1l2jc7su0fj73qfkkpa" + Name = "alias_kill" Enabled = true - Match = "^#fight\\s{0,1}(.*)$" + Match = "^#kill\\s{0,1}(.*)$" Send = "" - Script = "alias_fight" + Script = "alias_kill" SendTo = 0 Sequence = 0 ExpandVariables = false @@ -4990,7 +5066,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqkna4h71jkrj8o" + ID = "d1f1l2jc7su3hg73qfkkpb" Name = "alias_fq" Enabled = true Match = "^#fq\\s{0,1}(.*)$" @@ -5013,7 +5089,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqkncmo71jkrj8p" + ID = "d1f1l2jc7su5ud73qfkkpc" Name = "alias_make" Enabled = true Match = "^#make\\s{0,1}(.*)$" @@ -5036,7 +5112,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqknfdi71jkrj8q" + ID = "d1f1l2jc7su90873qfkkpd" Name = "alias_re" Enabled = true Match = "^#re(\\s(.*)){0,1}$" @@ -5059,7 +5135,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqknhv771jkrj8r" + ID = "d1f1l2jc7subbt73qfkkpe" Name = "alias_pick" Enabled = true Match = "^#pick$" @@ -5082,7 +5158,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqknkbf71jkrj8s" + ID = "d1f1l2jc7sudmn73qfkkpf" Name = "alias_setvalue" Enabled = true Match = "^#set(\\s{0,1}(\\S*)){0,1}\\s{0,1}(.*)$" @@ -5105,7 +5181,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqknmpe71jkrj8t" + ID = "d1f1l2jc7sugb873qfkkpg" Name = "alias_check" Enabled = true Match = "^#check\\s{0,1}(.*)$" @@ -5128,10 +5204,10 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqknp6f71jkrj8u" + ID = "d1f1l2jc7suj7n73qfkkph" Name = "alias_lian" Enabled = true - Match = "^#lian\\s{0,1}(.*)$" + Match = "^#lian\\s(.*)$" Send = "" Script = "alias_lian" SendTo = 0 @@ -5151,7 +5227,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqknroa71jkrj8v" + ID = "d1f1l2jc7suljn73qfkkpi" Name = "alias_assist" Enabled = true Match = "^#assist( (.+)){0,1}$" @@ -5174,7 +5250,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqknug171jkrj90" + ID = "d1f1l2jc7suo6t73qfkkpj" Name = "alias_dazuoneili" Enabled = true Match = "^#dazuo\\s{0,1}(.*)$" @@ -5197,7 +5273,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqko22v71jkrj91" + ID = "d1f1l2jc7suqkh73qfkkpk" Name = "alias_beiqi" Enabled = true Match = "^#beiqi\\s{0,1}(.*)$" @@ -5220,7 +5296,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqko80871jkrj92" + ID = "d1f1l2jc7susq073qfkkpl" Name = "alias_letter" Enabled = true Match = "^#letter\\s{0,1}(.*)$" @@ -5243,7 +5319,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqkodgu71jkrj93" + ID = "d1f1l2jc7suuvb73qfkkpm" Name = "alias_caxie" Enabled = true Match = "^#caxie\\s{0,1}(.*)$" @@ -5266,7 +5342,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqkoiav71jkrj94" + ID = "d1f1l2jc7sv1i573qfkkpn" Name = "alias_fish" Enabled = true Match = "^#fish\\s{0,1}(.*)$" @@ -5289,7 +5365,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqkonf871jkrj95" + ID = "d1f1l2jc7sv3of73qfkkpo" Name = "alias_dutable" Enabled = true Match = "#dutable" @@ -5312,7 +5388,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqkor8l71jkrj96" + ID = "d1f1l2jc7sv5vj73qfkkpp" Name = "alias_to" Enabled = true Match = "^#to (.*)$" @@ -5335,7 +5411,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqkp0a471jkrj97" + ID = "d1f1l2jc7sv87v73qfkkpq" Name = "alias_do" Enabled = true Match = "^##(.+)$" @@ -5358,7 +5434,7 @@ Channel="helllua" OmitFromCommandHistory = false [[Aliases]] - ID = "d1d3ic3aqkp5lm71jkrj98" + ID = "d1f1l2jc7svagc73qfkkpr" Name = "alias_canwu" Enabled = true Match = "#canwu" @@ -5519,78 +5595,91 @@ Channel="helllua" OmitFromCommandHistory = false [[RequiredParams]] -Name="id" -Desc="用户id" -Intro="登陆用的用户id" -[[RequiredParams]] -Name="passwd" -Desc="用户密码" -Intro="登陆用的用户密码" + Name = "id" + Desc = "用户id" + Intro = "登陆用的用户id" + [[RequiredParams]] -Name="expmax" -Desc="最大经验(整数)" -Intro="做师门任务时超过此数值将会自动放弃经验" + Name = "passwd" + Desc = "用户密码" + Intro = "登陆用的用户密码" + [[RequiredParams]] -Name="goldmin" -Desc="最少黄金" -Intro="黄金少于此数值时会自动取款" + Name = "expmax" + Desc = "最大经验(整数)" + Intro = "做师门任务时超过此数值将会自动放弃经验" + [[RequiredParams]] -Name="neilimin" -Desc="最小内力(整数)" -Intro="低于最小内力会自动睡觉或打坐" + Name = "goldmin" + Desc = "最少黄金" + Intro = "黄金少于此数值时会自动取款" + [[RequiredParams]] -Name="pfm" -Desc="攻击招数" -Intro="攻击时使用的pfm,如果为shot会自动买弓/箭进行射击" + Name = "neilimin" + Desc = "最小内力(整数)" + Intro = "低于最小内力会自动睡觉或打坐" + [[RequiredParams]] -Name="weapon" -Desc="武器" -Intro="攻击用的武器" + Name = "pfm" + Desc = "攻击招数" + Intro = "攻击时使用的pfm,如果为shot会自动买弓/箭进行射击" + [[RequiredParams]] -Name="potmax" -Desc="最大潜能" -Intro="高于最大潜能会去学习" + Name = "weapon" + Desc = "武器" + Intro = "攻击用的武器" + [[RequiredParams]] -Name="skilllist" -Desc="技能列表" -Intro="随机学习技能列表里的技能。参考格式为\nliterate,dodge,shenyuan-gong,beidou-xianzong,sword,murong-sword,parry" + Name = "potmax" + Desc = "最大潜能" + Intro = "高于最大潜能会去学习" [[RequiredParams]] -Name="passlist" -Desc="手谕列表" -Intro="以逗号分隔手谕列表，不为空这认为自带这些手谕，参考格式为\n胖胖包,老牛" + Name = "skilllist" + Desc = "技能列表" + Intro = "随机学习技能列表里的技能。参考格式为\nliterate,dodge,shenyuan-gong,beidou-xianzong,sword,murong-sword,parry" [[RequiredParams]] -Name="nuqimin" -Desc="怒气最小值(整数)" -Intro="性格符合时，低于怒气最小值会自动爆发" + Name = "passlist" + Desc = "手谕列表" + Intro = "以逗号分隔手谕列表，不为空这认为自带这些手谕，参考格式为\n胖胖包,老牛" +[[RequiredParams]] + Name = "nuqimin" + Desc = "怒气最小值(整数)" + Intro = "性格符合时，低于怒气最小值会自动爆发" [[RequiredParams]] -Name="fight_preper" -Desc="战斗准备命令" -Intro="每次战斗的准备命令，可留空" + Name = "fight_preper" + Desc = "战斗准备命令" + Intro = "每次战斗的准备命令，可留空" + [[RequiredParams]] -Name="fightcuff" -Desc="战斗准备拳法命令" -Intro="每次战斗的准备拳法命令，可留空" + Name = "fightcuff" + Desc = "战斗准备拳法命令" + Intro = "每次战斗的准备拳法命令，可留空" + [[RequiredParams]] -Name="killcmd" -Desc="杀人命名" -Intro="杀人后等信件时执行的命令" + Name = "killcmd" + Desc = "杀人命名" + Intro = "杀人后等信件时执行的命令" + [[RequiredParams]] -Name="qixuemin" -Desc="最低气血百分比(0-100整数)" -Intro="低于此数值后自动治疗" + Name = "qixuemin" + Desc = "最低气血百分比(0-100整数)" + Intro = "低于此数值后自动治疗" + [[RequiredParams]] -Name="tihuimax" -Desc="最大体会" -Intro="高于此值后自动汲取" + Name = "tihuimax" + Desc = "最大体会" + Intro = "高于此值后自动汲取" + [[RequiredParams]] -Name="weapon2" -Desc="砍头武器" -Intro="砍头用的武器" + Name = "weapon2" + Desc = "砍头武器" + Intro = "砍头用的武器" + [[RequiredParams]] -Name="jinlimin" -Desc="最小精力" -Intro="最小精力值，自动吐纳" + Name = "jinlimin" + Desc = "最小精力" + Intro = "最小精力值，自动吐纳" diff --git a/script/config.ini b/script/config.ini index bc0e547..f8869cd 100644 --- a/script/config.ini +++ b/script/config.ini @@ -37,12 +37,12 @@ preperskill["dodge"]["蛇行狸翻"]="yong dodge.guiyuan" cmd_limit=20 --每秒多少命令 -maxstep=12 +maxstep=10 --多步走的最大步数，0为不多步 -stepmaxstep=10 +stepmaxstep=6 --多步搜索的最大步数，0为不多步 -walkecho=false +walkecho=true --是否回显命令 mudsettings="set no_more;unset prompt;set auto_drinkout;set combatd self;set auto_regenerate;set wimpy 25;unset map_prompt" diff --git a/script/configs/items.ini b/script/configs/items.ini index 7418fc7..913c86f 100644 --- a/script/configs/items.ini +++ b/script/configs/items.ini @@ -45,7 +45,7 @@ items["mu dao"]=items["木刀"] items["木棍"]={name="木棍",id="mu gun",type="buy",loc=161,npc="mu jiang",npcname="木匠"} items["mu gun"]=items["木棍"] -items["钓竿"]={name="钓竿",id="diao gan",type="buy",loc=2636,npc="huo ji",npcname="伙计"} +items["钓竿"]={name="钓竿",id="diao gan",type="buy",loc=2717,npc="huo ji",npcname="伙计"} items["diao gan"]=items["钓竿"] --items["钓竿"]={name="钓竿",id="diao gan",type="buy",loc=269,npc="liu laoshi",npcname="刘老实"} diff --git a/script/configs/locs.ini b/script/configs/locs.ini index a476d59..1c42999 100644 --- a/script/configs/locs.ini +++ b/script/configs/locs.ini @@ -2,7 +2,7 @@ bankloc=23 --扬州银行 droploc=26 --丢东西的地方 sellloc=48 --默认卖东西的地方 --fishloc=39 --钓鱼的地方 -fishloc=2636 --钓鱼的地方 +fishloc=2717 --钓鱼的地方 chatroomloc=2046 ---drop gift的地方 diff --git a/script/main.lua b/script/main.lua index e72e43e..1a86556 100644 --- a/script/main.lua +++ b/script/main.lua @@ -44,3 +44,4 @@ if configcmd~=nil then configcmd() end loadmod("update.mod") +loadmod("queue.lua") \ No newline at end of file diff --git a/script/mods/beiqi.mod b/script/mods/beiqi.mod index 67d1f18..7e5cff3 100644 --- a/script/mods/beiqi.mod +++ b/script/mods/beiqi.mod @@ -121,6 +121,7 @@ beiqi["askend"]=function() busytest(beiqi.main) return end + busytest(beiqi.main) end beiqi_infook=function(n,l,w) diff --git a/script/mods/blocker.mod b/script/mods/blocker.mod index 4f0f836..b29cbc5 100644 --- a/script/mods/blocker.mod +++ b/script/mods/blocker.mod @@ -1,14 +1,16 @@ blocker={} blocker["虚通"]={id="xu tong",exp=50000} blocker["虚明"]={id="xu ming",exp=50000} -blocker["虚通伸手"]={id="xu tong",exp=50000} -blocker["虚明伸手"]={id="xu ming",exp=50000} blocker["校尉"]={id="xiao wei",exp=50000} blocker["采花子"]={id="caihua zi",exp=0} blocker["衙役"]={id="ya yi",exp=50000} +blocker["宋兵"]={id="song bing",exp=50000} +blocker["侍女"]={id="shi nu",exp=50000} +blocker["亲兵"]={id="qin bing",exp=50000} +blocker["大汉"]={id="qin bing",exp=100000} blocker["摘星子"]={id="zhaixing zi",exp=800000} -blocker["出尘子伸手"]={id="wuchen zi",exp=-1} ---blocker["劳德诺"]={id="lao denuo",exp=1500000} +blocker["出尘子"]={id="wuchen zi",exp=-1} +blocker["劳德诺"]={id="lao denuo",exp=1500000} blocker["鳌府侍卫"]={id="shi wei",exp=50000} blocker["鳌拜"]={id="ao bai",exp=200000} blocker["心砚"]={id="xin yan",exp=790000} @@ -17,14 +19,16 @@ blocker["蒋四根"]={id="jiang sigen",exp=790000} blocker["石双英"]={id="shi shuangying",exp=790000} blocker["卫春华"]={id="wei chunhua",exp=790000} blocker["杨成协"]={id="yang chengxie",exp=790000} -blocker["徐天宏长刀一摆，"]={id="xu tianhong",exp=790000} -blocker["常伯志飞身"]={id="chang bozhi",exp=790000} +blocker["徐天宏，"]={id="xu tianhong",exp=790000} +blocker["常伯志"]={id="chang bozhi",exp=790000} blocker["常赫志"]={id="chang hezhi",exp=790000} -blocker["安健刚一把"]={id="an jiangang",exp=790000} -blocker["孟健雄一把"]={id="meng jianxiong",exp=790000} -blocker["赵半山笑嘻嘻地"]={id="zhao banshan",exp=790000} +blocker["安健刚"]={id="an jiangang",exp=790000} +blocker["孟健雄"]={id="meng jianxiong",exp=790000} +blocker["赵半山"]={id="zhao banshan",exp=790000} blocker["周仲英"]={id="zhou zhongying",exp=790000} blocker["陆菲青"]={id="lu feiqing",exp=790000} +blocker["空见"]={id="kong jian",exp=5000000} +blocker["道一"]={id="kong jian",exp=50000} blocker["无尘"]={id="wuchen daozhang",exp=1190000} blocker["拓跋"]={id="tuoba",exp=300000} @@ -33,7 +37,6 @@ blocker["张富贵"]={cmd="give 10 gold to zhang fugui"} block_onnpc=function(n,l,w) - print(w[2]) -- if not(hashook(hooks.steptimeout)) then return end if not(hashook(hooks.step)) then return end if blocker[w[2]]==nil then return end diff --git a/script/mods/dutable.mod b/script/mods/dutable.mod index ff271c5..f891039 100644 --- a/script/mods/dutable.mod +++ b/script/mods/dutable.mod @@ -40,7 +40,7 @@ dutable.main=function() return end if _roomid==-1 then go(0,dutable.main,dutable.main) end - if _roomid~=1938 then + if _roomid~=2839 then getstatus(dutable["check"]) else getstatus(dutable.cmd) diff --git a/script/mods/jiqu.mod b/script/mods/jiqu.mod index a49e133..0bd783f 100644 --- a/script/mods/jiqu.mod +++ b/script/mods/jiqu.mod @@ -9,7 +9,7 @@ do_jiqu=function(jiqu_ok,jiqu_fail) end jiqu.arrive=function() - if me.fam=="华山剑宗" then + if me.fam=="华山剑宗" or me.fam=="华山气宗" then busytest(jiqu.sword) else busytest(jiqu.cmd) diff --git a/script/mods/kill.mod b/script/mods/kill.mod index 678f1b8..9480687 100644 --- a/script/mods/kill.mod +++ b/script/mods/kill.mod @@ -43,14 +43,6 @@ getfightpreper=function() cmd=cmd..";yun powerup" end cmd=cmd..";yun recover;yun shield" - weapon2id=GetVariable("weapon2") - weapon1id=GetVariable("weapon") - if weapon2id~="" and weapon2id~=nil then - cmd=cmd..";unwield "..weapon2id..";remove"..weapon2id - end - if weapon1id~="" and weapon1id~=nil then - cmd=cmd..";wield "..weapon1id..";wear "..weapon1id - end return cmd end fightpreper=function() @@ -93,33 +85,17 @@ kill_end_fail=function() kill["end"]("fail") end kill.cmd=function() - run("yun recover;yun regenerate") - if (me.score.xingge=="心狠手辣")or(me.score.xingge=="光明磊落")and(tonumber(GetVariable("nuqimin"))>2000) then run("burning") end - cmd=GetVariable("fightcuff") - prewield() - if cmd~=nil and cmd~="" then - npchere(kill.npc,"kill "..kill.npc) - fightcuff() - pfm() - else - npchere(kill.npc,getfightpreper()..";kill "..kill.npc..';'..getpfm()) - end - + local cmds="yun recover;yun regenerate;" + if (me.score.xingge=="心狠手辣")or(me.score.xingge=="光明磊落")and(tonumber(GetVariable("nuqimin"))>2000) then cmds=cmds.."burning;" end + cmds=cmds..npcherecmd(kill.npc,getfightpreper()..";kill "..kill.npc..';'..fightcuffcmd()..";"..getpfm()) + run(cmds,true) busytest(kill.test) end kill.fightcmd=function() - run("yun recover;yun regenerate") - if (me.score.xingge=="心狠手辣")or(me.score.xingge=="光明磊落")and(tonumber(GetVariable("nuqimin"))>2000) then run("burning") end - cmd=GetVariable("fightcuff") - prewield() - if cmd~=nil and cmd~="" then - npchere(kill.npc,"fight "..kill.npc) - fightcuff() - pfm() - else - npchere(kill.npc,getfightpreper()..";fight "..kill.npc..';'..getpfm()) - end - + local cmds="yun recover;yun regenerate;" + if (me.score.xingge=="心狠手辣")or(me.score.xingge=="光明磊落")and(tonumber(GetVariable("nuqimin"))>2000) then cmds=cmds.."burning;" end + cmds=cmds..npcherecmd(kill.npc,getfightpreper()..";fight "..kill.npc..';'..fightcuffcmd()..";"..getpfm()) + run(cmds,true) busytest(kill.test) end @@ -131,25 +107,22 @@ kill.test=function() end end -fightcuff=function() - if mudvar.powerup==nopowerup.drunk or (cmd~=nil and cmd~="") then - weapon(0) - if mudvar.powerup==nopowerup.drunk then - run("wield mu gun;yong club.zuida;unwield mu gun") + +fightcuffcmd=function() + local result="" + local weapon2id=GetVariable("weapon2") + local weapon1id=GetVariable("weapon") + if weapon2id~="" and weapon2id~=nil then + result="unwield "..weapon2id..";remove"..weapon2id..";" end - cmd=GetVariable("fightcuff") + local cmd=GetVariable("fightcuff") if cmd~=nil and cmd~="" then - run(cmd) + result=result..cmd..";" end - weapon(1) - end -end - - -prewield=function() - if (cmd==nil or cmd=="")and mudvar.powerup~=nopowerup.drunk then - weapon(1) - end + if weapon1id~="" and weapon1id~=nil then + result=result.."wield "..weapon1id..";wear "..weapon1id + end + return result end diff --git a/script/mods/letter.mod b/script/mods/letter.mod index b583b42..db5fc7e 100644 --- a/script/mods/letter.mod +++ b/script/mods/letter.mod @@ -50,6 +50,7 @@ letter.questok=function() do_npcinpath(city[letter.city].path,letter.npcfind,letter_end_fail) end letter.npcfind=function() + Note(npc.name) if npc.id==nil or npc.id=="" then npc.id=getcnname(npc.name) end diff --git a/script/mods/liandan.mod b/script/mods/liandan.mod index edc958d..df4abb0 100644 --- a/script/mods/liandan.mod +++ b/script/mods/liandan.mod @@ -31,18 +31,18 @@ liandan.pack["龙涎丹"]="longxian dan" liandan.pack["邀月丹"]="yaoyue dan" liandan.pack["子午龙甲丹"]="longjia dan" liandan.pack["幻灵丹"]="huanling dan" +liandan.pack["Luosha dan"]="luosha dan" +liandan.pack["轩辕补心丹"]="xuanyuan dan" +liandan.pack["Baihu dan"]="baihu dan" +liandan.pack["Qinglong dan"]="qinglong dan" +liandan.pack["Xuanwu dan"]="xuanwu dan" +liandan.pack["Zhuque dan"]="zhuque dan" +liandan.pack["Wanshou dan"]="wanshou dan" +liandan.pack["Yinyang dan"]="yinyang dan" +liandan.pack["Change dan"]="change dan" +liandan.pack["Longwang dan"]="longwang dan" liandan.dropgift={} -liandan.dropgift["Luosha dan"]="luosha dan" -liandan.dropgift["轩辕补心丹"]="xuanyuan dan" liandan.eat={} -liandan.eat["Wanshou dan"]="wanshou dan" -liandan.eat["Zhuque dan"]="zhuque dan" -liandan.eat["Baihu dan"]="baihu dan" -liandan.eat["Qinglong dan"]="qinglong dan" -liandan.eat["Xuanwu dan"]="xuanwu dan" -liandan.eat["Yinyang dan"]="yinyang dan" -liandan.eat["Change dan"]="change dan" -liandan.eat["Longwang dan"]="longwang dan" liandan.yaoanswer=0 liandan.tonganswer=0 liandan.loc={1397,1398,1399,1400,1401} @@ -84,6 +84,7 @@ liandan.check=function() end end liandan.packluosha=function() + send("keep dan") do_pack("dan","baoguo",liandan["main"],liandan["main"]) end liandan.askyao=function() @@ -192,9 +193,12 @@ liandan["end"]=function(s) liandan["fail"]=nil end -liandan_end_ok=function() +liandan_end_afterbusy=function() liandan["end"]("ok") end +liandan_end_ok=function() + DoAfterSpecial(2,"liandan_end_afterbusy()",12) +end liandan_end_fail=function() liandan["end"]("fail") diff --git a/script/mods/npc.mod b/script/mods/npc.mod index d4f23d9..5035883 100644 --- a/script/mods/npc.mod +++ b/script/mods/npc.mod @@ -4,8 +4,14 @@ npc={name="",id="",loc=-1,nobody=0} npchere=function(npcid,str) npc.nobody=0 - run("shou "..npcid) - catch("nobody",str..";") + run(npcherecmd(npcid,str),true) +end +npcherecmd=function(npcid,str) + npc.nobody=0 + if npcid==nil or npcid=="" then + npcid="_" + end + return("shou "..npcid..";"..catchcmd("nobody",str..";")) end npc_nobody=function(n,l,w) npc.nobody=1 diff --git a/script/mods/queue.lua b/script/mods/queue.lua new file mode 100644 index 0000000..3b06a8a --- /dev/null +++ b/script/mods/queue.lua @@ -0,0 +1,86 @@ +-- queue={ +-- queue={}, +-- tick=1100, +-- timestamp=0, +-- sent={}, +-- } + +-- queue.exec=function(cmds,grouped) +-- queue.append(cmds,grouped) +-- queue.send() +-- end +-- queue.limit=function() +-- return cmd_limit +-- end +-- queue.discard=function() +-- queue.queue={} +-- end +-- queue.append=function(rawcmds,grouped) +-- local cmds={} +-- for k,v in pairs(rawcmds) do +-- local splited=SplitN(v,"\n",-1) +-- for k,c in pairs(splited) do +-- table.insert(cmds,c) +-- end +-- end +-- if grouped then +-- table.insert(queue.queue,cmds) +-- else +-- for k,v in pairs(cmds) do +-- table.insert(queue.queue,{v}) +-- end +-- end +-- end +-- queue.full=function() +-- local ts=Milliseconds() +-- while #queue.sent )*(突然一位|忽听“嗖”的一声|你转身一看|你一回头|你正欲离开|只见你刚想离开|只听扑倏扑倏几声)(.*)(弟子急急忙忙地跑了上来，拍拍你的肩膀|一件暗器从你背后飞来|竟见到一只灰点信鸽飞至身旁，你赶紧|只见一位同门装束的弟子满头大汗地跑了过来|忽然发现不远处的地上一块石头上刻着些什么|一位同门装束的弟子追了上来|一只白鸽飞了过来，落在你肩头)","masterquest","mqletterattive") - addtri("block_onnpc","^(> )*(.*)(喝道：这位.*休走！|上前挡住你，朗声说道：这位|喝道：“威……武……。”|挡住了你：|伸手拦住你白眼一翻说道：千年以来|拦住你|迈步挡在你身前，双手合什说道：|大声喝道：他奶奶的，你要干嘛？|拦住你道：没有王爷的吩咐，谁也不能进去。|挡住你|一把抓住了你，说道：“咱们这里是有规矩的地方，不准带武器进入。”飞身挡住你的去路，脸上一丝表情也没有！|扭身挡住，脸上没有一点笑容！|笑嘻嘻地挡住你的去路：再玩玩才走啦。气得你半死！|一把拦住你：瞎窜什么，过来吧你给我！|一把拦住你：要上楼，先过了我这关！|哈哈一笑：这里还没打过呢，就想上楼|俏眼一瞪：没看见本姑娘在这里吗？|大喝一声：哪里走？滚下来！|冷哼一声：想走？放着十二郎在这你就给我留下来！|大吼一声：我有九条命，你有几条？放马过来！|大吼一声，执鞭拦在楼梯口！|长刀一摆，挡住你的去路，一言不发！|吹着白胡子，挡在楼梯口|用冷森森的眼光扫了你一眼，你迈向楼梯的脚吓了一哆嗦|长剑电闪，一下就刺到了楼梯口|对你道：对不起，不是我们华山派的人请勿入本派重地。)","system","block_onnpc") + addtri("block_onnpc","^(> )*(.*)(拦住你道|上前挡住你，朗声说道：|一把拦住你，喝道：|美目一挑，想走，没门！|喝道：“威……武……|向你喝道：什么人|拦住了你的去路|伸手拦住你说道|喝道：别乱逛|拦住你说：此处乃明教重地|对你道：对不起|喝道：这位|伸手拦住你白眼一翻说道|拦住你说道|迈步挡在你身前|一把拦住你|哈哈一笑|俏眼一瞪|大喝一声|冷哼一声|大吼一声|长刀一摆|飞身挡住你的去路|扭身挡住|笑嘻嘻地挡住你的去路|吹着白胡子|用冷森森的眼光扫了你一眼|长剑电闪|对你道：善哉，后殿|说道: 你未经许可|大声喝道：他奶奶的，你要干嘛|挡住了你：我的小妞可不是给你们邪派弟子准备的！)","system","block_onnpc") addtri("mqlettercontent","^(> )*“字谕弟子(.*?)：(得闻恶贼|武林人士|得闻所谓大侠)(.*?)(屡次和我派作对|打家劫舍|所为甚是讨厌)(.*)\\n(.*)出没，正是大好机会将他除去","mqletter","mqlettercontent") SetTriggerOption("mqlettercontent","multi_line","1") SetTriggerOption("mqlettercontent","lines_to_match","2") @@ -40,7 +40,7 @@ updateversion=function() AddAlias("alias_pick","^#pick$","",flag_base_enable+alias_flag.RegularExpression,"alias_pick") AddAlias("alias_setvalue","^#set(\\s{0,1}(\\S*)){0,1}\\s{0,1}(.*)$","",flag_base_enable+alias_flag.RegularExpression,"alias_setvalue") AddAlias("alias_check","^#check\\s{0,1}(.*)$","",flag_base_enable+alias_flag.RegularExpression,"alias_check") - AddAlias("alias_lian","^#lian\\s{0,1}(.*)$","",flag_base_enable+alias_flag.RegularExpression,"alias_lian") + AddAlias("alias_lian","^#lian\\s(.*)$","",flag_base_enable+alias_flag.RegularExpression,"alias_lian") AddAlias("alias_assist","^#assist( (.+)){0,1}$","",flag_base_enable+alias_flag.RegularExpression,"alias_assist") AddAlias("alias_dazuoneili","^#dazuo\\s{0,1}(.*)$","",flag_base_enable+alias_flag.RegularExpression,"alias_dazuoneili") AddAlias("alias_beiqi","^#beiqi\\s{0,1}(.*)$","",flag_base_enable+alias_flag.RegularExpression,"alias_beiqi") @@ -81,7 +81,7 @@ updateversion=function() addtri("event_dragonfind","^(> )*【(明教|天地会)】.{1,4}\\[(.*)\\]：helllua.dragon-(.*)-(.*)-(.*)","dragon","event_dragonfind") addtri("event_dragonfind2","^(> )*【(明教|天地会)】.{1,4}\\[(.*)\\]：Dragon：()().+\\.(.*)","dragon","event_dragonfind") SetTriggerOption("jiqu_fail","group","system") - addtri("status_onhptihui","^(【 平 和 】|【 愤 怒 】)\\s*(.*?)\\s*【 体 会 】(.*)$","hp","status_onhptihui") + addtri("status_onhptihui","^│\\s*│【体会】\\s*(\\d+)\\s*│$","hp","status_onhptihui") addtri("study_fail","^(> )*(你今天太累了，结果什么也没有研究成。|然而你今天太累了|也许是缺乏实战经验|你要向谁求教？|你的.*火候不够|你的.*水平有限|这项技能你的程度已经不输你师父了。|这项技能你恐怕必须找别人学了|[^a-zA-Z0-9、 ()【】.。,，:：;；?？!！]+说：嗯.... 你的.*功力已经是非同凡响了，我就不再教你，你自己多研究吧。|你对.*的掌握程度还未到研究的程度。)","study","study_fail") --SetOption("wrap_column",400) addvar("fightcuff","") @@ -121,7 +121,7 @@ updateversion=function() addtri("items_onbagitems","^ ([^a-z!@#$%\\^&*()\\\\/.,<> ]+)\\((\\w*\\s{0,1}\\w+)\\)$","bagitem","on_bagitems") addtri("heal_danbusy","^(> )*你的内力不足，无法运满一个周天。$","dispel","on_dispelneilifail") addtri("heal_neilifail","^(> )*你刚服用过药，需药性发挥完效用以后才能继续服用。$","eatdan","on_danbusy") - addtri("status_onhptihui","^(【 平 和 】|【 愤 怒 】)\\s*([^/ ]*).*【 体 会 】(.*)$","hp","status_onhptihui") + addtri("status_onhptihui","^│\\s*│【体会】\\s*(\\d+)\\s*│$","hp","status_onhptihui") addtri("on_getweapon","^(> )*你手腕一麻，手中(.*)不由脱手而出！","system","on_getweapon") addtri("study_gold","^(> )*(朱熹|厨娘|戚长发)(说道：您太客气了，这怎么敢当？|笑着说道：您见笑了，我这点雕虫小技怎够资格「指点」您什么？|像是受宠若惊一样，说道：请教？这怎么敢当？)","study","study_gold") addtri("askyouok","^(> )*游讯嘿嘿奸笑两声，对你小声道：“没有问题，不过得要50两黄金，不二价！”","askyou","askyouok") @@ -143,8 +143,8 @@ updateversion=function() addtri("walkdogkill","^(> )*看起来(.*)想杀死你！","system","dogkill") addtri("flyfail","^(> )*^(> )*(你已经超过17岁了，无法再使用这个指令回到客店了。|你身上带著密函，不能施展。|你要召唤什么物品？|你不知道如何召唤这个物品|你已经在扬州客店了。|你摸着.*，发了半天的呆。|你觉得.*的感觉相当飘忽，看来精力不济，难以感应。|你瞪着.*，看啥？|你摸着.*，发了半天的呆。)","system","walk_on_flyfail") addtri("lianrest","^(> )*(你的内力不够练.*。|你现在太累了，结果一行也没有看下去。)$","lian","lianrest") - addtri("on_objend","^(> )+","roomobj","on_objend") - addtri("on_obj","^ (.+)\\(([A-Za-z0-9_ ]+)\\)$","roomobj","on_obj") +-- addtri("on_objend","^(> )+","roomobj","on_objend") +-- addtri("on_obj","^ (.+)\\(([A-Za-z0-9_ ]+)\\)$","roomobj","on_obj") addtri("on_drunk2","^(> )*你觉得脑中昏昏沉沉，身子轻飘飘地，大概是醉了。$","system","on_drunk2") addtri("on_drunk","^(> )*你觉得一阵酒意上冲，眼皮有些沉重了。$","system","on_drunk") addtri("dazuofull","^(> )*你的内力修为似乎已经达到了瓶颈。$","dazuoneili","dazuofull") diff --git a/script/mods/walk.mod b/script/mods/walk.mod index 8c3b558..737172f 100644 --- a/script/mods/walk.mod +++ b/script/mods/walk.mod @@ -101,7 +101,10 @@ walk_on_busy=function(name, line, wildcards) end end walk_onnoweapon=function(n,l,w) - weapon(0) + local weaponid=GetVariable("weapon2") + local weapon1id=GetVariable("weapon") + run("unwield "..weapon1id) + run("unwield "..weaponid) if ((walking["step"]~=nil)and(hooks.step~=nil)) then run(walking["step"]) end @@ -112,7 +115,7 @@ walk_on_room=function (name, line, wildcards,styles) if ((#wildcards[1])~=0)and((#wildcards[1])==styles[1]["length"]) then __textindex=2 end - if ((#styles)==__textindex)and(styles[__textindex]["textcolour"]==ColourNameToRGB("Cyan")) then + if ((#styles)==__textindex)and(styles[__textindex]["textcolour"]==ColourNameToRGB("cyan")) then _roomname=((styles[__textindex]["text"])) end end @@ -336,6 +339,7 @@ convpath=function(path) end on_obj=function(name, line, wildcards) + wildcards[2]=string.lower(wildcards[2]) _item,num=getitemnum(wildcards[1]) if room_obj[wildcards[2]]~=nil then room_obj[wildcards[2]]["num"]=room_obj[wildcards[2]]["num"]+num @@ -345,8 +349,14 @@ on_obj=function(name, line, wildcards) room_obj[_item]=room_obj[wildcards[2]] end on_objend=function(name, line, wildcards) + --callhook(hooks.step) EnableTriggerGroup("roomobj",false) end +on_objga=function() + if GetTriggerOption("on_obj","enabled") then + on_objend() + end +end walk_npc=function(n,l,w) room_obj[w[2]]={num=1,id=nil} end diff --git a/script/mods/weapon.mod b/script/mods/weapon.mod index f32dc9b..acc0729 100644 --- a/script/mods/weapon.mod +++ b/script/mods/weapon.mod @@ -38,21 +38,17 @@ weapon1=function(wield) weaponid=GetVariable("weapon") if weaponid=="" or weaponid==nil then return end if wield==false then - if weapon1wielded~=true then return end if weapon1unwieldcmd=="" then run ("unwield "..weaponid..";remove "..weaponid) else run(weapon1unwieldcmd.." "..weaponid) end - weapon1wielded=false else - if weapon1wielded~=false then return end if weapon1wieldcmd=="" then run ("wield "..weaponid..";wear "..weaponid) else run(weapon1wieldcmd.." "..weaponid) end - weapon1wielded=true end end @@ -60,21 +56,17 @@ weapon2=function(wield) weaponid=GetVariable("weapon2") if weaponid=="" or weaponid==nil then return end if wield==false then - if weapon2wielded~=true then return end if weapon2unwieldcmd=="" then run ("unwield "..weaponid..";remove "..weaponid) else run(weapon2unwieldcmd.." "..weaponid) end - weapon2wielded=false else - if weapon2wielded~=false then return end if weapon2wieldcmd=="" then run ("wield "..weaponid..";wear "..weaponid) else run(weapon2wieldcmd.." "..weaponid) end - weapon2wielded=true end end diff --git a/script/rooms_all.h b/script/rooms_all.h index bd21502..6f79c61 100644 --- a/script/rooms_all.h +++ b/script/rooms_all.h @@ -24,9 +24,9 @@ 23=钱庄|e:22, 24=北大街|e:27,n:34,s:22,w*:25, 25=武庙|e:24,nw:1552,u:1551, -26=客店|menter0*:2046,s:1553,u*:-1,w:22,menter1:2456, +26=客店|#gift:2046,s:1553,u*:-1,w:22,menter1:2456, 27=醉仙楼|e*:28,u:29,w:24, -28=马厩|goto beijing:1353,goto changan:289,goto hangzhou:-1,goto hengyang:-1,goto jiaxing:-1,goto nanyang:1066,goto suzhou:-1,goto xiangyang:-1,w:27, +28=马厩|goto beijing:1353%10,goto changan:289%10,goto hangzhou:-1,goto hengyang:-1,goto jiaxing:-1,goto nanyang:1066%10,goto suzhou:-1,goto xiangyang:-1,w:27, 29=醉仙楼二楼|d:27,e*:30, 30=醉仙楼大堂|e:31,n:32,s:33,w:29, 31=玫瑰宴厅|w:30, @@ -169,7 +169,7 @@ 168=胡同|w:167, 169=胡同|s:167, 170=北内大街|e:167,n*:171,w:118, -171=马厩|goto beijing:1353,goto changan:289,goto chengdu:-1,goto dali:-1,goto hengyang:-1,goto yangzhou:-1,s:170, +171=马厩|goto beijing:1353%10,goto changan:289%10,goto chengdu:-1,goto dali:-1,goto hengyang:-1,goto yangzhou:-1,s:170, 172=将军府大门|n*:1568,s:153, 173=安抚府牌楼|n:174,s:135, 174=安抚使衙门|s:173, @@ -287,7 +287,7 @@ 286=面馆|s:285, 287=民居|n:285, 288=华瑞街|e:285,n*:289,s:290,w:291, -289=马厩|goto beijing:1353,goto nanyang:1066,goto chengdu:-1,goto lingzhou:1173,goto yangzhou:28,goto wugong:1674,goto xiangyang:-1,goto yangzhou:-1,goto yili:-1,s:288, +289=马厩|goto beijing:1353%10,goto nanyang:1066%10,goto chengdu:-1,goto lingzhou:1173,goto yangzhou:28,goto wugong:1674,goto xiangyang:-1,goto yangzhou:-1,goto yili:-1,s:288, 290=民居|n:288, 291=永泰南口|e:288,n:293,s:292, 292=包子铺|n:291, @@ -700,7 +700,7 @@ 699=望江楼|nw:698, 700=南大街|ne:698,se*:701,w:666, 701=锦城驿|e:702,nw:700,u*:-1, -702=马厩|goto changan:289,goto dali:-1,goto xiangyang:-1,w:701, +702=马厩|goto changan:289%10,goto dali:-1,goto xiangyang:-1,w:701, 703=南门|n:666,s:704, 704=南河桥|n:703,s:705, 705=山路|n:704,wu:706, @@ -1064,7 +1064,7 @@ 1063=百尺峡|eu:1064,nd:1062, 1064=平心石|eu:1065,wd:1063, 1065=老君沟|su*:2162,wd:1064, -1066=马厩|goto beijing:1353,goto changan:289,goto yangzhou:28,w:1067, +1066=马厩|goto beijing:1353%10,goto changan:289%10,goto yangzhou:28%10,w:1067, 1067=悦来客栈|e:1066,u*:-1,w:1068, 1068=南阳城|e*:1067,n:1069,s:1073,w*:1071, 1069=大驿道|n:1070,s:1068, @@ -1152,7 +1152,7 @@ 1151=伊犁|e:1155,n*:1154,nw:1153,se:1150,w:1152, 1152=杂货铺|e:1151, 1153=赛马场|se:1151, -1154=马厩|goto changan:289,goto lingzhou:1173,s:1151, +1154=马厩|goto changan:289%10,goto lingzhou:1173%10,s:1151, 1155=巴依家院|e*:1655,w:1151, 1156=客店|s:1150,u:-1, 1157=天山山路|ed:1150,n:1158,wang:2439, @@ -1171,7 +1171,7 @@ 1170=石道|e:1169,enter*:1657, 1171=星宿海|se:1172,sw:1169, 1172=星宿海|nw:1171,sw:1167, -1173=马厩|goto changan:289,goto yili:-1,w:1174,goto beijing:1353, +1173=马厩|goto changan:289%10,goto yili:-1,w:1174,goto beijing:1353%10, 1174=车马店|e:1173,u*:1658,w:1175, 1175=南大街|e*:1174,n:1176,s:1202,w:1201, 1176=城中心|e:1177,n:1188,s:1175,w:1190, @@ -1222,7 +1222,7 @@ 1221=小巷|e:1220,s:1222, 1222=小土屋|n:1221,gb>enter dong:2317, 1223=客店|e:1219,u*:-1,w:1224, -1224=马厩|e:1223,goto beijing:1353, +1224=马厩|e:1223,goto beijing:1353%10, 1225=香肉馆|e:1218, 1226=土路|e*:1227,nw:1218, 1227=采石场|w:1226, @@ -1351,7 +1351,7 @@ 1350=客店|e:1339, 1351=西单|e:1385,n:1354,s:1339,w:1352, 1352=鸟市|e:1351,w*:1353, -1353=马厩|e:1352,hu>goto changan:289,goto guanwai:-1,goto lingzhou:1173,hu>goto nanyang:1066,hu>goto xiangyang:171,goto yangzhou:28,hu>yun regenerate\ask shen ke about 入关:1242, +1353=马厩|e:1352,hu>goto changan:289%10,goto guanwai:-1,goto lingzhou:1173%10,hu>goto nanyang:1066%10,hu>goto xiangyang:171%10,goto yangzhou:28%10,hu>yun regenerate\ask shen ke about 入关:1242, 1354=西单北大街|e:1383,n:1364,s:1351,w:1355, 1355=城门口|e:1354,w:1356, 1356=西城门|e:1355,w:1357, @@ -1607,7 +1607,7 @@ 1606=小土屋|n:428, 1607=客店二楼|d:477, 1608=河上|e:614,w:591, -1609=马厩|e:609,goto emei2:2049, +1609=马厩|e:609,goto emei2:2049%10, 1610=提督府门|n*:1611,s:664, 1611=提督府|s:1610, 1612=小桥|n:1613,s:688, @@ -1672,7 +1672,7 @@ 1671=山洞|out:734,gm>wd:1951, 1672=净慈寺|out:880, 1673=六和塔|out:838,u*:2457, -1674=马厩|goto changan:289,s:910, +1674=马厩|goto changan:289%10,s:910, 1675=客店二楼|d:910, 1676=正殿|e:1677,out:960, 1677=寒拾殿|out:1678,w:1676, @@ -1842,7 +1842,7 @@ 1841=西侧殿|e:1840, 1842=东侧殿|w:1840, 1843=台阶|e:1845,nu:1846,s:1840,w:1844, -1844=西碑林|e:1843, +1844=西碑林|e:1843,say 上报四重恩，下济三途苦\pull stone up\pull stone up\pull stone up\pull stone up\push stone down\push stone down\push stone down\down:2839, 1845=东碑林|w:1843, 1846=天王殿|e:1848,n:1849,sd:1843,w:1847, 1847=西侧殿|e:1846, @@ -1926,7 +1926,7 @@ 1925=菩提院|sd:1870, 1926=大雄宝殿|sd:1849, 1927=树洞内部|out:0,gb>say 天堂有路你不走呀\d:1928,gb1>say 天堂有路你不走呀\d:1928, -1928=树洞下|d:1931,u:1927,w:1929,gb>goto 1:2309,gb>goto 2:2312,gb>goto 3:2315,no>goto 4:2318,no>goto 5:2321,gb>goto 6:2324,gb>goto 7:2327,gb>goto 8:2330,gb>goto 9:2333,gb>goto e:2337,gb>goto a:2340,gb>goto b:2343,gb>goto c:2346,gb>goto d:2349,gb>goto f:2352,gb1>goto 3:2315,gb1>goto 8:2330,gb1>goto c:2346,gb1>goto d:2349, +1928=树洞下|d:1931,u:1927,w:1929,gb>goto 1:2309%5,gb>goto 2:2312%5,gb>goto 3:2315%5,no>goto 4:2318,no>goto 5:2321,gb>goto 6:2324%5,gb>goto 7:2327%5,gb>goto 8:2330%5,gb>goto 9:2333%5,gb>goto e:2337%5,gb>goto a:2340%5,gb>goto b:2343%5,gb>goto c:2346%5,gb>goto d:2349%5,gb>goto f:2352%5,gb1>goto 3:2315%5,gb1>goto 8:2330%5,gb1>goto c:2346%5,gb1>goto d:2349%5, 1929=林间小屋|gb>e:1928,gb1>e:1928,out:1739,gb>w:1930,gb1>w:1930, 1930=暗道|e:1929,gb>out:1740,gb>#loc:2450, 1931=储藏室|u:1928,w:1932, @@ -2047,7 +2047,7 @@ 2046=聊天室|out:26, 2047=渡船|out:-1, 2048=沙漠|e:2048,n:2048,s*:1006,w:2048, -2049=马厩|goto emei:1609,s:2050, +2049=马厩|goto emei:1609%10,s:2050, 2050=华严顶|d:2115,n*:2049,yun recover\wu:2051, 2051=莲花石|ed:2050,se:2089,wu:2052, 2052=钻天坡|ed:2051,wu:2053, @@ -2175,7 +2175,7 @@ 2174=玉女祠|e:2173, 2175=小山路|ne:2176,sw:2173, 2176=小山路|push men\e:2177,sw:2175, -2177=华山小筑|open door\w:2176,hs>#loc:2450, +2177=华山小筑|open door\w:2176, 2178=广场|e:2180,n:2185,ne*:-1,nw:2181,s:2173,w:2179, 2179=山顶小店|e:2178, 2180=兵器房|w:2178, @@ -2837,3 +2837,4 @@ 2836=枯骨坑|out*:2832, 2837=乱坟岗|out*:2832, 2838=襄阳备用|n:177, +2839=石室| \ No newline at end of file