Browse Source

Merge remote-tracking branch 'Kevin-upstream/master'

Netuttki 3 months ago
parent
commit
60a0c7315c

+ 1 - 7
locations/intro_sg_select_custom.qsrc

@@ -24,14 +24,8 @@ if $ARGS[0] = 'start':
 			gs 'obj_din', 'old'
 		end
 
-		killvar 'class_list_institution'
-		killvar 'class_list_name'
 
-		!!Setting the shcoll classes such that grades can be assigned
-		gs 'intro_functions', 'create_sgclasses'
-
-		!!Set the greades to be average.
-		gs 'intro_functions', 'set_base_sgrades'
+		gs 'intro_functions', 'reset_sgclasses'
 
 		gt $loc, $loc_arg
 	end

+ 2 - 2
locations/therapist_hotel.qsrc

@@ -534,7 +534,7 @@ if $ARGS[0] = 'event5_submit':
 
 	act 'Accept':
 		*clr & cla
-		therapist['hotel_submit'] = 10
+		therapistQW['hotel_submit'] = 10
 		gs 'arousal', 'vaginal_finger', 15, 'sub'
 		gs 'stat'
 
@@ -852,7 +852,7 @@ if $ARGS[0] = 'event6_submit4':
 	HotelRoom['pav_hotel'] = 0
 	hotelRoomDays['pav_hotel'] = 0
 	therapistQW['hotel_key'] = 3
-	gs 'homes_preperties', 'set_home', 'hotel_therapist'
+	gs 'homes_properties', 'set_home', 'hotel_therapist'
 
 	gt 'pav_hotel'
 

+ 2 - 0
locations/torgcentr.qsrc

@@ -112,6 +112,8 @@ if hour > 12 and hour < 18 and sunWeather = 1 and exhibitionQW >= 5 and KsenyaQW
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/mall2.jpg"></center>'
 					'Makoto gets into the driver seat and starts up the car. "Come on Ksenya, we need to make a stop at the bank before we head back" she says and looks at you as Ksenya goes to the other side of the car. "Nice to have met you, <name>. I hope to see you around" she says and they drive off, leaving you alone in the parking lot.'
+
+					act 'Enter the mall': gt 'torgcentr'
 				end
 			end
 		end