|
@@ -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>>
|