9 Commits 0563627618 ... 45f3e44cc3

Author SHA1 Message Date
  Kevin_Smarts 45f3e44cc3 Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 2 years ago
  Kevin_Smarts 0ca3dfcc13 [fixed] Shouldn't be able to ask for help with Niko once the problem ahs been solved 2 years ago
  bgkjdgbizgblzdgbr 0e5a7c086b ]fixed] wrongly place end 2 years ago
  Kevin_Smarts dbd60e83df Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 2 years ago
  Kevin_Smarts 2f44c7a587 Merge remote-tracking branch 'Gwen/master' 2 years ago
  bgkjdgbizgblzdgbr 033046df37 [changed/added] Added a repeatble fisting scene with Katja, and changed a lot of old calls to use the arousal systme. 2 years ago
  bgkjdgbizgblzdgbr 789bacc04e [added] The possibility to put your whole hand and fist yourself during masturbation. 2 years ago
  Kevin_Smarts fde9d8c0ab Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 years ago
  Kevin_Smarts e9667120fb [text edit] [fixes] Many text edits and some fixes by colwyvern 2 years ago
46 changed files with 379 additions and 219 deletions
  1. 0 1
      glife.qproj
  2. 1 1
      locations/IvanEv.qsrc
  3. 1 1
      locations/albina_chat.qsrc
  4. 1 1
      locations/anushka.qsrc
  5. 1 1
      locations/anushkachat.qsrc
  6. 2 2
      locations/body_desc.qsrc
  7. 4 1
      locations/city_center.qsrc
  8. 1 1
      locations/city_clinic.qsrc
  9. 3 1
      locations/city_industrial.qsrc
  10. 4 2
      locations/city_industrial_train.qsrc
  11. 4 2
      locations/city_lake.qsrc
  12. 0 23
      locations/city_lake_path.qsrc
  13. 5 18
      locations/city_park.qsrc
  14. 1 1
      locations/city_redlight.qsrc
  15. 3 0
      locations/city_residential.qsrc
  16. 2 2
      locations/city_suburbs.qsrc
  17. 1 1
      locations/city_train.qsrc
  18. 1 1
      locations/dimalina.qsrc
  19. 6 6
      locations/gadforest.qsrc
  20. 13 9
      locations/gadriver.qsrc
  21. 3 3
      locations/gadroad.qsrc
  22. 3 3
      locations/gschool_jock_chats.qsrc
  23. 2 2
      locations/gschool_lessonsev3.qsrc
  24. 5 5
      locations/gschool_lunch.qsrc
  25. 7 7
      locations/intro_city_select.qsrc
  26. 8 8
      locations/intro_sg_select.qsrc
  27. 121 38
      locations/katjaEvDin.qsrc
  28. 1 1
      locations/katja_sex.qsrc
  29. 14 14
      locations/leonid.qsrc
  30. 3 2
      locations/liam.qsrc
  31. 2 2
      locations/meadow.qsrc
  32. 1 1
      locations/office.qsrc
  33. 1 1
      locations/pav_clinic.qsrc
  34. 4 3
      locations/pav_commercial.qsrc
  35. 5 5
      locations/pav_complex.qsrc
  36. 3 3
      locations/pav_complexrolan.qsrc
  37. 1 1
      locations/pav_industrial.qsrc
  38. 2 2
      locations/pav_market.qsrc
  39. 3 2
      locations/pav_residential.qsrc
  40. 1 1
      locations/pav_train_hall.qsrc
  41. 3 3
      locations/praiders_garage.qsrc
  42. 10 2
      locations/road.qsrc
  43. 116 29
      locations/selfplay.qsrc
  44. 4 4
      locations/sitrPar.qsrc
  45. 1 1
      locations/swamp.qsrc
  46. 1 1
      locations/train.qsrc

+ 0 - 1
glife.qproj

@@ -826,7 +826,6 @@
 		<Location name="city_kavkazkafe"/>
 		<Location name="city_jorahouse"/>
 		<Location name="city_lake"/>
-		<Location name="city_lake_path"/>
 		<Location name="city_drugden"/>
 		<Location name="city_bobka"/>
 		<Location name="city_park"/>

+ 1 - 1
locations/IvanEv.qsrc

@@ -124,7 +124,7 @@ if $ARGS[0] = 'School Chat':
 		act 'Move away': gt $loc, $loc_arg
 	end
 	
-	if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
+	if npc_rel['A3'] >= 80 and NikoPayback = 2 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
 	
 	act 'Chat':
 		cla

+ 1 - 1
locations/albina_chat.qsrc

@@ -413,7 +413,7 @@ end
 !!	end
 !!end
 
-if NikoPayback > 1 and AlbVsNiko = 0:
+if NikoPayback = 2 and AlbVsNiko = 0:
 	act 'Ask for help with Niko':
 	*clr & cla
 	AlbVsNiko = 1

+ 1 - 1
locations/anushka.qsrc

@@ -330,7 +330,7 @@ if $ARGS[0] = 'wedgie fight':
 						act 'Can''t':
 							*clr & cla
 							'You shake your head. "Sorry Nush, I have some things I need to do, but maybe some other time." Anushka shrugs and replies noncommittally. "Sure... whatever..."'
-							act 'leave': gt 'gschool_grounds', 'main'
+							act 'Leave': gt 'gschool_grounds', 'main'
 						end
 						act 'Sure':
 							*clr & cla

+ 1 - 1
locations/anushkachat.qsrc

@@ -252,7 +252,7 @@ if $ARGS[0] = 'chat':
 			act 'Keep talking': gt 'anushkachat', 'chat'
 		end
 	end
-	if npc_rel['A144'] >= 60 and NikoPayback > 1 and NushVsNiko = 0:
+	if npc_rel['A144'] >= 60 and NikoPayback = 2 and NushVsNiko = 0:
 		act 'Ask for help with Niko':
 			*clr & cla
 			NushVsNiko = 1

+ 2 - 2
locations/body_desc.qsrc

@@ -84,9 +84,9 @@ end
 if $ARGS[0] = 'pussy':
 	if vgape >= 4:
 		if rand(0,1) = 0:
-			$pcs_vag = 'Your regularly-fucked <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">playground</a> can take most things you force up there, ' + iif(stat['think_virgin'] = 0,'maybe you should skip the next gangbang?.','this can''t be right. What could be doing this to be?.')
+			$pcs_vag = 'Your regularly-fucked <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">playground</a> can take most things you force up there, ' + iif(stat['think_virgin'] = 0,'maybe you should skip the next gangbang?.','this can''t be right. What could be doing this to me?')
 		else
-			$pcs_vag = 'Your poor little <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">pussy</a> is broken from too much stuffing, it''ll need time to recover, ' + iif(stat['think_virgin'] = 0,'maybe you should skip the next gangbang?.','this can''t be right. What could be doing this to be?.')
+			$pcs_vag = 'Your poor little <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">pussy</a> is broken from too much stuffing, it''ll need time to recover, ' + iif(stat['think_virgin'] = 0,'maybe you should skip the next gangbang?.','this can''t be right. What could be doing this to me?')
 		end
 		$pcs_vag_image = 'images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg'
 		$pc_desc['pussy'] = func($this, 'ChooseDescWord', 'ruined', 'broken', 'proplapsed', 'destroyed', 'annihilated', 'obliterated','decimated')

+ 4 - 1
locations/city_center.qsrc

@@ -125,6 +125,9 @@ end
 
 if car > 0 and cardrive = 2:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
+act 'Walk to the central park (0:35)': minut += 35 & gt 'city_park', 'start'
+act 'Walk to the train station (0:05)': minut += 5 & gt 'city_train', 'start'
+
 act 'Wait':gs 'obj_din', 'wait'
 
 gs 'taxi'
@@ -135,7 +138,7 @@ else
 	$desc_txt1 = '<a href="exec:msg ''The metro is closed and will reopen at 4:00''">the metro</a>'
 end
 
-'You have easy access to the <a href="exec: minut += 1 & gs ''city_train'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St. Petersburg and the subway is great if you are tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''city_park'', ''start''">central park</a> is a thirty minute walk from here and provides a more scenic route to the other city districts.'
+'You have easy access to the <a href="exec: minut += 5 & gs ''city_train'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St. Petersburg and the subway is great if you are tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''city_park'', ''start''">central park</a> is a 35 minute walk from here and provides a more scenic route to the other city districts.'
 *nl
 if hour >= 8 and hour <= 22:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''kiosk'', ''start''">kiosk</a>'

+ 1 - 1
locations/city_clinic.qsrc

@@ -1791,7 +1791,7 @@ if $ARGS[0] = 'milk_donation':
 				else
 					'You put on your top'
 				end
-				act 'leave':
+				act 'Leave':
 					lact_ev['poli_milkedvolume'] = 0
 					gt 'city_clinic', 'milk_donation_room'
 				end

+ 3 - 1
locations/city_industrial.qsrc

@@ -43,7 +43,9 @@ if $ARGS[0] = '':
 	gs'street_event','city_industrial', 'extras'
 
 	act 'Walk to the main road to Pavlovsk (0:15)': minut += 15 & nroad = 0 & gt'road'
-	act 'Visit the Red Light District (0:05)': minut += 5 & gt 'city_redlight', 'start'
+	act 'Walk to the Red Light District (0:05)': minut += 5 & gt 'city_redlight', 'start'
+	act 'Walk to the central park (1:00)': minut += 60 & gt 'city_park', 'start'
+	act 'Walk to the industrial train station (0:15)': minut += 15 & gt 'city_industrial_train', 'outside'
 
 	act 'Wait':gs 'obj_din', 'wait'
 

+ 4 - 2
locations/city_industrial_train.qsrc

@@ -14,7 +14,6 @@ if $ARGS[0] = 'inside':
 	*clr & cla
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalholle.jpg" ></center>'
-	'There is a <a href="exec:gt ''city_lake_path''">path</a> leading off in to the distance, in the direction of the lake.'
 	act 'Leave the station': minut += 2 & gt 'city_industrial_train', 'outside'
 	*nl
 	if Trainpass_day > daystart:
@@ -55,7 +54,10 @@ if $ARGS[0] = 'outside':
 		'In the parking lot is <a href="exec:GS ''carF'',''start''">your <<$car>></a>.'
 	end
 
-	act 'Go to the city industrial region': minut += 15 & gt'city_industrial'
+	'There is a path leading off in to the distance, in the direction of the <a href="exec:minut += 60 & gt ''city_lake'', ''start''">lake</a>.'
+
+	act 'Walk to the City Industrial Region': minut += 15 & gt'city_industrial'
+	act 'Walk to the lake': minut += 60 & gt'city_lake', 'start'
 	act 'Enter the station building': minut += 2 & gt'city_industrial_train', 'inside'
 end
 

+ 4 - 2
locations/city_lake.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'start':
 
 	'A large lake close to the city, it is a favorite destination of residents in the summer.'
 	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis':
-		'There is a winding <a href="exec:gt ''city_lake_path'',''start''">path</a> leading to the railway station in the city industrial region.'
+		'There is a winding path leading to the <a href="exec:minut += 60 & gt ''city_industrial_train'',''outside''">railway station</a> in the city industrial region.'
 	else
 		'You can see the winding path leading to the railway station in the industrial region. You should get dressed into your clothes if you want to go there.'
 	end
@@ -61,7 +61,7 @@ if $ARGS[0] = 'start':
 
 	if npc_QW['A192'] = 3 and temper >= 15 and (PCloswimwear = 1) and hour >= 6 and hour <= 20:'<a href="exec:gt ''nastja'', ''pos14''">Anastasia</a> is waving her hand at you.'
 
-	act 'Leave':
+	act 'Walk to the Residential Area (0:40)':
 		if PCloswimwear = 1:
 			cla
 			'You need to get dressed into your regular clothing first.'
@@ -72,6 +72,8 @@ if $ARGS[0] = 'start':
 		end
 	end
 
+	act 'Walk to the industrial train station (1:00)': minut += 60 & gt 'city_industrial_train', 'outside'
+
 	if hour >= 6 and hour <= 20:
 		'There are various '+iif(PCloswimwear = 1,'<a href="exec:gt ''city_lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
 		'You can go for a ride on a <a href="exec:gt ''city_lake'', ''horse''">horse</a> along the beach.'

+ 0 - 23
locations/city_lake_path.qsrc

@@ -1,23 +0,0 @@
-# city_lake_path
-
-$loc = 'city_lake_path'
-$loc_arg = ''
-$menu_loc = 'city_lake_path'
-$menu_arg = ''
-menu_off = 0
-
-$location_type = 'public_outdoors'
-
-*clr & cla
-'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/prigor1.jpg" ></center>'
-
-minut += 60
-gs'stat'
-
-!'<a href="exec:gt ''nowostreet'',''start''">Buildings</a> '
-
-act 'Head to the station':gt 'city_industrial_train', 'inside'
-act 'Walk to the lake':gt 'city_lake', 'start'
-
---- city_lake_path ---------------------------------
-

+ 5 - 18
locations/city_park.qsrc

@@ -68,7 +68,11 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Leave': gt 'city_park', 'exit'
+	!!this leads to the old street walker content, blocked until it''s fixed up or moved into the new street walker content (julzor)
+	!!act 'Walk to the highway near the park (0:05)':minut += 5 & gt 'city_park', 'whore'
+	act 'Walk to the Residential Area (0:20)':minut += 20 & gt 'city_residential'
+	act 'Walk to the City Center (0:35)':minut += 35 & gt 'city_center'
+	act 'Walk to the City Industrial Region (1:00)':minut += 60 & gt 'city_industrial'
 
 	act 'Walk around the park (1:00)': gt 'park_walkeventsrnd'
 
@@ -276,23 +280,6 @@ if $ARGS[0] = 'start':
 	end
 end
 
-if $ARGS[0] = 'exit':
-	cla
-	$loc = 'city_park'
-	$loc_arg = 'exit'
-	$menu_loc = 'city_park'
-	$menu_arg = 'exit'
-	menu_off = 0
-	'<center><b><font color="maroon">Park</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/park.jpg"></center>'
-	act 'Don''t leave': gt 'city_park', 'start'
-	!!this leads to the old street walker content, blocked until it''s fixed up or moved into the new street walker content (julzor)
-	!!act 'Go to the highway near the park (0:05)':minut += 5 & gt 'city_park', 'whore'
-	act 'Go to the Residential Area (0:20)':minut += 20 & gt 'city_residential'
-	act 'Go to the City Center (0:35)':minut += 35 & gt 'city_center'
-	act 'Go to the City Industrial Region (1:00)':minut += 60 & gt 'city_industrial'
-end
-
 if $ARGS[0] = 'luna':
 	*clr & cla
 	$menu_loc = 'city_park'

+ 1 - 1
locations/city_redlight.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'start':
 		'You see a small printing shop tucked away between two larger buildings. It is currently closed and will open at 10:00.'
 	end
 
-	act 'Return to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'
+	act 'Walk to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'
 
 	act 'Wait':gs 'obj_din', 'wait'
 	

+ 3 - 0
locations/city_residential.qsrc

@@ -86,6 +86,9 @@ if home_owned[1] > 0:
 	end
 end
 
+act 'Walk to the central park (0:20)': minut += 20 & gt 'city_park', 'start'
+act 'Walk to the lake': minut += 40 & gt 'city_lake', 'start'
+
 act 'Wait':gs 'obj_din', 'wait'
 
 gs 'taxi'

+ 2 - 2
locations/city_suburbs.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0]='start':
 
 	if car > 0 and cardrive = 28:'Your <a href="exec:GS ''carF'', ''start''"><<$car>></a> stands on the street.'
 
-    if hour >= 4 and hour <= 23:'The <a href="exec: minut += 20 & gt ''metro'', ''start''">Metro</a> station is a 20 minut walk from here.'
+    if hour >= 4 and hour <= 23:'The <a href="exec: minut += 20 & gt ''metro'', ''start''">Metro</a> station is a 20 minute walk from here.'
 
 	gs 'taxi'
 
@@ -39,7 +39,7 @@ if $ARGS[0]='start':
 	act 'View the insane asylum': minut += 2 & gt 'city_suburbs', 'ps1'
 	act 'View the creepy old building': minut += 2 & gt 'city_suburbs', 'ps2'
 
-	act 'Go to the main road':nroad = 1 & minut += 15 & gt 'road'
+	act 'Walk to the main road':nroad = 1 & minut += 15 & gt 'road'
 
 	if AlexandriaQW = 6:
 		gs 'willpower', 'misc', 'self', 'easy'

+ 1 - 1
locations/city_train.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 		'In the parking lot is <a href="exec:GS ''carF'',''start''">your <<$car>></a>.'
 	end
 
-	act 'Go to the city center':minut += 5 & gt 'city_center'
+	act 'Walk to the city center (0:05)':minut += 5 & gt 'city_center'
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'
 		act 'Go to the platforms': gt 'city_train', 'platform'

+ 1 - 1
locations/dimalina.qsrc

@@ -1045,7 +1045,7 @@ if $ARGS[0] = 'escape':
 	npc_rel['A1'] -= 40
 	minut += rand(10,30)
 	gs 'stat'
-	act 'leave': gt 'pav_residential'
+	act 'Leave': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'succubusdimka':

+ 6 - 6
locations/gadforest.qsrc

@@ -305,21 +305,21 @@ if $ARGS[0] = 'forest_edge':
 
 	! Sveta cannot travel further into the forest if Mira is here at the forest with Sveta
 	if MiraLoc ! 3:
-		act 'Go further into the forest (0:15)': minut += 15 & gt 'gadforest','forest_outskirts'
+		act 'Walk further into the forest (0:15)': minut += 15 & gt 'gadforest','forest_outskirts'
 	end
 
 	gs 'bicycle', 'gadforest'
 
 	! Sveta can go to the Meadow if she has discovered it and bring Mira too if she is allowed
 	if (meadow > 0 and MiraLoc ! 3):
-		act 'Go to the meadow (0:20)': minut += 20 & gt 'meadow'
+		act 'Walk to the meadow (0:20)': minut += 20 & gt 'meadow'
 	elseif ((meadow = 3 or (meadow = 6 and npc_QW['A60'] >= 3)) and MiraLoc = 3):
-		act 'Go to the meadow with Mira': minut += 20 & MiraLoc = 2 & gt 'meadow'
+		act 'Walk to the meadow with Mira (0:20)': minut += 20 & MiraLoc = 2 & gt 'meadow'
 	end
 
 	! Can travel directly to the hunters cabin if Sveta has been there before, knows the hunters, and Mira is not here at the forest with Sveta
 	if hunterscabin = 1 and hunters_were_met = 1 and MiraLoc ! 3:
-		act 'Go to the hunters cabin(1:00)':
+		act 'Walk to the hunters cabin (1:00)':
 			! daytime chance to get stuck in swamp - use bike to get there 100% of the time
 			if hour >= 6 and hour <= 22:
 				gt 'swamp', 'stuck'
@@ -412,7 +412,7 @@ if $ARGS[0] = 'forest_outskirts':
 
 	act 'Head back out of the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_edge'
 
-	act 'Go further into the forest (0:15)': minut += 15 & gt 'gadforest','forest_center'
+	act 'Walk further into the forest (0:15)': minut += 15 & gt 'gadforest','forest_center'
 
 	! the generic actions for the different parts of the forest are so similar that they are all stored in their own gosubs so the code is not duplicated
 	gs 'gadforest', 'stripping'
@@ -493,7 +493,7 @@ if $ARGS[0] = 'forest_center':
 
 	act 'Head back out of the forest (0:15)': minut += 15 & gt 'gadforest', 'forest_outskirts'
 
-	act 'Go further into the swamp (0:15)': minut += 15 & gt 'swamp', 'start'
+	act 'Walk further into the swamp (0:15)': minut += 15 & gt 'swamp', 'start'
 
 	! the generic actions for the different parts of the forest are so similar that they are all stored in their own gosubs so the code is not duplicated
 	gs 'gadforest', 'stripping'

+ 13 - 9
locations/gadriver.qsrc

@@ -71,8 +71,9 @@ if $ARGS[0] = 'start':
 				act 'Finish':minut += 10 & gt'gadukino'
 			end
 		else
-			act 'Go to Gadukino':minut += 20 & gt 'gadukino'
-			act 'Go to the beach':gt 'gadriver', 'gadbitch'
+			act 'Walk to Gadukino (0:20)':minut += 20 & gt 'gadukino'
+			act 'Walk to the road (0:10)':minut += 10 & gt 'gadroad'
+			act 'Walk to the beach (0:05)':minut += 5 & gt 'gadriver', 'gadbitch'
 		end
 	elseif temp_gr = 5 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5:
 		if mitkaguysriver ! daystart:
@@ -105,8 +106,9 @@ if $ARGS[0] = 'start':
 				act 'Leave': gt'gadukino'
 			end
 		else
-			act 'Go to Gadukino':minut += 20 & gt 'gadukino'
-			act 'Go to the beach':gt 'gadriver', 'gadbitch'
+			act 'Walk to Gadukino (0:20)':minut += 20 & gt 'gadukino'
+			act 'Walk to the road (0:10)':minut += 10 & gt 'gadroad'
+			act 'Walk to the beach (0:05)':minut += 5 & gt 'gadriver', 'gadbitch'
 		end
 	elseif temp_gr = 6 and MiraLoc ! 1 and npc_QW['A63'] >= 13 and hour >= 5:
 		if mitkaguysriver ! daystart:
@@ -137,12 +139,14 @@ if $ARGS[0] = 'start':
 				act 'Finish': gt'gadukino'
 			end
 		else
-			act 'Go to the road (0:10)':minut += 20 & gt 'gadroad'
-			act 'Go to the beach':gt 'gadriver', 'gadbitch'
+			act 'Walk to Gadukino (0:20)':minut += 20 & gt 'gadukino'
+			act 'Walk to the road (0:10)':minut += 10 & gt 'gadroad'
+			act 'Walk to the beach (0:05)':minut += 5 & gt 'gadriver', 'gadbitch'
 		end
 	else
-		act 'Go to the road (0:10)':minut += 20 & gt 'gadroad'
-		act 'Go to the beach':gt 'gadriver', 'gadbitch'
+		act 'Walk to Gadukino (0:20)':minut += 20 & gt 'gadukino'
+		act 'Walk to the road (0:10)':minut += 10 & gt 'gadroad'
+		act 'Walk to the beach (0:05)':minut += 5 & gt 'gadriver', 'gadbitch'
 	end
 end
 
@@ -191,7 +195,7 @@ if $ARGS[0] = 'gadbitch':
 
 	if MiraLoc ! 1 and npc_QW['A63'] >= 13 and rand(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:'<a href="exec: gt ''gadriver'', ''GuysRiver'' ">Kolyamba and Vasyan</a> are resting on the riverbank.'
 
-	act 'Go back to the river (0:05)':
+	act 'Walk to the river (0:05)':
 		cla
 		if PCloswimwear = 1:
 			cla

+ 3 - 3
locations/gadroad.qsrc

@@ -59,10 +59,10 @@ if $ARGS[0] = '':
 		end
 	end
 
-	act 'Go back to Gadukino (0:10)':minut += 10 & gt'gadukino'
+	act 'Walk to Gadukino (0:10)':minut += 10 & gt'gadukino'
 	act 'Walk down to the river (0:10)':minut += 10 & gt 'gadriver', 'start'
-	act 'Go into the woods (0:15)':minut += 15 & gt'gadforest','forest_edge'
-	act 'Go to the fields (0:10)':minut += 10 & gt'gadfield','field'
+	act 'Walk into the woods (0:15)':minut += 15 & gt'gadforest','forest_edge'
+	act 'Walk to the fields (0:10)':minut += 10 & gt'gadfield','field'
 	if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and hour >= 6 and hour < 22 and gadrunday ! daystart:
 		act 'Go for a run (1:00)':
 			*clr & cla

+ 3 - 3
locations/gschool_jock_chats.qsrc

@@ -1037,7 +1037,7 @@ if $ARGS[0] = 'ivan':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></center>'
 	!!this is story arc stuff I think it is coded correct but not sure.
-	if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
+	if npc_rel['A3'] >= 80 and NikoPayback = 2 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
 	if fame['pav_slut'] < 225 and IvanShowerQW = 1:
 		IvanShowerQW = 11
 		'Ivan thinks for a moment before he speaks. "<<$pcs_nickname>>, I would like to talk to you about what happened in the shower. You''re a great girl, and I had a great time, but I''m not ready for a relationship. I need to put all my energy into my athletics. I think I have a good shot at getting to the Russian National Championships this year. I really can''t afford to be distracted by girls, even girls as attractive as you. So how about we just stick to fooling around a little?"'
@@ -1048,14 +1048,14 @@ if $ARGS[0] = 'ivan':
 			'He gives you a one armed hug. "<<$pcs_nickname>>, you''re the best! Not only are you smoking hot, but you''re a super cool chick too! If you want to hang out some time, you can stop by my place." He pauses and looks around before leaning in close. "Or if you get a little bored during lunch break, you can let me know too..." he says with a suggestive tone and waggled eyebrows.'
 			'You laugh at his silly antics. It''s nice to have found a fun guy to hang out with. Perhaps you will stop by his place, or maybe even take him up on his offer to make lunch break less boring. "Sure Ivan, I''ll think about it."'
 
-			if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
+			if npc_rel['A3'] >= 80 and NikoPayback = 2 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
 
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			act 'Tell him you''re bored right now':gt 'gdksport', 'Ivan_bored'
 		end
 	elseif IvanShowerQW = 11 and IvanShowerYes = 1:
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-		if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
+		if npc_rel['A3'] >= 80 and NikoPayback = 2 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
 
 		if rand(0,4) = 0:
 			'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'

+ 2 - 2
locations/gschool_lessonsev3.qsrc

@@ -1367,9 +1367,9 @@ if $ARGS[0] = 'art':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_6_1.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_6_2.jpg"></center>'
-					'Katja is trying to draw your attention for some reason. When she notices you''re watching, she quickly makes sure no one else is paying attention and then puts one leg on her desk, revealing her bare pussy to you. You bite your lip and give her an appreciative nod as you think to yourself "Damn, I''ll have to take a closer look into that after classes are over!"'
-					gs 'arousal', 'erotic_nudity', 2
 				end
+				'Katja is trying to draw your attention for some reason. When she notices you''re watching, she quickly makes sure no one else is paying attention and then puts one leg on her desk, revealing her bare pussy to you. You bite your lip and give her an appreciative nod as you think to yourself "Damn, I''ll have to take a closer look into that after classes are over!"'
+				gs 'arousal', 'erotic_nudity', 2
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else
 				jump 'art_event_once_more'

+ 5 - 5
locations/gschool_lunch.qsrc

@@ -146,15 +146,15 @@ if $ARGS[0] = 'break':
 		elseif NikoVolkovQW = 5 and NikoEv = 4 and NikoDate = 0:
 			lunch_event = daystart
 			gt 'NikoDates', 'Cafeteria'
-		elseif NikoPayback > 1 and FedorVsNiko = 1:
+		elseif NikoPayback = 2 and FedorVsNiko = 1:
 			gt 'NikoPayback', 'Fedor Help 2'
-		elseif NikoPayback > 1 and FyodorVsNiko = 1:
+		elseif NikoPayback = 2 and FyodorVsNiko = 1:
 			gt 'NikoPayback', 'Fyodor Help'
-		elseif NikoPayback > 1 and IvanVsNiko = 1:
+		elseif NikoPayback = 2 and IvanVsNiko = 1:
 			gt 'NikoPayback', 'Ivan Help 2'
-		elseif NikoPayback > 1 and NushVsNiko = 1:
+		elseif NikoPayback = 2 and NushVsNiko = 1:
 			gt 'NikoPayback', 'Nush Help'
-		elseif NikoPayback > 1 and AlbVsNiko = 1:
+		elseif NikoPayback = 2 and AlbVsNiko = 1:
 			gt 'NikoPayback', 'Albina Help'
 		elseif NikoPayback = 1 and NikoPayback_Day ! daystart:
 			gt 'NikoPayback', 'Payback'

+ 7 - 7
locations/intro_city_select.qsrc

@@ -180,10 +180,10 @@ if $ARGS[0] = 'charselect':
 	act 'Jock':
 		*clr & cla
 		gs 'intro_city_select', 'jockinfo'
-		act 'Avid volleyball player': gt 'intro_city_select', 'volleyball'
-		act 'Avid dancer': gt 'intro_city_select', 'dancer'
-		act 'Avid runner': gt 'intro_city_select', 'runner'
-		act 'Avid football player.': gt 'intro_city_select', 'football'
+		act 'I was an avid volleyball player': gt 'intro_city_select', 'volleyball'
+		act 'I was an avid dancer': gt 'intro_city_select', 'dancer'
+		act 'I was an avid runner': gt 'intro_city_select', 'runner'
+		act 'I was an avid football player': gt 'intro_city_select', 'football'
 	end
 
 	act 'Popular':
@@ -199,9 +199,9 @@ if $ARGS[0] = 'charselect':
 !!can pick 1-3 tattoos at start
 		*clr & cla
 		gs 'intro_city_select', 'gopnikinfo'
-		act 'A gopnik': gt 'intro_city_select', 'gopnikstart'
-		act 'A punk or troublemaker': gt 'intro_city_select', 'troublemaker'
-		act 'An alternative, party girl or rebel': gt 'intro_city_select', 'alternative'
+		act 'I was a gopnik': gt 'intro_city_select', 'gopnikstart'
+		act 'I was a punk or troublemaker': gt 'intro_city_select', 'troublemaker'
+		act 'I was an alternative, party girl or rebel': gt 'intro_city_select', 'alternative'
 	end
 
 	act 'Outcast':

+ 8 - 8
locations/intro_sg_select.qsrc

@@ -248,10 +248,10 @@ if $ARGS[0] = 'charselect':
 	act 'Jock':
 		*clr & cla
 		gs 'intro_sg_select', 'jockinfo'
-		act 'Avid volleyball player': gt 'intro_sg_select', 'volleyball'
-		act 'Avid dancer': gt 'intro_sg_select', 'dancer'
-		act 'Avid runner': gt 'intro_sg_select', 'runner'
-		act 'Avid football player.': gt 'intro_sg_select', 'football'
+		act 'I am an avid volleyball player': gt 'intro_sg_select', 'volleyball'
+		act 'I am an avid dancer': gt 'intro_sg_select', 'dancer'
+		act 'I am an avid runner': gt 'intro_sg_select', 'runner'
+		act 'I am an avid football player': gt 'intro_sg_select', 'football'
 	end
 
 	act 'Popular':
@@ -267,10 +267,10 @@ if $ARGS[0] = 'charselect':
 !!can pick 1-3 tattoos at start
 		*clr & cla
 		gs 'intro_sg_select', 'gopnikinfo'
-		act 'A gopnik': gt 'intro_sg_select', 'gopnikstart'
-		act 'A punk or troublemaker': gt 'intro_sg_select', 'troublemaker'
-		act '<<$npc_nickname[''A9'']>>''s girlfriend':  gt 'intro_sg_select', 'vitekgf'
-		act 'An alternative, party girl or rebel': gt 'intro_sg_select', 'alternative'
+		act 'I am a gopnik': gt 'intro_sg_select', 'gopnikstart'
+		act 'I am a punk or troublemaker': gt 'intro_sg_select', 'troublemaker'
+		act 'I am <<$npc_nickname[''A9'']>>''s girlfriend':  gt 'intro_sg_select', 'vitekgf'
+		act 'I am an alternative, party girl or rebel': gt 'intro_sg_select', 'alternative'
 	end
 
 	act 'Outcast':

+ 121 - 38
locations/katjaEvDin.qsrc

@@ -3,9 +3,8 @@
 
 if $ARGS[0] = 'kiss':
 	*clr & cla
-	minut += 5
 	pcs_mood = 100
-	pcs_horny += 10
+	gs 'arousal', 'kiss', 3
 	katjaQW['horny'] += 10
 
 	if katjaQW['QWstage'] < 3:
@@ -18,7 +17,6 @@ if $ARGS[0] = 'kiss':
 	end
 
 	gs 'stat'
-	gs 'katjaEvDin'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/kiss.jpg"></center>'
 	'You bring your face to Katjas face and feel her hot breath on your lips. Katja closes her eyes and touches her lips to your lips.'
 	'Katjas nimble tongue darts into your mouth, you suck on her tongue, then your tongue goes into Katja''s mouth and she very gently caressed it with her tongue and sucks on your tongue.'
@@ -29,14 +27,12 @@ if $ARGS[0] = 'kiss':
 
 		act 'Let her':
 			*clr & cla
-			minut += 5
-			pcs_horny += 10
+			gs 'arousal', 'foreplay', 3
 			katjaQW['horny'] += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits.jpg"></center>'
 			'Katja bares your breasts and touches them with her fingers, then she bows her head and begins to lick your nipple.'
 
-			gs 'boystat', 'A14', 'a'
 			gs 'KatjaEvDin', 'sex'
 		end
 
@@ -44,12 +40,12 @@ if $ARGS[0] = 'kiss':
 		if will_cost <= pcs_willpwr:
 			act 'Remove her hands (<<will_cost>> Willpower)':
 				*clr & cla
-				minut += 5
-				pcs_horny += 10
+				gs 'arousal', 'foreplay', 3
 				KatjaQW['dom'] -= 1
 				katjaQW['horny'] -= 10
 				katjaQW['horny'] = min(katjaQW['horny'], 60)
 				gs 'willpower', 'pay', 'resist'
+				gs 'arousal', 'end'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'You remove her hands and smile at Katja.'
@@ -63,8 +59,7 @@ if $ARGS[0] = 'kiss':
 		act 'Touch her chest':
 			menu_off = 1
 			*clr & cla
-			minut += 5
-			pcs_horny += 10
+			gs 'arousal', 'foreplay_give', 3
 			katjaQW['horny'] += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/touch.jpg"></center>'
@@ -74,14 +69,17 @@ if $ARGS[0] = 'kiss':
 				'You''re her breasts a little before Katja moves away from you.'
 				'"I''m not in the mood right now Sveta" Katja says "Another time"'
 
-				act 'Accept Katja''s decision':gt 'KatjaHomeTalk'
+				act 'Accept Katja''s decision':
+					gs 'arousal', 'end'
+					gs 'stat'
+					gt 'KatjaHomeTalk'
+				end
 
 				gs 'willpower', 'sex', 'force', 'hard'
 				if will_cost <= pcs_willpwr:
 					act 'Grab her (<<will_cost>> Willpower)':
 						*clr & cla
-						minut += 5
-						pcs_horny += 10
+						gs 'arousal', 'foreplay_give', 3
 						KatjaQW['dom'] -= 1
 						katjaQW['horny'] -= 10
 						gs 'stat'
@@ -89,6 +87,8 @@ if $ARGS[0] = 'kiss':
 						'You grab Katja firmly so she can''t back away.'
 !!{
 						if pcs_dom < KatjaQW['dom']:
+							gs 'arousal', 'end'
+							gs 'stat'
 							'Katja pushes your arms apart and pulls away, you understand that she doesn''t want more.'
 
 							if mey_vika['key'] = 1:
@@ -101,14 +101,12 @@ if $ARGS[0] = 'kiss':
 
 							act 'Lick her breast':
 								*clr & cla
-								minut += 5
-								pcs_horny += 10
+								gs 'arousal', 'foreplay_give', 3
 								katjaQW['horny'] += 10
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits_katja_get.jpg"></center>'
 								'You free Katja''s small, firm breasts from under her clothes and begin to lick them, paying special attention to her nipples. Katja closed her eyes in pleasure and bites her lip.'
 
-								gs 'boystat', 'A14', 'a'
 								gs 'KatjaEvDin', 'sex'
 							end
 						end
@@ -122,15 +120,12 @@ if $ARGS[0] = 'kiss':
 
 				act 'Let her':
 					*clr & cla
-					minut += 5
-					pcs_horny += 10
+					gs 'arousal', 'foreplay', 3
 					katjaQW['horny'] += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits.jpg"></center>'
 					'Katja bares your breasts and touches them with her fingers, then she bows her head and begins to lick your nipple.'
 
-
-					gs 'boystat', 'A14', 'a'
 					gs 'KatjaEvDin', 'sex'
 				end
 
@@ -143,27 +138,25 @@ if $ARGS[0] = 'kiss':
 
 					act 'Give in to her touch':
 						*clr & cla
-						minut += 5
-						pcs_horny += 10
+						gs 'arousal', 'foreplay', 3
 						KatjaQW['dom'] += 1
 						katjaQW['horny'] += 10
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits.jpg"></center>'
 						'Katja bares your breasts and touches them with her fingers, then she bows her head and begins to lick your nipple.'
 
-						gs 'boystat', 'A14', 'a'
 						gs 'KatjaEvDin', 'sex'
 					end
 					
 					if will_cost <= pcs_willpwr:
 						act 'Remove her hands (<<will_cost>> Willpower)':
 							*clr & cla
-							minut += 5
-							pcs_horny += 10
+							gs 'arousal', 'foreplay', 3
 							KatjaQW['dom'] -= 1
 							katjaQW['horny'] -= 10
 							katjaQW['horny'] = min(katjaQW['horny'], 60)
 							gs 'willpower', 'pay', 'resist'
+							gs 'arousal', 'end'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 							'You remove her hands and smile at Katja.'
@@ -177,6 +170,8 @@ if $ARGS[0] = 'kiss':
 			end
 		end
 	else
+		gs 'arousal', 'end'
+		gs 'stat'
 		'Katja turns and begins collecting books, pretending that nothing has happened.'
 
 		act 'Talk about something else': gt 'KatjaHomeTalk'
@@ -413,11 +408,20 @@ if $ARGS[0] = 'sex':
 			katjaQW['horny'] = min(katjaQW['horny'], 40)
 			'Katja is embarrassed and pulls her hand away from you.'
 
-			act 'Talk about something else': gt 'KatjaHomeTalk'
-				if mey_vika['key'] = 1:
-				act 'Leave the room': gt 'mey_home', 'start'
+			act 'Talk about something else':
+				gs 'arousal', 'end'
+				gt 'KatjaHomeTalk'
+			end
+			if mey_vika['key'] = 1:
+				act 'Leave the room': 
+					gs 'arousal', 'end'
+					gt 'mey_home', 'start'
+				end
 			else
-				act 'Say goodbye and go home':gt 'pav_residential'
+				act 'Say goodbye and go home':
+					gs 'arousal', 'end'
+					gt 'pav_residential'
+				end
 			end
 		end
 	end
@@ -441,11 +445,20 @@ if $ARGS[0] = 'sex':
 			katjaQW['horny'] = min(katjaQW['horny'], 40)
 			'Katja is embarrassed and removes your hand.'
 
-			act 'Talk about something else': gt 'KatjaHomeTalk'
+			act 'Talk about something else':
+				gs 'arousal', 'end'
+				gt 'KatjaHomeTalk'
+			end
 			if mey_vika['key'] = 1:
-				Act 'Leave the room': gt 'mey_home', 'start'
+				act 'Leave the room': 
+					gs 'arousal', 'end'
+					gt 'mey_home', 'start'
+				end
 			else
-				act 'Say goodbye and go home':gt 'pav_residential'
+				act 'Say goodbye and go home':
+					gs 'arousal', 'end'
+					gt 'pav_residential'
+				end
 			end
 		end
 	end
@@ -458,6 +471,10 @@ if $ARGS[0] = 'sex':
 	if katjaQW['slut'] >= 40 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and strapon > 0:
 		act 'Get your strap-on': gt 'KatjaEvDin', 'strapon_start'
 	end
+
+	if katjaQW['slut'] >= 40 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and  katjaQW['fisted_vag'] > 0:
+		act 'Use your fist on Katja': gt 'KatjaEvDin', 'fisting'
+	end
 end
 
 if $ARGS[0] = 'kuni':
@@ -480,11 +497,62 @@ if $ARGS[0] = 'kuni':
 		'Katja smiles at you "That was great <<$pcs_nickname>>. Spread your legs."'
 		act 'Spread your legs': gt 'KatjaEvDin', 'kuni_p'
 	else
-		act 'Talk about something else': gt 'KatjaHomeTalk'
+		act 'Talk about something else':
+			gs 'arousal', 'end'
+			gt 'KatjaHomeTalk'
+		end
 		if mey_vika['key'] = 1:
-			Act 'Smile and leave the room': gt 'mey_home', 'start'
+			act 'Leave the room': 
+				gs 'arousal', 'end'
+				gt 'mey_home', 'start'
+			end
 		else
-			act 'Say goodbye and leave':gt 'pav_residential'
+			act 'Say goodbye and go home':
+				gs 'arousal', 'end'
+				gt 'pav_residential'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'fisting':
+	*clr & cla
+	menu_off = 1
+	katjaQW['slut'] += 1
+	katjaQW['horny'] = 0
+	if npc_vag['A14'] < 33: 
+		npc_vag['A14'] += 3
+	else 
+		npc_vag['A14'] = 36
+	end
+	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & katjaQW['slut'] += 5
+
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/fisting/fisting_repeat.jpg"></center>'
+	'After making sure Katja was well lubed and ready, she lays back to spread her legs for you. As she massages her clit with a toy, you slide your fingers in one at a time, working them in, out and around, bringing her pleasure with each thrust, she cries out in orgasm more than once, which makes her more wet and ready.'
+	'With a final push, you tuck your thumb in and curl your hand to slide it all the way in, till her netherlips wraps around your wrist. You give her only a few moments rest before twisting and thrust your hand more vigorously within her sex. It doesn''t take Katja long before her climax breaks again, she arches her back and attempts to keep her voice down as you continue to move your hand and fingers inside of her, but eventually you slow down and slide your hand out of her.'
+	'Katja Tries to catch her breath as she continues to have aftershock orgasms, while you watch as her sex closes slowly around something that isn''t there. Eventually you climb up and lay next to her, holding her as she shakes with her final orgasms and kissing her softly until you are ready for something else...'
+
+	gs 'arousal', 'vaginal_fist_give', 5, 'lesbian'
+	gs 'stat'
+
+	if pcs_horny >= 50:
+		act 'Ask Katja to go down on you': gt 'KatjaEvDin', 'kuni_p'
+	else
+		act 'Talk about something else':
+			gs 'arousal', 'end'
+			gt 'KatjaHomeTalk'
+		end
+		if mey_vika['key'] = 1:
+			act 'Leave the room': 
+				gs 'arousal', 'end'
+				gt 'mey_home', 'start'
+			end
+		else
+			act 'Say goodbye and go home':
+				gs 'arousal', 'end'
+				gt 'pav_residential'
+			end
 		end
 	end
 end
@@ -510,11 +578,20 @@ if $ARGS[0] = 'kuni_p':
 		'Katja smiles at you "That was great <<$pcs_nickname>>. Come on now, my turn."'
 		act 'Lick Katja': gt 'KatjaEvDin', 'kuni'
 	else
-		act 'Talk about something else': gt 'KatjaHomeTalk'
+		act 'Talk about something else':
+			gs 'arousal', 'end'
+			gt 'KatjaHomeTalk'
+		end
 		if mey_vika['key'] = 1:
-			Act 'Smile and leave the room': gt 'mey_home', 'start'
+			act 'Leave the room': 
+				gs 'arousal', 'end'
+				gt 'mey_home', 'start'
+			end
 		else
-			act 'Say goodbye and leave':gt 'pav_residential'
+			act 'Say goodbye and go home':
+				gs 'arousal', 'end'
+				gt 'pav_residential'
+			end
 		end
 	end
 end
@@ -547,6 +624,7 @@ if $ARGS[0] = 'kuni_dom':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			if will_cost <= pcs_willpwr:
 				act 'Say goodbye and go home (<<will_cost>> Willpower)':
+					gs 'arousal', 'end'
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					gt 'pav_residential'
@@ -566,6 +644,7 @@ if $ARGS[0] = 'kuni_dom':
 				gs 'willpower', 'sex', 'resist', 'hard'
 				if will_cost <= pcs_willpwr:
 					act 'Decline and go home (<<will_cost>> Willpower)':
+						gs 'arousal', 'end'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						gt 'pav_residential'
@@ -596,6 +675,7 @@ if $ARGS[0] = 'kuni_dom':
 						gs 'willpower', 'vaginal', 'resist', 'hard'
 						if will_cost <= pcs_willpwr:
 							act 'Decline and go home (<<will_cost>> Willpower)':
+								gs 'arousal', 'end'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
 								gt 'pav_residential'
@@ -621,6 +701,7 @@ if $ARGS[0] = 'kuni_dom':
 							gs 'willpower', 'anal', 'resist', 'hard'
 							if will_cost <= pcs_willpwr:
 								act 'Decline and go home (<<will_cost>> Willpower)':
+									gs 'arousal', 'end'
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
 									gt 'pav_residential'
@@ -645,6 +726,7 @@ if $ARGS[0] = 'kuni_dom':
 									gs 'arousal', 'anal_strap', -1, 'lesbian', 'sub', 'rough'
 								end
 								
+								gs 'arousal', 'end'
 								gs 'stat'
 								
 								'Yet she doesn''t slow down her furious pace. Finally unable to keep it up anymore, she collapses on your back. You can feel her sweat on your back and her heavy breathing in your ear as she rests against with the dildo still firmly up your ass.'
@@ -664,6 +746,7 @@ if $ARGS[0] = 'kuni_dom':
 			end
 		end
 	else
+		gs 'arousal', 'end'
 		act 'Talk about something else': gt 'KatjaHomeTalk'
 		if mey_vika['key'] = 1:
 			Act 'Leave the room': gt 'mey_home', 'start'

+ 1 - 1
locations/katja_sex.qsrc

@@ -929,7 +929,7 @@ if $ARGS[0] = 'first_fisting':
 										end
 										katjaQW['horny'] = 0
 										katjaQW['slut'] += 5
-										katjaQW['fisted_vag'] = 1
+										if katjaQW['fisted_vag'] = 0:  katjaQW['fisted_vag'] = 1
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/fisting/fisting9.jpg"></center>'
 										'As you are sliding your body up and climbing up on top of Katja to hold her, her body still shakes as she deals with the aftershocks. You lost count how many times she cried out in new pleasure. She finally lets the buzzing toy drop to the side of the bed, wraps you in her arms and kisses you deeply. "Oh My God...oh my god....my body won''t stop...what did you do to me?...Ahhhh" she gasps out, as another one hits her stronger than the last few, she holds you tighter and squeezes you more as she rides through it, and relaxes afterwards, breathing heavily as if she just ran a marathon. "We definitely need to do that again, but not right away, I think I need to recover after that." '

+ 14 - 14
locations/leonid.qsrc

@@ -130,10 +130,6 @@ if $ARGS[0] = 'office':
 end
 
 if $ARGS[0] = 'secretaryGate':
-	if CloStyle3 ! 4:
-		gt 'leonid', 'toilet'
-	end
-
 	if hour	>= 19:
 		gt 'leonid', 'secretaryEndWorkday'
 	end
@@ -141,16 +137,20 @@ if $ARGS[0] = 'secretaryGate':
 		'<b>You are naked.</b>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/secretarynaked.jpg"></center>'
 		mult = 3
-	end
-	if CloStyle3 = 4 and CloBimbo = 0:
-		'<b>You are dressed as a secretary.</b>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/secretarynormal.jpg"></center>'
-		mult = 1
-	end
-	if CloStyle3 = 4 and CloBimbo = 1:
-		'<b>You are dressed as a naughty secretary.</b>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/secretarysexy.jpg"></center>'
-		mult = 2
+	else
+		if CloStyle3 ! 4:
+			gt 'leonid', 'toilet'
+		end
+		if CloStyle3 = 4 and CloBimbo = 0:
+			'<b>You are dressed as a secretary.</b>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/secretarynormal.jpg"></center>'
+			mult = 1
+		end
+		if CloStyle3 = 4 and CloBimbo = 1:
+			'<b>You are dressed as a naughty secretary.</b>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/secretarysexy.jpg"></center>'
+			mult = 2
+		end
 	end
 	
 	'You are in the office of <<$bName>> <<$bSurname>>. There are three other doors inside the office, one leading to a small <a href="exec:gt ''leonid'', ''officeKitchen''">kitchen</a>, second leading to a conference room and third leading to a <a href="exec:gt ''leonid'', ''toilet''">toilet</a>.'

+ 3 - 2
locations/liam.qsrc

@@ -55,13 +55,14 @@ end
 !!if arts = 1:'<a href="exec:gt ''Marin'',''start''">Marinka''s Apartment</a>'
 
 act 'Walk to Okhlopkov Square (0:05)':minut += 5 & gt 'liames'
-act 'Walk to the highway (0:05)':minut += 5 & nroad = 15 & gt 'road'
-act 'Walk to Pavlovsk park (0:10)':minut += 10 & nroad = 10 & gt 'pav_park', 'start'
+act 'Walk to the highway (0:05)':minut += 5 & nroad = 19 & gt 'road'
+act 'Walk to the park (0:10)':minut += 10 & gt 'pav_park', 'start'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
 act 'Walk to the Market (0:20)':minut += 20 & gt 'pav_market'
 act 'Walk to the Commercial area (0:25)':minut += 25 & gt 'pav_commercial'
 act 'Walk to the Residential area (0:30)':minut += 30 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:30)':minut += 30 & gt 'pav_industrial'
+act 'Walk to the Five Eight estate (0:30)':minut += 30 & gt 'pav_complex', 'start'
 
 if pushkin_walk_day ! daystart:
 	act 'Take a walk (1:00)':

+ 2 - 2
locations/meadow.qsrc

@@ -69,9 +69,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	end
 
 	if MiraLoc = 2 and meadow ! 2:
-		act 'Go back to the forest': minut += 20 & MiraLoc = 3 & gt 'gadforest', 'forest_edge'
+		act 'Walk back to the forest': minut += 20 & MiraLoc = 3 & gt 'gadforest', 'forest_edge'
 	elseif meadow ! 2:
-		act 'Go back to the forest': minut += 20 & gt 'gadforest', 'forest_edge'
+		act 'Walk back to the forest': minut += 20 & gt 'gadforest', 'forest_edge'
 	end
 
 	if sunWeather = 1:

+ 1 - 1
locations/office.qsrc

@@ -742,7 +742,7 @@ if $ARGS[0] = 'interview':
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/npc/torbica_office.jpg"></center>'
 					'You think about it. Some of the morality questions made you rather uncomfortable, so perhaps this isn''t the job for you. "Um... Thank you, but I''m not sure this is a good fit."'
 					'She looks very surprised and her smile fades. "I understand. If you change your mind, then you''re welcome to apply again." With that, you get up and leave.'
-					act 'leave': minut += 75 & gt 'office', 'start'
+					act 'Leave': minut += 75 & gt 'office', 'start'
 				end
 				act 'Take the job':
 					*clr & cla

+ 1 - 1
locations/pav_clinic.qsrc

@@ -1349,7 +1349,7 @@ if $ARGS[0] = 'spravka_arrange_pale':
 				gs 'stat'
 				'In a panic, you grab your clothes and run out of the office. You know you can''t talk about this with anyone... if you say anything, Dr. Petrovich would tell your <<$npc_nickname[''A29'']>> about your addiction. You quickly get dressed again in an empty examination room, wondering how you''re going to get out of this mess now.'
 				if $loc = 'kuhrPar':
-					act 'leave': gt 'mother', 'referral'
+					act 'Leave': gt 'mother', 'referral'
 				else
 					act 'Leave':gt 'pav_clinic'
 				end

+ 4 - 3
locations/pav_commercial.qsrc

@@ -114,9 +114,9 @@ end
 '<br>Of course, right after you visit the bank, you can spend your money at <<$desc_txt3>>.' 
 
 if hour >= 8 and hour <= 17:
-	$desc_txt1 = '<a href="exec: minut += 3 & gt ''barbershop'', ''start''">A Cut Above</a>, the only barber shop in the area, <a href="exec: minut += 3 & gt ''shop_coco_carmen'', ''start''">Coco Carmen</a> the trendy clothes shop and <a href="exec: minut += 3 & gt ''shop_allure'', ''start''">Allure</a> the swimwear chain.'
+	$desc_txt1 = '<a href="exec: minut += 3 & gt ''barbershop'', ''start''">A Cut Above</a>, the only barber shop in the area, <a href="exec: minut += 3 & gt ''shop_coco_carmen'', ''start''">Coco Carmen</a> the trendy clothes shop and <a href="exec: minut += 3 & gt ''shop_allure'', ''start''">Allure</a> the swimwear chain'
 else
-	$desc_txt1 = '<a href="exec:msg ''A Cut Above, which is closed right now. It will reopen again at 8:00''">A Cut Above</a>, the only barber shop in the area, <a href="exec:msg ''Coco Carmen, which is closed right now. It will reopen again at 8:00''">Coco Carmen</a> the trendy clothes shop and <a href="exec:msg ''Allure, which is closed right now. It will reopen again at 8:00''">Allure</a> the swimwear chain.'
+	$desc_txt1 = '<a href="exec:msg ''A Cut Above, which is closed right now. It will reopen again at 8:00''">A Cut Above</a>, the only barber shop in the area, <a href="exec:msg ''Coco Carmen, which is closed right now. It will reopen again at 8:00''">Coco Carmen</a> the trendy clothes shop and <a href="exec:msg ''Allure, which is closed right now. It will reopen again at 8:00''">Allure</a> the swimwear chain'
 end
 '<br>The rest of the street is filled with smaller locally owned businesses, most notable being <<$desc_txt1>>.'
 
@@ -141,7 +141,8 @@ if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pav_complex', 'start'
-act 'Walk to the Market (0:05)':minut += 5 & gt 'pav_market'
+act 'Walk to the Market (0:10)':minut += 10 & gt 'pav_market'
+act 'Walk to the park (0:05)':minut += 5 & gt 'pav_park', 'start'
 act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train_hall'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to Pushkin (0:25)':minut += 25 & nroad = 19 & gt 'liam'

+ 5 - 5
locations/pav_complex.qsrc

@@ -139,11 +139,11 @@ if $ARGS[0] = 'start':
 	
 	if home_owned[2] = 1: act '<b>Go Home</b> (Parents'' Apartment)': minut += 4 & pavhome_enter = 1 & gt 'korrPar'
 	if pavSharedAptEnabled = 1: act '<b>Go Home</b> (Shared Apartment)': minut += 5 & gt 'pav_shared_apt', 'start'
-	act 'Walk to the residential area (0:02)':minut += 2 & gt 'pav_residential'
-	act 'Walk to the commercial area (0:05)':minut += 5 & gt 'pav_commercial'
-	act 'Walk to the industrial region (0:05)':minut += 5 & gt 'pav_industrial'
-	act 'Walk to the Market (0:10)':minut += 10 & gt 'pav_market'
-	act 'Walk to the train station (0:20)':minut += 20 & gt 'pav_train_hall'
+	act 'Walk to the Residential area (0:02)':minut += 2 & gt 'pav_residential'
+	act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
+	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
+	act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
+	act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
 	act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'liam'
 	if mid($start_type,1,2) = 'sg' and home_owned[2] = 1: 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'

+ 3 - 3
locations/pav_complexrolan.qsrc

@@ -359,7 +359,7 @@ if $ARGS[0] = 'friends':
 									rolanblockhome = 0
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanturncry.jpg"></center>'
 									'"I''m sorry too Miss <<$pcs_lastname>>. I wish this wasn''t necessary, but I''m sure you have learned your lesson.'
-									act 'leave':gt 'pav_complex', 'start'
+									act 'Leave':gt 'pav_complex', 'start'
 								end
 							end
 						end
@@ -426,7 +426,7 @@ if $ARGS[0] = 'friends':
 								rolanblockhome = 0
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanturncry.jpg"></center>'
 								'"I''m sorry too Miss <<$pcs_lastname>>. I wish this wasn''t necessary, but I''m sure you have learned your lesson.'
-								act 'leave':gt 'pav_complex', 'start'
+								act 'Leave':gt 'pav_complex', 'start'
 							end
 						end
 					end
@@ -487,7 +487,7 @@ if $ARGS[0] = 'friends':
 							rolanblockhome = 0
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanturncry.jpg"></center>'
 							'"I''m sorry too Miss <<$pcs_lastname>>. I wish this wasn''t necessary, but I''m sure you have learned your lesson.'
-							act 'leave':gt 'pav_complex', 'start'
+							act 'Leave':gt 'pav_complex', 'start'
 						end
 					end
 				end

+ 1 - 1
locations/pav_industrial.qsrc

@@ -76,7 +76,7 @@ end
 act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pav_complex', 'start'
 act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
 act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
-act 'Walk to the Market (0:05)':minut += 5 & gt 'pav_market'
+act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'liam'

+ 2 - 2
locations/pav_market.qsrc

@@ -282,7 +282,7 @@ if kidalob = 0:
 	end
 end
 
-act 'Go to the train station (0:03)': minut += 3 & gt 'pav_train_hall'
+act 'Walk to the train station (0:03)': minut += 3 & gt 'pav_train_hall'
 if Trainpass_day > daystart:
 	'You have <<Trainpass_day - daystart>> days left on your train pass.'
 	act 'Go direct to train station platforms': gt 'pav_train_hall', 'platform'
@@ -292,7 +292,7 @@ act 'Walk to the Residential area (0:15)':minut += 15 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:15)':minut += 15 & gt 'pav_industrial'
 act 'Walk to the Five Eight estate (0:15)':minut += 15 & gt 'pav_complex', 'start'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to Pushkin (0:15)':minut += 15 & nroad = 19 & gt 'liam'
+act 'Walk to Pushkin (0:20)':minut += 20 & nroad = 19 & gt 'liam'
 
 gs 'camera', 'check_location'
 

+ 3 - 2
locations/pav_residential.qsrc

@@ -151,9 +151,10 @@ end
 act 'Walk to the Five Eight estate (0:02)':minut += 2 & gt 'pav_complex', 'start'
 act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
 act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
-act 'Walk to the Market (0:05)':minut += 5 & gt 'pav_market'
+act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
+act 'Walk to the park (0:05)':minut += 5 & gt 'pav_park', 'start'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
-act 'Walk to Pushkin (0:25)':minut += 25 & nroad = 19 & gt 'liam'
+act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'liam'
 
 act 'Wait':gs 'obj_din', 'wait'
 

+ 1 - 1
locations/pav_train_hall.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = '':
 		*nl
 	end
 
-	act 'Walk to Pav market (0:03)':minut += 3 & gt 'pav_market'
+	act 'Walk to the Market (0:03)':minut += 3 & gt 'pav_market'
 	act 'Walk to the Commercial area (0:10)':minut += 10 & gt 'pav_commercial'
 	act 'Walk to the Residential area (0:15)':minut += 15 & gt 'pav_residential'
 	act 'Walk to the Industrial region (0:15)':minut += 15 & gt 'pav_industrial'

+ 3 - 3
locations/praiders_garage.qsrc

@@ -491,7 +491,7 @@ if $ARGS[0] = 'hangout3':
 	act 'Talk to Valentin': gt 'praiders_garage', 'chat_valentin'
 	act 'Talk to Arkadi': gt 'praiders_garage', 'chat_arkadi'
 	act 'Talk to Lavrenti': gt 'praiders_garage', 'chat_lavrenti'
-	act 'leave': gt 'pav_complex', 'garages'
+	act 'Leave': gt 'pav_complex', 'garages'
 	else
 		act 'Party is finishing': gt 'praiders_garage', 'party_over'
 	end
@@ -530,7 +530,7 @@ if $ARGS[0] = 'hangout4':
 	act 'Talk to Arkadi': gt 'praiders_garage', 'chat_arkadi'
 	act 'Talk to Lena and Lera': gt 'praiders_garage', 'chat_lenalera'
 	act 'Talk to Lavrenti': gt 'praiders_garage', 'chat_lavrenti'
-	act 'leave': gt 'pav_complex', 'garages'
+	act 'Leave': gt 'pav_complex', 'garages'
 	else
 		act 'Party is finishing': gt 'praiders_garage', 'party_over'
 	end
@@ -647,7 +647,7 @@ if $ARGS[0] = 'hangout7':
 		act 'Talk to Arkadi': gt 'praiders_garage', 'chat_arkadi'
 		act 'Talk to Alyona': gt 'praiders_garage', 'chat_alyona'
 		act 'Talk to Roman': gt 'praiders_garage', 'chat_roman'
-		act 'leave': gt 'pav_complex', 'garages'
+		act 'Leave': gt 'pav_complex', 'garages'
 	else
 		act 'Party is finishing': gt 'praiders_garage', 'party_over'
 	end

+ 10 - 2
locations/road.qsrc

@@ -23,15 +23,23 @@ if $ARGS[0] = '':
 
 	if car > 0 and cardrive = 22 and ncarroad = nroad:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> next to the road.'
 	if nroad = 0: act 'Walk to the City Industrial Region (0:15)': minut += 15 & gt 'city_industrial'
+	if nroad = 1:
+		act 'Walk to the City Suburbs (0:15)': minut += 15 & gt 'city_suburbs', 'start'
+	end
 	if nroad = 10:
-		act 'Go to Gadukino (0:15)': minut += 15 & gt 'gadukino'
-		act 'Go to the train platform': gt 'train', 'village'
+		act 'Walk to Gadukino (0:15)': minut += 15 & gt 'gadukino'
+		act 'Walk to the train platform (0:15)': minut += 15 & gt 'train', 'village'
 		if npc_QW['A60'] > 15: act 'Look around for Mira': gt 'gadprostitutes', 'start'
 	end
 	if nroad = 16: act 'Check out the construction site (1:00)':minut += 60 & gt 'obekt'
+	if nroad = 19:
+		act 'Walk to Pushkin (0:05)': minut += 5 & gt 'liam'
+	end
 	if nroad = 20:
 		act 'Walk to Pavlovsk train station (0:15)': minut += 15 & gt 'pav_train_hall'
 		act 'Walk to Pavlovsk Commercial area (0:15)': minut += 15 & gt 'pav_commercial'
+		act 'Walk to Pavlovsk Industrial region (0:25)': minut += 25 & gt 'pav_industrial'
+		act 'Walk to Pavlovsk Market (0:15)': minut += 15 & gt 'pav_market'
 	end
 	if nroad < 20: act 'Walk towards Pavlovsk (0:20)': minut += 20 & nroad += 1 & gt $curloc
 	if nroad > 0: act 'Walk towards St. Petersburg (0:20)': minut += 20 & nroad -= 1 & gt $curloc

+ 116 - 29
locations/selfplay.qsrc

@@ -764,9 +764,10 @@ if $ARGS[0] = 'fingering2':
 
 		'<<$AnyaMsg>>'
 
-		gs 'selfplay', 'fingering2', 1
-
-		if org_temp = orgasm and pcs_vag > 0: gs 'selfplay', 'fingering3'
+		if org_temp = orgasm:
+			gs 'selfplay', 'fingering2', 1
+			if pcs_vag > 0: gs 'selfplay', 'fingering3'
+		end
 
 		act 'Stop touching yourself':gt 'selfplay', 'stop'
 	end
@@ -807,46 +808,132 @@ if $ARGS[0] = 'fingering3':
 
 		'<<$AnyaMsg>>'
 
-		if org_temp = orgasm:
-			act 'Fuck yourself with your fingers':
-				cls
-				selfplaytime += 10
-				gs 'selfplay', 'sis_prov'
+		if org_temp = orgasm: gs 'selfplay', 'fingering4'
 
-				if pcs_vag < 10:
-					if vgape = 2:vgape = 3
-					if vgape = 1:vgape = 2
-					if vgape = 0:vgape = 1
+		act 'Stop touching yourself':gt 'selfplay', 'stop'
+	end
+end
 
-					pcs_horny -= 10
-					pcs_mood -= 10
-				end
+if $ARGS[0] = 'fingering4':
+	act 'Fuck yourself with your fingers':
+		cls
+		selfplaytime += 10
+		gs 'selfplay', 'sis_prov'
+
+		if pcs_vag < 10:
+			if vgape = 2:vgape = 3
+			if vgape = 1:vgape = 2
+			if vgape = 0:vgape = 1
+
+			pcs_horny -= 10
+			pcs_mood -= 10
+		end
+
+		'<center><img <<$set_imgh>> src="images/shared/sex/mast/hand.jpg"></center>'
+		if args[1] = 1:
+			'You continue to move your hand, thrusting your fingers into your pussy again and again.'
+		else
+			'You start to slowly move your hand, thrusting your fingers into your pussy again and again.'
+		end
 
-				'<center><img <<$set_imgh>> src="images/shared/sex/mast/hand.jpg"></center>'
-				'You start to slowly move your hand, thrusting your fingers into your pussy again and again.'
+		gs 'arousal', 'vaginal_finger', 10, 'masturbate'
+		gs 'stat'
 
-				gs 'arousal', 'vaginal_finger', 10, 'masturbate'
-				gs 'stat'
+		if pcs_vag <= 15:pcs_horny -= 10 & pcs_mood -= 10 & 'You''re stretching your pussy to the point where it becomes rather painful, and don''t get any enjoyment out of it.'
+		if pcs_vag > 10:pcs_horny += rand(10, 20) & 'Your pussy walls are stretched nicely from the finger fucking, and you feel a pleasant warmth spread in your lower body.'
+
+		gs 'stat'
+
+		if pcs_vag < 20:vaginaTemp += 1
+
+		'<<$AnyaMsg>>'
 
-				if pcs_vag <= 15:pcs_horny -= 10 & pcs_mood -= 10 & 'You''re stretching your pussy to the point where it becomes rather painful, and don''t get any enjoyment out of it.'
-				if pcs_vag > 10:pcs_horny += rand(10, 20) & 'Your pussy walls are stretched nicely from the finger fucking, and you feel a pleasant warmth spread in your lower body.'
+		if org_temp = orgasm:
+			gs 'selfplay', 'fingering4', 1
+			if pcs_vag > 10: gs 'selfplay', 'self_fisting_1'
+		end
 
-				gs 'stat'
+		act 'Stop touching yourself':gt 'selfplay', 'stop'
+	end
+end
 
-				if pcs_vag < 20:vaginaTemp += 1
+if $ARGS[0] = 'self_fisting_1':
+	act 'Thrust your whole hand into your vagina':
+		cls
+		selfplaytime += 2
+		gs 'selfplay', 'sis_prov'
 
-				'<<$AnyaMsg>>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/mast/self_fisting.jpg"></center>'
 
-				gs 'selfplay', 'fingering3'
+		'You shove your whole hand inside your pussy.'
 
-				act 'Stop touching yourself':gt 'selfplay', 'stop'
-			end
+		if pcs_vag < 15:
+			if vgape = 2:vgape = 3
+			if vgape = 1:vgape = 2
+			if vgape = 0:vgape = 1
+
+			pcs_horny -= 10
+			pcs_mood -= 10
+			'You shove your whole hand inside your tight pussy, and feel it stretch out way more than it should. It''s rather painful.'
+		elseif pcs_vag < 20:
+			pcs_horny += rand(1, 3)
+			'You shove your whole hand inside your tight pussy, feeling your pussy grip it tightly. It doesn''t hurt, but doesn''t feel very good either.'
+		elseif pcs_vag < 25:
+			pcs_horny += rand(3, 6)
+			'You shove your whole hand inside your tight pussy, feeling your pussy grip it tightly.'
 		else
-			act 'Stop touching yourself':gt 'selfplay', 'stop'
+			pcs_horny += rand(6, 12)
+			'You stick your whole hand in your pussy, and feel how your vagina envelops it nicely. You get a pleasant feeling of fullness.'
 		end
+		if pcs_vag < 20:vaginaTemp += 1
+
+		gs 'arousal', 'self_fisting', 2, 'masturbate'
+		gs 'stat'
+
+		'<<$AnyaMsg>>'
+
+		if org_temp = orgasm: gs 'selfplay', 'self_fisting_2'
 	end
+end
 
-	act 'Stop touching yourself':gt 'selfplay', 'stop'
+if $ARGS[0] = 'self_fisting_2':
+	act 'Fuck your fist':
+		cls
+		selfplaytime += 10
+		gs 'selfplay', 'sis_prov'
+
+		if pcs_vag < 15:
+			if vgape = 2:vgape = 3
+			if vgape = 1:vgape = 2
+			if vgape = 0:vgape = 1
+
+			pcs_horny -= 10
+			pcs_mood -= 10
+		end
+
+		'<center><img <<$set_imgh>> src="images/shared/sex/mast/self_fisting.jpg"></center>'
+		if args[1] = 1:
+			'You continue to move your arm, thrusting your hand into your pussy again and again.'
+		else
+			'You start to slowly move your arm, thrusting your hand into your pussy again and again.'
+		end
+
+		gs 'arousal', 'self_fisting', 10, 'masturbate'
+		gs 'stat'
+
+		if pcs_vag <= 20:pcs_horny -= 10 & pcs_mood -= 10 & 'You''re stretching your pussy to the point where it becomes rather painful, and don''t get any enjoyment out of it.'
+		if pcs_vag > 15:pcs_horny += rand(10, 20) & 'Your pussy walls are stretched nicely from the the fisting, and you feel a pleasant warmth spread in your lower body.'
+
+		gs 'stat'
+
+		if pcs_vag < 25:vaginaTemp += 1
+
+		'<<$AnyaMsg>>'
+
+		if org_temp = orgasm: gs 'selfplay', 'self_fisting_2', 1
+
+		act 'Stop touching yourself':gt 'selfplay', 'stop'
+	end
 end
 
 if $ARGS[0] = 'anal_fingering':

+ 4 - 4
locations/sitrPar.qsrc

@@ -102,14 +102,14 @@ if $ARGS[0] = '':
 			end
 		else
 			'As you walk into the living room, you see your mother sweeping the floor. She hasn''t noticed you, she is intent on cleaning.'
-			act 'leave': gt 'korrPar'
+			act 'Leave': gt 'korrPar'
 		end
 		exit
 	elseif locat['Mother'] = 19 and locat['Stepdad'] = 10:
 		!! Watches TV with Vladimir
 		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/momvladtv.jpg"></center>'
 		'As you walk into the living room, you see your <<$npc_nickname[''A29'']>> and Vladimir sitting on the couch watching TV.'
-		act 'leave':gt 'korrPar'
+		act 'Leave':gt 'korrPar'
 		
 		act 'Join them':
 			cla & *clr
@@ -121,7 +121,7 @@ if $ARGS[0] = '':
 			gs 'stat'
 			!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
 			'You move over to join them, and your <<$npc_nickname[''A29'']>> scoots away from Vladimir and pats the spot between her and him. You take a seat between them. Vlad barely even glances at you with a brief smile before he goes back to watching TV. Your <<$npc_nickname[''A29'']>> pats you on the shoulder before returning her attention to the TV, apparently happy the family is spending time together.'
-			act 'leave':gt 'korrPar'
+			act 'Leave':gt 'korrPar'
 			
 			act 'Keep watching':gt 'sitrPar', 'TVfam'
 			act 'Finish watching':gt 'sitrPar', 'TVend'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'TVend':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
 	'Once the show is over, Vladimir picks up the remote and turns the TV off. He gets up then stretches before he turns and walks out of the room, likely heading to bed. <<$npc_nickname[''A29'']>> gets up and says to you, "You should go to bed or at least go to your room so your brother can get his rest." She then turns to Kolka and says to him, "Don''t stay up, go to bed." With that, she also leaves after making sure you leave as well. As you walk out, you see Kolka putting his pillow and sheet on the couch.'
-	act 'leave':gt 'korrPar'
+	act 'Leave':gt 'korrPar'
 end
 
 if $ARGS[0] = 'occupied':

+ 1 - 1
locations/swamp.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 
 	if hunterscabin = 1:
 		'You can see the small path to the clearing that contains the hunters cabin.'
-		act 'Go to the hunters cabin (0:15)':
+		act 'Walk to the hunters cabin (0:15)':
 			! daytime chance to get stuck in swamp - use bike to get there 100% of the time
 			if DayStage < 4:
 				swamp_stuck = 0

+ 1 - 1
locations/train.qsrc

@@ -158,7 +158,7 @@ if $ARGS[0] = 'village':
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'A fairly nondescript railway platform. The small village of Gadukino where your grandparents reside is not far from here.'
 
-	act 'Return to the road':minut += 15 & nroad = 10 & gt 'road'
+	act 'Walk to the road (0:15)':minut += 15 & nroad = 10 & gt 'road'
 	*nl
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'