瀏覽代碼

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

Lusticon 1 月之前
父節點
當前提交
26b42d1b7e
共有 3 個文件被更改,包括 10 次插入4 次删除
  1. 6 0
      locations/Cheatmenu_din.qsrc
  2. 1 1
      locations/LariskaHome.qsrc
  3. 3 3
      locations/therapist.qsrc

+ 6 - 0
locations/Cheatmenu_din.qsrc

@@ -646,6 +646,12 @@ $cheatmenu['permanent'] = {
 
 	*nl
 
+	*p 'Remove ''once a week'' therapist limit: '
+	if therapist_weekly_cheat = 0:
+		'<a href="exec: therapist_weekly_cheat = 1 && dynamic $cheatmenu[''permanent'']">on</a>&nbsp;|&nbsp;off'
+	else
+		'on&nbsp;|&nbsp;<a href="exec: therapist_weekly_cheat = 0 && dynamic $cheatmenu[''permanent'']">off</a>'
+	end
 	'Who says bimbos can''t be smart? Smart bimbo mode: <a href="exec:dynamic $cheatmenu[''SmartBimbo'']"><<$cheatBimbo2>></a>'
 	'Succubus bimbo mode: <a href="exec:dynamic $cheatmenu[''SuccuBimbo'']"><<$cheatBimbo3>></a>'
 

+ 1 - 1
locations/LariskaHome.qsrc

@@ -114,7 +114,7 @@ if $ARGS[0] = 'hallway':
 		$text_home = 'is in the kitchen'
 	elseif locat['Lariska'] = 13:
 		$text_home = 'is in the shower'
-	elseif locat['Lariska'] = 8:
+	elseif locat['Lariska'] = 20:
 		$text_home = 'is in the bathroom, cleaning'
 	elseif locat['Lariska'] = 14 or locat['Lariska'] = 16 or locat['Lariska'] = 18:
 		$text_home = 'should be in the living room'

+ 3 - 3
locations/therapist.qsrc

@@ -42,15 +42,15 @@ if $ARGS[0] = '':
 	
 	gs 'stat'
 
-	if therapist_weekly_block > 0:
+	if therapist_weekly_block = 0 or therapist_weekly_cheat > 0:
+		gs 'therapist', 'hypnoGreet'
+	else
 		*nl
 		'"Miss <<$pcs_lastname>>, too much treatment without time for your brain to process could be harmful.'
 		'Come next week, we can talk about your problems then."'
 		! '"Miss <<$pcs_lastname>>, your appointment is on Thursday at 21:30, we can talk about your problems then.'
 		! 'Too much treatment without time for your brain to process could be harmful."'
 		act 'Leave':gt $loc
-	else
-		gs 'therapist', 'hypnoGreet'
 	end
 end