1
0
Quellcode durchsuchen

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

hornguy6 vor 2 Jahren
Ursprung
Commit
5da6a220ce
6 geänderte Dateien mit 186 neuen und 142 gelöschten Zeilen
  1. 1 1
      build.sh
  2. 4 8
      locations/gschool_lessonsev1.qsrc
  3. 0 24
      locations/npc.qsrc
  4. 14 4
      locations/pod_ezd.qsrc
  5. 134 105
      locations/street_event.qsrc
  6. 33 0
      locations/uni_lessonsev1.qsrc

+ 1 - 1
build.sh

@@ -261,7 +261,7 @@ if $ARGS[0] = 'christina':
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if christinaQW['dompath'] = 0 and christinaQW['subpath'] = 0:
-		act 'Think about Christina': gt 'gschool_socialchg1', 'christina_decide'
+		act 'Think about Christina': gt 'Zvereva_events', 'christina_decide'
 	end
 end
 

+ 4 - 8
locations/gschool_lessonsev1.qsrc

@@ -1295,13 +1295,11 @@ if $ARGS[0] = 'computer':
 					gs 'stat'
 					npc_rel['A129'] += 1
 					if $pantyworntype ! 'none':
-						gs 'arousal', 'flash', -5
-						pcs_horny += 30
+						gs 'flash', 'panties', 'indoors', 5, 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spread.jpg"></center>'
 						'The thoughts of him checking you out so sneakily turns you on a great deal and the fact that you know you should know better makes it even hotter. Throughout the class, you keep spreading your legs whenever he looks your way and you can tell the looks of your panties are causing him a great deal of arousal as well. Unable to control yourself, you occasionally give yourself a quick rub over your pussy lips through your underwear, preferably when he looks at you. Towards the end of the class, your panties have a large damp spot on them; large enough for him to see from across the room. The outline of your pussy is clearly visible in the wet fabric.'
 					else
-						gs 'arousal', 'flash', -5
-						pcs_horny +=40
+						gs 'flash', 'pussy', 'indoors', 5, 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spreadb.jpg"></center>'
 						'The thoughts of him checking you out so sneakily turn you on a great deal and the fact that you know you should know better make it even hotter. Throughout the class, you keep spreading your legs whenever he looks your way and you can tell the looks of your bare pussy are causing him a great deal of arousal as well. Unable to control yourself, you occasionally give yourself a quick rub over your exposed pussy lips, preferably when he looks at you. Towards the end of the class, your pussy lips are soaked in your juices and you absent-mindedly put your finger in your mouth for a taste. '
 					end
@@ -1802,13 +1800,11 @@ if $ARGS[0] = 'russian':
 					gs 'stat'
 					npc_rel['A26'] += 1
 					if $pantyworntype ! 'none':
-						gs 'arousal', 'flash', -5
-						pcs_horny += 30
+						gs 'flash', 'panties', 'indoors', 5, 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spread.jpg"></center>'
 						'The thoughts of him checking you out so sneakily turns you on a great deal and the fact that you know you should know better makes it even hotter. Throughout the class, you keep spreading your legs whenever he looks your way and you can tell the looks of your panties are causing him a great deal of arousal as well. Unable to control yourself, you occasionally give yourself a quick rub over your pussy lips through your underwear, preferably when he looks at you. Towards the end of the class, your panties have a large damp spot on them; large enough for him to see from across the room. The outline of your pussy is clearly visible in the wet fabric.'
 					else
-						gs 'arousal', 'flash', -5
-						pcs_horny +=40
+						gs 'flash', 'pussy', 'indoors', 5, 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spreadb.jpg"></center>'
 						'The thoughts of him checking you out so sneakily turns you on a great deal and the fact that you know you should know better makes it even hotter. Throughout the class, you keep spreading your legs whenever he looks your way and you can tell the looks of your bare pussy are causing him a great deal of arousal as well. Unable to control yourself, you occasionally give yourself a quick rub over your exposed pussy lips, preferably when he looks at you. Towards the end of the class, your pussy lips are soaked in your juices and you absent-mindedly put your finger in your mouth for a taste. '
 					end

+ 0 - 24
locations/npc.qsrc

@@ -1,29 +1,5 @@
 # npc
 
-if $ARGS[0] = 'cleanarrays':
-	i_gs_cl = 0
-	:CiklNpcCleanLoop
-	if i_gs_cl < arrsize('$npc_index'):
-		if $npc_index[i_gs_cl] = $npclastgenerated : 			i_gs_cl += 1 & jump 'CiklNpcCleanLoop'
-		if arrpos('$cumarrnam', $npc_index[i_gs_cl]) >= 0 : 	i_gs_cl += 1 & jump 'CiklNpcCleanLoop'
-		if arrpos('$sparrnam', $npc_index[i_gs_cl]) >= 0 : 		i_gs_cl += 1 & jump 'CiklNpcCleanLoop'
-		if arrpos('$cumfthname', $npc_index[i_gs_cl]) >= 0 : 	i_gs_cl += 1 & jump 'CiklNpcCleanLoop'
-		if arrpos('$wombpotfath', $npc_index[i_gs_cl]) >= 0 : 	i_gs_cl += 1 & jump 'CiklNpcCleanLoop'
-		if arrpos('$wombName', $npc_index[i_gs_cl]) >= 0 : 		i_gs_cl += 1 & jump 'CiklNpcCleanLoop'
-		if arrpos('$cumfathlotto', $npc_index[i_gs_cl]) >= 0 : 	i_gs_cl += 1 & jump 'CiklNpcCleanLoop'
-		if arrpos('$ChildFath', $npc_index[i_gs_cl]) >= 0 : 	i_gs_cl += 1 & jump 'CiklNpcCleanLoop'
-		if arrpos('$ChildThFath', $npc_index[i_gs_cl]) >= 0 : 	i_gs_cl += 1 & jump 'CiklNpcCleanLoop'
-
-		if mid($npc_index[i_gs_cl],1,1) = 'C' or mid($npc_index[i_gs_cl],1,1) = 'b' :
-			gs 'npccleanc',ucase($npc_index[i_gs_cl])
-			jump 'CiklNpcCleanLoop'
-		end
-		i_gs_cl += 1
-		jump 'CiklNpcCleanLoop'
-	end
-	killvar 'i_gs_cl'
-end
-
 if $ARGS[0] = 'age':
 	currnpc_year = mid(npc_dob[$ARGS[1]], 1, 4)
 	currnpc_month = mid(npc_dob[$ARGS[1]], 5, 2)

+ 14 - 4
locations/pod_ezd.qsrc

@@ -608,6 +608,7 @@ if $ARGS[0] = 'floor4_events':
 			act 'Hide and watch them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif floor4 = 7:
+		prcptn_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/opendoor.jpg"></center>'
 		'You glance down the stairs and see that the apartment at the bottom has it''s door open. You can see inside the apartment, all the way to the bathroom, which also has it''s door wide open. Apparently the girl inside didn''t notice or maybe she did it on purpose. As she stands there naked applying facial cream to her face in the mirror.'
 		gs 'arousal', 'erotic_nudity', 3
@@ -809,6 +810,7 @@ if $ARGS[0] = 'boys_smoke':
 				gt 'pod_ezd', 'sex_ev<<rand(1,3)>>'
 			end
 		elseif fame['pav_slut'] >= 250 and fame['pav_sex'] >= fame['pav_prostitute']:
+			prcptn_exp += rand(1,2)
 			'As you smoke the cigarette, you hear the boys whisper among themselves: "That''s <<$pcs_nickname>>. I heard she''s a total slut. I bet if someone walked up to her and dropped their pants, she would start sucking them off without a second thought."'
 			act 'Leave before they get any ideas': gt 'pod_ezd', $smoke_loc
 			act 'Keep smoking':
@@ -843,6 +845,7 @@ if $ARGS[0] = 'boys_smoke':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/smokeboys.jpg"></center>'
 		'You decline, but you stay for a while talking about trivial things.'
 		if fame['pav_slut'] >= 250 and fame['pav_sex'] < fame['pav_prostitute']:
+			prcptn_exp += rand(1,2)
 			'You hear the boys whisper among themselves. "That''s <<$pcs_nickname>>! I heard she''s a '+func('gopsex','hide','gg_whore_text')+'. From what I''ve been told she''ll do just about anything if the price is right, let''s see if she''ll make us a deal."'
 			'One of the guys walks close to you, and gestures for you to lean your head closer to his. When you do, he pulls all of his money out of his pocket. He counts the crumpled bills and offers them to you, whispering: "Is <<rnd_money_sex>> <b>₽</b> enough for two?"'
 			'He never mentions what exactly he wants you to do with him and his friend.'
@@ -862,6 +865,7 @@ if $ARGS[0] = 'boys_smoke':
 				gt 'pod_ezd', 'sex_ev<<rand(1,3)>>'
 			end
 		elseif fame['pav_slut'] >= 250 and fame['pav_sex'] >= fame['pav_prostitute']:
+			prcptn_exp += rand(1,2)
 			'You hear the boys whisper among themselves. "That''s <<$pcs_nickname>>. I heard she''s a total slut. I bet if someone would walk up to her and drop their pants, she would start sucking them off without a second thought."'
 			gs 'willpower', 'gangbang', 'resist'
 			if will_cost <= pcs_willpwr:
@@ -990,7 +994,7 @@ if $ARGS[0] = 'juliamil':
 								gs 'stat'
 								act 'Use the dildo on her':
 									*clr & cla
-!!Image needed									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/stairs/julia9.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/stairs/julia9.jpg"></center>'
 									'When you notice her pussy is getting soaked, you pull away from her. She opens her mouth to complain, but closes it again when she sees you were just grabbing the dildo, she closes her eyes.'
 									'Her juices have lubricated her pussy quite well, and you have no difficulty working the dildo all the way in. Fucking her pussy with it in a teasingly slow fashion, you stop moving it for a few seconds every time she begs or complains. Her pussy is so slick now, the juices are beginning to cover your fingers as they run down the dildo. As she starts bucking against your hand holding the dildo, trying her best to stifle her moans and stay upright as her orgasm hits her hard.'
 									'After a few seconds she looks into your eyes and whispers: "Wow, <<$pcs_nickname>>, that was amazing! I don''t think I''ve ever orgasmed that hard before."'
@@ -1336,9 +1340,15 @@ if $ARGS[0] = 'gopnik_group_chat':
 		'Vasily answers before you can. "She is just some girl we go to school with." With that he gets up and walks over to you and leads you back to the stairs. "You should get going <<$pcs_nickname>>, this is no place for you." With that he prods you to go down the stairs.'
 		act 'Leave': gt 'pod_ezd', 'etaj_4'
 	else
-		'You take a seat next to Lena and Lera. "Hey guys whats up?" You ask them.'
-		'Lera leans over and kisses you on the lips. "Just hanging out and having fun." She slurs obviously she is pretty drunk already, her breath smells like a distillery.'
-		'Vasily offers you one of the beers. "Here <<$pcs_nickname>>."'
+		if npc_rel['A21'] >= 50:
+			'You take a seat next to Lena and Lera. "Hey guys whats up?" You ask them.'
+			'Lera leans over and kisses you on the lips. "Just hanging out and having fun." She slurs obviously she is pretty drunk already, her breath smells like a distillery.'
+			'Vasily offers you one of the beers. "Here <<$pcs_nickname>>."'
+		else
+			'You take a seat next to Lena and Lera. "Hey guys whats up?" You ask them.'
+			'Lera says. "Just hanging out and having fun." She slurs obviously she is pretty drunk already, her breath smells like a distillery.'
+			'Vasily offers you one of the beers. "Here <<$pcs_nickname>>."'
+		end
 		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Decline the beer (<<will_cost>> Willpower)':

+ 134 - 105
locations/street_event.qsrc

@@ -248,59 +248,65 @@ if $ARGS[1] = 'main':
 	if streetrand < streetev_rape and hour <= 3 and streetev_day ! daystart and cheat_street_rapists = 0:
 		*clr & cla
 		menu_off = 1
+		prcptn_exp += rand(1,2)
 		streetev_day = daystart
+		temp = rand(1,100) + pcs_observ
 		'<<$streetev_title>>'
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/rapist.jpg"></center>'
-		'As you walk down the street, a man jumps out of the shadows and suddenly grabs you. As you''re caught off-guard, he manages to drag you into a nearby alleyway. You try to scream but his strong hand covers your mouth. You attempt to get free, but his other arm wraps around your waist and lifts you off the ground as he drags you further down the alleyway.'
-		gs 'npcgeneratec', 0, 'Rapist', rand(18,45)
-		gs 'boyStat', $npclastgenerated
-		gs 'stat'
-		act 'Attempt to escape':
-!!should likely add willpower here to increase the odds of escaping but I never did understand how to add willpower to increase a skill check, but it would make sense here.
-			if pcs_run < 10:
-				peshimraperand = rand(0, 11)
-			elseif pcs_run < 30:
-				peshimraperand = rand(0, 20)
-			elseif pcs_run < 50:
-				peshimraperand = rand(0, 30)
-			elseif pcs_run < 70:
-				peshimraperand = rand(0, 40)
-			elseif pcs_run < 90:
-				peshimraperand = rand(0, 50)
-			elseif pcs_run < 110:
-				peshimraperand = rand(0, 60)
-			elseif pcs_run < 130:
-				peshimraperand = rand(0, 70)
-			elseif pcs_run < 150:
-				peshimraperand = rand(0, 80)
-			elseif pcs_run < 170:
-				peshimraperand = rand(0, 90)
-			else
-				peshimraperand = 11
-			end
+		if temp >= 100:
+			'You notice a hooded man standing in a darkened alleyway up ahead. Feeling he is up to no good you cross the street to the other side before you get to him. You see him look your direction before fading back into the darkness of the alleyway.'
+			act 'Continue':gt $loc
+		else
+			'As you walk down the street, a man jumps out of the shadows and suddenly grabs you. As you''re caught off-guard, he manages to drag you into a nearby alleyway. You try to scream but his strong hand covers your mouth. You attempt to get free, but his other arm wraps around your waist and lifts you off the ground as he drags you further down the alleyway.'
+			gs 'npcgeneratec', 0, 'Rapist', rand(18,45)
+			gs 'boyStat', $npclastgenerated
+			gs 'stat'
+			act 'Attempt to escape':
+				if pcs_run < 10:
+					peshimraperand = rand(0, 11)
+				elseif pcs_run < 30:
+					peshimraperand = rand(0, 20)
+				elseif pcs_run < 50:
+					peshimraperand = rand(0, 30)
+				elseif pcs_run < 70:
+					peshimraperand = rand(0, 40)
+				elseif pcs_run < 90:
+					peshimraperand = rand(0, 50)
+				elseif pcs_run < 110:
+					peshimraperand = rand(0, 60)
+				elseif pcs_run < 130:
+					peshimraperand = rand(0, 70)
+				elseif pcs_run < 150:
+					peshimraperand = rand(0, 80)
+				elseif pcs_run < 170:
+					peshimraperand = rand(0, 90)
+				else
+					peshimraperand = 11
+				end
 
-			if peshimraperand <= 10:
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/shared/street/rapist.jpg"></center>'
-				'You try to run away, but you''re not quick enough, and he catches you before you even get close to the end of the alleyway. He places a hand over your mouth so you can''t scream and drags you back into the alley.'
-				act 'Struggle': gt 'street_event', 'rape'
-			else
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
-				'You manage to lose him and get to a safer well lit area.'
-				act 'Continue':gt $loc
+				if peshimraperand <= 10:
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/shared/street/rapist.jpg"></center>'
+					'You try to run away, but you''re not quick enough, and he catches you before you even get close to the end of the alleyway. He places a hand over your mouth so you can''t scream and drags you back into the alley.'
+					act 'Struggle': gt 'street_event', 'rape'
+				else
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+					'You manage to lose him and get to a safer well lit area.'
+					act 'Continue':gt $loc
+				end
 			end
-		end
-		if succubusQW = 5:
-			!!Used if this was a random encounter instead of active hunting
-			act 'Lure him in and feed (this can take a lot of time)':
-				cla
-				'You wait until he has dragged you into the alley before turning on him.'
-				act 'Continue': gt 'succubus', 'RapistFight'
+			if succubusQW = 5:
+				!!Used if this was a random encounter instead of active hunting
+				act 'Lure him in and feed (this can take a lot of time)':
+					cla
+					'You wait until he has dragged you into the alley before turning on him.'
+					act 'Continue': gt 'succubus', 'RapistFight'
+				end
 			end
+			act 'Struggle': gt 'street_event', 'rape'
+			exit
 		end
-		act 'Struggle': gt 'street_event', 'rape'
-		exit
 	end
 
 	streetrand = rand(0, 100)
@@ -308,67 +314,74 @@ if $ARGS[1] = 'main':
 		*clr & cla
 		menu_off = 1
 		streetev_day = daystart
+		prcptn_exp += rand(1,2)
 		gs 'stat'
+		temp = rand(1,100) + pcs_observ
 		'<<$streetev_title>>'
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/mugger.jpg"></center>'
-		'Suddenly a man wearing a hoodie steps out from a darkened doorway in your path. He has one hand in his pocket, and the other he extends towards you. You can''t see his face as he says, "Give me all your money bitch, and you won''t get hurt."'
-		act 'Attempt to escape':
-			'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+		if temp >= 100:
+			'You notice a hooded man standing in a darkened doorway up ahead. Feeling he is up to no good you cross the street to the other side before you get to him. You see him look your direction before fading back into the darkness of the doorway.'
+			act 'Continue':gt $loc
+		else
+			'Suddenly a man wearing a hoodie steps out from a darkened doorway in your path. He has one hand in his pocket, and the other he extends towards you. You can''t see his face as he says, "Give me all your money bitch, and you won''t get hurt."'
+			act 'Attempt to escape':
+				'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
 
-			if pcs_run < 10:
-				peshimraperand = rand(0, 11)
-			elseif pcs_run < 30:
-				peshimraperand = rand(0, 20)
-			elseif pcs_run < 50:
-				peshimraperand = rand(0, 30)
-			elseif pcs_run < 70:
-				peshimraperand = rand(0, 40)
-			elseif pcs_run < 90:
-				peshimraperand = rand(0, 50)
-			elseif pcs_run < 110:
-				peshimraperand = rand(0, 60)
-			elseif pcs_run < 130:
-				peshimraperand = rand(0, 70)
-			elseif pcs_run < 150:
-				peshimraperand = rand(0, 80)
-			elseif pcs_run < 170:
-				peshimraperand = rand(0, 90)
-			else
-				peshimraperand = 11
+				if pcs_run < 10:
+					peshimraperand = rand(0, 11)
+				elseif pcs_run < 30:
+					peshimraperand = rand(0, 20)
+				elseif pcs_run < 50:
+					peshimraperand = rand(0, 30)
+				elseif pcs_run < 70:
+					peshimraperand = rand(0, 40)
+				elseif pcs_run < 90:
+					peshimraperand = rand(0, 50)
+				elseif pcs_run < 110:
+					peshimraperand = rand(0, 60)
+				elseif pcs_run < 130:
+					peshimraperand = rand(0, 70)
+				elseif pcs_run < 150:
+					peshimraperand = rand(0, 80)
+				elseif pcs_run < 170:
+					peshimraperand = rand(0, 90)
+				else
+					peshimraperand = 11
+				end
+				if peshimraperand <= 10:
+					*clr & cla
+					'He drags you into an alley.'
+					money = 0
+					gs 'stat'
+					'You try to run away, but you''re not quick enough, and he catches you. He grabs your purse and rummages in it, knocking most of the contents out on the ground. Once he has your money, he throws the purse back at you and then takes off running. You try to calm yourself down as you squat to gather your stuff back up and put them back in your purse.'
+					act 'Leave':gt $loc
+				else
+					*clr & cla
+					'You manage to lose him and get to a safer well lit area.'
+					act 'Continue':gt $loc
+				end
 			end
-			if peshimraperand <= 10:
-				*clr & cla
-				'He drags you into an alley.'
+			act 'Don''t fight, just give him your money':
+				cla
 				money = 0
 				gs 'stat'
-				'You try to run away, but you''re not quick enough, and he catches you. He grabs your purse and rummages in it, knocking most of the contents out on the ground. Once he has your money, he throws the purse back at you and then takes off running. You try to calm yourself down as you squat to gather your stuff back up and put them back in your purse.'
+				'You quickly open your purse. As you do, he grabs it from you and rummages in it. Knocking most of the contents out on the ground. Once he has your money, he throws the purse back at you and then takes off running. You try to calm yourself down as you squat to gather your stuff back up and put them back in your purse.'
 				act 'Leave':gt $loc
-			else
-				*clr & cla
-				'You manage to lose him and get to a safer well lit area.'
-				act 'Continue':gt $loc
 			end
-		end
-		act 'Don''t fight, just give him your money':
-			cla
-			money = 0
-			gs 'stat'
-			'You quickly open your purse. As you do, he grabs it from you and rummages in it. Knocking most of the contents out on the ground. Once he has your money, he throws the purse back at you and then takes off running. You try to calm yourself down as you squat to gather your stuff back up and put them back in your purse.'
-			act 'Leave':gt $loc
-		end
-		act 'Fight':
-			cla
-			'You clutch your purse to your body and tell him, "Fuck you asshole!" He snarls and lunges at you.'
-			act 'Defend yourself':
+			act 'Fight':
 				cla
-				gs 'npcgeneratec', 0, 'Robber', rand(18,45)
-				gs 'boyStat', $npclastgenerated
+				'You clutch your purse to your body and tell him, "Fuck you asshole!" He snarls and lunges at you.'
+				act 'Defend yourself':
+					cla
+					gs 'npcgeneratec', 0, 'Robber', rand(18,45)
+					gs 'boyStat', $npclastgenerated
 
-				gs 'fight','initFight'
+					gs 'fight','initFight'
 
-				gs 'fight_npcdata', 'robber'
+					gs 'fight_npcdata', 'robber'
 
-				gt 'fight', 'start'
+					gt 'fight', 'start'
+				end
 			end
 		end
 		exit
@@ -750,11 +763,26 @@ if $ARGS[1] = 'main':
 			*clr & cla
 			menu_off = 1
 			minut += 5
+			prcptn_exp += rand(1,2)
 			gs 'stat'
 			'<<$streetev_title>>'
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/beatup.jpg"></center>'
-			'As you walk down the street, you pass a man that is badly beaten lying unconscious on the sidewalk. You stop a moment, unsure what to do, but everyone else just ignores him. Not being sure what you could do to help, you continue on your way and wonder what happened to him.'
-			act 'Continue':gt $loc
+			'As you walk down the street, you pass a man that is badly beaten lying unconscious on the sidewalk. You stop a moment, unsure what to do, but everyone else just ignores him.'
+			act 'Ignore him':
+				'<center><img <<$set_imgh>> src="images/locations/shared/street/beatup.jpg"></center>'
+				'Not being sure what you could do to help, you continue on your way and wonder what happened to him.'
+				act 'Continue':gt $loc
+			end
+			act 'Call police':
+				*clr & cla
+				minut += 20
+				mood += 20
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/police/patrol.jpg"></center>'
+				'You call the police and are told to wait for the officers, it takes some time before the do. When a car finally pulls the officers get out and ask you a few questions then tell you to be on your way. You look back and they call in and start talking to the man, you continue on your way finally.'
+				act 'Continue':gt $loc
+			end
 		elseif streetrand > 84:
 			if hour >= 9:
 				menu_off = 1
@@ -914,6 +942,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				pcs_horny += 5
+				prcptn_exp += rand(1,2)
 				gs 'stat'
 				'<<$streetev_title>>'
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/lostkey.jpg"></center>'
@@ -1013,7 +1042,7 @@ if $ARGS[1] = 'main':
 				gs 'stat'
 				'<<$streetev_title>>'
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/girls1.jpg"></center>'
-				if hotcat > 5:
+				if hotcat > 6:
 					pcs_mood += 20
 					'As you walk down the street, you pass a group of girls. You hear them start talking about you as you pass by. "I love her outfit, she really knows how to dress." "I know, look at her shoes, they are just perfect." "What about her makeup? I wish I could do mine that good." They keep talking about you until they are out of earshot. You can''t help but smile and feel great after that.'
 					act 'Continue':gt $loc
@@ -1113,7 +1142,7 @@ if $ARGS[1] = 'main':
 				act 'Give her 100 <b>₽</b>':
 					*clr & cla
 					money -= 100
-					pcs_mood += 10
+					pcs_mood += 20
 					gs 'stat'
 					'<<$streetev_title>>'
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
@@ -1125,7 +1154,7 @@ if $ARGS[1] = 'main':
 				act 'Give her 250 <b>₽</b>':
 					*clr & cla
 					money -= 250
-					pcs_mood += 10
+					pcs_mood += 30
 					gs 'stat'
 					'<<$streetev_title>>'
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
@@ -1137,7 +1166,7 @@ if $ARGS[1] = 'main':
 				act 'Give her 500 <b>₽</b>':
 					*clr & cla
 					money -= 500
-					pcs_mood += 10
+					pcs_mood += 40
 					gs 'stat'
 					'<<$streetev_title>>'
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
@@ -1151,7 +1180,7 @@ if $ARGS[1] = 'main':
 					money -= 1000
 					'<<$streetev_title>>'
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
-					pcs_mood += 10
+					pcs_mood += 50
 					'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heart warming smile.'
 					act 'Leave':gt $loc
 				end
@@ -1287,7 +1316,7 @@ if $ARGS[1] = 'main':
 					act 'Give her 100 <b>₽</b>':
 						*clr & cla
 						money -= 100
-						pcs_mood += 20
+						pcs_mood += 30
 						gs 'stat'
 						'<<$streetev_title>>'
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
@@ -1311,7 +1340,7 @@ if $ARGS[1] = 'main':
 					act 'Give her 250 <b>₽</b>':
 						*clr & cla
 						money -= 250
-						pcs_mood += 20
+						pcs_mood += 40
 						gs 'stat'
 						'<<$streetev_title>>'
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
@@ -1335,7 +1364,7 @@ if $ARGS[1] = 'main':
 					act 'Give her 500 <b>₽</b>':
 						*clr & cla
 						money -= 500
-						pcs_mood += 20
+						pcs_mood += 50
 						gs 'stat'
 						'<<$streetev_title>>'
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
@@ -1359,7 +1388,7 @@ if $ARGS[1] = 'main':
 					act 'Give her 1000 <b>₽</b>':
 						*clr & cla
 						money -= 1000
-						pcs_mood += 20
+						pcs_mood += 50
 						gs 'stat'
 						'<<$streetev_title>>'
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'

+ 33 - 0
locations/uni_lessonsev1.qsrc

@@ -133,5 +133,38 @@ if $ARGS[0] = 'learning_theories':
 	end
 end
 
+if $ARGS[0] = 'psychology_of_a_student_101':
+	*clr & cla
+	menu_off = 1
+	uni_event_hour = 1
+	temp = rand(1,10)
+	if temp = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/girls_goofing.jpg"></center>'
+		'Mrs. Kovalchuk''s lessons are usually pretty interesting as she often interrupts herself and goes off topic talking about sci-fi or superhero movies. Sometimes a little spark of this is enough to lead the whole lecture into a discussion about her interests and everything nerdy or geeky in general. Today is no different and she speaks with a few students about the latest movie and how it could be connected to the subject. You''re free to do as you wish and a group of girls are doing just that, goofing around like they are in high school.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/girls_kissing.jpg"></center>'
+		'During the break, most of the students just relax, but a few quietly fool around so as not to draw too much attention. A pair of girls, perhaps feeling extra brave and cheeky, start slowly but passionately kissing near the front of the class and a number of both boys and girls enjoy the show. They keep kissing until Mrs. Kovalchuk walks up to them and asks them to take their seats as she starts the second part of the class.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 3:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/sleep_selfie.jpg"></center>'
+		'It''s a normal lecture about learning theories today. They are often quite fun and interesting, but today is very dry and slow. You nearly fall asleep when you see Eva taking a picture of Liliya sleeping on her desk, nearly drooling as she dreams. You wonder if it''s because the class is so boring, or if she had an interesting and exhausting night.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 4:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/feelup_teacher.jpg"></center>'
+		'Mrs. Kovalchuk goes off topic more than usual today, talking about her latest cosplay outfit after one of the other students asks her about her latest project. She describes the outfit and the character she is going to play in great detail and one of the boys uses the opportunity to get up and join her. After asking many questions and discussing the costume, the boy comments that only fairly large and natural breasts that are still very firm could pull it off. She assures him that her breasts are real and are very firm.'
+		'He takes this as an invite to reach out and give her breasts a squeeze. She seems shocked at first, but doesn''t stop him. After a few squeezes, he seems rather impressed and nods in agreement, which gets most of the class laughing. She scolds him and sends him back to his seat before returning to her lesson.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 5:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/upskirt_no_panties.jpg"></center>'
+		'"May I use the bathroom Mrs. Kovalchuk?" you hear a girl ask and glance up to see Liliya walking towards the door to leave the classroom. Several eyes are fixated on her and she clearly enjoys the attention. With a wink and a huge smile on her face, she then lets out an innocent sounding "Oops, what''s that?" She stops and acts like she dropped something before getting down on all fours and crawling under Mrs. Kovalchuk''s desk, clearly exposing her naked ass and pussy as she does. Everybody in the classroom goes crazy and the boys start to whistle and holler. Mrs. Kovalchuk has no clue what''s going on as Liliya climbs out, fixes her dress and leaves the classroom with an even bigger smile on her face.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
+		'As you sit listening to the lesson, you look around hoping something interesting will happen, but nothing does.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	end
+end
+
 --- uni_lessonsev1 ---------------------------------