Merge remote-tracking branch 'rachels/master'

locations/bus_incidental.qsrc

@@ -33,6 +33,5 @@ if $ARGS[0] = 'end1':
 	act 'Continue': gt $loc, $loc_arg
 end
 
+--- bus_incidental ---------------------------------
 
-
---- bus_incidental ---------------------------------------

locations/din_bad.qsrc

@@ -223,7 +223,7 @@ if $ARGS[0] = 'd_bag':
 	elseif mc_inventory['mentats'] > 0:
 		'There are <b><<mc_inventory[''mentats'']>></b> neurobooster pills left. You really shouldn''t take any more pills today.'
 	end
-	if mc_inventory['steroids'] > 0:'<a href="exec:dynamic gs ''drugs'', ''steroids'' & gs ''din_bad'', ''d_bag''">Use steroids.</a> You have <b><<mc_inventory[''steroids'']>></b> steroids left in your purse.'
+	if mc_inventory['steroids'] > 0:'<a href="exec: gs ''drugs'', ''steroids'' & gs ''din_bad'', ''d_bag''">Use steroids.</a> You have <b><<mc_inventory[''steroids'']>></b> steroids left in your purse.'
 	if mc_inventory['breastcream'] > 0:'<a href="exec: gs ''drugs'', ''breastcream'' & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<mc_inventory[''breastcream'']>></b> cream left in your purse.'
 	if mc_inventory['aphrodisiac'] > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $drugVars[''aphrodisiac_msg''] & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<mc_inventory[''aphrodisiac'']>></b> gum left in your purse.'
 

locations/girl.qsrc

@@ -61,10 +61,10 @@ if $ARGS[0] = 'set_boybody':
 
 	boybodrand = rand(1, 4)
 
-	if boybodrand = 1 and boyboyrand = 1: 
+	if boybodrand = 1 and boybodyrand = 1: 
 		$boybod = 'petite'
 		$boybod_pref = 'a petite'
-	elseif boybodrand = 1 and boybodyrand = 1: 
+	elseif boybodrand = 1 and boybodyrand = 2: 
 		$boybod = 'slender'
 		$boybod_pref = 'a slender'
 	elseif boybodrand = 2: 

locations/gopnik_house.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'rape':
 		if ciklkm < placerParameter['number_of_man']:'Once the Gopnik finishes, his friend quickly takes his place between your legs.'
 		gs 'npcgeneratec', 0, 'Gopnik from the park', rand(16,26)
 		gs 'boyStat', $npclastgenerated
-		act 'Continue' gt 'gopnik_house', 'rape'
+		act 'Continue': gt 'gopnik_house', 'rape'
 	else
 		gt 'gopnik_house', 'rape_end'
 	end

locations/pav_library.qsrc

@@ -98,8 +98,8 @@ if hour >= 8 and hour < 18:
 		act 'Do your homework (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	
-	if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14 and SchoolAtestat = 0 and SchoolBlock = 0 _
-	and (class['school_grades_above_40'] + class['school_grades_above_70'] + class['school_grades_above_90'] <= 20 or grupTipe = 3):
+	if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14 and SchoolAtestat = 0 and SchoolBlock = 0 and _
+	(class['school_grades_above_40'] + class['school_grades_above_70'] + class['school_grades_above_90'] <= 20 or grupTipe = 3):
 		act 'Join the nerd''s study group': gt 'pav_library_nerdstudy', 'nerd_study_night'
 	end
 else

locations/transport_functions.qsrc

@@ -693,7 +693,7 @@ if $ARGS[0] = 'display_bus_timecost':
 		temp_mins += transportVars['bus_wait_gadukino']
 	elseif ($ARGS[1] = 'pavstation' and $ARGS[2] = 'community') or ($ARGS[1] = 'pushkin' and ($ARGS[2] = 'community' or $ARGS[2] = 'pavstation')) or ($ARGS[1] = 'construction' and $ARGS[2] ! 'gadukino') or ($ARGS[1] = 'gadukino' and ($ARGS[2] ! 'communal' and $ARGS[2] ! 'graveyard' and $ARGS[2] ! 'suburbs')):
 		temp_mins += transportVars['bus_wait_pavlovsk']
-	elseif $ARSG[1] = 'suburbs' or ($ARGS[1] = 'graveyard' and $ARGS[2] ! 'suburbs') or $ARGS[1] = 'communal' and $ARGS[2] = 'gadukino':
+	elseif $ARGS[1] = 'suburbs' or ($ARGS[1] = 'graveyard' and $ARGS[2] ! 'suburbs') or $ARGS[1] = 'communal' and $ARGS[2] = 'gadukino':
 		temp_mins += transportVars['bus_wait_gadukino']
 	else
 		temp_mins += transportVars['bus_wait_suburbs']