59 Commits 9288b43b95 ... 724220ad32

Author SHA1 Message Date
  LinaHirata 724220ad32 [fixed] `Unexpected operator after ELSE` in `katalkin` 4 months ago
  Kevin_Smarts 2031fa555f [fixed] Missing T spotted by Sword 4 months ago
  Kevin_Smarts 9e8a3493a0 Merge branch 'master' of onyxLumen/glife into master 4 months ago
  Kevin_Smarts 3b3c5af252 Merge branch 'pain-rework' of Lusticon/glife into master 4 months ago
  Kevin_Smarts 5496ba26bc Merge remote-tracking branch 'Lusticon/bugfixes' 4 months ago
  Kevin_Smarts fab8de9581 [fixed] Wrong variable in checks for Gopnik style uniform 4 months ago
  Kevin_Smarts 2f02841b30 [update] Latest parser as requested 4 months ago
  Kevin_Smarts 0bb05355ba Merge remote-tracking branch '00/master' 4 months ago
  bgkjdgbizgblzdgbr d113fc3fc2 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 months ago
  bgkjdgbizgblzdgbr 40a037acab [fixed] More missing rand. 4 months ago
  sjgg555 0ee1ae9d45 [fixed] fixed incorrect image path in sister_sex_talk.qsrc 4 months ago
  Kevin_Smarts 8751a81bde Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master' 4 months ago
  Kevin_Smarts 4e7f080c7b Merge branch 'master' of Lusticon/glife into master 4 months ago
  bgkjdgbizgblzdgbr 7304078665 [fixed] Missing : 4 months ago
  bgkjdgbizgblzdgbr 08a01ebcc3 [fixed] Missing rand. Spotted by Chimrod. 4 months ago
  Kevin_Smarts fd5eade99f [fixed] Typo causing volleyball icon not to work as reported by Frankieo 4 months ago
  Kevin_Smarts e3079d0c3a [changed] Therapist schedules done correctly using the old daily forced scheduling but now weekly 4 months ago
  onyxLumen 79d8fc21e7 Merge branch 'dev' of onyxLumen/glife into master 4 months ago
  onxyLumen ceb19684c8 fix: placer event 4 months ago
  Kevin_Smarts 68a75337fa [added] Therapist sets Thursday at 17:00 schedule during first treatment. 4 months ago
  Lusticon 3a0fb318a0 no morning events while being late 4 months ago
  Lusticon 62e0df2d3d no morning events while being late 4 months ago
  Lusticon ae055efb23 a little better navigation 4 months ago
  Lusticon ce5039a82c a little better navigation 4 months ago
  Lusticon 813b75f27f fix model job status text display 4 months ago
  Lusticon 20d95c31af fix model job status text display 4 months ago
  Lusticon 438c1da28c fix sopping wet panties without panties 4 months ago
  Lusticon 266cd5cd3a fix sopping wet panties without panties 4 months ago
  Lusticon 010188e266 fix sopping wet panties without panties 4 months ago
  Lusticon cfbaac51ae fix misspelling 4 months ago
  Lusticon 8ce7567289 fix PanThinness check without panties 4 months ago
  Lusticon 4d2df62bc5 fix misspellings 4 months ago
  Lusticon 53c098bad3 fix misspellings 4 months ago
  Lusticon ce1c4b31b5 fix double spelling 4 months ago
  Lusticon d19098d2c6 fix misspellings 4 months ago
  Lusticon 3af27e1087 fix blini double picture 4 months ago
  Lusticon 123e8d2fa0 fix Ivan double portrait picture display 4 months ago
  Lusticon 21f9b01be4 added missed stat update after strip_all 4 months ago
  Lusticon d8ba1d7f8c fix double character information view 4 months ago
  Lusticon 99ecbb8b9c fix for no panties skirtless event 4 months ago
  Lusticon 32d3ac5b01 fix history lesson daydreaming 4 months ago
  Lusticon 608de83639 fix usage of sanitary pads and tampon 4 months ago
  Lusticon 23f43bf927 fix OR AND statement 4 months ago
  Lusticon 1374aeda92 fix birth_control['remind_icon'] appear while pregnancy 4 months ago
  Lusticon 64d91b30cf removed unnecessary cum_manage call 4 months ago
  Lusticon 2aa4b2dddd fix makeup vs swimwear check issue 4 months ago
  Lusticon 0c11713bc7 fix exit location after check out fuckornot and hotornot at gschool_lessons2 4 months ago
  Lusticon 1635a3af12 fix exit location after check out fuckornot and hotornot at gschool_lessons2 4 months ago
  Lusticon 31662e1fe7 dimaRevenge fixes 4 months ago
  Lusticon bc13e1a6ad dimaRevenge fixes 4 months ago
  Lusticon c0eb5a8af3 dimaRevenge fixes 4 months ago
  Lusticon f7705aea6b added missed cla 4 months ago
  Lusticon 54f51cd0a9 Обновить 'locations/motherkafeboss.qsrc' 4 months ago
  Lusticon 0d82b02d42 Обновить 'locations/prostitution_functions.qsrc' 4 months ago
  Lusticon ebbbc75392 Обновить 'locations/medical_din.qsrc' 4 months ago
  Lusticon f67883837c Обновить 'locations/mother.qsrc' 4 months ago
  Lusticon 762d2c71ab Обновить 'locations/pain.qsrc' 4 months ago
  Lusticon a4a0ca7e9b Обновить 'locations/exercise.qsrc' 4 months ago
  Lusticon c10f4cfbcf Обновить 'locations/korrPar.qsrc' 4 months ago
59 changed files with 584 additions and 653 deletions
  1. 5 3
      glife.qproj
  2. 19 26
      locations/KatjaHomeTalk.qsrc
  3. 4 2
      locations/LakeBoyDy.qsrc
  4. 1 1
      locations/Nudelake.qsrc
  5. 0 1
      locations/Serge_kuh.qsrc
  6. 2 1
      locations/artemhome.qsrc
  7. 1 1
      locations/body.qsrc
  8. 1 1
      locations/cikl.qsrc
  9. 4 0
      locations/dimaRevenge.qsrc
  10. 14 2
      locations/din_van.qsrc
  11. 1 1
      locations/exercise.qsrc
  12. 2 2
      locations/fbDormD.qsrc
  13. 0 1
      locations/food.qsrc
  14. 1 0
      locations/foto.qsrc
  15. 1 0
      locations/foto_shoot.qsrc
  16. 4 4
      locations/gopnik_house.qsrc
  17. 1 1
      locations/gschool_break.qsrc
  18. 1 1
      locations/gschool_grounds.qsrc
  19. 1 0
      locations/gschool_jock_chats.qsrc
  20. 3 3
      locations/gschool_lessons.qsrc
  21. 1 1
      locations/gschool_lessons1.qsrc
  22. 2 3
      locations/gschool_lessons2.qsrc
  23. 1 1
      locations/katalkin.qsrc
  24. 4 4
      locations/katja_pantyquest.qsrc
  25. 4 0
      locations/komp_HF_or_not.qsrc
  26. 1 1
      locations/korrPar.qsrc
  27. 1 1
      locations/lug.qsrc
  28. 1 1
      locations/medical_din.qsrc
  29. 2 2
      locations/mey_vika_events.qsrc
  30. 4 0
      locations/motherkafeboss.qsrc
  31. 72 132
      locations/pain.qsrc
  32. 1 1
      locations/pav_commercial.qsrc
  33. 0 1
      locations/pav_disco.qsrc
  34. 9 9
      locations/pav_disco_coolkids.qsrc
  35. 1 1
      locations/pav_lake_nude.qsrc
  36. 17 0
      locations/pav_park_meet_event.qsrc
  37. 70 0
      locations/pav_park_meet_kol_event.qsrc
  38. 28 164
      locations/pav_parkev.qsrc
  39. 2 0
      locations/pav_pool.qsrc
  40. 1 1
      locations/pav_shared_nestor.qsrc
  41. 1 1
      locations/pav_shared_oleg.qsrc
  42. 35 38
      locations/placer.qsrc
  43. 64 62
      locations/placer_act.qsrc
  44. 2 2
      locations/placer_end.qsrc
  45. 2 3
      locations/placer_gop_orgy.qsrc
  46. 12 12
      locations/placer_house.qsrc
  47. 76 78
      locations/placer_man.qsrc
  48. 55 49
      locations/placer_pav_park.qsrc
  49. 8 8
      locations/placer_sex.qsrc
  50. 4 4
      locations/podval_rape.qsrc
  51. 1 1
      locations/prostitution_functions.qsrc
  52. 1 1
      locations/sister_sex_talk.qsrc
  53. 8 4
      locations/stat.qsrc
  54. 15 11
      locations/stat_display.qsrc
  55. 1 1
      locations/street_event.qsrc
  56. 2 0
      locations/talent_agency.qsrc
  57. 8 3
      locations/therapist.qsrc
  58. 1 1
      locations/uni_dorm.qsrc
  59. BIN
      tools/Parser/qsp_parser.exe

+ 5 - 3
glife.qproj

@@ -613,6 +613,8 @@
 		<Location name="fbDormD"/>
 		<Location name="fbGar"/>
 		<Location name="zsoft_gopskverGorSlut"/>
+        <Location name="pav_park_meet_event"/>
+        <Location name="pav_park_meet_kol_event"/>
 	</Folder>
 	<Folder name="Employment Systems">
 		<Location name="emp_functions"/>
@@ -687,7 +689,7 @@
 		<Location name="VolleyTrenCentr"/>
 		<Location name="VolleyTrenerSpeak"/>
 		<Location name="Voltrenersex"/>
-		<Location name="chessplay"/>git
+		<Location name="chessplay"/>
 		<Location name="boilerroom"/>
 		<Location name="krupo"/>
 		<Location name="kruchess"/>
@@ -1362,7 +1364,7 @@
 		<Location name="treeCircActs"/>
 		<Location name="treeCircEntry"/>
 	</Folder>
-	<folder name="Ballet_career">
+	<Folder name="Ballet_career">
 		<Location name="pushkin_ballet_init"/>
 		<Location name="core_library"/>
 		<Location name="ballet_npc"/>
@@ -1378,7 +1380,7 @@
 		<Location name="marlilnsky_theatre"/>
 		<Location name="pushkin_theatre"/>
 		<Location name="st_petersburg_canals"/>
-	</folder>
+	</Folder>
 	<Location name="cleanHTML"/>
 	</Structure>
 </QGen-project>

+ 19 - 26
locations/KatjaHomeTalk.qsrc

@@ -279,19 +279,7 @@ if $ARGS[0] = 'chat':
 	if katjaQW['QWstage'] >= 7 and katjaQW['birth_control_start_day'] < daystart and katjaQW['birth_control_start_day'] > 0 and katjaQW['horny'] > 60 and katjaQW['sex_clossedness'] = 0:
 		!!If you have gotten to the last stage of Katja''s questline, you can suggest to go to the park to look for boys if Katja is horny.
 		act 'Look for boys in the park':
-			minut += 15
-			katjaQW['horny'] += 5
-			$ev_name = 'Katja'
-			$ev_name_a = 'Katja'
-			$ev_name_om = 'Katja'
-			dick = 0
-			place = 1
-			Frend_num = 14
-			p_slut = katjaQW['slut']
-			p_dom = KatjaQW['dom'] + 50
-			p_horny = katjaQW['horny']
-			p_alko = 0
-			gt 'placer'
+			gt 'KatjaHomeTalk', 'go_to_park'
 		end
 	end
 			
@@ -1874,19 +1862,7 @@ if $ARGS[0] = 'random_park_sex_talk':
 		'"Awesome!" she says and looks at you really excitedly. "Why don''t we go right now?"'
 		if katjaQW['birth_control_start_day'] < daystart and katjaQW['birth_control_start_day'] > 0:
 			act 'Agree':
-				minut += 15
-				katjaQW['horny'] += 5
-				$ev_name = 'Katja'
-				$ev_name_a = 'Katja'
-				$ev_name_om = 'Katja'
-				dick = 0
-				place = 1
-				Frend_num = 14
-				p_slut = katjaQW['slut']
-				p_dom = KatjaQW['dom'] + 50
-				p_horny = katjaQW['horny']
-				p_alko = 0
-				gt 'placer'
+				gt 'KatjaHomeTalk', 'go_to_park'
 			end				
 			act 'Not right now': gt 'KatjaHomeTalk'
 		else
@@ -2163,5 +2139,22 @@ if $ARGS[0] = 'fisting_ask':
 	end
 end
 
+if $ARGS[0] = 'go_to_park':
+	minut += 15
+	katjaQW['horny'] += 5
+	dick = 0
+	gs 'placer', 'init'
+	$placerStringParameter['ev_name'] = 'Katja'
+	$placerStringParameter['ev_name_a'] = 'Katja'
+	$placerStringParameter['ev_name_om'] = 'Katja'
+	placerParameter['friend_index'] = 14
+	placerParameter['friend_horny'] = katjaQW['horny']
+	placerParameter['friend_dom'] = KatjaQW['dom'] + 50
+	placerParameter['friend_slut'] = katjaQW['slut']
+	placerParameter['friend_alko'] = 0
+	placerParameter['location_index']  = 0
+	gt 'placer'
+end
+
 --- KatjaHomeTalk ---------------------------------
 

+ 4 - 2
locations/LakeBoyDy.qsrc

@@ -7,8 +7,10 @@ if $ARGS[0] = 'ride':
 		gs'stat'
 
 		'You quickly get dressed and follow the fat man to his car. He guides you to an old Mitsubishi Pajero, and takes place behind the wheel while he invites you to relax in the passenger seat. Once you get in the car, he puts his hand on your knee as he starts the engine.'
-		'"My name is Vadim Bely... you can call me Mr. Bely. What''s your name, girl?"'
-		'You''re still a bit intimidated by his presence, and just say your name: "<<$pcs_nickname>>."'
+		if npc_QW['A113'] = 0 and belgangday = 0:
+			'"My name is Vadim Bely... you can call me Mr. Bely. What''s your name, girl?"'
+			'You''re still a bit intimidated by his presence, and just say your name: "<<$pcs_nickname>>."'
+		end
 		'Vadim slides his hand up your leg a little, and gently kneads your thigh as you drive through town, the engine roaring. Within minutes, you approach a five-storey apartment. Vadim parks the car in front of it and says: "Get out and follow me", not waiting for a response.'
 		act'Look around':
 			cls

+ 1 - 1
locations/Nudelake.qsrc

@@ -65,7 +65,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				$lastwornbratype['swim'] = $braworntype
 				lastwornbranumber['swim'] = brawornnumber
 				gs 'clothing', 'strip_all'
-				if pcs_horny >= 80 and exhibitionist_lvl > 1:
+				if pcs_horny >= 80 and exhibitionist_lvl > 1 and CloPanties > 0:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
 					'You strip off. A few passing men do a double-take and pause to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
 				elseif pcs_inhib >= 60:

+ 0 - 1
locations/Serge_kuh.qsrc

@@ -1700,7 +1700,6 @@ if $ARGS[0] = 'sex2':
 					*clr & cla
 					minut +=10
 					pcs_mood = 100
-					gs 'cum_manage'
 					gs 'cum_call','',$boy,1
 					pcs_hairbsh = 0
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/sex2-5.jpg"></center>'

+ 2 - 1
locations/artemhome.qsrc

@@ -1196,7 +1196,8 @@ if $ARGS[0] = 'chat':
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
 !! This is triggered after Sveta has asked Artem to steal the video
-	elseif artemQW['artlie'] =1 and artemQW['dimkahelp'] ! daystart:
+!! dimaRevChoice ! 6 - Sveta did not ask Artem for extra help at school
+	elseif artemQW['artlie'] = 1 and artemQW['dimkahelp'] ! daystart and dimaRevChoice ! 6:
 		cla & clr
 		DimaRudeBlock = 1
 		artemQW['artlie'] = 2

+ 1 - 1
locations/body.qsrc

@@ -648,7 +648,7 @@ if $ARGS[0] = 'Redistribute_Mass':
 					pcs_mass['body'] -= 1
 				!end
 
-			elseif emp_mass_ass < pcs_mass['butt'] and pcs_mass['butt'] > 0:
+			elseif temp_mass_ass < pcs_mass['butt'] and pcs_mass['butt'] > 0:
 				pcs_mass['butt'] -= 1
 				pcs_mass['body'] += 1
 			end

+ 1 - 1
locations/cikl.qsrc

@@ -113,7 +113,7 @@ end
 if week = 7 and masseuse['schedule_update'] ! daystart: gs 'masseuse_schedule','schedule_reset'
 
 !!modelling check
-if model_week ! (daystart - week) / 7:model_job_week = 0
+if model_week ! (daystart - week) / 7 and model['status'] > 0: model_job_week = 0
 
 !!acting strings to set available jobs
 if casting = 1:

+ 4 - 0
locations/dimaRevenge.qsrc

@@ -9,6 +9,7 @@ menu_off = 1
 !! dimaDisco - Did you attend the disco?
 !! dimaTrain - Did you go to the train station?
 gs 'stat'
+if DimaRudeBlock = 0: DimaRudeBlock = 1
 
 if ARGS[0] = 1:
 	menu_off = 1
@@ -730,6 +731,9 @@ if dimaRevChoice = 3:
 			'"No wait! I''m sorry. I''ll stop everyone from talking. I swear. Jst don''t show that to anyone."'
 			'"That''s more like it. You have until the end of the day to get results, or else you know what will happen. Don''t you? I don''t want to see you in class until you get it done." He nods and heads into the hall. You breathe a sigh of relief. You were seriously scared there, but it was also exciting seeing him so scared himself. You think about following him around to make sure he keeps his word, but that would mean skipping class. You know he won''t cross you as long as you have dirt on him. You head to class.'
 			act 'Go to class':
+				!! needed to avoid school absences
+				gs 'gschool_lessons', 'morning' & school_period = 1
+
 				*clr & cla
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'

+ 14 - 2
locations/din_van.qsrc

@@ -1505,7 +1505,10 @@ if $ARGS[0] = 'prvt_pee':
 			if isprok = 1 and mc_inventory['tampons'] > 0:
 				act 'Change tampon (0:02)':
 					*clr & cla
+					mc_inventory['tampons'] -=  1
+					isprok = 1
 					minut += 2
+					pcs_mood -= 5
 					'<center><img <<$set_imgh>> src="images/pc/body/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 					'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one, unpack it and carefully insert it into yourself.'
 
@@ -1514,10 +1517,13 @@ if $ARGS[0] = 'prvt_pee':
 			end
 	!!If PC is on her period and using pad, then the following options should appear as well as the standard "Finish and wipe" act:
 	!!This may require an addition check to see if the PC has a purse since I think they need that to carry pads with them.
-			if isprokp = 1 and mc_inventory['sanitary_pads'] > 0:
+			if isprokp = 1 and mc_inventory['sanitary_pads'] > 0 and $pantyworntype ! 'none':
 				act 'Change pad (0:02)':
 					*clr & cla
+					mc_inventory['sanitary_pads'] -=  1
+					isprokp = 1
 					minut += 2
+					pcs_mood -= 5
 					'<center><img <<$set_imgh>> src="images/pc/body/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 					'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 
@@ -1626,7 +1632,10 @@ if $ARGS[0] = 'pblc_pee':
 			if mesec > 0 and (isprok = 1 or (isprok = 0 and isprokp = 0)) and mc_inventory['tampons'] > 0 and bag = 1:
 				act 'Change tampon (0:02)':
 					*clr & cla
+					mc_inventory['tampons'] -=  1
+					isprok = 1
 					minut += 2
+					pcs_mood -= 5
 					'<center><img <<$set_imgh>> src="images/pc/body/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 					'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into yourself.'
 
@@ -1634,10 +1643,13 @@ if $ARGS[0] = 'pblc_pee':
 				end
 			end
 
-			if mesec > 0 and (isprokp = 1 or (isprok = 0 and isprokp = 0)) and mc_inventory['sanitary_pads'] > 0 and bag = 1:
+			if mesec > 0 and (isprokp = 1 or (isprok = 0 and isprokp = 0)) and mc_inventory['sanitary_pads'] > 0 and bag = 1 and $pantyworntype ! 'none':
 				act 'Change pad (0:02)':
 					*clr & cla
+					mc_inventory['sanitary_pads'] -=  1
+					isprokp = 1
 					minut += 2
+					pcs_mood -= 5
 					'<center><img <<$set_imgh>> src="images/pc/body/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 					'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 

+ 1 - 1
locations/exercise.qsrc

@@ -144,7 +144,7 @@ if $ARGS[0] = 'manual':
 	menu_off = 0
 	cla
 	act 'Return':gt 'exercise', 'workout'
-	if pcs_energy < 20 and pcs_stam < stammax / 5:
+	if pcs_energy < 20 or pcs_stam < stammax / 5:
 		'You don''t have the energy/stamina to work out anymore now.'
 	else
 		act 'Do pushups for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'push'

+ 2 - 2
locations/fbDormD.qsrc

@@ -251,8 +251,8 @@ $d_fbd_drunk = {
 
 		act 'Drink some more':
 			dormrape = 0
-			kol_man = rand(5,16)
-			$kol_man_text = 'guys'
+			placerParameter['number_of_man'] = rand(5,16)
+			$placerStringParameter['text_someone'] = 'guys'
 			gs 'drugs', 'alcohol', 'vodka', 4
 			gt 'placer_sex', 'meet'
 		end

+ 0 - 1
locations/food.qsrc

@@ -179,7 +179,6 @@ if $ARGS[0] = 'bliny':
 		'You buy some bliny. The portions are fairly small.'
 		gs 'uni_cafe', 'sitting_choice'
 	else
-		'<center><img <<$set_imgh>> src="images/shared/food/blini.jpg"></center>'
 		'You eat some bliny. The portions are fairly small and<<$mtxt>>'
 		gs 'stat'
 		if food_loc = 1:

+ 1 - 0
locations/foto.qsrc

@@ -22,6 +22,7 @@ if $ARGS[0] = 'start':
 	special_model['roll'] = rand(30,1400)
 	special_skill_model['roll'] = rand(1,500)
 	foto['documentary'] = rand(1,100)
+	act'Leave':gt'city_center'
 	act'Strip down':
 		cla & *clr
 		menu_off = 1

+ 1 - 0
locations/foto_shoot.qsrc

@@ -45,6 +45,7 @@ if $ARGS[0] = 'model':
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 		'"Alright, what kind of shoot? Clothing or swimsuits?"'
 		
+		act 'Look at something else':gt 'foto_shoot','model'
 		act'Clothing':
 			$modelfoto['shoot_type'] = 'catalog'
 			modelfoto['catalog'] += 1

+ 4 - 4
locations/gopnik_house.qsrc

@@ -24,8 +24,8 @@ if gophouse = 0:
 		rape += 1
 		gang += 1
 		gophouse = 1
-		guy += kol_man
-		ciklkm = kol_man
+		guy += placerParameter['number_of_man']
+		ciklkm = placerParameter['number_of_man']
 		
 		gs 'arousal', 'vaginal', 5, 'sub', 'group'
 		gs 'stat'
@@ -47,8 +47,8 @@ elseif gophouse = 1:
 
 	ciklkm -= 1
 	if ciklkm > 0:
-		if ciklkm < kol_man:'All of the guys want to fuck you at least once. You see one of them impatiently stroking his cock, keeping it erect while he is waiting for the Gopnik that is currently fucking you to finish. There might be more beyond your vision range though, you''re not quite sure. And frankly, you''re also too drunk to care.'
-		if ciklkm < kol_man:'Once the Gopnik finishes, his friend quickly takes his place between your legs.'
+		if ciklkm < placerParameter['number_of_man']:'All of the guys want to fuck you at least once. You see one of them impatiently stroking his cock, keeping it erect while he is waiting for the Gopnik that is currently fucking you to finish. There might be more beyond your vision range though, you''re not quite sure. And frankly, you''re also too drunk to care.'
+		if ciklkm < placerParameter['number_of_man']:'Once the Gopnik finishes, his friend quickly takes his place between your legs.'
 		gs 'npcgeneratec', 0, 'Gopnik from the park', rand(16,26)
 		gs 'boyStat', $npclastgenerated
 		jump 'markgophouserape'

+ 1 - 1
locations/gschool_break.qsrc

@@ -481,7 +481,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			if soniaPS < 5:soniasextime += 1
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/soniabj.mp4"></video></center>'
-			'You go to the girls restroom to wash your hands and see Sonia on her knees with an open blouse and a cock in her mouth, enthusiastically deepthroating a boy you''ve never seen before.'
+			'You go to the boys restroom and see Sonia on her knees with an open blouse and a cock in her mouth, enthusiastically deepthroating a boy you''ve never seen before.'
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 			act 'Leave':

+ 1 - 1
locations/gschool_grounds.qsrc

@@ -437,7 +437,7 @@ if $ARGS[0] = 'bulding':
 			!!this should happen the first time Sveta enters school in a game and never again
 			gt 'Zvereva_events', 'christina_bu_1'
 		else
-			if rand(0,1) = 0:
+			if rand(0,1) = 0 or hour > 7:
 				gt 'gschool_lessons', 'morning'
 			else
 				if rand(0,3) = 0:

+ 1 - 0
locations/gschool_jock_chats.qsrc

@@ -1496,6 +1496,7 @@ if $ARGS[0] = 'ivan':
 		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:
+			*clr
 			'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/School/ivan2.jpg"></center>'
 			func('npc_reactions', 'general', 'A3')

+ 3 - 3
locations/gschool_lessons.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'morning':
 		lernHome += 1
 
 		if SchoolSorev = 1: SchoolSorev = 0
-		gs 'gschool_socialchg', 'test'
+		if hour < 8: gs 'gschool_socialchg', 'test'
 	end
 		
 	if $breaktype ! 'first':
@@ -80,7 +80,7 @@ if $ARGS[0] = 'uniform_check':
 			grupvalue[4] += 1
 			grupvalue[5] -= 1
 			'<font color="red">This uniform complies with the regulations but is too risqué.</font>'
-		elseif CloStyle = 2:
+		elseif PCloStyle = 2:
 			grupvalue[4] += 1
 			'<font color="blue">This uniform follows the school regulation on skirt length and is of a style that appeals to Gopniks.</font>'	
 		elseif PCloQuality >= 4:
@@ -98,7 +98,7 @@ if $ARGS[0] = 'uniform_check':
 			grupvalue[4] += 1
 			grupvalue[5] -= 1
 			'<font color="red">This uniform slightly breaches the school regulations and it is too risqué.</font>'
-		elseif CloStyle = 2:
+		elseif PCloStyle = 2:
 			grupvalue[4] += 1
 			'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that appeals to Gopniks.</font>'	
 		elseif PCloQuality >= 4:

+ 1 - 1
locations/gschool_lessons1.qsrc

@@ -1496,7 +1496,7 @@ if $ARGS[0] = 'history':
 				'It was an embarrassing experience, but the sudden adrenaline surge helps you to stay awake for the rest of the period.'
 			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
-		elseif daydream = 2:
+		elseif daydream = 3:
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/sleeping.jpg"></center>'
 			'You''re far too tired to pay attention in class today. Mrs. Sokoloff is droning on about the Tsar''s family and their life.'

+ 2 - 3
locations/gschool_lessons2.qsrc

@@ -576,9 +576,8 @@ if $ARGS[0] = 'computer':
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 		end
 	end
-	if fuckornot > 2:
-		act 'Check the listings on "Fuck or Not"': $view_location = 'school' & gt 'komp_HF_or_not', 'fuckornot'
-	end
+	if fuckornot > 2: act 'Check the listings on "Fuck or Not"': $view_location = 'school_lesson' & gt 'komp_HF_or_not', 'fuckornot'
+	if hotornot >= 2: act 'Check the listings on "Hot or Not"': $view_location = 'school_lesson' & gt 'komp_HF_or_not', 'hotornot'
 end
 
 if $ARGS[0] = 'science':

+ 1 - 1
locations/katalkin.qsrc

@@ -187,7 +187,7 @@ if hour >= 8 and hour < 22:
 			end
 		end
 	end
-elseif hour >= 22:
+else
 	'Captain Katalkin is sitting at a table with two of his colleagues. The table has a nice assortment of snacks, and vodka. The policemen look like they have been drinking.'
 
 	if katalkinSexOnce = 1:

+ 4 - 4
locations/katja_pantyquest.qsrc

@@ -74,7 +74,7 @@ if $ARGS[0] = 'kitchen':
 							gs 'arousal', 'erotic', -2
 							gs 'arousal', 'end'
 							gs 'stat'
-							katjaQW['horny'] += (5,10)
+							katjaQW['horny'] += rand(5,10)
 							katjaQW['slut'] += 4
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquesty/kitchen_sitting_showing_panties1.jpg"></center>'
 							'Katja looks around to see if there is anybody else around. "I don''t know. We really shouldn''t be doing such things..." she says.'
@@ -141,7 +141,7 @@ if $ARGS[0] = 'kitchen':
 							else
 								if lazarQW['your_prize_panties_katja'] = 0: lazarQW['your_prize_panties_katja'] = 1
 								katjaQW['pantiesQWstage'] = 5
-								katjaQW['horny'] += (5,10)
+								katjaQW['horny'] += rand(5,10)
 								katjaQW['slut'] += 4
 								'"I''m getting annoyed that I have to keep telling you to take off your panties. You have to learn that proper girls like us don''t wear panties to Uni," you say in a fake angry voice.'
 								'She looks around and says, sighing, "Fine, you pervert."'
@@ -378,7 +378,7 @@ if $ARGS[0] = 'uni_hallway':
 							else
 								if lazarQW['your_prize_panties_katja'] = 0: lazarQW['your_prize_panties_katja'] = 1
 								katjaQW['pantiesQWstage'] = 5
-								katjaQW['horny'] += (5,10)
+								katjaQW['horny'] += rand(5,10)
 								katjaQW['slut'] += 4
 								'"I''m getting annoyed that I have to keep telling you to take off your panties. You have to learn that proper girls like us don''t wear panties to Uni," you say in a fake angry voice.'
 								'She looks around, sighs, and says, "Fine you pervert." Then, she quickly reachs up under her skirt and pulls down her panties.'
@@ -473,7 +473,7 @@ if $ARGS[0] = 'uni_hallway':
 						gs 'arousal', 'erotic', -2
 						gs 'arousal', 'end'
 						gs 'stat'
-						katjaQW['horny'] += (5,10)
+						katjaQW['horny'] += rand(5,10)
 						katjaQW['slut'] += 4
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquesty/uni_hallway_stitting_panties.jpg"></center>'
 						'Katja looks around and when she''s sure that nobody else can see you two, she says, "I don''t know. We really shouldn''t be doing such things..."'

+ 4 - 0
locations/komp_HF_or_not.qsrc

@@ -23,6 +23,8 @@ if $ARGS[0] = 'fuckornot':
 	act 'Leave the site':
 		if $view_location = 'school':
 			gt 'gschool_lessons', 'short_break'
+		elseif $view_location = 'school_lesson':
+			gt 'gschool_lessons2', 'computer'
 		else
 			gt 'komp', 'browse'
 		end
@@ -54,6 +56,8 @@ if $ARGS[0] = 'hotornot':
 		if $view_location = 'school':
 			killvar 'access'
 			gt 'gschool_lessons', 'short_break'
+		elseif $view_location = 'school_lesson':
+			gt 'gschool_lessons2', 'computer'
 		else
 			gt 'komp', 'browse'
 		end

+ 1 - 1
locations/korrPar.qsrc

@@ -36,7 +36,7 @@ gs 'courtletter'
 
 if (hour ! 16 or hour ! 17) and blockBedrPar = 1:blockBedrPar = 0
 
-if locat['Mother'] = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 < daystart and rand(1,5) = 1: gt 'mother', 'condom_steal', 'talk'
+if locat['Mother'] = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 > daystart and rand(1,5) = 1: gt 'mother', 'condom_steal', 'talk'
 
 act '<b>Leave and go to the stairwell</b>':
 	if $clothingworntype ! 'nude':

+ 1 - 1
locations/lug.qsrc

@@ -150,7 +150,7 @@ if $ARGS[0] = 'prut2':
 				if pcs_stren < 30: gs 'exp_gain', 'stren', 1
 				gs 'arousal', 'flash', 10, 'exhibitionism'
 				gs 'clothing', 'strip_all'
-				if pcs_horny >= 80 and pcs_inhib >= 60:
+				if pcs_horny >= 80 and pcs_inhib >= 60 and CloPanties > 0:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
 					'AS you strip off. A couple of passing men do a double-take and pause a moment to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you and carry on stripping.'
 					'Once you are naked you play around and have fun in the pond, enjoying the feel of the warm water on your body. The clean pond water refreshes and invigorates you.'

+ 1 - 1
locations/medical_din.qsrc

@@ -125,7 +125,7 @@ if $ARGS[0] = 'abortion':
 	abortionbirthdate = daystart
 
 	gs 'medical_din', 'remove_preg'
-	knowpregloss = 2
+	knowpregloss = 1
 
 	abortrand = rand(0, 10)
 	if age > 18:

+ 2 - 2
locations/mey_vika_events.qsrc

@@ -580,7 +580,7 @@ if $ARGS[0] = 'park_meet':
 			elseif npc_rel['A15'] >= 80 and mey_vika['mey_vika_qw'] >= 18:
 				cla
 				if (month >= 5 and month <= 10) and (hour <= 20 and hour >= 8):
-					'Walking through the park, you meet Vicky and Vanya. They are going to the beach and ask you to join them.'
+					'They are going to the beach and ask you to join them.'
 
 					if mesec = 0:
 						act 'Go with them to the beach':
@@ -603,7 +603,7 @@ if $ARGS[0] = 'park_meet':
 						end
 					end
 				elseif (month >= 11 or month <= 4) and (hour <= 20 and hour >= 8):
-					'Walking through the park, you meet Vicky and Vanya. They are going to the sauna and ask you to join them.'
+					'They are going to the sauna and ask you to join them.'
 
 					if mesec = 0:
 						act 'Go with them to the sauna':

+ 4 - 0
locations/motherkafeboss.qsrc

@@ -196,6 +196,7 @@ if $ARGS[0] = 'dealbreaker':
 						if pcafejob = 2:'"Listen," he says. "Since you''ve found out the truth, our bargain doesn''t hold up anymore. If you want to stop that, you can even still work here, no strings attached. Like I said, I need another waitress anyways. How does that sound?"'
 
 						act'Leave without saying anything':
+							cla
 							pcafejob = 3
 							slavatalk = 3
 							*nl
@@ -888,6 +889,7 @@ if $ARGS[0] = 'cloth_fuck':
 	'<center><video autoplay loop src="images/locations/pavlovsk/cafe/wait_fuck.mp4"></video></center>'
 	'As usual, he wastes no time, not bothering to build up the tempo slowly but instead preferring to go straight to full fuck speed. The table rocks underneath you and creates a strange melody of squeaking wood, slapping flesh, and moans and grunts. In the middle of this hypnotic rhythm, you find your mind thinking of...'
 	*nl
+	slavafuck += 1
 	if slavafuck < 4:
 		act'Nothing in particular':
 			cla
@@ -1125,6 +1127,7 @@ if $ARGS[0] = 'cloth_fuck':
 					'Afterwards, you dutifully clean his cock, licking off your pussy juice and sucking out the remnants as you did before. He pulls up his trousers and leaves you.'
 					act'Continue':
 						*nl
+						cla
 						'Once you''re alone, your thoughts go back to when Slava was fucking you. Up until now, you used thoughts of your mother to keep yourself going during this time. You tried to remember that you were doing it for her so she wouldn''t have to but it didn''t help. You feel empty inside as you realize that thoughts of your mother no longer drive you.'
 
 						act'Find your panties and leave':
@@ -1157,6 +1160,7 @@ if $ARGS[0] = 'cloth_fuck':
 					'Afterwards, you dutifully clean his cock, licking off your pussy juice and sucking out the remnants as you did before. He pulls up his trousers and leaves you.'
 					act'Continue':
 						*nl
+						cla
 						'You sit alone in the room with Slava''s cum plastered across your face. Your thoughts drift back to how Slava''s cock felt inside of you. How big he was. How full you felt. Your pussy leaks onto the floor as you become lost in your thoughts, but you push these intrusive feelings away.'
 
 						act'Find your panties and leave':

+ 72 - 132
locations/pain.qsrc

@@ -12,147 +12,87 @@
 !Format to use: gs 'pain', n, 'BobyPart', 'Act'
 !For pain to multiple body parts, use multiple calls
 
-pain[1] = min(ARGS[0],9)
-if pain[1]<1:exit 
+pain[1] = min(ARGS[0]+ARGS[1]+ARGS[2],9)
+if pain[1]<1: exit
 
-if	   $ARGS[2] = 'slap':
-	pain[2] = 1
-elseif $ARGS[2] = 'bind':
-	pain[2] = 1
-elseif $ARGS[2] = 'spank':
-	pain[2] = 3
-	spank += 1
-elseif $ARGS[2] = 'choke':
-	pain[2] = 3
-elseif $ARGS[2] = 'shock':
-	pain[2] = 4
-elseif $ARGS[2] = 'twist':
-	pain[2] = 4
-elseif $ARGS[2] = 'pull':
-	pain[2] = 4	
-elseif $ARGS[2] = 'fall':
-	pain[2] = 4
-elseif $ARGS[2] = 'labor':
-	pain[2] = 4
-elseif $ARGS[2] = 'pinch':
-	pain[2] = 5
-elseif $ARGS[2] = 'stretch':
-	pain[2] = 6
-elseif $ARGS[2] = 'slam':
-	pain[2] = 6
-elseif $ARGS[2] = 'burn':
-	pain[2] = 7
-elseif $ARGS[2] = 'freeze':
-	pain[2] = 7
-elseif $ARGS[2] = 'hit':
-	pain[2] = 7
-elseif $ARGS[2] = 'pierce':
-	pain[2] = 8
-elseif $ARGS[2] = 'bite':
-	pain[2] = 8
-elseif $ARGS[2] = 'tear':
-	pain[2] = 9
-elseif $ARGS[2] = 'ache':
-	pain[2] = 9
-elseif $ARGS[2] = 'kick':
-	pain[2] = 10
-elseif $ARGS[2] = 'break':
-	pain[2] = 10
-elseif $ARGS[2] = 'cramp':
-	pain[2] = 10
-end
+pain[2] = 0
+if arrpos('$ARGS', 'slap') >= 0:    pain[2] = 1
+if arrpos('$ARGS', 'bind') >= 0:    pain[2] = 1
+if arrpos('$ARGS', 'spank') >= 0:   pain[2] = 3 & spank += 1
+if arrpos('$ARGS', 'choke') >= 0:   pain[2] = 3
+if arrpos('$ARGS', 'shock') >= 0:   pain[2] = 4
+if arrpos('$ARGS', 'twist') >= 0:   pain[2] = 4
+if arrpos('$ARGS', 'pull') >= 0:    pain[2] = 4	
+if arrpos('$ARGS', 'fall') >= 0:    pain[2] = 4
+if arrpos('$ARGS', 'labor') >= 0:   pain[2] = 4
+if arrpos('$ARGS', 'pinch') >= 0:   pain[2] = 5
+if arrpos('$ARGS', 'stretch') >= 0: pain[2] = 6
+if arrpos('$ARGS', 'slam') >= 0:    pain[2] = 6
+if arrpos('$ARGS', 'burn') >= 0:    pain[2] = 7
+if arrpos('$ARGS', 'freeze') >= 0:  pain[2] = 7
+if arrpos('$ARGS', 'hit') >= 0:     pain[2] = 7
+if arrpos('$ARGS', 'pierce') >= 0:  pain[2] = 8
+if arrpos('$ARGS', 'bite') >= 0:    pain[2] = 8
+if arrpos('$ARGS', 'tear') >= 0:    pain[2] = 9
+if arrpos('$ARGS', 'ache') >= 0:    pain[2] = 9
+if arrpos('$ARGS', 'kick') >= 0:    pain[2] = 10
+if arrpos('$ARGS', 'break') >= 0:   pain[2] = 10
+if arrpos('$ARGS', 'cramp') >= 0:   pain[2] = 10
+if pain[2]<1: exit
 
-if	   $ARGS[1] = 'hair':
-	pain[3] = 1
-elseif $ARGS[1] = 'asscheeks':
-	pain[3] = 2
-elseif $ARGS[1] = 'feet':
-	pain[3] = 2
-elseif $ARGS[1] = 'shoulders':
-	pain[3] = 2
-elseif $ARGS[1] = 'wrists':
-	pain[3] = 2
-elseif $ARGS[1] = 'ankles':
-	pain[3] = 2
-elseif $ARGS[1] = 'armL':
-	pain[3] = 2
-elseif $ARGS[1] = 'armR':
-	pain[3] = 2
-elseif $ARGS[1] = 'cheeks':
-	pain[3] = 3
-elseif $ARGS[1] = 'legL':
-	pain[3] = 3
-elseif $ARGS[1] = 'legR':
-	pain[3] = 3
-elseif $ARGS[1] = 'hands':
-	pain[3] = 3
-elseif $ARGS[1] = 'mouth':
-	pain[3] = 4
-elseif $ARGS[1] = 'jaw':
-	pain[3] = 4
-elseif $ARGS[1] = 'thighs':
-	pain[3] = 4
-elseif $ARGS[1] = 'toes':
-	pain[3] = 4
-elseif $ARGS[1] = 'fingers':
-	pain[3] = 4
-elseif $ARGS[1] = 'nose':
-	pain[3] = 5
-elseif $ARGS[1] = 'back':
-	pain[3] = 5
-elseif $ARGS[1] = 'ribs':
-	pain[3] = 5
-elseif $ARGS[1] = 'hips':
-	pain[3] = 5
-elseif $ARGS[1] = 'head':
-	pain[3] = 6
-elseif $ARGS[1] = 'ears':
-	pain[3] = 6
-elseif $ARGS[1] = 'eyebrows':
-	pain[3] = 6
-elseif $ARGS[1] = 'lips':
-	pain[3] = 6
-elseif $ARGS[1] = 'throat':
-	pain[3] = 6
-elseif $ARGS[1] = 'tummy':
-	pain[3] = 6
-elseif $ARGS[1] = 'pubic':
-	pain[3] = 6
-elseif $ARGS[1] = 'urethra':
-	pain[3] = 6
-elseif $ARGS[1] = 'tongue':
-	pain[3] = 7
-elseif $ARGS[1] = 'neck':
-	pain[3] = 7
-elseif $ARGS[1] = 'chest':
-	pain[3] = 7
-elseif $ARGS[1] = 'eyes':
-	pain[3] = 8
-elseif $ARGS[1] = 'breasts':
-	pain[3] = 8
-elseif $ARGS[1] = 'vaginal':
-	pain[3] = 8
-elseif $ARGS[1] = 'labia':
-	pain[3] = 8
-elseif $ARGS[1] = 'cervix':
-	pain[3] = 8
-elseif $ARGS[1] = 'asshole':
-	pain[3] = 9
-elseif $ARGS[1] = 'nipples':
-	pain[3] = 9
-elseif $ARGS[1] = 'clitoris':
-	pain[3] = 10
-end
+pain[3] = 0
+if arrpos('$ARGS', 'hair') >= 0:      pain[3] = 1  & $painPart = 'hair'
+if arrpos('$ARGS', 'asscheeks') >= 0: pain[3] = 2  & $painPart = 'asscheeks'
+if arrpos('$ARGS', 'feet') >= 0:      pain[3] = 2  & $painPart = 'feet'
+if arrpos('$ARGS', 'shoulders') >= 0: pain[3] = 2  & $painPart = 'shoulders'
+if arrpos('$ARGS', 'wrists') >= 0:    pain[3] = 2  & $painPart = 'wrists'
+if arrpos('$ARGS', 'ankles') >= 0:    pain[3] = 2  & $painPart = 'ankles'
+if arrpos('$ARGS', 'armL') >= 0:      pain[3] = 2  & $painPart = 'armL'
+if arrpos('$ARGS', 'armR') >= 0:      pain[3] = 2  & $painPart = 'armR'
+if arrpos('$ARGS', 'cheeks') >= 0:    pain[3] = 3  & $painPart = 'cheeks'
+if arrpos('$ARGS', 'legL') >= 0:      pain[3] = 3  & $painPart = 'legL'
+if arrpos('$ARGS', 'legR') >= 0:      pain[3] = 3  & $painPart = 'legR'
+if arrpos('$ARGS', 'hands') >= 0:     pain[3] = 3  & $painPart = 'hands'
+if arrpos('$ARGS', 'mouth') >= 0:     pain[3] = 4  & $painPart = 'mouth'
+if arrpos('$ARGS', 'jaw') >= 0:       pain[3] = 4  & $painPart = 'jaw'
+if arrpos('$ARGS', 'thighs') >= 0:    pain[3] = 4  & $painPart = 'thighs'
+if arrpos('$ARGS', 'toes') >= 0:      pain[3] = 4  & $painPart = 'toes'
+if arrpos('$ARGS', 'fingers') >= 0:   pain[3] = 4  & $painPart = 'fingers'
+if arrpos('$ARGS', 'nose') >= 0:      pain[3] = 5  & $painPart = 'nose'
+if arrpos('$ARGS', 'back') >= 0:      pain[3] = 5  & $painPart = 'back'
+if arrpos('$ARGS', 'ribs') >= 0:      pain[3] = 5  & $painPart = 'ribs'
+if arrpos('$ARGS', 'hips') >= 0:      pain[3] = 5  & $painPart = 'hips'
+if arrpos('$ARGS', 'head') >= 0:      pain[3] = 6  & $painPart = 'head'
+if arrpos('$ARGS', 'ears') >= 0:      pain[3] = 6  & $painPart = 'ears'
+if arrpos('$ARGS', 'eyebrows') >= 0:  pain[3] = 6  & $painPart = 'eyebrows'
+if arrpos('$ARGS', 'lips') >= 0:      pain[3] = 6  & $painPart = 'lips'
+if arrpos('$ARGS', 'throat') >= 0:    pain[3] = 6  & $painPart = 'throat'
+if arrpos('$ARGS', 'tummy') >= 0:     pain[3] = 6  & $painPart = 'tummy'
+if arrpos('$ARGS', 'pubic') >= 0:     pain[3] = 6  & $painPart = 'pubic'
+if arrpos('$ARGS', 'urethra') >= 0:   pain[3] = 6  & $painPart = 'urethra'
+if arrpos('$ARGS', 'tongue') >= 0:    pain[3] = 7  & $painPart = 'tongue'
+if arrpos('$ARGS', 'neck') >= 0:      pain[3] = 7  & $painPart = 'neck'
+if arrpos('$ARGS', 'chest') >= 0:     pain[3] = 7  & $painPart = 'chest'
+if arrpos('$ARGS', 'eyes') >= 0:      pain[3] = 8  & $painPart = 'eyes'
+if arrpos('$ARGS', 'breasts') >= 0:   pain[3] = 8  & $painPart = 'breasts'
+if arrpos('$ARGS', 'vaginal') >= 0:   pain[3] = 8  & $painPart = 'vaginal'
+if arrpos('$ARGS', 'labia') >= 0:     pain[3] = 8  & $painPart = 'labia'
+if arrpos('$ARGS', 'cervix') >= 0:    pain[3] = 8  & $painPart = 'cervix'
+if arrpos('$ARGS', 'asshole') >= 0:   pain[3] = 9  & $painPart = 'asshole'
+if arrpos('$ARGS', 'nipples') >= 0:   pain[3] = 9  & $painPart = 'nipples'
+if arrpos('$ARGS', 'clitoris') >= 0:  pain[3] = 10 & $painPart = 'clitoris'
+if pain[3]<1: exit
 
 curpain = (pain[1] * pain[2] * pain[3]) /10
-prevpain = pain[$ARGS[1]]
+prevpain = pain[$painPart]
 
-pain[$ARGS[1]] = func( 'shortgs','modul',prevpain,curpain)
+pain[$painPart] = func( 'shortgs','modul',prevpain,curpain)
 
-if pain[$ARGS[1]] > 100: pain[$ARGS[1]] = 100
+if pain[$painPart] > 100: pain[$painPart] = 100
 
 killvar 'prevpain'
 killvar 'curpain'
+killvar '$painPart'
 
 !arousal calculation
 !arousal += (pain[1] * pain[2]) * pain[3] * masochism['pref'] / 1000

+ 1 - 1
locations/pav_commercial.qsrc

@@ -138,7 +138,7 @@ end
 
 if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 
- if  hour >= 6 and hour < 19 and hypnoSchedule = 1 and therapistday ! daystart: 
+ if  hour >= 18 and hour < 19 and week = 4 and hypnoSchedule = 1 and therapistday ! daystart: 
     act '<b>Go see your therapist  (1:00)</b>': minut += 5 & gt 'therapist'
     *nl
 end

+ 0 - 1
locations/pav_disco.qsrc

@@ -249,7 +249,6 @@ if $ARGS[0] = '':
 						*clr & cla
 						'<center><b><font color="maroon">Disco</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/very_drunk_dance.jpg"></center>'
-						'You''re very drunk, but are having a lot of fun out on the dance floor anyway. You''re not paying attention to anyone else or even the music.'
 						if pcs_danc <= 30:
 							grupvalue[1] -= 4
 							grupvalue[2] -= 4

+ 9 - 9
locations/pav_disco_coolkids.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'dimka':
 		act 'Go out on the dance floor':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/dimka_dance.jpg"></center>'
-			if grupTipe = 5:
+			if grupTipe = 5 or (dimaRevenge = 6 and (dimaRevChoice = 3 or dimaRevChoice = 5 or dimaRevChoice = 6)) or (dimaRevenge = 7 and dimaRevChoice = 2) or (dimaRevenge = 8 and (dimaRevChoice = 1 or dimaRevChoice = 4)):
 				'He ignores you and turns his back on you as you approach, shunning you.'
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 			elseif npc_rel['A1'] >= 50 and fame['pav_slut'] < 250:
@@ -37,7 +37,12 @@ if $ARGS[0] = 'dimka':
 	else
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
 		'You see Dimka sitting at a table near the dance floor. He is dressed very stylishly and is in the middle of a small crowd of of people, mostly girls.'
-		if dimka_debt > 0:
+		if (dimaRevenge = 6 and (dimaRevChoice = 3 or dimaRevChoice = 5 or dimaRevChoice = 6)) or (dimaRevenge = 7 and dimaRevChoice = 2) or (dimaRevenge = 8 and (dimaRevChoice = 1 or dimaRevChoice = 4)):
+			'Dimka glares at you as you approach. "What the fuck do you want, slut?"'
+			'You sigh. "Look, I know a lot has happened between us, but I thought we could leave it in the past and just be friends or something?"'
+			'He looks a little dumbfounded, but shrugs. "Whatever." The two of you make a little small talk, but you get the feeling he is planning something.'
+			act 'Do something else': gt 'pav_disco_classmates', 'classmates'
+		elseif dimka_debt > 0:
 			'The first thing Dimka does as you walk up is grab you by the arm and drag you aside so no one can hear him. "Do you have my money?"'
 			if money >= dimka_debt:
 				act 'Pay your debt':
@@ -99,11 +104,6 @@ if $ARGS[0] = 'dimka':
 		elseif fame['pav_slut'] >= 250:
 			'Dimka sees you approaching and gives you a blank look, his gaze cold and unblinking. "Do you really think I would talk to a whore like you?" he dryly states. He continues to stare you down until you finally leave.'
 			act 'Do something else': gt 'pav_disco_classmates', 'classmates'
-		elseif (dimaRevenge = 6 and (dimaRevChoice = 3 or dimaRevChoice = 5 or dimaRevChoice = 6)) or (dimaRevenge = 7 and dimaRevChoice = 2) or (dimaRevenge = 8 and (dimaRevChoice = 1 or dimaRevChoice = 4)):
-			'Dimka glares at you as you approach. "What the fuck do you want, slut?"'
-			'You sigh. "Look, I know a lot has happened between us, but I thought we could leave it in the past and just be friends or something?"'
-			'He looks a little dumbfounded, but shrugs. "Whatever." The two of you make a little small talk, but you get the feeling he is planning something.'
-			act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 		else
 			'Dimka is willing to entertain you for a bit, occasionally taking part in the conversation but letting you do most of the talking before someone calls over to him and he smiles and waves back to them. "Sorry, I hope you don''t mind." He starts heading towards them - you could quickly ask him something or just let him go.'
 			if dimarudorient = 1: act 'Ask for some pale lady': gt 'pav_disco_coolkids', 'dim_drugs'
@@ -132,7 +132,7 @@ if $ARGS[0] = 'dimka_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 	'You start dancing with him. He''s a pretty good dancer and you both enjoy dancing together for a while.'
 
-	if npc_rel['A1'] >= 80 and DimaRudeQW > 0:
+	if npc_rel['A1'] >= 80 and DimaRudeQW > 0 and DimaRudeBlock = 0:
 		'After the dance, Dimka holds onto your hand. "Let''s go outside."'
 
 		act 'Refuse':npc_rel['A1'] -= 5 & gt $loc, $loc_arg
@@ -882,7 +882,7 @@ if $ARGS[0] = 'igor_dance':
 		elseif IgorLoverQW = 0:
 			'While the two of you are dancing, you feel Igor''s hands wander to the small of your back and further down to your ass. He gives your ass a good squeeze.'
 
-			if DimaRudeQW > 0:
+			if DimaRudeQW > 0 and DimaRudeBlock = 0:
 				'Igor leans in close to your ear. "Dimka told me that you were a fantastic cocksucker. How about we go outside and you show me if he''s right?" he whispers.'
 				act 'Go outside with him':
 					cls

+ 1 - 1
locations/pav_lake_nude.qsrc

@@ -90,7 +90,7 @@ if month >= 5 and month <= 9:
 				end
 				gs 'clothing', 'strip_all'
 				gs 'stat'
-				if pcs_horny >= 80 and exhibitionist_lvl > 1:
+				if pcs_horny >= 80 and exhibitionist_lvl > 1 and CloPanties > 0:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
 					'You strip off. A few passers-by do a double-take and pause to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
 				elseif pcs_inhib >= 60:

+ 17 - 0
locations/pav_park_meet_event.qsrc

@@ -0,0 +1,17 @@
+#pav_park_meet_event
+
+!! revamp pav park meet events
+
+$pav_park_meet_event_type = $ARGS[0]
+!! kol
+
+if $pav_park_meet_event_type ='kol':
+    gs 'pav_park_meet_kol_event', 'meet_start'
+elseif  $pav_park_meet_event_type ='kol_more':
+    gs 'pav_park_meet_kol_event', 'meet_start_1'
+elseif  $pav_park_meet_event_type ='kol_deep':
+    gs 'pav_park_meet_kol_event', 'meet_start_2'
+else
+end
+
+--- pav_park_meet_event ---------------------------------

+ 70 - 0
locations/pav_park_meet_kol_event.qsrc

@@ -0,0 +1,70 @@
+#pav_park_meet_kol_event
+
+$pav_park_meet_kol_event_type = $ARGS[0]
+!! string event
+
+if $pav_park_meet_kol_event_type = 'meet_start':
+    pav_park_meet_kol_event_is_winter = (month = 1 or month = 2 or month = 12)
+    pav_park_meet_kol_event_is_day = (daystage = 2 or daystage = 3)
+    temprand = rand(1,3)
+    if pav_park_meet_kol_event_is_winter = -1 and pav_park_meet_kol_event_is_day = 0:
+        temprand = 1
+    end
+    if temprand = 1:
+        if pav_park_meet_kol_event_is_winter = -1:
+            '<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver_znacom_1.jpg"></center>'
+        else
+            '<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/skver_znacom_3.jpg"></center>'
+        end
+        'You see a group of teenagers sitting on a park bench, listening to some music.'
+        if hotcat >= 5:
+            gs 'placer', 'init'
+            placerParameter['number_of_man'] = rand(2, 6)
+            placerParameter['recognize_status'] = 1
+            place = 1
+            gs 'placer_man'
+            'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "<<$placerStringParameter[''text_start_meet'']>>"'
+            act 'Meet':gt 'placer_act'
+        else
+            'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
+            act 'Finish your walk':gt 'pav_park', 'start'
+        end
+    else
+        '<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.night.jpg"></center>'
+        'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
+    end
+elseif $pav_park_meet_kol_event_type = 'meet_start_1':
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver_znacom_1.jpg"></center>'
+	'Some gopniks are sitting on their haunches just off to the side of one of the main paths, drinking beer. The area around them is littered with empty bottles.'
+	if hotcat >= 5:
+        gs 'placer', 'init'
+        placerParameter['number_of_man'] = rand(3, 6)
+        placerParameter['recognize_status'] = 2
+        place = 1
+        gs 'placer_man'
+		'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "<<$placerStringParameter[''text_start_meet'']>>"'
+		act 'Meet':gt 'placer_act'
+	else
+		'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
+		act 'Finish your walk': gt 'pav_park', 'deeper_park'
+	end
+elseif $pav_park_meet_kol_event_type = 'meet_start_2':
+    '<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/walk_deep_day.jpg"></center>'
+    'You stroll through the park by yourself, enjoying its beauty.'
+    if hotcat >= 6:
+        'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "Hey there, good looking. Why don''t you come to hang out with us?"'
+        gs 'placer', 'init'
+        placerParameter['number_of_man'] = rand(3, 6)
+        placerParameter['recognize_status'] = 2
+        place = 1
+        gs 'placer_man'
+        act 'Agree to hang out': gt 'placer_act'
+    else
+        'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
+    end
+else
+end
+
+
+
+--- pav_park_meet_kol_event ---------------------------------

+ 28 - 164
locations/pav_parkev.qsrc

@@ -64,43 +64,15 @@ if $ARGS[0] = 'walk1':
 		elseif temprand = 6:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/winter/selfie_couple1.jpg"></center>'
 			'You pass by a couple taking a bunch of selfies together. You can''t really tell if they''re locals or not, but they seem very happy together and enjoy each other''s company. The occasional kissing selfie leaves no doubt that they''re romantically involved.'
-		!!elseif temprand = 7:
-		!!	kol_man = rand(2, 6)
-		!!	mass_ver_zn = 1
-		!!	know_status = 1
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver_znacom_1.jpg"></center>'
-		!!	'You see a group of teenagers sitting on a park bench, listening to some music.'
-		!!	if hotcat >= 5:
-		!!		'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "<<$text_znak>>"'
-		!!		act 'Meet':gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!		act 'Finish your walk':gt 'pav_park', 'start'
-		!!	end
+		elseif temprand = 7:
+			gs 'pav_park_meet_event', 'kol'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/walk_winter_day.jpg"></center>'
 			'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
 		end
 	elseif (month = 1 or month = 2 or month = 12):
 	!!night winter
-		!!temprand = rand(1,3)
-		!!if temprand = 1:
-		!!	kol_man = rand(2, 6)
-		!!	mass_ver_zn = 1
-		!!	know_status = 1
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver_znacom_1.jpg"></center>'
-		!!	'You see a group of teenagers sitting on a park bench, listening to some music.'
-		!!	if hotcat >= 5:
-		!!		'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "<<$text_znak>>"'
-		!!		act 'Meet':gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!		act 'Finish your walk':gt 'pav_park', 'start'
-		!!	end
-		!!else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.night.jpg"></center>'
-		'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
-		!!end
+			gs 'pav_park_meet_event', 'kol'
 	elseif daystage = 2 or daystage = 3:
 		!!day
 		temprand = rand(1,35)
@@ -253,18 +225,8 @@ if $ARGS[0] = 'walk1':
 			gs 'arousal', 'erotic_nudity', 1
 			gs 'arousal', 'end'
 			gs 'stat'
-		!!elseif temprand = 27:
-		!!	kol_man = rand(2, 6)
-		!!	mass_ver_zn = 1
-		!!	know_status = 1
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/skver_znacom_3.jpg"></center>'
-		!!	'You see a group of teenagers sitting on a park bench, listening to some music.'
-		!!	if hotcat >= 5:
-		!!		'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "<<$text_znak>>"'
-		!!		act 'Meet':gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!	end
+		elseif temprand = 27:
+			gs 'pav_park_meet_event', 'kol'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/walk_day.jpg"></center>'
 			'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
@@ -285,18 +247,8 @@ if $ARGS[0] = 'walk1':
 			'As you walk around the touristy area of the park near the cafe, you see a girl sitting on a bench in a skirt with her legs spread wide, showing off her bare pussy. She''s looking for a boy that you assume is her boyfriend. He laughs and starts taking pictures of her, neither seeming to care that other people can see her pussy as well. Finally, after several shots, he walks over to her. He kisses her and she gets up before they walk away together arm in arm.'
 			gs 'arousal', 'erotic_nudity', 1
 			gs 'stat'
-		!!elseif temprand = 3:
-		!!	kol_man = rand(2, 6)
-		!!	mass_ver_zn = 1
-		!!	know_status = 1
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/skver_znacom_3.jpg"></center>'
-		!!	'You see a group of teenagers sitting on a park bench, listening to some music.'
-		!!	if hotcat >= 5:
-		!!		'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "<<$text_znak>>"'
-		!!		act 'Meet':gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a moment, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!	end
+		elseif temprand = 3:
+			gs 'pav_park_meet_event', 'kol'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/walk_night.jpg"></center>'
 			'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
@@ -369,66 +321,25 @@ if $ARGS[0] = 'walk2':
 			'Walking on one of the more used pathways in the deeper part of the park, you see two girls up ahead playing in the snow. They are running around chasing and throwing snowballs at each other. They seem to be two close friends having the time of their life.'
 		elseif temprand = 6 and $coatworntype ! 'none':
 			gt 'pav_parkev', 'old_man'
-		!!elseif temprand = 7:
-		!!	kol_man = rand(2, 6)
-		!!	mass_ver_zn = 1
-		!!	know_status = 1
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver_znacom_1.jpg"></center>'
-		!!	'You see a group of teenagers sitting on a park bench, listening to some music.'
-		!!	if hotcat >= 5:
-		!!		'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "<<$text_znak>>"'
-		!!		act 'Meet':gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!	end
-		!!elseif temprand = 8:
-		!!	kol_man = rand(3, 6)
-		!!	mass_ver_zn = 1
-		!!	know_status = 2
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver_znacom_1.jpg"></center>'
-		!!	'Some gopniks are sitting on their haunches just off to the side of one of the main paths, drinking beer. The area around them is littered with empty bottles.'
-		!!	if hotcat >= 5:
-		!!		'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "<<$text_znak>>"'
-		!!		act 'Meet':gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!		act 'Finish your walk': gt 'pav_park', 'deeper_park'
-		!!	end
+		elseif temprand = 7:
+			gs 'pav_park_meet_event', 'kol'
+		elseif temprand = 8:
+			gs 'pav_park_meet_event', 'kol_more'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/walk_deep_winter_day.jpg"></center>'
 			'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
 		end
 	elseif (month=1 or month=2 or month=12):
 		!!night winter
-		!!temprand = rand(1,6)
-		!!if temprand = 1:
-		!!	kol_man = rand(2, 6)
-		!!	mass_ver_zn = 1
-		!!	know_status = 1
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver_znacom_1.jpg"></center>'
-		!!	'You see a group of teenagers sitting on a park bench, listening to some music.'
-		!!	if hotcat >= 5:
-		!!		'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "<<$text_znak>>"'
-		!!		act 'Meet':gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!	end
-		!!elseif temprand = 2:
-		!!	kol_man = rand(3, 6)
-		!!	mass_ver_zn = 1
-		!!	know_status = 2
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver_znacom_1.jpg"></center>'
-		!!	'Some gopniks are sitting on their haunches just off the side of one of the main paths, drinking beer. The area around them is littered with empty bottles.'
-		!!	if hotcat >= 5:
-		!!		'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "<<$text_znak>>"'
-		!!		act 'Meet':gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!	end
-		!!else
+		temprand = rand(1,6)
+		if temprand = 1:
+			gs 'pav_park_meet_event', 'kol'
+		elseif temprand = 2:
+			gs 'pav_park_meet_event', 'kol_more'
+		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.night.jpg"></center>'
 			'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
-		!!end
+		end
 	elseif daystage = 2 or daystage = 3:
 		!!day
 		temprand = rand(1,36)
@@ -536,43 +447,16 @@ if $ARGS[0] = 'walk2':
 			'While walking along a heavily forested area with many bushes growing between the trees, almost completely blocking any sight beyond the path, you hear what sounds like some soft moaning, but you can''t be sure.'
 			act 'Ignore it':gt 'pav_park', 'deeper_park'
 			act 'Investigate': gt 'pav_park_sex', 'watch_sonia'
-		!!elseif temprand = 20:
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/walk_deep_day.jpg"></center>'
-		!!	'You stroll through the park by yourself, enjoying its beauty.'
-		!!	if hotcat >= 6:
-		!!		'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "Hey there, good looking. Why don''t you come to hang out with us?"'
-		!!		act 'Agree to hang out': gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!	end
+		elseif temprand = 20:
+			gs 'pav_park_meet_event', 'kol_deep'
 		elseif temprand = 21 and $coatworntype ! 'none':
 			gt 'pav_parkev', 'old_man'
 		!!note add code to check for jacket
 		!!this gt will go to the old man even if this comes up yes?
-		!!elseif temprand = 22:
-		!!	kol_man = rand(2, 6)
-		!!	mass_ver_zn = 1
-		!!	know_status = 1
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/skver_znacom_3.jpg"></center>'
-		!!	'You see a group of teenagers sitting on a park bench, listening to some music.'
-		!!	if hotcat >= 5:
-		!!		'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "<<$text_znak>>"'
-		!!		act 'Meet':gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!	end
-		!!elseif temprand = 23:
-		!!	kol_man = rand(3, 6)
-		!!	mass_ver_zn = 1
-		!!	know_status = 2
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/skver_znacom_3.jpg"></center>'
-		!!	'Some gopniks are sitting on their haunches just off the side of one of the main paths, drinking beer. The area around them is littered with empty bottles.'
-		!!	if hotcat >= 5:
-		!!		'You don''t think you''ve ever seen them before. The guys walk towards you as one of them says: "<<$text_znak>>"'
-		!!		act 'Meet':gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a second, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!	end
+		elseif temprand = 22:
+			gs 'pav_park_meet_event', 'kol'
+		elseif temprand = 23:		
+			gs 'pav_park_meet_event', 'kol_more'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/walk_deep_day.jpg"></center>'
 			'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
@@ -594,30 +478,10 @@ if $ARGS[0] = 'walk2':
 			gs 'arousal', 'erotic_nudity', 2
 			gs 'arousal', 'end'
 			gs 'stat'
-		!!elseif temprand = 3:
-		!!	kol_man = rand(2, 6)
-		!!	mass_ver_zn = 1
-		!!	know_status = 1
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/skver_znacom_3.jpg"></center>'
-		!!	'You see a group of teenagers sitting on a park bench, listening to some music.'
-		!!	if hotcat >= 5:
-		!!		'You don''t think you''ve ever seen them before as they walk towards you and one of them says: "<<$text_znak>>"'
-		!!		act 'Meet':gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a moment, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!	end
-		!!elseif encounter = 4:
-		!!	kol_man = rand(3, 6)
-		!!	mass_ver_zn = 1
-		!!	know_status = 2
-		!!	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/skver_znacom_3.jpg"></center>'
-		!!	'Some gopniks are sitting on their haunches just off the side of one of the main paths, drinking beer. The area around them is littered with empty bottles.'
-		!!	if hotcat >= 5:
-		!!		'You don''t think you''ve ever seen them before as they walk towards you and one of them says: "<<$text_znak>>"'
-		!!		act 'Meet':gt 'placer_act'
-		!!	else
-		!!		'The guys look at you for a moment, but you see one of them shake his head before they turn their backs on you and pretend you''re not there.'
-		!!	end
+		elseif temprand = 3:
+			gs 'pav_park_meet_event', 'kol'
+		elseif encounter = 4:
+			gs 'pav_park_meet_event', 'kol_more'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/walk_night.jpg"></center>'
 			'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'

+ 2 - 0
locations/pav_pool.qsrc

@@ -186,11 +186,13 @@ if $ARGS[0] = 'lockerfemale':
 			gt 'pav_pool', 'pool'
 		end
 	else
+		delact 'Enter the pool area'
 		*nl
 		'You need to put some swimwear on first if you want to go in the pool.'
 		*nl
 	end
 	if pcs_makeup >= 2:
+		delact 'Enter the pool area'
 		*nl
 		'You need to wash your make-up off first if you want to go in the pool.'
 		*nl

+ 1 - 1
locations/pav_shared_nestor.qsrc

@@ -91,7 +91,7 @@ if $ARGS[0] = 'nestor_Dick':
 	'<<$npc_notes[$boy]>>'
 	'his mood is <<$nestor_mood>>'
 
-	'His dick is npc_dick[$boy] cm long with somehow maintained pubic hair.'
+	'His dick is <<npc_dick[$boy]>> cm long with somehow maintained pubic hair.'
 	''
 		if nestor_hj = 1:'-you have jerked him off'	
 			if nestor_hj > 1:'-you have jerked him off <<nestor_hj>> times' & if nestor_hjFail > 1:' and failed to make him cum with your hands <<nestor_hjFail>> times'

+ 1 - 1
locations/pav_shared_oleg.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'oleg':
 		'<font color=#<<$oleg_font>>>"Hello <<$pcs_firstname>>, I think you have sperm on your clothes. Please go change."</a>'
 		act 'Leave': gt 'pav_shared_apt', 'start'	
 	! cum on belly, breasts, ass, pussy; visible only when nude
-	elseif cumloc[14] > 0 or cumloc[15] > 0 or cumloc[1] > 0 or cumloc[4] > 0 and $clothingworntype = 'nude':
+	elseif (cumloc[14] > 0 or cumloc[15] > 0 or cumloc[1] > 0 or cumloc[4] > 0) and $clothingworntype = 'nude':
 		'<font color=#<<$oleg_font>>>"Hello <<$pcs_firstname>>, why are you naked? And is that sperm on you? It''s gross, please go wash yourself and put on some clothes."</a>'
 		act 'Leave': gt 'pav_shared_apt', 'start'
 	else

+ 35 - 38
locations/placer.qsrc

@@ -1,43 +1,40 @@
 # placer
-!!$ev_name = 'Fedor'
-!!$ev_name_a = 'Fedor'
-!!$ev_name_om = 'Fedor'
-!!dick = 17
-!!silavag = 0
-!!npcSex[$static_num] - sex
-!!npc_rel[$static_num] - relationship
-!!the presence of NPC theoretically able to meet
-mass_ver_zn = 0
-!!want or do not meet NPCs
-ver_zn = 0
-!!the number of men
-kol_man = 0
-!!greeting text
-$text_znak = ''
-!!the possibility of knowledge turnip years
-know_status = 0
-!!identified reputation or not
-know_gor_slut = 0
-!!retext
-$kol_man_text_no = ''
-plact = 0
-gs 'stat'
-$textEvent = ''
-if place = 0:
-	!!street
-	if litltown = 1:$numplace = 'pav_residential'
-elseif place = 1:
-	!!square
-	$numplace = 'pav_park'
-elseif place = 2:
-	!!movie
-elseif place = 3:
-	!!home to the guy. preposition Vidic
-elseif place = 4:
-	!!disco in town
-end
+!! This is meeting someone with a friend.
+
+if $ARGS[0] = 'init':
+	!! friend param
+	placerParameter['friend_index'] = 0
+	placerParameter['friend_horny'] = 0
+	placerParameter['friend_dom'] = 0
+	placerParameter['friend_slut'] = 0
+	placerParameter['friend_alko'] = 0
+
+	!! friend name about
+	$placerStringParameter['ev_name'] = ''
+	$placerStringParameter['ev_name_a'] = ''
+	$placerStringParameter['ev_name_om'] = ''
+
+	!! meet parameter
+	placerParameter['mass_number_meet'] = 0
+	placerParameter['want_to_meet'] = 0
+	placerParameter['number_of_man'] = 0
+	placerParameter['recognize_status'] = 0
+	placerParameter['know_slut'] = 0
+	placerParameter['slut_visual'] = 0
 
-gt 'placer_<<$numplace>>'
+	!! text parameter
+	$placerStringParameter['text_start_meet'] = ''
+	$placerStringParameter['text_friend_refuse'] = ''
+	$placerStringParameter['text_someone'] = ''
+
+	!! where
+	placerParameter['location_index'] = 0
+
+	!! player action
+	placerParameter['player_act'] = 0
+else
+	if placerParameter['location_index'] = 0: gt 'placer_pav_park'
+end
 
 --- placer ---------------------------------
 

+ 64 - 62
locations/placer_act.qsrc

@@ -2,13 +2,15 @@
 
 gs 'skverdin'
 
-if plact = 0:
+$ev_name = $placerStringParameter['ev_name']
+
+if placerParameter['player_act'] = 0:
 	menu_off = 1
 	gs 'npcgeneratec', 0, 'Stranger', rand(18,35)
 	gs 'boyStat', $npclastgenerated
 	gs 'stat'
 
-	if Frend_num > 0:
+	if placerParameter['friend_index'] > 0:
 		$text_mod = ' Your girlfriend <<$ev_name>> introduces herself too.'
 	else
 		$text_mod = ''
@@ -17,7 +19,7 @@ if plact = 0:
 	$npc_usedname[$boy] = $npc_nickname[$boy]
 	$boydesc = $npc_nickname[$boy]
 
-	if know_status = 2:
+	if placerParameter['recognize_status'] = 2:
 		!!random Gopniks
 		if month=1 or month=2 or month=12 or month=11:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver_znacom_1.jpg"></center>'
@@ -28,8 +30,8 @@ if plact = 0:
 		'You smile as you reply: "I''m <<$pcs_nickname>>."'+$text_mod
 		'<<$boydesc>> invites you: "Pleased to meet you, <<$pcs_nickname>>! Would you like to have a beer with me?"'
 
-		!!if Frend_num = 0:end
-		if Frend_num > 0:'<<$ev_name>> whispers to you: "I''m not so sure about this, <<$pcs_nickname>>! I think we should go..."'
+		!!if placerParameter['friend_index'] = 0:end
+		if placerParameter['friend_index'] > 0:'<<$ev_name>> whispers to you: "I''m not so sure about this, <<$pcs_nickname>>! I think we should go..."'
 	else
 		!!random normal guys
 		if month=1 or month=2 or month=12 or month=11:
@@ -41,26 +43,26 @@ if plact = 0:
 		'You smile as you reply: "I''m <<$pcs_nickname>>."'+$text_mod
 		'<<$boydesc>> invites you: "Pleased to meet you, <<$pcs_nickname>>! Would you like to have a beer with me?"'
 
-		if kol_man = 1 and Frend_num > 0:
+		if placerParameter['number_of_man'] = 1 and placerParameter['friend_index'] > 0:
 			'<<$ev_name>> whispers to you: "Who do you think he likes more, <<$pcs_nickname>>? You or me?"'
-		elseif kol_man > 1:
+		elseif placerParameter['number_of_man'] > 1:
 			'Vying for the guys'' attention, you happily accept <<$boydesc>>''s invitation and introduce yourself to everyone.'
-			if Frend_num > 0:'<<$ev_name>> whispers to you: "They''re cute, <<$pcs_nickname>>! Let''s stay for a while and see what happens?"'
+			if placerParameter['friend_index'] > 0:'<<$ev_name>> whispers to you: "They''re cute, <<$pcs_nickname>>! Let''s stay for a while and see what happens?"'
 		end
 	end
 
-	act 'Drink some beer':plact = 1 & gt $curloc
+	act 'Drink some beer':placerParameter['player_act'] = 1 & gt $curloc
 
-	if Frend_num = 0:act 'Decline and leave':gt 'pav_park', 'start'
+	if placerParameter['friend_index'] = 0:act 'Decline and leave':gt 'pav_park', 'start'
 
-	if Frend_num > 0:
+	if placerParameter['friend_index'] > 0:
 		act 'Leave with your friend':
 			*clr & cla
 			gs 'stat'
 
-			if p_slut < 80:gt 'placer_end'
+			if placerParameter['friend_slut'] < 80:gt 'placer_end'
 
-			if p_slut >= 80:
+			if placerParameter['friend_slut'] >= 80:
 				'<<$ev_name>> whispers to you: "Don''t be such a bore, <<$pcs_nickname>>! I want to stay, he''s cute! Come on, stay with me and live a little!"'
 
 				gs 'willpower', 'drink', 'resist', 'medium'
@@ -74,7 +76,7 @@ if plact = 0:
 					act 'Leave your friend behind and go (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 
-				act 'Drink some beer with them':plact = 1 & gt $curloc
+				act 'Drink some beer with them':placerParameter['player_act'] = 1 & gt $curloc
 
 				act 'Drag your friend away':gt 'placer_end'
 			end
@@ -82,28 +84,28 @@ if plact = 0:
 	end
 end
 
-!!if slut_vid > 0:know_gor_slut = 1
+!!if placerParameter['slut_visual'] > 0:placerParameter['know_slut'] = 1
 
 !!!!!!!!!!!!!!!
 !!!drink beer!!!
 !!!!!!!!!!!!!!!
-if plact = 1:
+if placerParameter['player_act'] = 1:
 	menu_off = 1
 	minut += 5
 	gs 'drugs', 'alcohol', 'beer'
 	gs 'stat'
 
-	if Frend_num > 0:$textsub = ' and your friend'
-	if Frend_num = 0:$textsub = ''
-	if kol_man = 1:$textsub2 = 'guy'
-	if kol_man > 1:$textsub2 = 'guys'
+	if placerParameter['friend_index'] > 0:$textsub = ' and your friend'
+	if placerParameter['friend_index'] = 0:$textsub = ''
+	if placerParameter['number_of_man'] = 1:$textsub2 = 'guy'
+	if placerParameter['number_of_man'] > 1:$textsub2 = 'guys'
 
-	'You<<$textsub>> join the <<$textsub2>> for some beers, and go to a more secluded area of the park. <<$boydesc>> pours beer into plastic cups and hands them out. The beer is nice and cold, and you<<$textsub>> have a chat with <<$boydesc>> while the <<$kol_man_text>> mess around.'
+	'You<<$textsub>> join the <<$textsub2>> for some beers, and go to a more secluded area of the park. <<$boydesc>> pours beer into plastic cups and hands them out. The beer is nice and cold, and you<<$textsub>> have a chat with <<$boydesc>> while the <<$placerStringParameter[''text_someone'']>> mess around.'
 
-	if know_status = 2:
+	if placerParameter['recognize_status'] = 2:
 		!!gopniks in the park, 3-6
-		if Frend_num = 0:
-			if know_gor_slut = 0:
+		if placerParameter['friend_index'] = 0:
+			if placerParameter['know_slut'] = 0:
 				'<<$boydesc>> excuses himself for a moment, and then surprises you when he comes up to you from behind. He puts his arms around your waist while kissing your neck. The other guys are mostly ignoring you and are talking among one another, though you do see one or two jealous glances from them.'
 
 				gs 'arousal', 'kiss', 5
@@ -284,7 +286,7 @@ if plact = 1:
 						act 'Leave':gt 'pav_park', 'start'
 					end
 				end
-			elseif know_gor_slut = 1 and BjBeerQW > 1 and bjgangrand = 1:
+			elseif placerParameter['know_slut'] = 1 and BjBeerQW > 1 and bjgangrand = 1:
 					'One of the guys suddenly laughs: "Wait a minute, I know her! That''s <<$pcs_nickname>>, everyone knows she''s a <<$gnikname>>. She gives guys blowjobs just to get a beer! My buddy showed me a video where they gave like three guys a blowjob, and then happily said hi to her mother with the cum still on her face!"'
 					'One of the other guys approaches you, and puts his hand on your chin while he takes a good look at your face. When he sees you flinch, he slaps you across the face quite hard. He orders you: "Don''t move, bitch."'
 					'You''re too afraid to fight him, and just let him do what he wants while he runs his fingers over your lips and slips a finger inside your mouth, which you begin to suck on without even giving it any thought.'
@@ -301,18 +303,18 @@ if plact = 1:
 
 					act 'Kneel down and open your mouth':
 						*clr & cla
-						stat['bj'] += kol_man
-						guy += kol_man
+						stat['bj'] += placerParameter['number_of_man']
+						guy += placerParameter['number_of_man']
 						i = 0
 						:parkbj
 						spafinloc = 12
 						gs 'cum_manage'
 						i += 1
-						if i <= kol_man:
+						if i <= placerParameter['number_of_man']:
 							spafinloc = 11
 							gs 'cum_manage'
 							i += 1
-							if i <= kol_man: jump 'parkbj'
+							if i <= placerParameter['number_of_man']: jump 'parkbj'
 						end
 						face_write = 1
 						gang += 1
@@ -344,7 +346,7 @@ if plact = 1:
 						end
 					end
 				end
-			elseif know_gor_slut = 1:
+			elseif placerParameter['know_slut'] = 1:
 				'One of the guys tells you: "<<$pcs_nickname>>, we all know you''re a <<$gnikname>>". One of his friends pitches in: "In other words: we''re going to some place quiet and we''re going to fuck you. Cause trouble and we''ll knock your teeth out. Understood?"'
 
 				act 'Go with the guys':
@@ -356,18 +358,18 @@ if plact = 1:
 
 					act 'Squat before them':
 						*clr & cla
-						stat['bj'] += kol_man
-						guy += kol_man
+						stat['bj'] += placerParameter['number_of_man']
+						guy += placerParameter['number_of_man']
 						i = 0
 						:parkbj2
 						spafinloc = 12
 						gs 'cum_manage'
 						i += 1
-						if i <= kol_man:
+						if i <= placerParameter['number_of_man']:
 							spafinloc = 11
 							gs 'cum_manage'
 							i += 1
-							if i <= kol_man: jump 'parkbj2'
+							if i <= placerParameter['number_of_man']: jump 'parkbj2'
 						end
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/sex/gop/blowbang.jpg"></center>'
@@ -385,8 +387,8 @@ if plact = 1:
 					end
 				end
 			end
-		elseif Frend_num > 0:
-			if know_gor_slut = 0:
+		elseif placerParameter['friend_index'] > 0:
+			if placerParameter['know_slut'] = 0:
 				'You see one of the guys come behind to your friend, closing his arms around her in a bear grip as he kisses her neck. Another guy does the same to you, and kisses your neck quite aggressively while he has a tight grip on your waist.'
 
 				act 'Kiss him':
@@ -417,7 +419,7 @@ if plact = 1:
 				exit
 			end
 
-			if know_gor_slut = 1:
+			if placerParameter['know_slut'] = 1:
 				'One of the guys says: "<<$pcs_nickname>>, we all know you''re a whore. If your little girlfriend is with you, we can only assume she is, too."'
 				'Another guy pitches in: "In other words: you and your girlfriend are going to entertain us at our place. If you''re good enough, we''ll let you go afterwards."'
 
@@ -450,14 +452,14 @@ if plact = 1:
 		end
 	end
 
-	if know_status < 2:
+	if placerParameter['recognize_status'] < 2:
 		tiprand = rand(0, 1)
 		tiploverand = rand(0, 1)
 
 		!norms
-		if kol_man = 1:
-			if Frend_num = 0 and kol_man = 1:
-				if slut_vid > 0:
+		if placerParameter['number_of_man'] = 1:
+			if placerParameter['friend_index'] = 0 and placerParameter['number_of_man'] = 1:
+				if placerParameter['slut_visual'] > 0:
 					'The guy comes up to you, and aggressively kisses you on your mouth.'
 
 					act 'Kiss him back':
@@ -541,7 +543,7 @@ if plact = 1:
 						if tiperand = 2:gt 'fbGar'
 					end
 				end
-			elseif Frend_num > 0 and kol_man = 1:
+			elseif placerParameter['friend_index'] > 0 and placerParameter['number_of_man'] = 1:
 				if tiploverand = 0:
 					'You''re having fun, drinking beers with your friend and the guy you just met. After a while you realize that he is mostly just paying attention to you though, while pretending your friend <<$ev_name>> isn''t there.'
 
@@ -550,7 +552,7 @@ if plact = 1:
 						gs 'stat'
 						'<<$boydesc>> whispers in your ear: "Come on <<$pcs_nickname>>, let''s go to my place..."'
 
-						if p_slut < 50 or (Frend_num = 14 and katjaQW['park_sex'] < rand(1,2)):
+						if placerParameter['friend_slut'] < 50 or (placerParameter['friend_index'] = 14 and katjaQW['park_sex'] < rand(1,2)):
 							!!If Katja have not done much with guys from the park, she might want to leave you alone.
 							'<<$ev_name>> seems to understand where this is going, and nods at you: "Okay, <<$pcs_nickname>>... I guess I should leave the two of you alone. I''ll see you later?"'
 
@@ -587,23 +589,23 @@ if plact = 1:
 						*clr & cla
 						gs 'stat'
 
-						if p_slut < 30:
+						if placerParameter['friend_slut'] < 30:
 							'<<$ev_name>> kisses the guy for a while, but when he whispers something to her she apologizes to him: "Sorry, <<$boydesc>>... I can''t just leave <<$pcs_nickname>> hanging. We should be going."'
 
 							act 'Leave with your friend':gt 'placer_end'
 						end
 
-						if p_slut >= 30 and p_slut < 60:
+						if placerParameter['friend_slut'] >= 30 and placerParameter['friend_slut'] < 60:
 							'<<$ev_name>> kisses the guy, and he begins to grope her body. She quickly whispers something in his ear, and you see him nod. Then <<$ev_name>> turns to you: "Sorry <<$pcs_nickname>>, <<$boydesc>> promised me he''d show me his cool rock collection. His apartment is small though, there''d be no room for the both of us... I''ll see you later?"'
 
-							if Frend_num = 14:
+							if placerParameter['friend_index'] = 14:
 								KatjaQW['slut'] += 10
 								KatjaQW['horny'] = 0
 								if katjaQW['park_sex'] = 0: katjaQW['park_sex'] = 1
 							end
 
 							act 'Watch her leave with the stranger':gt 'pav_park', 'start'
-						elseif p_slut >= 60:
+						elseif placerParameter['friend_slut'] >= 60:
 							'<<$ev_name>> kisses the guy, and he begins to grope her body. She quickly whispers something in his ear, and you see him nod. Then <<$ev_name>> turns to you and asks innocently: "Hey <<$pcs_nickname>>... <<$boydesc>> asks if you want to come with us for some fun. What do you say?"'
 
 							gs 'willpower', 'sex', 'resist', 'hard'
@@ -622,11 +624,11 @@ if plact = 1:
 					end
 				end
 			end
-		elseif kol_man > 1:
-			if Frend_num = 0:
-				if slut_vid > 0:
-					if kol_man = 2:$textsub = 'The second guy looks at you knowingly, as if he recognizes you from somewhere. He has a greedy look in his eyes.'
-					if kol_man > 2:$textsub = 'The other guys look at you knowingly, as if they recognize you from somewhere. They have greedy looks in their eyes.'
+		elseif placerParameter['number_of_man'] > 1:
+			if placerParameter['friend_index'] = 0:
+				if placerParameter['slut_visual'] > 0:
+					if placerParameter['number_of_man'] = 2:$textsub = 'The second guy looks at you knowingly, as if he recognizes you from somewhere. He has a greedy look in his eyes.'
+					if placerParameter['number_of_man'] > 2:$textsub = 'The other guys look at you knowingly, as if they recognize you from somewhere. They have greedy looks in their eyes.'
 
 					'<<$boydesc>> comes up to you, and aggressively kisses you on your mouth while he hugs you. <<$textsub>>.'
 
@@ -672,8 +674,8 @@ if plact = 1:
 						act 'Continue':gt 'placer_sex', 'meet'
 					end
 				end
-			elseif Frend_num > 0:
-				if slut_vid > 0:
+			elseif placerParameter['friend_index'] > 0:
+				if placerParameter['slut_visual'] > 0:
 					'You see one of the guys come behind to your friend, closing his arms around her in a bear grip as he kisses her neck. Another guy does the same to you, and kisses your neck quite aggressively while he has a tight grip on your waist.'
 
 					act 'Kiss him':
@@ -704,16 +706,16 @@ if plact = 1:
 
 	gs 'stat'
 
-	if Frend_num = 0:
+	if placerParameter['friend_index'] = 0:
 		act 'Turn around and walk away':
 			*clr & cla
 			gs 'stat'
 
-			if know_gor_slut = 0:
-				if slut_vid = 0:gt 'pav_park', 'start'
+			if placerParameter['know_slut'] = 0:
+				if placerParameter['slut_visual'] = 0:gt 'pav_park', 'start'
 
-				if slut_vid > 0:
-					if know_status = 2:
+				if placerParameter['slut_visual'] > 0:
+					if placerParameter['recognize_status'] = 2:
 						'<<$boydesc>> disappointedly remarks: "We know you''re a whore... why are you being such a prude?"'
 						'You shrug at him and keep walking... that remark sure made your decision to leave a lot easier! What a jackass!'
 
@@ -722,8 +724,8 @@ if plact = 1:
 						gt 'pav_park', 'start'
 					end
 				end
-			elseif know_gor_slut = 1:
-				if know_status = 2:
+			elseif placerParameter['know_slut'] = 1:
+				if placerParameter['recognize_status'] = 2:
 					'You shake your head and apologize: "Sorry boys... I have places to be. Maybe some other time" as you leave. You walk away in a brisk pace, and are gone before they can object.'
 
 					act 'Return to the park':gt 'pav_park', 'start'
@@ -732,7 +734,7 @@ if plact = 1:
 				end
 			end
 		end
-	elseif Frend_num > 0:
+	elseif placerParameter['friend_index'] > 0:
 		act 'Leave with your friend':gt 'placer_end'
 	end
 end

+ 2 - 2
locations/placer_end.qsrc

@@ -1,7 +1,7 @@
 # placer_end
 !2021/05/02
 
-if Frend_num = 14:
+if placerParameter['friend_index'] = 14:
 	menu_off = 1
 	katjaQW['horny'] += 10
 	gs 'stat'
@@ -26,7 +26,7 @@ if Frend_num = 14:
 	'You say goodbye and Katja disappears into her house.'
 
 	act 'Leave':
-		Frend_num = 0
+		placerParameter['friend_index'] = 0
 		gt 'pav_residential'
 	end
 end

+ 2 - 3
locations/placer_gop_orgy.qsrc

@@ -7,12 +7,12 @@ gs 'drugs', 'alcohol', 'vodka', 2
 gs 'stat'
 'You, <<$ev_name>> and the guys enter what seems to be an otherwise abandoned apartment. The place barely has any furniture, and there is rubbish and dirt everywhere. Are you even allowed to be in here?'
 'The boys don''t pay any attention to their surroundings, and pour out some vodka from a bottle into several cups they brought while they actively flirt with you and your friend. You soon forget about your surroundings as you''re having fun with the guys, and undress alongside <<$ev_name>>. The boys quickly clear an area of bottles and other debris, so you can lie down.'
-ciklkm = (kol_man / 2) + 1
+ciklkm = (placerParameter['number_of_man'] / 2) + 1
 guy += ciklkm
 
 if goporgyeQW = 0:goporgyeQW = 1
 
-if Frend_num = 14:
+if placerParameter['friend_index'] = 14:
 	KatjaQW['slut'] += 5
 	KatjaQW['horny'] = 0
 	if katjaQW['park_sex'] < 3: katjaQW['park_sex'] = 3
@@ -20,7 +20,6 @@ if Frend_num = 14:
 
 	gs 'arousal', 'foreplay', 10, 'group'
 	gs 'stat'
-
 end
 
 act 'Continue':

+ 12 - 12
locations/placer_house.qsrc

@@ -6,7 +6,7 @@ gs 'drugs', 'alcohol', 'vodka', 3
 gs 'stat'
 'You exit the park with your friend, and follow <<$boydesc>> to an apartment nearby. You all go inside, and continue to drink and have fun there.'
 
-if kol_man = 1:
+if placerParameter['number_of_man'] = 1:
 	'You begin to hug and kiss <<$boydesc>>. Soon <<$ev_name>> joins in and you''re both kissing the guy, as well as each other.'
 	gs 'arousal', 'foreplay', 4, 'group', 'lesbian'
 	gs 'stat'
@@ -20,7 +20,7 @@ if kol_man = 1:
 		act 'Get on your hands and knees for him':
 			*clr & cla
 
-			if Frend_num = 14:
+			if placerParameter['friend_index'] = 14:
 				KatjaQW['slut'] += 5
 				KatjaQW['horny'] = 0
 				if katjaQW['park_sex'] = 0: katjaQW['park_sex'] = 1
@@ -40,7 +40,7 @@ if kol_man = 1:
 			act 'Leave':gt 'placer_end'
 		end
 	end
-elseif kol_man = 2:
+elseif placerParameter['number_of_man'] = 2:
 	guy += 1
 	'The guys seem to each have picked their favorite girl, and <<$boydesc>> is all over you. While he kisses and gropes you greedily, his friend is doing the same to <<$ev_name>>. She seems to be quite into him, and happily returns him kiss and lets him touch her wherever and however he wants. Within minutes, she lowered her body and is vigorously sucking her guy''s cock. Meanwhile, <<$boydesc>> looks at you expectantly as he exposes his hard dick to you, expecting you to do the same.'
 
@@ -55,7 +55,7 @@ elseif kol_man = 2:
 		act 'Fuck him':
 			*clr & cla
 
-			if Frend_num = 14:
+			if placerParameter['friend_index'] = 14:
 				KatjaQW['slut'] += 5
 				KatjaQW['horny'] = 0
 				if katjaQW['park_sex'] = 0: katjaQW['park_sex'] = 1
@@ -75,7 +75,7 @@ elseif kol_man = 2:
 			act 'Leave':gt 'placer_end'
 		end
 	end
-elseif kol_man = 3:
+elseif placerParameter['number_of_man'] = 3:
 	$d_dozdat = {
 		act 'Wait for your friend':
 			*clr & cla
@@ -83,7 +83,7 @@ elseif kol_man = 3:
 			gs 'stat'
 			cumface = 0
 
-			if Frend_num = 14:
+			if placerParameter['friend_index'] = 14:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/katja/katjacum.jpg"></center>'
 				'Eventually, Katja comes out of the room. She has cum smeared all over her face, and looks exhausted... but happy. Very happy.'
 			end
@@ -98,7 +98,7 @@ elseif kol_man = 3:
 		act 'Continue':
 			*clr & cla
 
-			if Frend_num = 14:
+			if placerParameter['friend_index'] = 14:
 				gs 'npcgeneratec', 0, 'Guy', rand(18,35)
 				gs 'boyStat', $npclastgenerated
 				KatjaQW['slut'] += 5
@@ -118,7 +118,7 @@ elseif kol_man = 3:
 				*clr & cla
 				gs 'stat'
 
-				if Frend_num = 14:
+				if placerParameter['friend_index'] = 14:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/katja/katjaend.jpg"></center>'
 					'You open the door slightly look inside the room. On the bed lies Katja, clearly flustered from getting fucked just now. She''s eagerly sucking off the boy with her, sucking his cock and pleading and begging for him to cum on her face. The guy does, and Katja happily smears the sperm over her lips and cheeks before licking some of it up.'
 					gs 'arousal', 'voyeur_sex', 15
@@ -136,7 +136,7 @@ elseif kol_man = 3:
 		act 'Continue':
 			*clr & cla
 
-			if Frend_num = 14:
+			if placerParameter['friend_index'] = 14:
 				gs 'npcgeneratec', 0, 'Guy', rand(18,35)
 				gs 'boyStat', $npclastgenerated
 				KatjaQW['slut'] += 10
@@ -157,7 +157,7 @@ elseif kol_man = 3:
 				*clr & cla
 				gs 'stat'
 
-				if Frend_num = 14:
+				if placerParameter['friend_index'] = 14:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/katja/katjaendgang.jpg"></center>'
 					'The two guys in the room have Katja spitroasted; one of them is furiously fucking her from behind, while Katja is sucking the other guy''s cock like her life depended on it. Her loud groans are clearly noticeable for you, despite her having a cock in her mouth... you can''t help but notice how cute she sounds, even during an act such as this.'
 					gs 'arousal', 'voyeur_sex', 15
@@ -386,7 +386,7 @@ elseif kol_man = 3:
 			end
 		end
 	end
-elseif kol_man >= 4:
+elseif placerParameter['number_of_man'] >= 4:
 	guy += 2
 	'The boys begin to embrace you and your girlfriend, feeling emboldened by the liquor they have been drinking. Their touches soon make you want more, and you and <<$ev_name>> make out with the boys while they impatiently tug at your clothes. Two of them seem to have taken a liking to you, while the two others are focusing their efforts on <<$ev_name>>.'
 
@@ -395,7 +395,7 @@ elseif kol_man >= 4:
 		gs 'npcgeneratec', 0, 'Guy', rand(18,35)
 		gs 'boyStat', $npclastgenerated, 'b'
 		gs 'boyStat', $boy, 'a'
-		if Frend_num = 14:
+		if placerParameter['friend_index'] = 14:
 			KatjaQW['slut'] += 10
 			KatjaQW['horny'] = 0
 			if katjaQW['park_sex'] < 3: katjaQW['park_sex'] = 3

+ 76 - 78
locations/placer_man.qsrc

@@ -1,96 +1,94 @@
 # placer_man
-if mass_ver_zn > 0:
-	!!calculation of the probability of dating
-	ver_zn = 0
-	if rand(0, 200) < pcs_apprnc and (rand(0, 1) = 0 or Frend_num = 14):
-		ver_zn = 1
-		if kol_man = 1:
-			$kol_man_text = 'guy' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'he'
-		elseif kol_man = 2:
-			$kol_man_text = 'two guys' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'they'
-		elseif kol_man = 3:
-			$kol_man_text = 'three guys' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'they'
-		elseif kol_man = 4:
-			$kol_man_text = 'four guys' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'they'
-		elseif kol_man = 5:
-			$kol_man_text = 'five guys' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'they'
-		elseif kol_man = 6:
-			$kol_man_text = 'six guys' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'they'
-		end
-
-		$text_znak = ''
+!!calculation of the probability of dating
+placerParameter['want_to_meet'] = 0
+if rand(0, 150) < pcs_apprnc and (rand(0, 10) > 2 or placerParameter['friend_index'] = 14):
+	placerParameter['want_to_meet'] = 1
+	if placerParameter['number_of_man'] = 1:
+		$placerStringParameter['text_someone'] = 'guy' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'he'
+	elseif placerParameter['number_of_man'] = 2:
+		$placerStringParameter['text_someone'] = 'two guys' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'they'
+	elseif placerParameter['number_of_man'] = 3:
+		$placerStringParameter['text_someone'] = 'three guys' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'they'
+	elseif placerParameter['number_of_man'] = 4:
+		$placerStringParameter['text_someone'] = 'four guys' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'they'
+	elseif placerParameter['number_of_man'] = 5:
+		$placerStringParameter['text_someone'] = 'five guys' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'they'
+	elseif placerParameter['number_of_man'] = 6:
+		$placerStringParameter['text_someone'] = 'six guys' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'they'
+	end
 
-		!!iconic moments
-		if fame['pav_slut'] >= 50 and know_gor_slut = 0:
-			if know_status = 1:knowrand = rand(0, 1)
-			if know_status = 2:knowrand = rand(0, 4)
-			if knowrand = 0:know_gor_slut = 1
-		end
+	$placerStringParameter['text_start_meet'] = ''
 
-		if Frend_num = 0:
-			slut_vid = 0
+	!!iconic moments
+	if fame['pav_slut'] >= 50 and placerParameter['know_slut'] = 0:
+		if placerParameter['recognize_status'] = 1:knowrand = rand(0, 1)
+		if placerParameter['recognize_status'] = 2:knowrand = rand(0, 4)
+		if knowrand = 0:placerParameter['know_slut'] = 1
+	end
 
-			if pcs_makeup = 4:slut_vid += 1
+	if placerParameter['friend_index'] = 0:
+		placerParameter['slut_visual'] = 0
 
-			if pirsA > 0 and pirsA < 10000:slut_vid += 1
-			if pirsB > 0 and pirsB < 10000:slut_vid += 1
-			!!if tits > 2:end
-			!!if pcs_hips-pcs_waist > 30:end
-			!!if glamur > 0 or ski > 0:end
-			!!if sport > 0:end
+		if pcs_makeup = 4:placerParameter['slut_visual'] += 1
 
-			$txt_a= 'Hello there,'
-			$txt_b= 'beautiful!'
+		if pirsA > 0 and pirsA < 10000:placerParameter['slut_visual'] += 1
+		if pirsB > 0 and pirsB < 10000:placerParameter['slut_visual'] += 1
+		!!if tits > 2:end
+		!!if pcs_hips-pcs_waist > 30:end
+		!!if glamur > 0 or ski > 0:end
+		!!if sport > 0:end
 
-			if know_status = 2:
-				textrand = rand(0, 1)
+		$txt_a= 'Hello there,'
+		$txt_b= 'beautiful!'
 
-				if textrand = 0:$txt_a = 'Hi'
-				if textrand = 1:$txt_a = 'Hey,'
+		if placerParameter['recognize_status'] = 2:
+			textrand = rand(0, 1)
 
-				textrand2 = rand(0, 1)
+			if textrand = 0:$txt_a = 'Hi'
+			if textrand = 1:$txt_a = 'Hey,'
 
-				if textrand2 = 0:$txt_b = 'gorgeous!'
-				if textrand2 = 1:$txt_b = 'cutie!'
-			end
+			textrand2 = rand(0, 1)
 
-			$text_znak = '<<$txt_a>> <<$txt_b>>'
-		else
-			$text_znak = 'Hey ladies!'
-		end
-	elseif Frend_num = 0:
-		if know_gor_slut = 1:
-			if kol_man = 1:
-				$text_znak = ' The guy grins, he recognizes who you are.'
-			elseif kol_man > 1:
-				$text_znak = ' The guys whisper to one another: "Look guys, it''s <<$pcs_nickname>>. She''s a pretty big <<$gnikname>>, from what I heard."'
-			end
+			if textrand2 = 0:$txt_b = 'gorgeous!'
+			if textrand2 = 1:$txt_b = 'cutie!'
 		end
+
+		$placerStringParameter['text_start_meet'] = '<<$txt_a>> <<$txt_b>>'
 	else
-		$text_znak = 'Hey girl!'
-		if know_status = 2:$text_znak = 'Hi honey!'
+		$placerStringParameter['text_start_meet'] = 'Hey ladies!'
 	end
-
-	if PCloStyle = 4:
-		randtext = rand(0, 5)
-
-		if randtext = 0:$txt_a = 'Nice clothes, slut!'
-		if randtext = 1:$txt_a = 'Hey, slut!'
-		if randtext = 2:$txt_a = 'Hey, whore!'
-		if randtext = 3:$txt_a = 'Hey girl!'
-		if randtext = 4:$txt_a = 'Aren''t you a whore?'
-		if randtext = 5:$txt_a = 'Oh, a prostitute!'
-
-		randtext2 = rand(0, 5)
-
-		if randtext2 = 0:$txt_b = 'How much for a blowjob?'
-		if randtext2 = 1:$txt_b = 'Didn''t I see you at the brothel the other day?'
-		if randtext2 = 2:$txt_b = 'I''m saving up for you, babe!'
-		if randtext2 = 3:$txt_b = 'Nice rack!'
-		if randtext2 = 4:$txt_b = 'Is this where you usually work?'
-		if randtext2 = 5:$txt_b = 'I''d like to see you work that mouth.'
-		$text_znak = '<<$txt_a>> <<$txt_b>>'
+elseif placerParameter['friend_index'] = 0:
+	if placerParameter['know_slut'] = 1:
+		if placerParameter['number_of_man'] = 1:
+			$placerStringParameter['text_start_meet'] = ' The guy grins, he recognizes who you are.'
+		elseif placerParameter['number_of_man'] > 1:
+			$placerStringParameter['text_start_meet'] = ' The guys whisper to one another: "Look guys, it''s <<$pcs_nickname>>. She''s a pretty big <<$gnikname>>, from what I heard."'
+		end
 	end
+else
+	$placerStringParameter['text_start_meet'] = 'Hey girl!'
+	if placerParameter['recognize_status'] = 2:$placerStringParameter['text_start_meet'] = 'Hi honey!'
+end
+
+if PCloStyle = 4:
+	randtext = rand(0, 5)
+
+	if randtext = 0:$txt_a = 'Nice clothes, slut!'
+	if randtext = 1:$txt_a = 'Hey, slut!'
+	if randtext = 2:$txt_a = 'Hey, whore!'
+	if randtext = 3:$txt_a = 'Hey girl!'
+	if randtext = 4:$txt_a = 'Aren''t you a whore?'
+	if randtext = 5:$txt_a = 'Oh, a prostitute!'
+
+	randtext2 = rand(0, 5)
+
+	if randtext2 = 0:$txt_b = 'How much for a blowjob?'
+	if randtext2 = 1:$txt_b = 'Didn''t I see you at the brothel the other day?'
+	if randtext2 = 2:$txt_b = 'I''m saving up for you, babe!'
+	if randtext2 = 3:$txt_b = 'Nice rack!'
+	if randtext2 = 4:$txt_b = 'Is this where you usually work?'
+	if randtext2 = 5:$txt_b = 'I''d like to see you work that mouth.'
+	$placerStringParameter['text_start_meet'] = '<<$txt_a>> <<$txt_b>>'
 end
 
 --- placer_man ---------------------------------

+ 55 - 49
locations/placer_pav_park.qsrc

@@ -3,13 +3,15 @@
 if hour >= 22 or hour < 8:
 	encounter = 0
 else
-	if Frend_num = 14 and katjaQW['park_sex'] < 2:
+	if placerParameter['friend_index'] = 14 and katjaQW['park_sex'] < 2:
 		encounter = rand(0, 8)
 	else
 		encounter = rand(0, 10)
 	end
 end
 
+met_someone = 0
+
 if encounter = 0:
 	!!no one in the park
 	$textEvent = 'The park is quiet and deserted. There is no one in sight.'
@@ -18,7 +20,7 @@ elseif encounter = 1:
 	$textEvent = 'You see a young mother with a stroller walking along a path.'
 elseif encounter = 2:
 	!!people in the park old_man
-	if bimbolevel < 1 or Frend_num > 0:
+	if bimbolevel < 1 or placerParameter['friend_index'] > 0:
 		$textEvent = 'A lonely old man with a newspaper in his hand strolls down a path.'
 	else
 		$textEvent='A lonely old man with a newspaper in his hand is strolling down a path. He looks at you greedily when he sees your appearance and walks over to you. When he reaches you, he extends his hand and says: "Hi there, young lady! If you have a minute, come with me! I have something for you!"'
@@ -32,39 +34,39 @@ elseif encounter = 4:
 	$textEvent = 'You see two young girls taking a stroll in the park.'
 elseif encounter = 5:
 	!!people in the park number of guys
-
-	if Frend_num = 14 and katjaQW['park_sex'] = 0:
+	
+	if placerParameter['friend_index'] = 14 and katjaQW['park_sex'] = 0:
 		!!If Katja never have had sex with a random guy at the park you only meet 1 guy.
-		kol_man = 1
-	elseif Frend_num = 14 and katjaQW['park_sex'] = 1:
+		placerParameter['number_of_man'] = 1
+	elseif placerParameter['friend_index'] = 14 and katjaQW['park_sex'] = 1:
 		!!If Katja have had sex with 1 random guy at the park you have a 50% chance of meeting 1 guy and 25% of meeting 2 and 25% of meeting 3.
-		kol_man = max(1,rand(0,3))
+		placerParameter['number_of_man'] = max(1,rand(0,3))
 	elseif rand(0,1) = 0:
 		!!50% chance of meeting 1 guy.
-		kol_man = 1
+		placerParameter['number_of_man'] = 1
 	elseif rand(0,1) = 0:
 		!!25% chance of meeting 2 guys.
-		kol_man = 2
+		placerParameter['number_of_man'] = 2
 	elseif rand(0,1) = 0:
 		!!12.5% chance of meeting 3 guys.
-		kol_man = 3
+		placerParameter['number_of_man'] = 3
 	elseif rand(0,2) > 0:
 		!!8.35% chance of meeting 4 guys.
-		kol_man = 4
+		placerParameter['number_of_man'] = 4
 	else
 		!!4.15% chance of meeting 5 guys.
-		kol_man = 5
+		placerParameter['number_of_man'] = 5
 	end
 
-	if kol_man = 1:$textSub = 'a guy'
-	if kol_man = 2:$textSub = 'two guys'
-	if kol_man = 3:$textSub = 'three guys'
-	if kol_man = 4:$textSub = 'four guys'
-	if kol_man = 5:$textSub = 'five guys'
+	if placerParameter['number_of_man'] = 1:$textSub = 'a guy'
+	if placerParameter['number_of_man'] = 2:$textSub = 'two guys'
+	if placerParameter['number_of_man'] = 3:$textSub = 'three guys'
+	if placerParameter['number_of_man'] = 4:$textSub = 'four guys'
+	if placerParameter['number_of_man'] = 5:$textSub = 'five guys'
 
 	$textEvent = 'You see <<$textSub>> walking through the park, holding a case of beer.'
-	mass_ver_zn = 1
-	know_status = 1
+	placerParameter['recognize_status'] = 1
+	met_someone = 1
 elseif encounter = 6:
 	!!dog in the park
 	$textEvent = 'This part of the park is quiet and deserted. The only sign of life is a stray dog, sniffing around near a garbage bin.'
@@ -93,21 +95,23 @@ elseif encounter = 8:
 elseif encounter = 9:
 	!!young people in the park company
 	$textEvent = 'You see a group of teenagers sitting on a park bench, listening to some music.'
-	kol_man = rand(2, 6)
-	mass_ver_zn = 1
-	know_status = 1
+	placerParameter['number_of_man'] = rand(2, 6)
+	placerParameter['recognize_status'] = 1
+	met_someone = 1
 elseif encounter = 10:
 	!!Gopnik in the park
-	kol_man = rand(3, 6)
+	placerParameter['number_of_man'] = rand(3, 6)
 	$textEvent = 'Some Gopniks are sitting on their haunches just off to the side of one of the main paths, drinking beer. The area around them is littered with empty bottles.'
-	mass_ver_zn = 1
-	know_status = 2
+	placerParameter['recognize_status'] = 2
+	met_someone = 1
 else
 	$textEvent = 'You see 2 women walking in the park, holding each other''s hands tightly. They''re clearly in love.'
 end
 
-
-gs 'placer_man'
+if met_someone = 1: 
+	gs 'placer_man'
+	met_someone = 0
+end
 
 !!Copied from gskver - Start.
 
@@ -213,27 +217,29 @@ if soniaPS=5 and rand(1,10)=>9 and hour>14 and hour<20:
 	end
 end
 
-if Frend_num > 0:
-	'You arrive at one of the smaller plazas in the park, together with <<$ev_name_om>>. <<$textEvent>>'
+$textSomeone = $placerStringParameter['text_someone']
+$textRefuse = $placerStringParameter['text_friend_refuse']
 
-	if ver_zn = 0:
+if placerParameter['friend_index'] > 0:
+	'You arrive at one of the smaller plazas in the park, together with <<$placerStringParameter[''ev_name_om'']>>. <<$textEvent>>'
+	if placerParameter['want_to_meet'] = 0:
 		!!your friend is a guy
-		if kol_man = 1 and $text_znak = '':$kol_man_text_no = 'The guy looks at you, and for a second you think he''s going to say something. However, when he gets closer, he wrinkles his nose and turns away.'
-		if kol_man > 1 and $text_znak = '':$kol_man_text_no = 'The guys look at you for a moment, but you see one of them shake his head. The guys then turn their backs to you, and pretend you''re not there.'
-		if kol_man > 0:'You give the <<$kol_man_text>> a cute smile as you walk past. You don''t think you''ve ever seen him before. <<$kol_man_text_no>>.'+$text_znak
-	elseif ver_zn = 1 and kol_man > 0:
+		if placerParameter['number_of_man'] = 1 and $placerStringParameter['text_start_meet'] = '':$placerStringParameter['text_friend_refuse'] = 'The guy looks at you, and for a second you think he''s going to say something. However, when he gets closer, he wrinkles his nose and turns away.'
+		if placerParameter['number_of_man'] > 1 and $placerStringParameter['text_start_meet'] = '':$placerStringParameter['text_friend_refuse'] = 'The guys look at you for a moment, but you see one of them shake his head. The guys then turn their backs to you, and pretend you''re not there.'
+		if placerParameter['number_of_man'] > 0:'You give the <<$textSomeone>> a cute smile as you walk past. You don''t think you''ve ever seen him before. <<$textRefuse>>.'+$placerStringParameter['text_start_meet']
+	elseif placerParameter['want_to_meet'] = 1 and placerParameter['number_of_man'] > 0:
 		!!your friend is a girl
-		'You give the <<$kol_man_text>> a cute smile as you walk past with your friend.'
+		'You give the <<$textSomeone>> a cute smile as you walk past with your friend.'
 
-		if kol_man = 1:'You don''t think you''ve ever seen him before. He approaches you and says: "<<$text_znak>>"'
-		if kol_man > 1:'You don''t think you''ve ever seen them before. The guys walk towards you, and one of them says: "<<$text_znak>>"'
+		if placerParameter['number_of_man'] = 1:'You don''t think you''ve ever seen him before. He approaches you and says: "<<$placerStringParameter[''text_start_meet'']>>"'
+		if placerParameter['number_of_man'] > 1:'You don''t think you''ve ever seen them before. The guys walk towards you, and one of them says: "<<$placerStringParameter[''text_start_meet'']>>"'
 
 		act 'Agree to hang out':
 			cls
 
-			if p_dom < 80:
+			if placerParameter['friend_dom'] < 80:
 				gt 'placer_act'
-			elseif p_dom >= 80:
+			elseif placerParameter['friend_dom'] >= 80:
 				gs 'stat'
 				'<<$ev_name>> hisses in your ear: "I don''t want to hang out with strangers, <<$pcs_nickname>>! They could be dangerous! If you want to stay here, I''m leaving."'
 
@@ -249,7 +255,7 @@ if Frend_num > 0:
 				end
 
 				act 'Say goodbye to your friend and stay':
-					Frend_num = 0
+					placerParameter['friend_index'] = 0
 					gt 'placer_act'
 				end
 			end
@@ -257,21 +263,21 @@ if Frend_num > 0:
 	end
 
 	act 'Continue on your walk':gt 'placer_end'
-elseif Frend_num = 0:
+elseif placerParameter['friend_index'] = 0:
 	'You stroll through the park by yourself, enjoying its beauty. <<$textEvent>>'
 
-	if ver_zn = 1:
-		'You give the <<$kol_man_text>> a cute smile as you walk past. '
+	if placerParameter['want_to_meet'] = 1:
+		'You give the <<$textSomeone>> a cute smile as you walk past. '
 
-		if kol_man = 1:'You don''t think you''ve ever seen him before. He approaches you and says: "<<$text_znak>>"'
-		if kol_man > 1:'You don''t think you''ve ever seen them before. The guys walk towards you, and one of them says: "<<$text_znak>>"'
+		if placerParameter['number_of_man'] = 1:'You don''t think you''ve ever seen him before. He approaches you and says: "<<$placerStringParameter[''text_start_meet'']>>"'
+		if placerParameter['number_of_man'] > 1:'You don''t think you''ve ever seen them before. The guys walk towards you, and one of them says: "<<$placerStringParameter[''text_start_meet'']>>"'
 
 		act 'Meet':gt 'placer_act'
-	elseif ver_zn = 0 and kol_man > 0:
-		if kol_man = 1:$kol_man_text_no = 'The guy looks at you, and for a second you think he''s going to say something. However, when he gets closer, he wrinkles his nose and turns away.'
-		if kol_man > 1:$kol_man_text_no = 'The guys look at you for a moment, but you see one of them shake his head. The guys then turn their backs to you, and pretend you''re not there.'
+	elseif placerParameter['want_to_meet'] = 0 and placerParameter['number_of_man'] > 0:
+		if placerParameter['number_of_man'] = 1:$placerStringParameter['text_friend_refuse'] = 'The guy looks at you, and for a second you think he''s going to say something. However, when he gets closer, he wrinkles his nose and turns away.'
+		if placerParameter['number_of_man'] > 1:$placerStringParameter['text_friend_refuse'] = 'The guys look at you for a moment, but you see one of them shake his head. The guys then turn their backs to you, and pretend you''re not there.'
 
-		'You give the <<$kol_man_text>> a cute smile as you walk past.' & '<<$kol_man_text_no>>'
+		'You give the <<$textSomeone>> a cute smile as you walk past.' & '<<$textRefuse>>'
 	end
 	:parkaway
 	act 'Finish your walk':gt 'pav_park', 'start'

+ 8 - 8
locations/placer_sex.qsrc

@@ -38,7 +38,7 @@ $din_analplugin_off = {
 }
 
 if $args[0] = 'meet':
-	if kol_man < 4 and pcs_ass > 14 and pcs_vag > 14 and mesec <= 0 :
+	if placerParameter['number_of_man'] < 4 and pcs_ass > 14 and pcs_vag > 14 and mesec <= 0 :
 		*clr & cla
 		minut += 30
 		gs'stat'
@@ -54,14 +54,14 @@ if $args[0] = 'meet':
 		'<center><img <<$set_imgh>> src="images/shared/sex/sleep/drunk.jpg"></center>'
 		'They can stomach their alcohol a lot better than you, and before you know it you''re absolutely hammered. The guys look like they''re still feeling fine.'
 		'Once they realize you''re drunk enough for them to make their move, they begin tugging at your clothes and undress you on one of their beds. You''re too drunk to fight them off, and just let it happen.'
-		'Once they have you naked, you hear the <<$kol_man_text>> discussing among one another: "Alright, we got her here... that was easy! Whose turn is it to go first?"'
+		'Once they have you naked, you hear the <<$placerStringParameter[''text_someone'']>> discussing among one another: "Alright, we got her here... that was easy! Whose turn is it to go first?"'
 		act 'Continue':
 			cls
 			rape += 1
 			gang += 1
 			minut += 5
-			guy += kol_man
-			ciklkm = kol_man
+			guy += placerParameter['number_of_man']
+			ciklkm = placerParameter['number_of_man']
 			if dormrapeQW = 0:dormrapeQW = 1
 			placer_rand1 = rand(0,100)
 			if placer_rand1 < 10:'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/sex/gop/gopgang2.jpg"></center>'
@@ -283,7 +283,7 @@ if $args[0] = 'piano':
 									*clr & cla
 									'You feel bad for <<$boydesc2>>''s friend, and tell them: "There''s no need to argue, guys! I''ll make all of you feel good..."'
 									'You see <<$boydesc2>> wants to object, but at the same time he realizes he''s had you to himself for most of the time. He relaxes, and let you do what you want to do."'
-									if kol_man = 2:
+									if placerParameter['number_of_man'] = 2:
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/placer_sex17.jpg"></center>'
 										'The guys pull you off the table without hesitation, and put you down on your knees in front of them. You take both of their cocks in your hands, and guide them towards your mouth. You tease them with your tongue, savouring the taste of yourself on <<$boydesc2>>''s cock. That doesn''t mean you ignore his friend though; you pay just as much attention to him, sucking him off, or stroking his cock when you have your lips around <<$boydesc2>>''s.'
 										gs 'arousal', 'bj', 5, 'sub', 'group'
@@ -384,7 +384,7 @@ if $args[0] = 'piano':
 												end
 											end
 										end
-									elseif kol_man = 3 and analpluginbonus = 10 and pcs_vag => 15 :
+									elseif placerParameter['number_of_man'] = 3 and analpluginbonus = 10 and pcs_vag => 15 :
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/placer_sex23.jpg"></center>'
 										'The guys pull you off the table without hesitation, and put you down on your knees in front of them. You take their cocks in your hands, and guide them towards your mouth. You tease them with your tongue, savoring the taste of yourself on <<$boydesc2>>''s cock. That doesn''t mean you ignore his friends though; you pay just as much attention to them, sucking them off, or stroking their cock when you have your lips around <<$boydesc2>>''s.'
 										act 'Continue':
@@ -532,7 +532,7 @@ if $args[0] = 'vodka2':
 				'He shrugs apologetically, watching the mixture of sperm slowly drip from your vagina.'
 				gs 'arousal', 'vaginal', 5, 'sub', 'unknown'
 				gs 'stat'
-				if kol_man = 2:
+				if placerParameter['number_of_man'] = 2:
 					act 'Take a shower':
 						$din_dush_text='You smile at the boys: "Alright guys, I really need to go wash this sperm out of my pussy before I get pregnant. Where is your bathroom?"' & 'The guys show you where their bathroom is and leave you alone to go clean up. You scoop their sperm out of your pussy as much as you can, and dry yourself off with a fluffy towel they laid out for you.'
 						dynamic $din_dush
@@ -731,7 +731,7 @@ if $args[0] = 'cards':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/placer_sex61.jpg"></center>'
 	'You smile at him and reply: "Cards sound like fun! Let''s do that."'
-	if kol_man > 2: 'One of the guys gets up and says: "Cards!? I don''t want to play fucking cards, even with a charming girl such as her. Sorry guys, I''m out of here."' & 'He leaves the room, leaving you alone with just <<$boydesc2>> and his friend. They just shrug, apparently that''s normal.'
+	if placerParameter['number_of_man'] > 2: 'One of the guys gets up and says: "Cards!? I don''t want to play fucking cards, even with a charming girl such as her. Sorry guys, I''m out of here."' & 'He leaves the room, leaving you alone with just <<$boydesc2>> and his friend. They just shrug, apparently that''s normal.'
 	'<<$boydesc2>> then suggests: "Alright... what do you want to play for? Money? Or... you''re such a beautiful girl, we could play for a favor instead?"'
 	'You and his friend nod, that sounds like it could be fun.'
 	act 'Play cards':

+ 4 - 4
locations/podval_rape.qsrc

@@ -6,15 +6,15 @@ gs 'stat'
 $boydesc2 = $boydesc
 if podvalrape = 0:
 	'You try to focus your view, to see where you are. It looks like a basement... there are no windows anywhere, and the room is rather dark. The guys push you down onto a dirty mattress in the room. Other than a lot of empty bottles and the mattress you''re on, the room is empty. You guess this is where they often take girls they meet in the park.'
-	'The <<$kol_man_text>> are discussing among themselves: "Alright guys, we got the slut here. I''m surprised she came so readily. Anyway... who gets to go first this time?"'
+	'The <<$placerStringParameter[''text_someone'']>> are discussing among themselves: "Alright guys, we got the slut here. I''m surprised she came so readily. Anyway... who gets to go first this time?"'
 
 	act 'Continue':
 		rape += 1
 		gang += 1
 		podvalrape = 1
 		gs 'sweat', 'add', 10
-		guy += kol_man
-		ciklkm = kol_man
+		guy += placerParameter['number_of_man']
+		ciklkm = placerParameter['number_of_man']
 
 		if podvalrapeQW = 0:podvalrapeQW = 1
 
@@ -67,7 +67,7 @@ elseif podvalrape = 1:
 		gs 'arousal', 'vaginal', 15, 'group', 'sub'
 		gs 'stat'
 		
-		act 'Continute': gt 'podval_rape'
+		act 'Continue': gt 'podval_rape'
 	else 
 		if rand (0,1) = 0:
 			act 'Continue':

+ 1 - 1
locations/prostitution_functions.qsrc

@@ -1072,7 +1072,7 @@ if $ARGS[0] = 'abortion':
 	abortionbirthdate = daystart
 
 	gs 'medical_din', 'remove_preg'
-	knowpregloss = 2
+	knowpregloss = 1
 
 	abortrand = rand(0, 10)
 	if age > 18:

+ 1 - 1
locations/sister_sex_talk.qsrc

@@ -444,7 +444,7 @@ end
 
 if $ARGS[0] = 'anal_virginity':
 	cla & *clr
-	'<center><img <<$set_imgh>> src="images/shared/sex/anal/anal23.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/sex/anal/doggy/anal23.jpg"></center>'
 	'"Two of my best friends both got their cherry popped by a guy we all hang out with. He was about <i>this close</i> to talking me into giving up mine, but I changed my mind at the last second. I would''ve let him, but I was still too scared of mom finding out, so I let him fuck my ass instead!" your sister giggles. "Turns out, that was his first ass fucking too. Made me feel special."'
 	gs 'sister_sex_talk', 'sex_talk_continue'
 end

+ 8 - 4
locations/stat.qsrc

@@ -866,9 +866,13 @@ else
 end
 
 !!stop auto birth control pill taking if the player believes they are pregnant or are pregnant
-if (thinkpreg = 1 or knowpreg = 1) and tabletkicheck = 1: tabletkicheck = 0
-
-if birth_control['remind_hour'] > 0 and hour >= birth_control['remind_hour'] and hour <= birth_control['remind_hour'] + 1 and tabletkiday ! daystart:
+if thinkpreg = 1 or knowpreg = 1:
+	if tabletkicheck = 1: tabletkicheck = 0
+	if birth_control['remind_hour'] > 0:
+		birth_control['remind_hour'] = 0
+		if birth_control['remind_icon'] = 1: birth_control['remind_icon'] = 0
+	end
+elseif birth_control['remind_hour'] > 0 and hour >= birth_control['remind_hour'] and hour <= birth_control['remind_hour'] + 1 and tabletkiday ! daystart:
 	birth_control['remind_icon'] = 1
 else
 	birth_control['remind_icon'] = 0
@@ -1075,7 +1079,7 @@ else
 	pornstar['icon'] = 0
 end
 
-if therapistday ! daystart and remindedtherapyday ! daystart and hypnoSchedule = 1 and (hour >= 18 and (minut > 45 or hour >= 19)) and (hour < 20 and (minut < 15 or hour < 19)) and menu_off = 0 and workDolg = 0:
+if therapistday ! daystart and remindedtherapyday ! daystart and week ! 4 and hypnoSchedule = 1 and (hour >= 18 and (minut > 45 or hour >= 19)) and (hour < 20 and (minut < 15 or hour < 19)) and menu_off = 0 and workDolg = 0:
 	remindedtherapyday = daystart
 	gt 'therapist_reminder'
 end

+ 15 - 11
locations/stat_display.qsrc

@@ -325,7 +325,7 @@ if hypnoAddict > 0:
 		$stat_hypno_tooltip = 'You feel moody for some reason.'
 	end
 end
-if therapistday ! daystart and hypnoSchedule = 1:
+if therapistday ! daystart and week ! 4 and hypnoSchedule = 1:
 	if $stat_hypno_msg ! '': 
 		$stat_hypno_msg += '<br>'
 		$stat_hypno_tooltip += '<br>'
@@ -697,7 +697,7 @@ $stat_clothes_msg = ''
 $stat_clothes_text = ''
 
 if $clothingworntype = 'nude':
-	if PanThinness >= 5:
+	if PanThinness >= 5 and $pantyworntype ! 'none':
 		if $braworntype = 'none':
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through panties, and your boobs sway invitingly as you walk.</font>'
 			$stat_clothes_tooltip = 'You are wearing your see-through panties.'
@@ -1331,9 +1331,11 @@ if cheatStatusIcons = 0:
 	end
 
 	if model['icon'] = 1:
-		if model['status'] > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:
+		if model_job_week >= 2:
+			$stat_model_msg = 'You have no more modeling jobs available this week.'
+		elseif model_job_week = 1:
 			$stat_model_msg = 'You can get paid for 1 more modeling job this week.'
-		elseif model['status'] > 0 and model_week < (daystart - week) / 7 and model_job_week < 1:
+		elseif model_job_week < 1:
 			$stat_model_msg = 'You can get paid for 2 modeling jobs this week.'
 		end
 		$statusIconBarTab += '<td><a href="exec: msg $stat_model_msg"><img title="<<$stat_model_msg>>" height = <<set_siconht>> src="images/system/icons/status/model_'+iif(theme['is_dark'] = 1, 'white', 'black')+'.png"></a></td>'
@@ -1356,7 +1358,7 @@ if cheatStatusIcons = 0:
 
 	if volleysostav > 0 and week = 6 and sorevday ! daystart and hour <= 18:
 		$stat_volleyball_msg = 'There is volleyball tournament today at 18:00.'
-		$statusIconBarTab += '<td><a href="exec: msg $stat_volleyball_msg"><img title="<<$stat_volleyball_msg>>" height = <<set_siconht>> src="images/system/icons/status/volleball'+iif(theme['is_dark'] = 1, '_white', '')+'.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec: msg $stat_volleyball_msg"><img title="<<$stat_volleyball_msg>>" height = <<set_siconht>> src="images/system/icons/status/volleyball'+iif(theme['is_dark'] = 1, '_white', '')+'.png"></a></td>'
 	end
 	
 	if pfilmNO ! 1:
@@ -2308,12 +2310,14 @@ if enable_extra_msg = 1:
 	end
 
 
-	if model['status'] > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
-		$stat_msg += '<BR><b>You have no more modeling jobs available this week.</b>'
-	elseif model['status'] > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:
-		$stat_msg += '<BR><b>You can get paid for 1 more modeling job this week.</b>'
-	elseif model['status'] > 0 and model_week < (daystart - week) / 7 and model_job_week < 1:
-		$stat_msg += '<BR><b>You can get paid for 2 modeling jobs this week.</b>'
+	if model['status'] > 0:
+		if model_job_week >= 2:
+			$stat_msg += '<BR><b>You have no more modeling jobs available this week.</b>'
+		elseif model_job_week = 1:
+			$stat_msg += '<BR><b>You can get paid for 1 more modeling job this week.</b>'
+		elseif model_job_week < 1:
+			$stat_msg += '<BR><b>You can get paid for 2 modeling jobs this week.</b>'
+		end
 	end
 
 	if pornstack > 0:

+ 1 - 1
locations/street_event.qsrc

@@ -910,7 +910,7 @@ if $ARGS[1] = 'main':
 				gs 'stat'
 				act 'Continue':gt $loc
 		!! when rainy and not wearing panties
-			elseif sunWeather = 0 and $pantyworntype = 'none':
+			elseif PCloSkirt > 2 and sunWeather = 0 and $pantyworntype = 'none':
 				*clr & cla
 				menu_off = 1
 				minut += 5

+ 2 - 0
locations/talent_agency.qsrc

@@ -212,6 +212,7 @@ if $ARGS[0] = 'SMTV_shy':
 	minut += 5
 	*clr & cla
 	gs 'clothing', 'strip_all'
+	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/citycenter/photo/fullstrip.mp4"></video></center>'
 	'Mr Yanovich makes no move to leave the room as you shyly take off all your clothes and awkwardly stand naked before him.'
 	'He stares appreciatively at your nude body.'
@@ -298,6 +299,7 @@ if $ARGS[0] = 'SMTV_confident':
 	minut += 5
 	*clr & cla
 	gs 'clothing', 'strip_all'
+	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/citycenter/photo/fullstrip.mp4"></video></center>'
 	'You confidently strip down in front of Mr Yanovich, not bothered by his presence.'
 	'He stares appreciatively at your nude body.'

+ 8 - 3
locations/therapist.qsrc

@@ -41,7 +41,12 @@ if $ARGS[0] = '':
 	
 	'As you look about the room, it has the appearance of a study; warm and inviting. Large windows face out to the forest beyond. There is a desk with a chair at one end of the room covered in folders and books about Hypnotherapy and other therapy materials, including a laptop. It is currently closed and looks clean, though seldom used. You see an older <a href="exec: VIEW ''images/locations/pavlovsk/clinic/therapist/pavlovfamily.jpg''">photograph of Dr. Pavlov''s family</a> in which he appears to be about two decades younger.'
 	gs 'stat'
-	gs 'therapist', 'hypnoGreet'
+	if hypnoSchedule = 1 and day ! 4 and hour ! 17:
+		'Your appointment is on Thursday at 17:00 we can talk about your problems then, too much treatment without time for your brain to process could be harmful."'
+		act 'Leave':gt $loc
+	else
+		gs 'therapist', 'hypnoGreet'
+	end
 end
 
 
@@ -57,7 +62,7 @@ if $ARGS[0] = 'hypnoGreet':
 				'You remain silent.'
 				'"That''s cheating and I will count it as panties."'
 				'"I''m sorry Dr. Pavlov... I don''t know what I was thinking. I-"'
-				'He interupts you and commands you to strip off your bodysuit and hand them to him.'
+				'He interrupts you and commands you to strip off your bodysuit and hand them to him.'
 
 				act 'Give Dr. Pavlov your bodysuit':
 					*clr & cla
@@ -2140,7 +2145,7 @@ if $ARGS[0] = 'hypnoRandom':
 		*clr & cla
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		'"Now that I''ve sufficiently broken your resistance, we need to make sure you show up more often. From now on, you will feel that you NEED my hypnotism treatment. You will feel that you NEED to scheduled therapy sessions every day between 6:00 and 18:00. I would prefer you be here before school so my seed will impregnate you while you sit in class, but you have to be here by at least 18:00 so you will not feel terrible. Do you understand, Cunt?"' 
+		'"Now that I''ve sufficiently broken your resistance, we need to make sure you show up more often. From now on, you will feel that you NEED my hypnotism treatment. You will feel that you NEED to scheduled therapy sessions every Thursday. I have clients until 18:00 so come after then but before 19:00, I''m not going to wait here all night for you. Do you understand, Cunt?"' 
 		'You nod "Yes, Master."'
 		hypnoSchedule = 1
 

+ 1 - 1
locations/uni_dorm.qsrc

@@ -185,7 +185,7 @@ if $ARGS[0] = 'second_floor':
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big260.jpg"></center>'
 						'Sofia opens the door. "Hey, <<$pcs_nickname>>! Katja is at the library right now and I have Maxim over so I don''t have time to talk. See you later!" she says before closing the door.'			
 					end
-				elseif (locat['katja'] = 32 or locat['katja'] = 33) and katjaQW['kitchen_day'] ! daystart
+				elseif (locat['katja'] = 32 or locat['katja'] = 33) and katjaQW['kitchen_day'] ! daystart:
 					'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 					'You knock on the door, but no one answers. Noticing what thime it is Katja is probably in the shared Kitchen eating or preparing food.'
 					act 'See if Katja is in the shared kitchen': gt 'katja_pantyquest', 'kitchen'

BIN
tools/Parser/qsp_parser.exe