Explorar o código

mid($start_type,1,2) != 'sg' -> !setup.startingCharacterTagsIncludes('sg')

Stephan Fuchs hai 8 meses
pai
achega
0dccae6c28

+ 1 - 1
sugarcube/src/autogenerated/unsorted/dreams.tw

@@ -8,7 +8,7 @@
 		Today you had a very strange dream: You were blindfolded, having sex with a stranger. After the two of you are done you remove the blindfold and recognize the stranger to be your stepfather.
 		<<set $pc.horny = 100>>
 		<<set $stepdadqw += 1>>
-	<<elseif getvar("$canBraidHair") == 0 and mid($start_type,1,2) != 'sg' and $pc.pcs_hairlng > 80>>
+	<<elseif getvar("$canBraidHair") == 0 and !setup.startingCharacterTagsIncludes('sg') and $pc.pcs_hairlng > 80>>
 		<<set $canBraidHair = 1>>
 		<<image "characters/pavlovsk/resident/anya/braid.jpg">>
 		You dream about the time your sister taught you how to braid your hair. She was happy to help you out and teach you how to do it, it was one of your more memorable sister bonding moments the two of you had not long before you moved out.

+ 10 - 10
sugarcube/src/autogenerated/unsorted/pav_aptcourtev.tw

@@ -146,13 +146,13 @@
 	<<set $location_type = 'public_outdoors'>>
 	<<set $time.minutes += 2>>
 	<<warn 'JUMP MARKER ENCOUNTERED: :reroll_jump1'>>
-	<<if getvar("$rolanmeet") == 0 or mid($start_type,1,2) != 'sg'>>
+	<<if getvar("$rolanmeet") == 0 or !setup.startingCharacterTagsIncludes('sg')>>
 		<<set $events = rand(0,17)>>
 	<<else>>
 		<<set $events = rand(0,22)>>
 	<</if>>
 	<<if getvar("$anushkaQW['first_visit']") == 0 and $npcs.get('A144','rel') > 50 and rand(0,1) == 1 and $anushka_met != $time.daystart>>
-		<<if mid($start_type,1,2) != 'sg'>>
+		<<if !setup.startingCharacterTagsIncludes('sg')>>
 			<<warn 'JUMP COMMAND ENCOUNTERED: jump reroll_jump1'>>
 
 		<</if>>
@@ -188,7 +188,7 @@
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
 	<<elseif getvar("$events") == 2>>
-		<<if mid($start_type,1,2) != 'sg'>>
+		<<if !setup.startingCharacterTagsIncludes('sg')>>
 			<<warn 'JUMP COMMAND ENCOUNTERED: jump reroll_jump1'>>
 
 		<</if>>
@@ -247,7 +247,7 @@
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
 	<<elseif getvar("$events") == 9>>
-		<<if mid($start_type,1,2) != 'sg' or ($time.weekday < 6 and $time.hour < 14) or ($time.weekday == 3 and $time.hour >= 16)>>
+		<<if !setup.startingCharacterTagsIncludes('sg') or ($time.weekday < 6 and $time.hour < 14) or ($time.weekday == 3 and $time.hour >= 16)>>
 			<<warn 'JUMP COMMAND ENCOUNTERED: jump reroll_jump1'>>
 
 		<</if>>
@@ -314,7 +314,7 @@
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
 	<<elseif getvar("$events") == 15>>
-		<<if mid($start_type,1,2) != 'sg' or ($time.weekday < 5 and $time.hour < 14)>>
+		<<if !setup.startingCharacterTagsIncludes('sg') or ($time.weekday < 5 and $time.hour < 14)>>
 			<<warn 'JUMP COMMAND ENCOUNTERED: jump reroll_jump1'>>
 
 		<</if>>
@@ -334,7 +334,7 @@
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
 	<<elseif getvar("$events") == 16>>
-		<<if mid($start_type,1,2) != 'sg' or ($time.weekday == 3 and $time.hour >= 16) or ($time.weekday < 5 and $time.hour < 14)>>
+		<<if !setup.startingCharacterTagsIncludes('sg') or ($time.weekday == 3 and $time.hour >= 16) or ($time.weekday < 5 and $time.hour < 14)>>
 			<<warn 'JUMP COMMAND ENCOUNTERED: jump reroll_jump1'>>
 
 		<</if>>
@@ -475,7 +475,7 @@
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
 	<<elseif getvar("$nightevents") == 5>>
-		<<if mid($start_type,1,2) != 'sg' or ($time.weekday < 6 and $time.hour > 3) or $time.hour > 6>>
+		<<if !setup.startingCharacterTagsIncludes('sg') or ($time.weekday < 6 and $time.hour > 3) or $time.hour > 6>>
 			<<warn 'JUMP COMMAND ENCOUNTERED: jump reroll_jump2'>>
 
 		<</if>>
@@ -508,7 +508,7 @@
 			<<gt 'pav_complex' 'start'>>
 		<</actCLA>>
 	<<elseif getvar("$nightevents") == 8>>
-		<<if mid($start_type,1,2) != 'sg' or ($time.weekday < 6 and $time.hour > 3) or $time.hour > 6>>
+		<<if !setup.startingCharacterTagsIncludes('sg') or ($time.weekday < 6 and $time.hour > 3) or $time.hour > 6>>
 			<<warn 'JUMP COMMAND ENCOUNTERED: jump reroll_jump2'>>
 
 		<</if>>
@@ -592,7 +592,7 @@
 			<</if>>
 		<</actCLA>>
 	<<elseif getvar("$nightevents") == 9>>
-		<<if mid($start_type,1,2) != 'sg' or ($time.weekday == 3 and $time.hour <= 23) or ($time.weekday == 5 and $time.hour >= 20) or ($time.weekday == 6 and $time.hour >= 20) or ($time.weekday < 6 and $time.hour > 3) or $time.hour > 6>>
+		<<if !setup.startingCharacterTagsIncludes('sg') or ($time.weekday == 3 and $time.hour <= 23) or ($time.weekday == 5 and $time.hour >= 20) or ($time.weekday == 6 and $time.hour >= 20) or ($time.weekday < 6 and $time.hour > 3) or $time.hour > 6>>
 			<<warn 'JUMP COMMAND ENCOUNTERED: jump reroll_jump2'>>
 
 		<</if>>
@@ -658,7 +658,7 @@
 			<</if>>
 		<</actCLA>>
 	<<elseif getvar("$nightevents") == 10>>
-		<<if mid($start_type,1,2) != 'sg' or ($time.weekday < 6 and $time.hour > 3) or $time.hour > 6>>
+		<<if !setup.startingCharacterTagsIncludes('sg') or ($time.weekday < 6 and $time.hour > 3) or $time.hour > 6>>
 			<<warn 'JUMP COMMAND ENCOUNTERED: jump reroll_jump2'>>
 
 		<</if>>

+ 1 - 1
sugarcube/src/autogenerated/unsorted/uni_admin.tw

@@ -57,7 +57,7 @@
 			<<gt 'uni_admin' 'take_test'>>
 		<</actCLA>>
 	<</if>>
-	<<if (getvar("$university['entrance_exam_passed']") == 1 or getvar("$university['prep_enrolled']") == 0) and getvar("$university['student']") == 0 and getvar("$university['diploma']") == 0 and getvar("$pc.age") >= 17 and (mid($start_type,1,2) != 'sg' or getvar("$SchoolAtestat") == 1) and $time.month < 9 and $time.month > 4 and getvar("$university['exam_week']") == 0>>
+	<<if (getvar("$university['entrance_exam_passed']") == 1 or getvar("$university['prep_enrolled']") == 0) and getvar("$university['student']") == 0 and getvar("$university['diploma']") == 0 and getvar("$pc.age") >= 17 and (!setup.startingCharacterTagsIncludes('sg') or getvar("$SchoolAtestat") == 1) and $time.month < 9 and $time.month > 4 and getvar("$university['exam_week']") == 0>>
 		<<actCLA 'Enroll at the university'>>
 			<<gt 'uni_admin' 'enrollment'>>
 		<</actCLA>>

+ 2 - 2
sugarcube/src/locations/city/city_industrial.tw

@@ -101,9 +101,9 @@
 	<<else>>
 		The community centre is currently closed. It's only open during the week between 09:00 and 17:00.
 	<</if>>
-	<<if $time.hour >= 9 and $time.hour <= 17 and (mid($start_type,1,2) != 'sg' or getvar("$SchoolAtestat") == 0) or getvar("$bumtolik") > 3>>
+	<<if $time.hour >= 9 and $time.hour <= 17 and (!setup.startingCharacterTagsIncludes('sg') or getvar("$SchoolAtestat") == 0) or getvar("$bumtolik") > 3>>
 		<<link "Mercy clinic">><<gt 'buklinik' 'start'>><</link>> is open.
-	<<elseif ($time.hour < 9 or $time.hour > 17) and (mid($start_type,1,2) != 'sg' or getvar("$SchoolAtestat") == 0) or getvar("$bumtolik") > 3>>
+	<<elseif ($time.hour < 9 or $time.hour > 17) and (!setup.startingCharacterTagsIncludes('sg') or getvar("$SchoolAtestat") == 0) or getvar("$bumtolik") > 3>>
 		Mercy clinic is closed.
 	<</if>>
 	<<if $time.hour >= 8 and $time.hour <= 20>>