瀏覽代碼

[fixed] simplify conditional in sitr2x

Spackled Lanturn 3 年之前
父節點
當前提交
354befdcfc
共有 1 個文件被更改,包括 2 次插入11 次删除
  1. 2 11
      locations/sitr2x.qsrc

+ 2 - 11
locations/sitr2x.qsrc

@@ -45,18 +45,9 @@ gs 'exercise', 'start'
 !if week = 5 and hour > 17 and hour < 21 and housegostrand > 15 and husband > 0 and husbandrink ! 10:gt'sitr2x','guest'
 
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
-	if week < 6:
-		if hour > 17 and hour <= 22:
-			'<a href="exec: gt''husb'',''start'' ">Your husband is sitting on the couch watching TV.</a>'
-		end
-	else
-		if hour > 7 and hour < 17:
-			'<a href="exec: gt''husb'',''start'' ">Your husband is sitting on the couch watching TV.</a>'
-		elseif hour > 17 and hour <= 22:
-			'<a href="exec: gt''husb'',''start'' ">Your husband is sitting on the couch watching TV.</a>'
-		end
+	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
+		'<a href="exec: gt''husb'',''start'' ">Your husband is sitting on the couch watching TV.</a>'
 	end
-
 end
 
 gs'subkid'