files update~

Taromati2/ghost/master/dic/aya/master/ghost.dic

@@ -45,3 +45,11 @@ IsGhostExist{//IsGhostExist('SSPER')
 IsSakuraExist{
 	INARRAY(installedsakuralist,_argv[0])
 }
+GetSakuraNameFromGhostName{
+	_t=ARRAY.GetIndex(installedghostlist,_argv[0])
+	installedsakuralist[_t]
+}
+GetKeroNameFromGhostName{
+	_t=ARRAY.GetIndex(installedghostlist,_argv[0])
+	installedkerolist[_t]
+}

Taromati2/ghost/master/dic/aya/master/last_time.dic

@@ -1,3 +1,3 @@
 //last time用于鉴定当前时间是否错误
-#globaldefine	LAST_BUILD_TIME.YEAR		2023
-#globaldefine	LAST_BUILD_TIME.MOUNTH	12
+#globaldefine	LAST_BUILD_TIME.YEAR		2024
+#globaldefine	LAST_BUILD_TIME.MOUNTH	01

Taromati2/ghost/master/dic/aya/master/sysex.dic

@@ -8,14 +8,21 @@ OnChoiceSelectEx{
 		if ISSTR(_arglist[_i])
 			_arglist[_i]=ValueTOstring(_arglist[_i],0)
 	}
+	_result=''
 	if ISFUNC("Select.%(reference1)")
-		EVAL("Select.%(reference1)(%_arglist)")
+		_result=EVAL("Select.%(reference1)(%_arglist)")
 	elseif ISFUNC('Select.'+reference1[0,'('])
-		EVAL('Select.'+reference1)
+		_result=EVAL('Select.'+reference1)
 	elseif ISFUNC(reference1[0,'('])
-		do_nothing
-	else
+		return
+	else{
 		BUGNow("事件“%(reference1)”未定义")
+		return
+	}
+	if !_result
+		BUGNow("选项“%(reference1)”返值为空")
+	else
+		_result
 }
 OnAITalk{
 	if specialmode == 'rest'//休息事件中随机谈话禁止

Taromati2/ghost/master/dic/communicate/talk/talk_t.dic

@@ -140,6 +140,8 @@ OnMouseDoubleClick1{
 Select.ReturnMain{
 	mode = '0'
 	specialmode = ''
+	DiscordCustom.ModeSet
+	--
 	'\1\s[110]嗯。\w9\w9\n那、\w9也该回去了。\w9\w9\w9\w9\1\s[-1]\c\b[-1]\w9\w9\0\s[0]啊、\w9\s[26]欢迎回来。\w9\w9\1\s[10]呼。'
 	'\1\s[110]那、\w9也该回去当小公主的卫兵了。\w9\w9\w9\w9\1\s[-1]\c\b[-1]\w9\w9\0\s[0]啊、\w9\s[26]欢迎回来。\w9\w9\1\s[10]呼。'
 }

Taromati2/ghost/master/dic/communicate/touch/touch.dic

@@ -31,6 +31,10 @@ OnTouch.FunctionCase.OnlyPhase.base{
 //**** 抚で反応 *************************************************************************
 //---- OnMouseMoveイベント --------------------------------------------------------------
 OnMouseMove{
+	if reference3 > 1{
+		"\p[%(reference3)]\s[-1]"
+		return
+	}
 	if mode == '1' && specialmode != 'mealtime'{
 		OnMouseMove1
 	}

Taromati2/ghost/master/dic/games/GoldenFlower.dic

@@ -6,7 +6,6 @@ OnGoldenFlower{
 		return
 	}
 	_txt=''
-	mode='-1'
 	mess=''
 	if !GoldenFlowerInited{
 		Card

Taromati2/ghost/master/dic/other/Miniuse.dic

@@ -3266,31 +3266,21 @@ OnOtherGhostClosed{
 	//ghostexlist=RE_REPLACE(ghostexlist,',$','')
 	ghostexcount=ARRAYSIZE(ghostexlist)
 	--
-	if 'Kyara' _in_ reference0{
-		'……哼'
-	}
-	else{
-		if mode == '1'{
-			if ghostexcount > 0{
-				'\1\s[11]喵呜~？'
-			}
-			else{
-				mode = '0'
-				'\1\s[18]哈啊……没人在的话就好。\n/
-				真是麻烦。'
-			}
+	if mode == '1'{
+		if ghostexcount > 0{
+			'\1\s[11]喵呜~？'
 		}
 		else{
-			if ghostexcount > 0{
-				mode = '1'
-				'\0\s[11]喵呜~？'
-			}
-			else{
-				mode = '0'
-				'\0\s[0]………………'
-			}
+			'\1\s[13]哈啊……没人在的话就好。\n/
+			真是麻烦。'
 		}
 	}
+	else{
+		if 'Kyara' _in_ reference0
+			'\0\s[0]……哼\s[6]'
+		else
+			'\0\s[0]………………'
+	}
 }
 OnChangeChineseCode{
 	'/

Taromati2/ghost/master/dic/other/otherserv.dic

@@ -393,19 +393,23 @@ meal8 : nonoverlap{
 	'芒果奶茶'
 }
 Select.meal{
-	DiscordCustomSet.CustomDetail('有人在用不知道什么方式进行料理')
-	--
 	mode = '1'
 	specialmode = 'mealtime'
 	mealendtime = ghostuptime + 60*4
 	'\0\w9\w9\s[26]那么，请稍等一下，或许需要准备很长时间呢\w9\w9\w9\s[-1]'
+	--
+	DiscordCustomSet.CustomDetail('有人在用不知道什么方式进行料理')
+	--
+	DiscordCustom.ModeSet
 }
 Onmealfin{
-	DiscordCustomSet.CustomDetail('开饭')
-	--
 	mode = '0'
 	specialmode = ''
 	ERASEVAR('mealendtime')
+	DiscordCustomSet.CustomDetail('开饭')
+	--
+	DiscordCustom.ModeSet
+	--
 	"\s[51]准备好了，%(username)，这是橘花精心制作的菜式哦，不知是否合口味\w9\w9\n\q[◇做得很好哦，橘花谢谢你,goodjob]\n\q[◇一点也不好吃,notgoodjob]\![set,choicetimeout,0]"
 }
 Select.goodjob{

Taromati2/ghost/master/dic/system/bootend.dic

@@ -4,6 +4,7 @@
 BaseGhostStart{//改动于2020 by steve02081504
 	VERSION_UPGRADE
 	OnOptionSet
+	OnDiscordPluginCustomEnd
 	--
 	FCHARSET(1)
 	lastTalk = '\0\s[20]咦？分明才刚启动的说…\1\s[10]喵，刚才什么都没说'
@@ -185,13 +186,13 @@ OnBoot{
 	MAGICLOCK
 	BaseGhostStart
 	--
+	SHIORI_FW.PushNoBreakNotifyResult(OnBoot.base(_argv))
+	--
 	if LOADED_FROM_MAGIC
 		OnSilentChangeShell(shellID)
 	else
 		SHIORI_FW.PushNoBreakNotifyResult(OnAutoChangeShell.boot)
 	--
-	SHIORI_FW.PushNoBreakNotifyResult(OnBoot.base(_argv))
-	--
 	if AutoUpdate{
 		if QuickStartVersion && !FullDataPackInstalled
 			SHIORI_FW.PushNoBreakNotifyResult(OnInstallFullDataPack)
@@ -200,12 +201,39 @@ OnBoot{
 	}
 }
 OnBoot.base{
+	if reference6 == 'halt'
+		DiscordCustomSet.CustomDetail('Halt!')
+	--
 	if mode == '1'{
 		if specialmode == 'mealtime'
 			mealendtime=60
-		"\0\s[-1]\1\s[%(specialmode != 'mealtime')10]呦。"
+		"\0\s[-1]\1\s[%(specialmode != 'mealtime')10]呦。\w9\n"
+		--
+		if reference6 == 'halt' {
+			if reference7 == 'Taromati2' 
+				'电脑没问题吗？'
+			elseif IsGhostExist(reference7)
+				"不去找%(GetSakuraNameFromGhostName(reference7))它们聊聊？"
+			else
+				'那家伙，\s[13]\w9见不到了啊。'
+			--
+			'\x'
+		}
 		return
 	}
+	if reference6 == 'halt' {
+		'\0\s[8]'
+		--
+		if reference7 == 'Taromati2' 
+			'电脑\w8没问题吗？'
+		elseif IsGhostExist(reference[7])
+			"\s[26]需要去找%(GetSakuraNameFromGhostName(reference[7]))聊聊吗？"
+		else
+			'.\w9.\w9.\w9发生了什么事呢？\n'
+		--
+		'\x'
+	}
+	--
 	if elapsetime > 300 && specialmode == 'mealtime'{
 		void Onmealfin
 	}

Taromati2/ghost/master/dic/system/discord.dic

@@ -1,17 +1,43 @@
 OnDiscordPluginCustom{
+	if !DiscordCustom.State
+		DiscordCustom.DeveloperSet
+	if !DiscordCustom.Detail
+		DiscordCustom.LoggingSet
+	if !DiscordCustom.LargeImageKey
+		DiscordCustom.ModeSet
+	--
 	InDiscordPluginCustom=1
 	'\![raiseplugin,Discord Rich Presence,OnDiscordPluginCustomALL,'
 	--
 	'902362898960117830,'//Appid
 	--
-	','//CustomDetail
+	if DiscordCustom.Detail
+		DiscordCustom.Detail
+	--
+	','
+	--
+	DiscordCustom.State
+	--
+	','
+	--
+	DiscordCustom.LargeImageKey
+	--
+	','
 	--
-	','//CustomState
+	if DiscordCustom.LargeImageText
+		DiscordCustom.LargeImageText
+	else
+		'github.com/Taromati2'//LargeImageText
 	--
-	'kikka_eye_open,'//LargeImageKey
+	','
 	--
-	'github.com/Taromati2,'//LargeImageText
+	DiscordCustom.SmallImageKey
 	--
+	','
+	--
+	DiscordCustom.SmallImageText
+	--
+	','
 	/*
 	'simple_hollow_red_heart,'//SmallImageKey
 	--
@@ -20,40 +46,38 @@ OnDiscordPluginCustom{
 	*/
 	']'
 	--
-	DiscordCustom.DeveloperSet
-	--
-	DiscordCustom.LoggingSet
-	--
 	'\0\s[0]好的，Discord个人资料已经更新了\n'
 }
 OnDiscordPluginCustomEnd{
 	InDiscordPluginCustom=0
 }
+ClearDiscordVar{
+	ERASEALLVARBEGINAS('DiscordCustom.')
+}
 DiscordCustomSet.base{
+	LETTONAME('DiscordCustom.'+_argv[0],_argv[1])
 	if InDiscordPluginCustom
-		'\![raiseplugin,Discord Rich Presence,'+_argv[0]+','+SakuraScriptArgConverter(_argv[1])+']'
+		'\![raiseplugin,Discord Rich Presence,OnDiscordPluginCustom'+_argv[0]+','+SakuraScriptArgConverter(_argv[1])+']'
 }
 DiscordCustomSet.LargeImageKey{
-	DiscordCustomSet.base('OnDiscordPluginCustomLargeImageKey',_argv[0])
+	DiscordCustomSet.base('LargeImageKey',_argv[0])
 }
 DiscordCustomSet.LargeImageText{
-	DiscordCustomSet.base('OnDiscordPluginCustomLargeImageText',_argv[0])
+	DiscordCustomSet.base('LargeImageText',_argv[0])
 }
 DiscordCustomSet.SmallImageKey{
-	DiscordCustomSet.base('OnDiscordPluginCustomSmallImageKey',_argv[0])
+	DiscordCustomSet.base('SmallImageKey',_argv[0])
 }
 DiscordCustomSet.SmallImageText{
-	DiscordCustomSet.base('OnDiscordPluginCustomSmallImageText',_argv[0])
+	DiscordCustomSet.base('SmallImageText',_argv[0])
 }
 DiscordCustomSet.CustomDetail{
-	DiscordCustomSet.base('OnDiscordPluginCustomDetail',_argv[0])
+	DiscordCustomSet.base('Detail',_argv[0])
 }
 DiscordCustomSet.CustomState{
-	DiscordCustomSet.base('OnDiscordPluginCustomState',_argv[0])
+	DiscordCustomSet.base('State',_argv[0])
 }
 DiscordCustom.DeveloperSet{
-	if !InDiscordPluginCustom
-		return
 	if SHIORI_FW.DebugMode{
 		DiscordCustomSet.SmallImageKey('simple_hollow_red_heart')
 		--
@@ -66,12 +90,16 @@ DiscordCustom.DeveloperSet{
 	}
 }
 DiscordCustom.LoggingSet{
-	if !InDiscordPluginCustom
-		return
 	if SHIORI_FW.LogMode{
 		DiscordCustomSet.CustomDetail('寻找蛛丝马迹')
 	}
 	else{
 		DiscordCustomSet.CustomDetail('发呆。')
 	}
 }
+DiscordCustom.ModeSet{
+	if mode=='0'
+		DiscordCustomSet.LargeImageKey('kikka_eye_open')
+	elseif mode=='1'
+		DiscordCustomSet.LargeImageKey('catail')
+}

Taromati2/ghost/master/dic/system/menu.dic

@@ -172,18 +172,14 @@ OpenMenuTalk{
 				"\0\s[27]讨厌，%(username)想被锯上一锯吗？\e"
 		}
 	}
-	elseif !_phase {
+	elseif _phase <= 0 {
 		'\0\s[0]？'
 		'\0\s[6]干嘛'
 		'\0\s[7]什么事。'
 		'\0\s[25]有何贵干。'
-	}
-	elseif _phase < 0 {
-		'\0\s[0]？'
-		'\0\s[6]干嘛'
-		'\0\s[7]什么事。'
 		--
-		'\e'
+		if intimacy < -312
+			'\e'
 	}
 	else {
 		'\0\s[26]好的、什么事呢？'
@@ -1190,22 +1186,41 @@ Select.SmokingPlace{
 	DiscordCustomSet.CustomDetail('陪猫抽烟')
 	--
 	mode = '1'
+	DiscordCustom.ModeSet
+	--
 	if specialmode == 'smoking'{
 		{
-			towaflag = 1
 			'\0\s[30]那里、是在另一边喔…\w9\w9\w9\s[-1]\b[-1]\c\w9\w9\w9\w9\1\s[111]嗯？'
 			--
-			if smoker=='0'
+			if smoker=='0' && !towaflag
 				'\w9\w9\n你不是不吸烟吗？'
 			--
 			'\w9\w9\s[110]\n[150]虽然是无所谓、可别自己跑到吸烟室来、\n却抱怨'
 			--
-			'到处都是『烟雾』喔？'
-			'满屋都是『烟臭味』喔？'
-			'到处都是『烟雾』喔？抽烟怎么会没有烟雾呢~？'
-			'满屋都是『烟臭味』喔？看不清楚了吧'
-			'满屋都是『难闻的味道』喔？话说，你受不了的话就回去吧'
-			'里面全是『猫咪的味道』喔？猫咪身上可是很香的的哦~'
+			'到处'
+			'满屋'
+			'里面'
+			--
+			'都是'
+			'全是'
+			--
+			{
+				'『烟雾』喔？'
+				'『烟臭味』喔？'
+				--
+				'看不清楚了吧'
+				'抽烟怎么会没有烟雾呢~？'
+				''
+			}
+			{
+				'『难闻的味道』喔？'
+				'『猫咪的味道』喔？'
+				--
+				'话说，你受不了的话就回去吧'
+				'猫咪身上可是很香的的哦~'
+				''
+			}
+			towaflag = 1
 		}
 		{
 			'\0\s[30]那里、是在另一边喔…\w9\s[0]\n'