Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/arturRinok.qsrc

@@ -140,7 +140,7 @@ if $ARGS[0] = 'work_1':
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/arturqw_4.jpg"></center>'
-				'Arthur comes up behind you and firmly grabs a handful of your ass. "<<$pcs_nickname>>, here you go, you earned this." He hands you 5000 <b>₽</b>.'
+				'Arthur comes up behind you and firmly grabs a handful of your ass. "<<$pcs_nickname>>, here you go, you earned this." He hands you 1250 <b>₽</b>.'
 				'"I like helping you very much, thank you very much Arturik." You look at him with grateful eyes and take the money.'
 				'"Well, you know, the sight of your beautiful eyes nearly overwhelm me every time I see them. So does your tight ass." He says, smiling lecherously at you'
 				'You turn and give him a quick shake of your rump before departing.'

locations/begin.qsrc

@@ -7,6 +7,7 @@ if $ARGS[0] = 'start':
 	timerEndM = 0
 	timer = 6
 	timerM = 30
+	settingmode = 0
 
 	gs 'Cheatmenu_din'
 	showstat 1

locations/city_apt_building.qsrc

@@ -323,14 +323,6 @@ if $ARGS[0] = 'lift':
 	killvar 'res_lift_ev'
 end
 
-if $ARGS[0] = 'elev_objava':
-		*clr & cla
-		minut += 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/elevator_ob'+rand(1,2)+'.jpg"></center>'
-	act 'Continue': gt 'city_apt_building','lift'
-end
-
 if $ARGS[0] = 'pod_objava':
 		*clr & cla
 		minut += 1

locations/nerd_game_night.qsrc

@@ -1149,7 +1149,7 @@ if $ARGS[0] = 'summer_invite_sms':
 		$trialSMS += $SMSFrM+$VM['1a']+$SMSBkM
 		$SMSMessage[ARGS[1]] = $trialSMS
 		gs 'telefon', 'show_sms', ARGS[2]
-		nerd_game['invite_day'] = 2147483647 & ! block the event
+!!		nerd_game['invite_day'] = 2147483647 & ! block the event
 	end
 
 	if $ARGS[1] = 'V2':

locations/obj_din.qsrc

@@ -114,7 +114,7 @@ if $ARGS[0] = 'cheattabs':
 	act 'Exit the menu': killvar 'menu_page' & gt 'obj_din', 'menu_exit'
 end
 
-if $ARGS[0] = 'menu_exit': gt $menu_loc, $menu_arg
+if $ARGS[0] = 'menu_exit': settingmode = 0 & gt $menu_loc, $menu_arg
 
 if $ARGS[0] = 'menu_disabled': '<font color="red"><b>Menu is disabled for this event</b></font>'
 

locations/pav_complexb2.qsrc

@@ -195,7 +195,7 @@ if $ARGS[0] = 'lift':
 	minut +=1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator.jpg"></center>'
-	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pav_complexb2'',''elev_objava''">notification</a> in the elevator.</center>'
+	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pav_complexb2'',''elev_objava'',$ARGS[1]">notification</a> in the elevator.</center>'
 	act 'Push button: Floor 1': gt 'pav_complexb2','etaj_1'
 	act 'Push button: Floor 2': gt 'pav_complexb2','etaj_2'
 	act 'Push button: Floor 3': gt 'pav_complexb2','etaj_3'
@@ -228,7 +228,7 @@ if $ARGS[0] = 'elev_objava':
 		minut +=1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator_ob'+rand(1,2)+'.jpg"></center>'
-	act 'Continue': gt 'pav_complexb2','lift'
+	act 'Continue': gt 'pav_complexb2','lift',$ARGS[1]
 end
 
 !locked ads

locations/pav_complexb3.qsrc

@@ -198,7 +198,7 @@ if $ARGS[0] = 'lift':
 	minut +=1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator.jpg"></center>'
-	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pav_complexb3'',''elev_objava''">notification</a> in the elevator.</center>'
+	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pav_complexb3'',''elev_objava'',$ARGS[1]">notification</a> in the elevator.</center>'
 	act 'Push button: Floor 1': gt 'pav_complexb3','etaj_1'
 	act 'Push button: Floor 2': gt 'pav_complexb3','etaj_2'
 	act 'Push button: Floor 3': gt 'pav_complexb3','etaj_3'
@@ -231,7 +231,7 @@ if $ARGS[0] = 'elev_objava':
 		minut +=1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator_ob'+rand(1,2)+'.jpg"></center>'
-	act 'Continue': gt 'pav_complexb3','lift'
+	act 'Continue': gt 'pav_complexb3','lift',$ARGS[1]
 end
 
 !locked ads

locations/pod_ezd.qsrc

@@ -311,7 +311,7 @@ if $ARGS[0] = 'lift':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator.jpg"></center>'
-	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pod_ezd'',''elev_objava''">notification</a> in the elevator.</center>'
+	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pod_ezd'',''elev_objava'',$ARGS[1]">notification</a> in the elevator.</center>'
 	act 'Push button: floor 1': gt 'pod_ezd','etaj_1'
 	act 'Push button: floor 2': gt 'pod_ezd','etaj_2'
 	act 'Push button: floor 3': gt 'pod_ezd','etaj_3'
@@ -343,7 +343,7 @@ if $ARGS[0] = 'elev_objava':
 		minut +=1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator_ob'+rand(1,2)+'.jpg"></center>'
-	act 'Continue': gt 'pod_ezd','lift'
+	act 'Continue': gt 'pod_ezd','lift',$ARGS[1]
 end
 
 if $ARGS[0] = 'pod_objava':

locations/stat.qsrc

@@ -630,6 +630,10 @@ if minut >= 60:
 
 	if (hour mod 2) = 0: gs 'outdoors', 'weather'
 
+	!! I do not think that this should be here, but I put it here temporaly - rachels
+	!! generate SMS for nerd games
+	if rand(0,2) = 0 and hour > 10 and hour < 16 and week = 1 and grupTipe = 3 and nerd_game['invite_day'] < daystart: gs 'nerd_game_night', 'summer_invite_sms', 'Add SMS'
+
 	if minut >= 60:jump 'loopmin'
 end
 

locations/uni_grounds.qsrc

@@ -82,7 +82,7 @@ if $ARGS[0] = 'main':
 	if university['semester_week'] > 0: gs 'uni_lessons', 'schedule'
 	if university['exam_week'] > 0: gs 'uni_lessons', 'exam_schedule'
 
-	act 'Got to the dorms':
+	act 'Go to the dorms':
 		minut += 5
 		gt 'uni_dorm', 'start'
 	end

locations/uni_programs.qsrc

@@ -164,7 +164,7 @@ if $ARGS[0] = 'uni_period_second':
 			elseif week = 4: 
 				*nl
 				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Lerning Theories 101 Class': 
+				act 'Go to your Learning Theories 101 Class': 
 					if hour = 10: minut += 60 - minut
 					uni_period['second'] = daystart
 					gs 'stat'
@@ -231,7 +231,7 @@ if $ARGS[0] = 'uni_period_third':
 			elseif $ARGS[1] = 'tuesday' and $university['elective2'] ! '':
 				$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
 			elseif $ARGS[1] = 'wednesday':
-				$Result = 'Lerning Theories 101 (13:15 to 14:45)'
+				$Result = 'Learning Theories 101 (13:15 to 14:45)'
 			elseif $ARGS[1] = 'thursday' and $university['elective3'] ! '':
 				$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
 			elseif week = 1 and $university['elective1'] ! '': 
@@ -255,7 +255,7 @@ if $ARGS[0] = 'uni_period_third':
 			elseif week = 3:
 				*nl
 				'Your next class will start at 13:15. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Lerning Theories 101 Class': 
+				act 'Go to your Learning Theories 101 Class': 
 					if hour = 12: minut += 75 - minut
 					if hour = 13 and minut < 15: minut += 15 - minut
 					uni_period['third'] = daystart
@@ -332,13 +332,13 @@ if $ARGS[0] = 'exam':
 			if $ARGS[1] = 'schedule':
 				if university['exam_week'] = 1: 
 					if week < 4 or (week = 4 and hour < 9):
-						$Result = 'General Education 101 Exam (09:00 to 12:00) Thursday this week. Teaching Methods 101 Exam (09:00 to 12:00) Monday next week. Lerning Theories 101 Exam (09:00 to 12:00) Thursday next week.'
+						$Result = 'General Education 101 Exam (09:00 to 12:00) Thursday this week. Teaching Methods 101 Exam (09:00 to 12:00) Monday next week. Learning Theories 101 Exam (09:00 to 12:00) Thursday next week.'
 					else	
 						$Result = 'Teaching Methods 101 Exam (09:00 to 12:00) Tuesday next week. Learning Theories 101 Exam (09:00 to 12:00) Thursday next week.'
 					end
 				elseif university['exam_week'] = 2: 
 					if week < 2 or (week = 2 and hour < 9):
-						$Result = 'Teaching Methods 101 Exam (09:00 to 12:00) Tuesday this week. Lerning Theories 101 Exam (09:00 to 12:00) Thursday this week.'
+						$Result = 'Teaching Methods 101 Exam (09:00 to 12:00) Tuesday this week. Learning Theories 101 Exam (09:00 to 12:00) Thursday this week.'
 					elseif week < 4 or (week = 4 and hour < 9):
 						$Result = 'Learning Theories 101 Exam (09:00 to 12:00) Thursday this week.'
 					else
@@ -388,8 +388,8 @@ if $ARGS[0] = 'exam':
 					end
 				elseif week = 4: 
 					*nl
-					'Your Lerning Theories 101 exam will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-					act 'Go to your Lerning Theories 101 exam': 
+					'Your Learning Theories 101 exam will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your Learning Theories 101 exam': 
 						if hour = 8: minut += 60 - minut
 						if hour = 7: minut += 120 - minut					
 						gs 'stat'