update

jarlyyn · jarlyyn · commit c5d2bcaea8e2 · 2023-09-21T22:59:01.000+08:00
diff --git a/script.toml b/script.toml
diff --git a/script/config.ini b/script/config.ini
@@ -42,7 +42,7 @@ maxstep=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/main.lua b/script/main.lua
@@ -44,4 +44,4 @@ if configcmd~=nil then
 	configcmd()
 end
 loadmod("update.mod")
-loadmod("queue.lua")
+loadmod("queue.lua")
diff --git 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/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/status.mod b/script/mods/status.mod
@@ -5,12 +5,12 @@ me.hp={}
 me.fam={"None"}
 me.special={}
 checkstatus=function()
-run("special;who -n -fam;score1;league;")
+run("special;who -n -fam;score;league;")
 end
 
 score=function()
 	me.score={}
-	catch("charinfo","score1")
+	catch("charinfo","score")
 end
 
 status_on_score1=function (name, line, wildcards)
@@ -29,6 +29,10 @@ status_on_teacher=function (name, line, wildcards)
 	me.score["xingge"]=wildcards[1]
 	me.score["teacher"]=wildcards[2]
 end
+status_onteachernew=function(name, line, wildcards)
+	me.score["sex"]=wildcards[1]
+	me.score["teacher"]=wildcards[2]
+end
 status_noteacher=function (name, line, wildcards)
 	me.score["xingge"]=wildcards[1]
 	me.score["teacher"]="none"
@@ -85,13 +89,13 @@ status_onhpwater=function(name, line, wildcards)
 end
 
 status_onhptihui=function(name, line, wildcards)
-	me.hp.nuqi=wildcards[2]
-	if me.hp.nuqi=="怒火中烧" or me.hp.nuqi=="竖发冲冠" then
-		me.hp.nuqi=10000
-	else
-		me.hp.nuqi=tonumber(me.hp.nuqi)
-	end
-	me.hp["tihui"]=tonumber(wildcards[3])
+	--me.hp.nuqi=wildcards[2]
+	--if me.hp.nuqi=="怒火中烧" or me.hp.nuqi=="竖发冲冠" then
+	--	me.hp.nuqi=10000
+	--else
+	--	me.hp.nuqi=tonumber(me.hp.nuqi)
+	--end
+	me.hp["tihui"]=tonumber(wildcards[1])
 end
 
 getfam=function()
diff --git a/script/mods/update.mod b/script/mods/update.mod
@@ -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
@@ -115,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
@@ -339,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
@@ -348,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
