소스 검색

Merge remote-tracking branch 'upstream/master' into pro_integration

netuttki 1 년 전
부모
커밋
3c45ab6b9e
100개의 변경된 파일3344개의 추가작업 그리고 1824개의 파일을 삭제
  1. 282 0
      changes from 0_8_6 to 0_8_7.txt
  2. 3 0
      glife.qproj
  3. 1 1
      locations/BMloc.qsrc
  4. 13 13
      locations/Cheatmenu_din.qsrc
  5. 1 27
      locations/Cum_Manage.qsrc
  6. 2 2
      locations/FedorEv2.qsrc
  7. 4 4
      locations/FedorMisc.qsrc
  8. 2 2
      locations/Gnpc2.qsrc
  9. 1 1
      locations/JuliaMilHome.qsrc
  10. 1 1
      locations/KatjaHomeTalk.qsrc
  11. 2 2
      locations/Katlake.qsrc
  12. 4 4
      locations/Komp.qsrc
  13. 2 2
      locations/MartinSex.qsrc
  14. 2 2
      locations/MartinTalk.qsrc
  15. 1 1
      locations/Military.qsrc
  16. 1 1
      locations/NikoDates.qsrc
  17. 1 1
      locations/NikoEv.qsrc
  18. 5 5
      locations/Nudelake.qsrc
  19. 0 1
      locations/Prostitute.qsrc
  20. 1 1
      locations/Vika.qsrc
  21. 4 4
      locations/WorkHosp.qsrc
  22. 2 2
      locations/abduction.qsrc
  23. 1 1
      locations/act_minor1.qsrc
  24. 563 542
      locations/albina_chat.qsrc
  25. 386 89
      locations/albina_house_events.qsrc
  26. 5 5
      locations/albina_starlets.qsrc
  27. 343 41
      locations/albina_wine_event.qsrc
  28. 16 16
      locations/albinahome.qsrc
  29. 2 2
      locations/alexandriaChat.qsrc
  30. 24 24
      locations/alexandriaEv.qsrc
  31. 4 4
      locations/anushapt.qsrc
  32. 4 4
      locations/anushaptbr.qsrc
  33. 10 10
      locations/anushkachat.qsrc
  34. 2 2
      locations/artem_events.qsrc
  35. 1 1
      locations/artemhome.qsrc
  36. 3 3
      locations/bass.qsrc
  37. 30 30
      locations/bbgamein.qsrc
  38. 37 37
      locations/bbgameout.qsrc
  39. 5 0
      locations/bed2.qsrc
  40. 1 1
      locations/bedrPar.qsrc
  41. 1 1
      locations/beg.qsrc
  42. 5 5
      locations/beg1.qsrc
  43. 6 7
      locations/belpicknick.qsrc
  44. 14 14
      locations/bicycle.qsrc
  45. 2 2
      locations/billiard.qsrc
  46. 0 12
      locations/booty_call.qsrc
  47. 554 183
      locations/booty_call_after.qsrc
  48. 413 0
      locations/booty_call_condoms.qsrc
  49. 27 8
      locations/booty_call_cum.qsrc
  50. 3 0
      locations/booty_call_morning.qsrc
  51. 24 5
      locations/booty_call_pillow_talk.qsrc
  52. 50 368
      locations/booty_call_sex.qsrc
  53. 22 13
      locations/booty_call_start.qsrc
  54. 2 2
      locations/booty_call_talk.qsrc
  55. 1 0
      locations/brothel.qsrc
  56. 2 2
      locations/brother.qsrc
  57. 4 4
      locations/buklinik_event.qsrc
  58. 19 19
      locations/camera.qsrc
  59. 4 4
      locations/castSpell.qsrc
  60. 2 2
      locations/chessplay.qsrc
  61. 1 1
      locations/city_church.qsrc
  62. 1 1
      locations/city_house_res_misc.qsrc
  63. 2 2
      locations/city_kafe.qsrc
  64. 1 1
      locations/city_kafeevents2.qsrc
  65. 2 2
      locations/city_lake.qsrc
  66. 1 1
      locations/city_library.qsrc
  67. 3 3
      locations/city_mansion_residence_2.qsrc
  68. 1 1
      locations/city_mansion_residence_3.qsrc
  69. 2 2
      locations/city_nightclub.qsrc
  70. 4 4
      locations/city_park.qsrc
  71. 1 1
      locations/city_sauna.qsrc
  72. 0 1
      locations/city_saunawhore.qsrc
  73. 1 1
      locations/crossfit_north_box.qsrc
  74. 6 6
      locations/danceclass.qsrc
  75. 2 2
      locations/djibril.qsrc
  76. 2 2
      locations/djibrilev1.qsrc
  77. 4 4
      locations/dk.qsrc
  78. 1 1
      locations/dom_gor.qsrc
  79. 1 0
      locations/drugs.qsrc
  80. 6 6
      locations/etoexhib.qsrc
  81. 1 1
      locations/eugeneev1.qsrc
  82. 7 7
      locations/events.qsrc
  83. 40 28
      locations/exercise.qsrc
  84. 22 0
      locations/exp_gain.qsrc
  85. 3 3
      locations/fame.qsrc
  86. 1 1
      locations/father.qsrc
  87. 23 23
      locations/fbgameout.qsrc
  88. 11 11
      locations/fit.qsrc
  89. 47 27
      locations/foto.qsrc
  90. 135 56
      locations/foto_events.qsrc
  91. 3 3
      locations/foto_events2.qsrc
  92. 1 1
      locations/foto_model_documentary.qsrc
  93. 13 13
      locations/foto_models2.qsrc
  94. 16 16
      locations/foto_practice.qsrc
  95. 18 18
      locations/foto_shoot.qsrc
  96. 1 1
      locations/gad_church.qsrc
  97. 2 2
      locations/gaddvor.qsrc
  98. 14 14
      locations/gadfield.qsrc
  99. 1 1
      locations/gadforest.qsrc
  100. 16 16
      locations/gadforestlost.qsrc

+ 282 - 0
changes from 0_8_6 to 0_8_7.txt

@@ -0,0 +1,282 @@
+Locations:
+
+=== added locations ===
+
+$attributes_lusso_bodysuit
+$attributes_lusso_bra
+$attributes_lusso_panties
+$attributes_moncheri_bodysuit
+$pcs_outfit_image
+$shoe_description2 <-- shoe_description2
+booty_call
+booty_call_after
+booty_call_cum
+booty_call_morning
+booty_call_pillow_talk
+booty_call_sex
+booty_call_shower
+booty_call_sms
+booty_call_start
+booty_call_stats
+booty_call_talk
+booty_call_virgin
+hookup_female
+hookup_rape
+journal_uni
+katja_dorm
+katja_chat
+katja_procedural
+katja_uni
+katja_uni_sex
+model_anastasia
+model_krystal
+model_mari
+natbel_cp_1
+natbel_friend
+natbel_chat
+npcstatic6
+underwear_attributes
+underwear_bodysuits
+underwear_descriptions
+uni_events
+yearstart
+Zvereva_house
+Zvereva_house_events
+Zvereva_schedule
+Zvereva_Sly_events
+Zvereva_Sly_sex
+
+=== deleted locations ===
+
+$menu_mobila
+artgar
+city_lake_path
+family
+gdksex
+LariskaStart
+pavlov_home
+shoe_description2 --> $shoe_description2
+unicoursework
+Zvereva_domme_1
+
+Variables:
+
+=== Deleted variables ===
+
+[Numeric variables]
+
+afra
+anyaloc
+apmeet
+apmeetday
+ArendHouseSL4_due
+arthakQW
+bra_none
+BronzeMedal
+clrbelo
+clrbra
+csb_start
+detention
+dostupindorf	--> locat['Fam_set_month_inGad']
+fame_model_event
+family_trip_month
+father_go
+gaptek_aunt_hours
+gaptek_timers
+gaptekfirstbirthcontrol
+gaptekfirstcondom
+gaptekfirstlube
+gaptekfirstmorningafter
+gaptekfirstpregtest
+gdksex
+GoldMedal
+goth_clothing
+grandaQW
+hypnoHairStyle
+indorf			--> locat['Fam_inGad']
+indorf_month	--> locat['Fam_month_inGad']
+internet_store
+kats_bras		--> cats_bras
+kats_brasS		--> cats_brasS
+kats_panties	--> cats_panties
+kats_pantiesS	--> cats_pantiesS
+kolloc
+lariloc
+laris_rand1
+LariskaHomeIn
+lariskaQwestStart
+lazar_threesome
+loopmarket_outfits
+m_day
+model_chatter
+modelfoto_catalog
+modelfoto_erotic
+modelfoto_fashion
+modelfoto_fitness
+modelfoto_glamour
+modelfoto_lingerie
+modelfoto_nip
+momclean1
+momclean2
+momloc
+mother_go
+motherknowsdildo
+motherpirsadbytalk
+motherQS
+narkossista
+ocpd_room
+panty_none
+pffilmday
+pillsdays
+pirsGL
+puff_nip
+sdadloc
+SilverMedal
+sister_indorf	--> locat['Anya_Gad']
+sister_opr_indorf	--> locat['Anya_check_Gad']
+skill_model_event
+sobaka
+surname
+tabletkicpd
+tempSchtype
+
+[String variables]
+
+$actresslife
+$hypnoKitchenDirtiness
+$namesob
+$npclastsaveddesc
+$objmobila
+$pornactor
+$preshave
+$randdoc
+$slava_bj
+$spDick
+$tempSchbrand
+$unicourseworkloc
+$vaginatipe2
+$VirginHookUp
+$wornclothingtype
+
+
+=== Added variables ===
+
+[Numeric variables]
+
+actresslife
+bodysuitwornnumber
+booty_call
+boutique_bodysuit
+Boyfriend
+BraCover
+BraFun
+BraMaterial
+BraQuality
+BraThinness
+BraType
+cats_bras		<-- kats_bras
+cats_brasS		<-- kats_brasS
+cats_panties	<-- kats_panties
+cats_pantiesS	<-- kats_pantiesS
+condom_break
+cum_loc
+defbodysuitnumber
+defunderwear
+changingroom_underwear
+internet_free
+item_moisturizer_time
+kuni_no
+kuni_yes
+lastwornbodysuitnumber
+lusso_bodysuits
+lusso_bodysuits_s
+metka_bodysuits
+npc_aggressive
+npc_apt_bedroom
+npc_ask_creampie
+npc_birh
+npc_bj_cum_warn
+npc_bootycalls
+npc_boyfriend_creampie_rule
+npc_caretaker
+npc_creampie_count
+npc_creampie_okay
+npc_cum_count
+npc_cum_gag
+npc_cum_hand_count
+npc_cum_pref_know
+npc_cum_together_count
+npc_dont_like_creampie
+npc_facial_count
+npc_fake_orgasm_count
+npc_cheating_know
+npc_know_bc
+npc_know_cheat
+npc_know_love_creampie
+npc_know_love_swallow
+npc_know_not_bc
+npc_like_cum_taste
+npc_mouth_cum_count
+npc_need_ask_creampie
+npc_no_kiss
+npc_orgasm_count
+npc_pullout_count
+npc_pussyeater_know
+npc_rel_daily
+npc_seen_swallow
+npc_sex_speed
+npc_shower_sex_count
+npc_spit_count
+npc_swallow_count
+npc_willpwr
+PanCoverBack
+PanCoverFront
+PanMaterial
+PanQuality
+PanStyle
+PanThinness
+PantyFun
+PanType
+PBraCover
+PBraFun
+PBraMaterial
+PBraQuality
+PBraThinness
+PBraType
+pharmacy
+pharmacy_timers
+pharmacyfirstbirthcontrol
+pharmacyfirstlube
+pharmacyfirstpregtest
+PPanCoverBack
+PPanCoverFront
+PPanMaterial
+PPanQuality
+PPanThinness
+PPantyFun
+price_set
+sofiaQW
+sportsbodysuitnumber
+sportsunderwear
+tempbodysuitnumber
+underwear
+yearstart
+
+[String variables]
+
+$actress
+$bodysuitworntype
+$booty_call
+$class_name
+$defbodysuittype
+$foto_documentary
+$fuckbuddy
+$lastwornbodysuittype
+$lover_drawn
+$mari
+$model
+$npc_abusive
+$npc_lovername
+$shop_name
+$sportsbodysuittype
+$tempbodysuittype

+ 3 - 0
glife.qproj

@@ -39,6 +39,7 @@
 		<Location name="stat_display"/>
 		<Location name="stat_sklattrib"/>
 		<Location name="stat_sklattrib_lvlset"/>
+		<Location name="exp_gain"/>
 		<Location name="fame"/>
 		<Location name="traits"/>
 		<Location name="din_bad"/>
@@ -638,6 +639,7 @@
 		<Location name="booty_call"/>
 		<Location name="booty_call_start"/>
 		<Location name="booty_call_after"/>
+		<Location name="booty_call_condoms"/>
 		<Location name="booty_call_cum"/>
 		<Location name="booty_call_talk"/>
 		<Location name="booty_call_pillow_talk"/>
@@ -705,6 +707,7 @@
 		<Location name="albina_mother_events"/>
 		<Location name="albina_election_events"/>
 		<Location name="albina_starlets"/>
+		<Location name="albina_wine_event"/>
 	</Folder>
 	<Folder name="Lariska">
 		<Location name="LariskaGo"/>

+ 1 - 1
locations/BMloc.qsrc

@@ -35,7 +35,7 @@ act 'Dance':
 	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
-			sprt_exp += rand(0,1)
+			gs 'exp_gain', 'sprt', rand(0,1)
 			gs 'willpower', 'drink', 'resist'
 			gs 'willpower', 'pay'
 			gs 'stat'

+ 13 - 13
locations/Cheatmenu_din.qsrc

@@ -1192,19 +1192,19 @@ $cheatmenu['stats'] = {
 	*nl
 	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
 		*pl'<b>School:</b>'
-		if class['school_math_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''math'', 10 & dynamic $cheatmenu[''stats'']">Improve your Math grade: <<class[''school_math_grade'']>></a>'
-		if class['school_rus_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''rus'', 10 & dynamic $cheatmenu[''stats'']">Improve your Russian grade: <<class[''school_rus_grade'']>></a>'
-		if class['school_lit_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''lit'', 10 & dynamic $cheatmenu[''stats'']">Improve your Literature grade: <<class[''school_lit_grade'']>></a>'
-		if class['school_art_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''art'', 10 & dynamic $cheatmenu[''stats'']">Improve your Art grade: <<class[''school_art_grade'']>></a>'
-		if class['school_bio_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''bio'', 10 & dynamic $cheatmenu[''stats'']">Improve your Biology grade: <<class[''school_bio_grade'']>></a>'
-		if class['school_eng_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''eng'', 10 & dynamic $cheatmenu[''stats'']">Improve your English grade: <<class[''school_eng_grade'']>></a>'
-		if class['school_geo_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''geo'', 10 & dynamic $cheatmenu[''stats'']">Improve your Geography grade: <<class[''school_geo_grade'']>></a>'
-		if class['school_sci_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''sci'', 10 & dynamic $cheatmenu[''stats'']">Improve your Science grade: <<class[''school_sci_grade'']>></a>'
-		if class['school_his_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''his'', 10 & dynamic $cheatmenu[''stats'']">Improve your History grade: <<class[''school_his_grade'']>></a>'
-		if class['school_shop_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''shop'', 10 & dynamic $cheatmenu[''stats'']">Improve your Shop grade: <<class[''school_shop_grade'']>></a>'
-		if class['school_comp_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''comp'', 10 & dynamic $cheatmenu[''stats'']">Improve your Computer grade: <<class[''school_comp_grade'']>></a>'
-		if class['school_mus_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''mus'', 10 & dynamic $cheatmenu[''stats'']">Improve your Music grade: <<class[''school_mus_grade'']>></a>'
-		if class['school_pe_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''pe'', 10 & dynamic $cheatmenu[''stats'']">Improve your P.E. grade: <<class[''school_pe_grade'']>></a>'
+		if class['school_math_grade'] < 100:*pl'Math grade: <<class[''school_math_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''math'', 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''math'', -10 & dynamic $cheatmenu[''stats'']">-10</a>'
+		if class['school_rus_grade'] < 100:*pl'Russian grade: <<class[''school_rus_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''rus'', 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''rus'', -10 & dynamic $cheatmenu[''stats'']">-10</a>'
+		if class['school_lit_grade'] < 100:*pl'Literature grade: <<class[''school_lit_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''lit'', 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''lit'', -10 & dynamic $cheatmenu[''stats'']">-10</a>'
+		if class['school_art_grade'] < 100:*pl'Art grade: <<class[''school_art_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''art'', 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''art'', -10 & dynamic $cheatmenu[''stats'']">-10</a>'
+		if class['school_bio_grade'] < 100:*pl'Biology grade: <<class[''school_bio_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''bio'', 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''bio'', -10 & dynamic $cheatmenu[''stats'']">-10</a>'
+		if class['school_eng_grade'] < 100:*pl'English grade: <<class[''school_eng_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''eng'', 10 & dynamic $cheatmenu[''stats'']"> +10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''eng'', -10 & dynamic $cheatmenu[''stats'']"> -10</a>'
+		if class['school_geo_grade'] < 100:*pl'Geography grade: <<class[''school_geo_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''geo'', 10 & dynamic $cheatmenu[''stats'']"> +10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''geo'', 10 & dynamic $cheatmenu[''stats'']"> -10</a>'
+		if class['school_sci_grade'] < 100:*pl'Science grade: <<class[''school_sci_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''sci'', 10 & dynamic $cheatmenu[''stats'']"> +10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''sci'', -10 & dynamic $cheatmenu[''stats'']"> -10</a>'
+		if class['school_his_grade'] < 100:*pl'History grade: <<class[''school_his_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''his'', 10 & dynamic $cheatmenu[''stats'']"> +10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''his'', -10 & dynamic $cheatmenu[''stats'']"> -10</a>'
+		if class['school_shop_grade'] < 100:*pl'Shop grade: <<class[''school_shop_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''shop'', 10 & dynamic $cheatmenu[''stats'']"> +10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''shop'', -10 & dynamic $cheatmenu[''stats'']"> -10</a>'
+		if class['school_comp_grade'] < 100:*pl'Computer grade: <<class[''school_comp_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''comp'', 10 & dynamic $cheatmenu[''stats'']"> +10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''comp'', -10 & dynamic $cheatmenu[''stats'']"> -10</a>'
+		if class['school_mus_grade'] < 100:*pl'Music grade: <<class[''school_mus_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''mus'', 10 & dynamic $cheatmenu[''stats'']"> +10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''mus'', -10 & dynamic $cheatmenu[''stats'']"> -10</a>'
+		if class['school_pe_grade'] < 100:*pl'P.E. grade: <<class[''school_pe_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''pe'', 10 & dynamic $cheatmenu[''stats'']"> +10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''pe'', -10 & dynamic $cheatmenu[''stats'']"> -10</a>'
 		if schoolprogul >= 0:*pl'<a href="exec:schoolprogul = 0 & dynamic $cheatmenu[''stats'']">Zero Absenteeism (School): <<schoolprogul>></a>'
 		*nl
 	end

+ 1 - 27
locations/Cum_Manage.qsrc

@@ -214,38 +214,12 @@ if $ARGS[0] = '':
 
 					if slip_thresh < 4: slip_thresh = 4
 					break_thresh += slip_thresh
+					slip_thresh = 0
 
 					if temprand = 0:
 						cumarrcpt[cumarrtemp] += cumarrppt[cumarrtemp]/4
 						cumarrcon[cumarrtemp] = 3
 
-					elseif temprand <= slip_thresh:
-						cumarrcpt[cumarrtemp] += cumarrppt[cumarrtemp]/200
-						cumarrcon[cumarrtemp] = 5
-						cumcondslip = 1
-						cumcondsanb = cumarrtemp
-						sexcontra = 5
-						sparrage[sparrtemp] = 0
-						sparrloc[sparrtemp] = 17
-						$sparrnam[sparrtemp] = $boy
-						sparrcnt[sparrtemp] = stat['cum_count']
-						sparrppt[sparrtemp] = sexspecpot
-
-
-						sparrvol[sparrtemp] += sexvolume
-						cumsumbod += sexvolume
-						cumsumvag += sexvolume
-
-
-						sparridt[sparrtemp] = cumarrkno[cumarrtemp]
-						sparrslc[sparrtemp] = 0
-
-						cumcondslip += 1
-						if cumcondslip_deep <= 0:cumcondslip_deep = rand(1, dick)
-						if sparridt[sparrtemp] >= 0:cumcondslip_aware = 1
-
-						dynamic $ferteggfather
-
 					elseif temprand <= break_thresh:
 						cumarrcpt[cumarrtemp] += cumarrppt[cumarrtemp]/2
 						cumarrcon[cumarrtemp] = 4

+ 2 - 2
locations/FedorEv2.qsrc

@@ -827,7 +827,7 @@ if $ARGS[0] = 'Park 2':
 	if VKwip = 100:
 		act 'Go jogging':	
 			*clr & cla
-			react_exp += rand(1, 2)	
+			gs 'exp_gain', 'react', rand(1, 2)	
 			fat -= 1
 			pcs_mood -= 5
 			gs 'sweat', 'add', 30			
@@ -838,7 +838,7 @@ if $ARGS[0] = 'Park 2':
 
 			act 'VKwip':	
 				*clr & cla
-				agil_exp += rand(1, 2)
+				gs 'exp_gain', 'agil', rand(1, 2)
 				fat -= 1
 				pcs_mood -= 5
 				gs 'sweat', 'add', 30			

+ 4 - 4
locations/FedorMisc.qsrc

@@ -644,7 +644,7 @@ if $ARGS[0] = 'Strength':
 	*clr & cla
 	menu_off = 1
 	minut += 30
-	stren_exp += rand(1, 4) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+	gs 'exp_gain', 'stren', rand(1, 4) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 	fat -= 1
 	pcs_mood += 5
 	gs 'sweat', 'add', 30
@@ -687,8 +687,8 @@ if $ARGS[0] = 'Agility':
 	*clr & cla
 	menu_off = 1
 	minut += 30
-	react_exp += rand(1, 3)
-	agil_exp += rand(1, 3)
+	gs 'exp_gain', 'react', rand(1, 3)
+	gs 'exp_gain', 'agil', rand(1, 3)
 	fat -= 1
 	pcs_mood += 5
 	gs 'sweat', 'add', 30
@@ -731,7 +731,7 @@ if $ARGS[0] = 'Endurance':
 	*clr & cla
 	menu_off = 1
 	minut += 30
-	vital_exp += rand(1, 4)
+	gs 'exp_gain', 'vital', rand(1, 4)
 	fat -= 1
 	pcs_mood += 5
 	gs 'sweat', 'add', 30

+ 2 - 2
locations/Gnpc2.qsrc

@@ -57,7 +57,7 @@ $din_gboy_go_to_disco = {
 		end
 
 		minut += 120
-		if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
+		if pcs_danc < 50 and pcs_agil >= pcs_danc:gs 'exp_gain', 'danc', 1
 		pcs_mood += 10
 		gs 'stat'
 		diskoIvrand = rand(0, 100)
@@ -282,7 +282,7 @@ $din_gboy_go_to_disco = {
 					act 'Decline his offer and keep dancing (<<will_cost>> Willpower)':
 						cla
 						gs 'willpower', 'pay', 'resist'
-						if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
+						if pcs_danc < 50 and pcs_agil >= pcs_danc:gs 'exp_gain', 'danc', 1
 						minut += 5
 						gs 'stat'
 						'Your <<$bfTitle[numnpc]>> gets himself a beer at the bar and in the meantime you continue to dance.'

+ 1 - 1
locations/JuliaMilHome.qsrc

@@ -28,7 +28,7 @@ if lernHome > 0 and juliaQW['homework_day'] ! daystart:
 		juliaQW['homework_day'] = daystart
 		gs 'npc_relationship', 'modify', 'A12', 'love' 
 		lern += rand(3,6)
-		intel_exp += rand(1,2) + (mentats_dose - rand(0,mentats_dose))
+		gs 'exp_gain', 'intel', rand(1,2) + (mentats_dose - rand(0,mentats_dose))
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
 		'You spend an hour doing your homework with Julia, and thanks to her you manage to learn quite a lot. She''s a very clever girl, and good at explaining things.'

+ 1 - 1
locations/KatjaHomeTalk.qsrc

@@ -963,7 +963,7 @@ if $ARGS[0] = 'homework':
 	npc_rel['A14'] += 2
 	gs 'grades', 'homework', 'school', 'yes', 1, 1, 'A14'
 	lern += rand(2, 4)
-	intel_exp += rand(0, 1) + (mentats_dose - rand(0,mentats_dose))
+	gs 'exp_gain', 'intel', rand(0, 1) + (mentats_dose - rand(0,mentats_dose))
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'For half an hour you and Katja pour over your books, you fully learn the lessons and pretty well understand the material.'

+ 2 - 2
locations/Katlake.qsrc

@@ -88,8 +88,8 @@ if $ARGS[0] = 'voleybol':
 	katday = daystart
 	npc_rel['A219'] += 3
 	minut += 30
-	agil_exp += 1
-	react_exp += 1
+	gs 'exp_gain', 'agil', 1
+	gs 'exp_gain', 'react', 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/volleyball.jpg"></center>'
 	'"Hey, Kat! Want to go play some volleyball over there? Those girls look like they could use some competition!" you say.'

+ 4 - 4
locations/Komp.qsrc

@@ -509,8 +509,8 @@ if $ARGS[0] = 'study':
 	minut = minut + 60
 	elektro = elektro + 3
 	if internet_free = 0: internet -= 1
-	intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
-	compskl_exp += 1
+	gs 'exp_gain', 'intel', 1 + (mentats_dose - rand(0,mentats_dose))
+	gs 'exp_gain', 'compskl', 1
 	'<center><b>The Institute for Education Measurement</b></center>'
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/study.jpg"></center>'
 	'You spend an hour on the IEM website, reading news articles and educational blogs. You feel a bit smarter afterwards.'
@@ -1504,7 +1504,7 @@ if $ARGS[0] = 'waitclients':
 				'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/strip5.mp4"></video></center>'
 				'Turning on some music you dance eroticly hoping to entice some viewers.'
 			end	
-			dancero_exp += 1
+			gs 'exp_gain', 'dancero', 1
 			gs 'arousal', 'porn', 5
 			gs 'stat'
 			act 'Continue':gt 'komp','waitclients'
@@ -1527,7 +1527,7 @@ if $ARGS[0] = 'waitclients':
 			end
 			'<center><video autoplay loop src="images/locations/city/residential/sauna/sex/striptease4.mp4"></video></center>'
 			'You decide that making a show of stripping yourself might encourage some attention.  Repositioning your cam, you stand up and dance as you remove your underwear.'
-			dancero_exp += 1
+			gs 'exp_gain', 'dancero', 1
 			topmfc = 0
 			backmfc = 0
 			gs 'arousal', 'porn', 3

+ 2 - 2
locations/MartinSex.qsrc

@@ -453,7 +453,7 @@ if $ARGS[0] = 'MartinTease':
 	if MartinStripVar = 1:
 		MartinSex = 1
 		MartinSexTalk = 2
-		if pcs_dancero <= 50:dancero_exp += rand(2,5)
+		if pcs_dancero <= 50:gs 'exp_gain', 'dancero', rand(2,5)
 		inhib_exp += rand(1,3)
 
 		if $pantyworntype ! 'none':
@@ -645,7 +645,7 @@ if $ARGS[0] = 'MartinTease2':
 end
 
 if $ARGS[0] = 'MartinTease3':
-	if pcs_dancero <= 50:dancero_exp += rand(2,5)
+	if pcs_dancero <= 50:gs 'exp_gain', 'dancero', rand(2,5)
 	inhib_exp += rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/tease1.jpg"></center>'
 	'Feeling in the mood to give Martin a bit of a show today, you give him a soft push, just strong enough to make him get the hint and sit down on the chair behind him.'

+ 2 - 2
locations/MartinTalk.qsrc

@@ -480,7 +480,7 @@ if $ARGS[0] = '':
 				*nl
 				
 				if pcs_persuas < 30:
-					persuas_exp += rand(2,5)
+					gs 'exp_gain', 'persuas', rand(2,5)
 					
 					if age >= 18:
 						gs 'npc_relationship', 'modify', 'A216', -10
@@ -521,7 +521,7 @@ if $ARGS[0] = '':
 					end
 				
 				else
-					persuas_exp += rand(4,6)
+					gs 'exp_gain', 'persuas', rand(4,6)
 					npc_rel['A216'] -= 2
 					pcs_mood -= rand(1,3)
 					'"My parents sent me to school a year later than usual. Thought it''d be good if I had more childhood," you say quickly.'

+ 1 - 1
locations/Military.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 		menu_off = 1
 		minut += 60
 		sanrand = rand(0, 10)
-		medcn_exp += rand (0,2) 
+		gs 'exp_gain', 'medcn', rand (0,2) 
 		gs 'stat'
 
 		if sanrand = 0:gt 'Military', 'san0'

+ 1 - 1
locations/NikoDates.qsrc

@@ -1250,7 +1250,7 @@ if $ARGS[0] = 'Disco':
 
 		act 'Dance':
 			*clr & cla
-			danc_exp += rand(1,3)
+			gs 'exp_gain', 'danc', rand(1,3)
 			minut += 5
 			gs'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/disco/dance1.mp4"></video></center>'

+ 1 - 1
locations/NikoEv.qsrc

@@ -543,7 +543,7 @@ if $ARGS[0] = 'Disco Chat':
 	if NikoLuv > -4 and  NikoPayback = 0:
 		act 'Dance':	
 			*clr & cla
-			danc_exp += rand(1,3)
+			gs 'exp_gain', 'danc', rand(1,3)
 			NikoLuv += 1
 			npc_rel['A189'] += rand(5,10)
 			minut += 10

+ 5 - 5
locations/Nudelake.qsrc

@@ -133,9 +133,9 @@ if $ARGS[0] = 'voleybol':
 		menu_off = 1
 		cla
 		*clr
-		agil_exp += 1
-		react_exp += 1
-		vball_exp += rand(1,3)
+		gs 'exp_gain', 'agil', 1
+		gs 'exp_gain', 'react', 1
+		gs 'exp_gain', 'vball', rand(1,3)
 		minut += 30
 		inhib_exp += rand(1,3)
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/volleyball.jpg"></center>'
@@ -185,10 +185,10 @@ if $ARGS[0] = 'swim':
 	gs 'cum_cleanup'
 	minut += 60
 	if $clothingworntype = 'nude':
-		gs 'exercise', 'tier1', 1, 'stren_exp'
+		gs 'exercise', 'tier1', 1, 'stren'
 		inhib_exp += rand(1,3)
 	else
-		gs 'exercise', 'tier1', 1, 'stren_exp'
+		gs 'exercise', 'tier1', 1, 'stren'
 		if pcs_inhib < 50:inhib_exp += rand(1,3)
 	end
 	pcs_sweat = 10 + rand(0,4)

+ 0 - 1
locations/Prostitute.qsrc

@@ -296,7 +296,6 @@ if $ARGS[0] = 'work2':
 		gs 'npcgeneratec', 0, '"John"', rand(18,45)
 		gs 'boyStat', $npclastgenerated
 		!! gs 'boy', 'details'    & !! does not seem to be needed for "Johns"
-		slutty += 1
 		guy += 1
 		if pcs_throat < dick: pcs_throat += 1
 

+ 1 - 1
locations/Vika.qsrc

@@ -178,7 +178,7 @@ end
 
 if $ARGS[0] = 'study':
 	minut += 60
-	intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
+	gs 'exp_gain', 'intel', 1 + (mentats_dose - rand(0,mentats_dose))
 	gs 'npc_relationship', 'modify', 'A220', 'like'
 	gs 'stat'
 

+ 4 - 4
locations/WorkHosp.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 	act 'Work in the operating room (1:00)':
 		cla
 		minut += 60
-		medcn_exp += rand (0,2) 
+		gs 'exp_gain', 'medcn', rand (0,2) 
 
 		if jobhosprand = 0:gt 'WorkHosp', '2'
 
@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 	act 'Help the doctors in the emergency room (1:00)':
 		cla
 		minut += 60
-		medcn_exp += rand (0,2)
+		gs 'exp_gain', 'medcn', rand (0,2)
 
 		if jobhosprand = 0:gt 'WorkHosp', '3'
 
@@ -235,7 +235,7 @@ if $ARGS[0] = '2':
 	'A patient comes through the door and takes off his pants to show you his flaccid penis. He asks you to help him, as he can''t seem to get an erection and it''s causing him depression. You realize that it''s all just a silly game and that he hopes to fuck you, but you still feel sorry for him. You wonder what caused him to come up with this plan and decide it might just be that he has no luck with girls, and if today is not his lucky day, he may jump out of the window.'
 	
 	act 'Oust him':
-		medcn_exp += rand (0,1) 
+		gs 'exp_gain', 'medcn', rand (0,1) 
 		gt 'WorkHosp', 'start'
 	end
 	
@@ -256,7 +256,7 @@ if $ARGS[0] = '3':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex12.jpg"></center>'
 	'A pretty patient comes into the room, and the doctor tries to examine her. Then she touches his trousers near his poorly hidden erection. The doctor glances at you with a question in his eyes.'
 	
-	act 'Ask if she actually needs treatment':medcn_exp += rand (0,1) & gt 'WorkHosp', 'start'
+	act 'Ask if she actually needs treatment':gs 'exp_gain', 'medcn', rand (0,1) & gt 'WorkHosp', 'start'
     
 	gs 'willpower', 'sex', 'self'
 	if will_cost <= pcs_willpwr: 

+ 2 - 2
locations/abduction.qsrc

@@ -685,7 +685,7 @@ end
 if $ARGS[0] = 'abdexercise':
 	*clr & cla
 	menu_off = 1
-	gs 'exercise', 'tier2', 30, 'stren_exp'
+	gs 'exercise', 'tier2', 30, 'stren'
 	
 	'<center><video autoplay loop src="images/pc/activities/exercises/push_nude.mp4"></video></center>'
 	*nl
@@ -706,7 +706,7 @@ if $ARGS[0] = 'abdexercise':
 	act 'Continue':
 		*clr & cla
 		menu_off = 1
-		gs 'exercise', 'tier2', 30, 'vital_exp'
+		gs 'exercise', 'tier2', 30, 'vital'
 		
 		'<center><video autoplay loop src="images/pc/activities/exercises/abdominal_nude.mp4"></video></center>'
 		*nl

+ 1 - 1
locations/act_minor1.qsrc

@@ -161,7 +161,7 @@ if $ARGS[0] = 'diner_waitress1':
 end
 
 if $ARGS[0] = 'diner_waitress2':
-	if pcs_perform < 50:perform_exp += 5
+	if pcs_perform < 50:gs 'exp_gain', 'perform', 5
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/backgrounds/bedroom1.jpg"></center>'
 	'You step on set while everybody else is setting up. Your co-star for the scene and the main character for the show is already naked on the bed. A production assistant notices your arrival and instructs you to take of your robe and get up there with him so they can frame the shot.'
 	act'Get on the bed':

+ 563 - 542
locations/albina_chat.qsrc

@@ -6,13 +6,9 @@ if $ARGS[0] = 'chat':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	act 'Stop talking': gt 'albinahome', 'bedroom'
-	act 'Make small talk':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-		'You chat about a variety of things, including school, music, clothes and what has been going on in Pavlovsk lately.'
-		act 'Stop talking': gt 'albinahome', 'bedroom'
-		act 'Change the subject': gt 'albina_chat', 'chat'
-	end
+	act 'Make small talk':gt'albina_chat','small_talk2'
+	act 'Talk about sex':gt'albina_chat','sex_talk_start'
+	
 	if AlbinaQW['Maid'] <= daystart:
 		act 'The new maid':
 			*clr & cla
@@ -49,7 +45,6 @@ if $ARGS[0] = 'chat':
 				'"So there''s nothing serious then? No chance of you guys ever becoming a couple?"'
 				'She hesitates, as if trying to decide how much to say.'
 				'"Lazar was a shoulder for me to cry on when I needed it. He listened to me and helped me when I was down without expecting anything in return. He was and still is a good friend to me. It ended up turning into casual sex one day and we found we liked it that way. We''re never going to hook up, end of story." She really doesn''t want to continue this conversation and you know better than to push your luck with her.'
-				'"So what about you? Hooked up with anyone?" she asks, turning the conversation on you.'
 			else
 				'"What''s the deal with you and Lazar?" you ask her.'
 				'What do you mean?" She gives you a puzzled look.'
@@ -57,8 +52,9 @@ if $ARGS[0] = 'chat':
 				'"No, we''re just friends with benefits. Or ''fuck buddies'' as Marcus says it''s called in America. We just have sex when we feel like it, no strings attached. I don''t care about being his ''girlfriend'' and he enjoys all the female attention he gets. It would never work between us."'
 				'"So there''s nothing serious then? No chance of you guys ever becoming a couple?"'
 				'She hesitates, as if trying to decide how much to say. "Look <<$pcs_nickname>>, Lazar was a shoulder for me to cry on when I needed it. He listened to me and helped me when I was down without expecting anything in return. He was and still is a good friend to me. It ended up turning into casual sex one day and we found we liked it that way. We''re never going to hook up, end of story." She really doesn''t want to continue this conversation and you know better than to push your luck with her.'
-				'"So what about you? Hooked up with anyone?" she asks, turning the conversation on you.'
 			end
+			*nl
+			'"So what about you? Hooked up with anyone?" she asks, turning the conversation on you.'
 			act 'No':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -67,14 +63,57 @@ if $ARGS[0] = 'chat':
 				act 'Stop talking': gt 'albinahome', 'bedroom'
 				act 'Change the subject': gt 'albina_chat', 'chat'
 			end
-			act 'Same as you':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-				'You smile at her. "I''m in the same boat as you. I like it keeping things casual. It''s just easier that way."'
-				'She smiles. "Don''t I know it. I just want some good fucking sex, not a cheesy love story."'
-				act 'Stop talking': gt 'albinahome', 'bedroom'
-				act 'Change the subject': gt 'albina_chat', 'chat'
+			
+			if arrsize('$fuckbuddy') = 1:
+				act'I have a fuckbuddy':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+					'"Pretty much the same deal as you," you smile. "I keep it casual with a fuckbuddy. We booty call each other whenever we want to get off."'
+					'"Better that way, isn''t it?" Albina smirks. "Romance is overrated. Let''s not kid ourselves. We''re all in it for the fucking."'
+					act 'Stop talking': gt 'albinahome', 'bedroom'
+					act 'Change the subject': gt 'albina_chat', 'chat'
+				end
+			elseif arrsize('$fuckbuddy') > 1:
+				act'I have a few fuckbuddies':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+					'"Pretty much the same deal as you," you smile. "I keep it casual with a few fuckbuddies I have stashed around the way. They booty call me whenever they want to hook up."'
+					'"Better that way, isn''t it?" Albina smirks. "Romance is overrated. Let''s not kid ourselves. Even couples are just looking for an excuse to fuck."'
+					act 'Stop talking': gt 'albinahome', 'bedroom'
+					act 'Change the subject': gt 'albina_chat', 'chat'
+				end
 			end
+			
+			if stat['hookup'] > 0:
+				act'I hook up with random guys':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+					'"You know how guys try to pick you up around town?" you ask. Albina rolls her eyes.'
+					'"Duh. I can''t go a day without some pervert catcalling me about my ass, trying to get me to go home with them."'
+					'"Sometimes I let them," you wink. Albina''s jaw drops.'
+					'"Slut!" she grins.'
+					'"Hey!" you say, shoving her back with both hands but laughing anyways.'	
+					'"Ow! Come on! You know I''m kidding. But seriously, do you really get off on one night stands?" Albina asks. "I like fucking Lazar because he <i>knows</i> how to fuck me. He knows exactly what to do to drive me insane and I love it. Is fucking a random guy once enough for you?"'
+					act'It''s hit or miss':
+						cla & *nl
+						'"It''s pretty hit or miss," you admit. "But when it''s good, it''s great. I can put up with a few bad lays and tiny dicks for that. Hit enough quantity, you''ll get quality."'
+						'"You really are a slut!" Albina guffaws loudly.'
+						'"Take it back you bitch!" you laugh back.'
+						act 'Stop talking': gt 'albinahome', 'bedroom'
+						act 'Change the subject': gt 'albina_chat', 'chat'
+					end
+					
+					act'Absolutely':
+						cla & *nl
+						'"Absolutely," you grin. "I love trying new dicks! I think I''m up to <<stat[''vaginal'']>>."'
+						'"You really are a slut!" Albina guffaws loudly.'
+						'"Take it back you bitch!" you laugh back.'
+						act 'Stop talking': gt 'albinahome', 'bedroom'
+						act 'Change the subject': gt 'albina_chat', 'chat'
+					end
+				end
+			end
+			
 			if Rex_Love = 1 or artembf = 1 or kotovLoveQW = 1 or fedorKozlovQW or NikoVolkovQW >= 5 or pcs_lover > pcs_girlfriends:
 				act 'I have a boyfriend':
 					*clr & cla
@@ -119,8 +158,8 @@ if $ARGS[0] = 'chat':
 					if artembf = 1:
 						act 'Artem':
 							cla
-							'"Artem..." you reply.'
-							'She arches a brow. "Artem? Loser nerd Artem?" She stops and seems to consider it. "Don''t you <i>ever</i> fucking tell him I said this, but he is kind of cute. I bet you have him wrapped around your little finger and he does whatever you want, right?" she says with a sly smile.'
+							'"Artem..." you reply. She arches a brow.'
+							'"Artem? Loser nerd Artem?" She stops and seems to consider it. "Don''t you <i>ever</i> fucking tell him I said this, but he is kind of cute. I bet you have him wrapped around your little finger and he does whatever you want, right?" she says with a sly smile.'
 							'You shake your head. "He''s sweet, and really nice to me."'
 							'She laughs, seemingly amused by your words. "Yeah, I''m sure he is ''nice'' and ''sweet''. Does he rock your world though?" she asks with a grin."'
 							'You disregard her comment. "There''s more to life than sex you know." The amused look on her face tells you she isn''t buying it. "Okay fine, he''s pretty good at it... Good enough anyway."'
@@ -151,6 +190,86 @@ if $ARGS[0] = 'chat':
 					act 'Change the subject': gt 'albina_chat', 'chat'
 				end
 			end
+			if brotherSex > 0:
+				act'Kolka':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+					if albina['kolka_know'] = 0:
+						'"Well..." you say. "I''ve been doing stuff with Kolka lately."'
+						'"Kolka? Who''s Kolk-" She stops mid-sentence and her eyes go wide. "Wait, you mean your <i>brother</i>?!"'
+						
+						if brotherSex >= 5:
+							act'It''s just handjobs':
+								cla & *nl
+								if brotherwakeup > 0:
+									'"It''s just a handjob now and then," you say, trying to justify yourself. "Help him get off. Or get him out of bed for school."'
+								else
+									'"It''s just a handjob now and then," you say, trying to justify yourself. "Help him get off, help him sleep."'
+								end
+								'Albina holds up her hand, cutting you off.'
+								'"TMI <<$pcs_nickname>>," she says, grimacing. "Way TMI. Keep your weird family business to yourself."'
+								'"But you aske-"'
+								'"<i>No,</i>" she says firmly. "We''re never talking about this again."'
+								act 'Stop talking': gt 'albinahome', 'bedroom'
+								act 'Change the subject': gt 'albina_chat', 'chat'
+							end
+						end	
+						
+						if brotherSex >= 6:
+							act'It''s just blowjobs':
+								cla & *nl
+								if brotherwakeup > 0:
+									'"It''s not like I let him fuck me,"  you say, trying to justify yourself. "It''s just the occassional blowjob, help him relieve the tension. Or to motivate him to wake up for school."'
+								else
+									'"It''s not like I let him fuck me,"  you say, trying to justify yourself. "It''s just the occassional blowjob, help him relieve the tension."'
+								end
+								'Albina holds up her hand, cutting you off.'
+								'"<<$pcs_nickname>>," she says, grimacing. "That''s fucking disgusting."'
+								'"But you aske-"'
+								'"<i>No,</i>" she says firmly. "I''m just going to pretend you never told me that. Keep your weird family business to yourself and we''re never talking about this again."'
+								act 'Stop talking': gt 'albinahome', 'bedroom'
+								act 'Change the subject': gt 'albina_chat', 'chat'
+							end
+						end	
+						
+						if brotherSex = 9:
+							act'It''s just casual':
+								cla & *nl
+								'"It''s just casual," you say, trying to justify yourself. "Totally physical, purely for pleasure purposes only. You know, for a little brother, he''s got a surprisingly good coc-"'
+								'Albina holds up her hand, cutting you off.'
+								'"<<$pcs_nickname>>," she says, grimacing. "That''s fucking disgusting."'
+								'"What? It''s not like we''re gonna get married. Is it so wrong to have a little fun together and-"'
+								'"<<$pcs_nickname>>," she says firmly interrupting you again. "I''m going to pretend you never said that. And I don''t want to hear about it ever again."'
+								'"Bu-"'
+								'"<i>Ever. Again.</i>"'
+								act 'Stop talking': gt 'albinahome', 'bedroom'
+								act 'Change the subject': gt 'albina_chat', 'chat'
+							end
+						end	
+						
+						if brotherSex = 10:
+							act'I love him':
+								cla & *nl
+								'"Recently," you say. "I''ve realized that I see him as more than just a brother. I let him into the shower with me and one thing led to another and-"'
+								'Albina holds up her hand, cutting you off.'
+								'"<<$pcs_nickname>>," she says, grimacing. "That''s fucking disgusting."'
+								'"Albina, I <i>love</i> him. He means everything to me and I want to spend the rest of my life-"'
+								'"Okay, <i>stop.</i>" Albina firmly interrupts you again. "If that''s how you really feel I... I''m not going to harp on you for it. But I''m also going to pretend you never said it. And I don''t want to hear about it ever again."'
+								'"Bu-"'
+								'"<i>Ever. Again.</i>"'
+								act 'Stop talking': gt 'albinahome', 'bedroom'
+								act 'Change the subject': gt 'albina_chat', 'chat'
+							end
+						end	
+					else
+						'"Well, still mostly Kolka, but-"'
+						'Albina shoves her hand directly into your face and clamps it over your mouth, glaring at you.'
+						'"I fucking told you <<$pcs_nickname>>. I don''t want to hear about this. That''s your weird family business and <b>I. Don''t. Want. To. Know.</b>"'
+						act 'Stop talking': gt 'albinahome', 'bedroom'
+						act 'Change the subject': gt 'albina_chat', 'chat'
+					end
+				end
+			end
 		end
 	end
 	if AlbinaQW['Mom_Future'] = 0:
@@ -219,22 +338,421 @@ if $ARGS[0] = 'chat':
 			!!act 'Stop talking': gt 'albinahome', 'bedroom'
 		!!end
 	!!end
-	act 'Talk about sex':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-		'Albina is a girl who is comfortable about her sexuality and so you end up talking about sex.'
-		if stat['think_virgin'] = 1:
-			'Knowing that you don''t have much experience in the subject, she offers to change the topic.'
-			act 'Stop talking': gt 'albinahome', 'bedroom'
-			act 'Change the subject': gt 'albina_chat', 'chat'
-			act 'Ask her about her sex life instead': gt 'albina_chat', 'Anal'
+	act 'Talk about sex':gt'albina_chat','sex_talk'
+		
+end
+
+if $ARGS[0] = 'small_talk':
+	act 'Stop talking': gt 'albinahome', 'bedroom'
+	act 'Keep talking':gt'albina_chat','small_talk2'
+	act 'Change the subject': gt 'albina_chat', 'chat'
+end
+
+if $ARGS[0] = 'small_talk2':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	'You chat about a variety of things, including school, music, clothes and what has been going on in Pavlovsk lately.'
+	*nl
+	AlbinaQW['chat_rand'] = rand(1,3)
+	if AlbinaQW['chat_rand'] = 1:
+		'"What do you do for money <<$pcs_nickname>>?" Albina asks you. "I used to get money for things from Starlets.  Whatever my dad didn''t steal from me anyways. But that''s dried up now and I can''t rely on mama forever. Don''t tell me that everything you had came from Starlets?"'
+		act'My mom':
+			cla & *nl
+			'"I get most of my money from my mom too," you say reluctantly. "Starlets was all the extra money I made too."'
+			'"Fuuuuck," Albina groans, flipping over to stare at the ceiling in frustration. "What else can I do? I''m <i>so</i> over getting fucked for money."'
+			gs'albina_chat','small_talk'
+		end
+		act'Odd jobs':
+			cla & *nl
+			'"Odd jobs here and there," you shrug. "There''s a lot of things to do around town. They don''t pay very much, but it gives me some spending money. You could try doing that?" Albina wrinkles her nose in disgust.'
+			'"I don''t want to <i>work</i> for a living," she says, sending both of you into giggles.'
+			gs'albina_chat','small_talk'
+		end
+		
+!!		gs'albina_chat','model_talk1'
+
+		gs'albina_chat','pornstar_talk1'
+		
+!!{		if masseuse['jobtype'] ! 0:
+			act'I work as a masseuse':
+				cla & *nl
+				
+				gs'albina_chat','small_talk'
+			end
+		end
+		
+		if stripdancesum > 0:
+			act'I''m a stripper':
+				cla & *nl
+				
+				gs'albina_chat','small_talk'
+			end
+		end}
+	elseif AlbinaQW['chat_rand'] = 2:
+!!		'Which girl do you think is the best dressed in our class?'
+		gs'albina_chat','small_talk'
+	else
+		
+		gs'albina_chat','small_talk'
+	end
+end
+
+if $ARGS[0] = 'model_talk1':
+	if model['status'] = 1:
+		act'I do some modelling':
+			cla & *nl
+			'"I... do some modelling in the city..." you admit slowly. Albina''s eyes go wide right before she swiftly punches you in the arm. "Ow! What the hell!"'
+			'"You''ve been modelling this whole time and you''re only just telling me now?" she says, managing to look betrayed while wearing a huge smile at the same time. "Why would you hide that from me?"'
+			if age < 18:
+				'"It''s not..." you say hesitantly. "Strictly speaking... legal..." Albina''s eyes narrow.'
+				'"Why? What kind of modelling are you doing?" she says suspiciously.'
+				act'Tell her (embarrassed)':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+					if $model['type'] = 'catalog':
+						'"Nothing bad!" you say hurriedly, holding your hands up in defense. "Just some stuff for catalogues. You know, the kind of stuff you see on G&M websites and stuff like that."'
+						'"Why all the secrecy then?" Albina asks, not letting up.'
+						'"It''s an... 18+ agency..." you say. "I have a fake passport just to work there. They do... <i>other</i> stuff there too..."'
+						gs'albina_chat','model_talk_shy2'
+					elseif $model['type'] = 'fashion':
+						'"Fashion modelling mostly," you say, shrugging uncomfortably. "Fancy dresses, designer clothing, all the stuff you see in magazines but never actually see people wearing in real life."'
+						'"That''s so cool!" Albina exclaims, punching you in the arm again. "Why are you so embarrassed about it?"'
+						'"It''s an 18+ agency," you say. "I have to use a fake passport just to work there. And they do... <i>other</i> stuff there too..."'
+						gs'albina_chat','model_talk_shy2'
+					elseif $model['type'] = 'lingerie':
+						'"I''m a... lingerie model?" you say, shrugging uncomfortably. "High end bras and panties. Sexy things, usually stuff with lace."'
+						'"That''s so cool!" Albina exclaims, punching you in the arm again. "You''re a goddamn supermodel! Why are you so embarrassed about it?"'
+						'"It''s an 18+ agency," you say, rubbing your arm. "I have to use a fake passport just to work there. And they do... <i>other</i> stuff there too..."'
+						gs'albina_chat','model_talk_shy2'
+					elseif $model['type'] = 'glamour':
+						if modelfoto['topless'] > 0:
+							'"It''s kind of... risque," you say, shrugging uncomfortably. "You can... see my breasts in some of them..."'
+							gs'albina_chat','model_talk_shy4'
+						else
+							'"It''s kind of... risque," you say, shrugging uncomfortably. "High end bras and panties. Sexy things, usually stuff with lace."'
+							'"That''s so cool!" Albina exclaims, punching you in the arm again. "You''re a goddamn supermodel! Why are you so embarrassed about it?"'
+							'"It''s an 18+ agency," you say, rubbing your arm. "I have to use a fake passport just to work there. And they do... <i>other</i> stuff there too..."'
+							gs'albina_chat','model_talk_shy2'
+						end
+					elseif $model['type'] = 'fitness':
+						if modelfoto['topless'] > 0:
+							'"It''s kind of... risque," you say, shrugging uncomfortably. "You can... see my breasts in some of them..."'
+							gs'albina_chat','model_talk_shy4'
+						else
+							'"It''s kind of... risque," you say, shrugging uncomfortably. "High end bras and panties. Sexy things, usually stuff with lace."'
+							'"That''s so cool!" Albina exclaims, punching you in the arm again. "You''re a goddamn supermodel! Why are you so embarrassed about it?"'
+							'"It''s an 18+ agency," you say, rubbing your arm. "I have to use a fake passport just to work there. And they do... <i>other</i> stuff there too..."'
+							gs'albina_chat','model_talk_shy2'
+						end
+					elseif $model['type'] = 'artistic nude':
+						'"It''s kind of... risque," you say, shrugging uncomfortably. "Most of the modelling I do is... nude...?"'
+						gs'albina_chat','model_talk_shy4'
+					elseif $model['type'] = 'erotic':
+						'"It''s kind of... <i>erotic</i>," you admit uncomfortably. "You can practically see right up my pussy in some of them..."'
+						gs'albina_chat','model_talk_shy4'
+					else
+						if modelfoto['nude'] > 0:
+							'"It''s kind of... risque," you say, shrugging uncomfortably. "I''m... I''m not wearing any clothes in some of them..."'
+							gs'albina_chat','model_talk_shy4'
+						elseif modelfoto['topless'] > 0:
+							'"It''s kind of... risque," you say, shrugging uncomfortably. "You can... see my breasts in some of them..."'
+							gs'albina_chat','model_talk_shy4'
+						else
+							'"It''s kind of... risque," you say, shrugging uncomfortably. "High end bras and panties. Sexy things, usually stuff with lace."'
+							'"That''s so cool!" Albina exclaims, punching you in the arm again. "You''re a goddamn supermodel! Why are you so embarrassed about it?"'
+							'"It''s an 18+ agency," you say, rubbing your arm. "I have to use a fake passport just to work there. And they do... <i>other</i> stuff there too..."'
+							gs'albina_chat','model_talk_shy2'
+						end
+					end
+				end
+			else
+				act'I didn''t want people to know':
+					cla & *nl
+					'"I just didn''t want to spread it around," you say, rubbing your arm. "Word gets around town fast, you know? Could you imagine what my mother would say if she found out?"'
+					'"<<$pcs_nickname>>," she says, looking at you seriously. "I''ve kept a lot worse secrets than this over the years. I would''ve kept this one. Don''t you trust me?"'
+					'Albina looks away from you, seeming genuinely offended that you didn''t tell her until now.'
+					gs'albina_chat','small_talk'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'model_talk_shy2':
+	'"Like nude photography?" Albina says, in classic straight-to-the-point fashion. And then, with a predatory smile, she asks, "Have <i>you</i> done any?"'
+	if modelfoto['nude'] > 0:
+		act'No (lie)':
+			cla & *nl
+			'"No!" you say quickly. "No way! I''m not that desperate!"'
+			'"Hmmm..." Albina looks at you suspiciously. "I don''t believe you. Why don''t we fire up my computer and do a little search for your name online? ''<<$pcs_firstname>> <<$pcs_lastname>> naked''"'
+			'She reaches for her laptop and you slap her hand down to the bed. Albina turns slowly, giving you a smug smirk. "Want to confess something <<$pcs_nickname>>?"'
+			'"No," you insist, putting your nose up at her. "I just don''t want you to see any other pictures of me. It''s embarrassing."'
+			'"Oh, I am <i>so</i> going to schlick off to naked pictures of you later," she grins.'
+			'"You are not!" you gasp, mouth open wide.'
+			*nl
+			'You start beating her with her own pillow and Albina cackles maniacally the whole time.'
+			gs'albina_chat','small_talk'
+		end
+		
+		act'Yes':
+			cla & *nl
+			'"Y-yes... I''ve done a few..." you admit.'
+			'Albina''s eyes gleam and her lips crack into a wide grin. "Seriously? I can''t believe it! what made you do it?"'
+			gs'albina_chat','model_talk_shy3'
+		end
+	else
+		act'No':
+			cla & *nl
+			'"No!" you say quickly. "I wouldn''t. I mean, I couldn''t. Could you imagine if any of the boys at school got ahold of pictures like that?"'
+			'"But what if <i>I</i> want pictures like that?" Albina bites her lip seductively, shamelessly eye fucking you.'
+			if npc_sex['A23'] = 1:
+				'"Albina." You give her a dry stare. "We''ve fucked. What do you need pictures like that for?"'
+				'"Maybe I want to get off on you while you''re busy," she grins.'
+			else
+				'"I can''t believe you," you scoff and she lets a smile break through.'
+			end
+			gs'albina_chat','small_talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'model_talk_shy3':
+	act'I asked':
+		cla & *nl
+		'"I told them I wanted to do one," you say, cheeks heating up.'
+		'"Then why are you so embarrassed about this?" Albina laughs out loud. "You got what you asked for didn''t you?"'
+		'"It''s embarrassing to tell people I actually know!" you protest. "It''s different when <i>you</i> know!"'
+		'"Well, get used to it," she says, leaning back. "If you get famous off this, everyone you talk to will have seen your tits. Do you go full frontal too?"'
+		'"Stop it!" you say, blushing even harder, pushing her backwards as if it will make her stop.'
+		*nl
+		'But she doesn''t stop and you have to endure Albina''s teasing for several minutes longer.'
+		gs'albina_chat','small_talk'
+	end
+	
+	act'For my career':
+		cla & *nl
+		'"I thought it would be good for my career," you sigh. "I didn''t <i>want</i> too, but everyone says that you have to bare it all at some point."'
+		'"Must''ve been a good deal for them because I know for a fact that you look <i>great</i> naked," she grins.'
+		'"Stop it!" you say, pushing her backwards with a mock shove.'
+		gs'albina_chat','small_talk'
+	end
+	
+	act'I really needed the money (to buy)':
+		cla & *nl
+		'"I really needed the money," you say, embarrassedly. "I really wanted to buy something and I didn''t have enough and I just thought, <i>Well, I could just do a nude shoot...</i> They pay double for your nude debut."'
+		'"Must''ve been a good deal for them because I know for a fact that you look <i>great</i> naked," she grins.'
+		'"Stop it!" you say, pushing her backwards with a mock shove.'
+		gs'albina_chat','small_talk'
+	end
+	
+	act'I really needed the money (to pay off)':
+		cla & *nl
+		'"I really needed the money," you say, uncomfortably. "I owed some people money and I was desperate. They pay double for your nude debut so I just thought..."'
+		'You trail off and Albina''s grin melts away, her expression becoming somber.'
+		'"Oh. That''s... I''m sorry <<$pcs_nickname>>." She looks away. "I shouldn''t have teased you. I didn''t... I didn''t realize it was like that..."'
+		gs'albina_chat','small_talk'
+	end
+	
+	if foto['suborn'] > 0:
+		act'I was pressured into it':
+			cla & *nl
+			'"I didn''t want to," you say. "I was... I had been working there for a while so they asked. I said no, but then they kept asking. Eventually they just... talked me into it."'
+			'You trail off and Albina''s grin melts away, her expression becoming somber.'
+			'"Oh. That''s... I''m sorry <<$pcs_nickname>>..." She looks away. "I didn''t... I didn''t realize it was like that..."'
+			'You sit in silence for a few moments before Albina turns back towards you tentatively.'
+			'"Do you regret it?"'
+			act'No':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+				'"Actually... no." You give Albina a shy smile. "I''m actually really glad that I did it. But it''s still kind of embarrassing to tell you about it."'
+				'"Well, don''t be," Albina says, her eyes lighting up with your good humor. "You''re hot as fuck naked!"'
+				'"Stop it!" you say, face turning crimson as you try to push her''s away and she laughs aloud.'
+				gs'albina_chat','small_talk'
+			end
+			
+			act'Yes (thought I wanted it)':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+				'"I do," you say, solemnly. "I thought it would be sexy, feel empowering. But once it started, I just felt... I realized I didn''t want it anymore. But I couldn''t take it back. And now those pictures of me are out there. On the internet or in a magazine and... I wish I could take it all back."'
+				'Albina leans her head against your shoulder, saying nothing. The two of you sit in silence for a few more minutes.'
+				gs'albina_chat','small_talk'
+			end
+			
+			act'Yes (felt pressured)':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+				'"I do," you say, solemnly. "I just wanted to get them off my back and I crossed a line that... I can''t uncross now. I should''ve stood my ground."'
+				'Albina leans her head against your shoulder, saying nothing. The two of you sit in silence for a few more minutes.'
+				gs'albina_chat','small_talk'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'model_talk_shy4':
+	if $model['type'] = 'glamour':
+		'"You''re naked in these?" Albina''s eyes go wide.'
+		'"I didn''t say I was naked!" you protest.'
+		'"Yeah yeah, who cares," Albina says, completely ignoring you, reaching for her laptop. "Your tits are out, that''s what matters. I <i>gotta</i> see these pics."'
+	else
+		'"You''re naked in these?" Albina''s eyes go wide and scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
+	end
+end
+
+if $ARGS[0] = 'stripper_talk1':
+	act'Embarrassed':
+		cla & *nl
+		'"I... do some strip dancing in the city," you admit, blushing hard.'
+		if age < 18:
+			'"You''re a stripper?" Albina exclaims, her draw dropping. "How? You''re underage!"'
+			if alterstrtimg = 18 or alterstrtimg = 19 or alterstrtimg = 20 or alterstrtimg = 21:
+				'"I''ve had a fake passport for years, Albina," you shrug uncomfortably. "Easiest way to get booze. Now it helps me with other things too."'
+			else
+				
+			end
+		else
+			
+		end
+	end
+	
+	act'Nonchalant':
+		cla & *nl
+		'"I... do some strip dancing in the city," you say casually.'
+		if age < 18:
+			'"You''re a stripper?" Albina exclaims, her draw dropping. "How? You''re underage!"'
+			if alterstrtimg = 18 or alterstrtimg = 19 or alterstrtimg = 20 or alterstrtimg = 21:
+				'"I''ve had a fake passport for years, Albina," you say, rolling your eyes. "How do you think I got all my booze?"'
+			else
+				
+			end
+		else
+			
+		end
+	end
+	
+	act'Proud':
+		cla & *nl
+		'"I... do some strip dancing in the city," you admit, blushing hard.'
+		if age < 18:
+			'"You''re a stripper?" Albina exclaims, her draw dropping. "How? You''re underage!"'
+			if alterstrtimg = 18 or alterstrtimg = 19 or alterstrtimg = 20 or alterstrtimg = 21:
+				'"I''ve had a fake passport for years, Albina," you shrug uncomfortably. "Easiest way to get booze. Now it helps me with other things too."'
+			else
+				
+			end
 		else
-			'She isn''t willing to talk about losing her own virginity and you can guess why, but she listens as you tell her about your first time.'
+			
+		end
+	end
+end
+
+if $ARGS[0] = 'pornstar_talk1':
+	if $pfname ! '':
+		act'Tell her you''ve shot porn (embarrassed)':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+			'"Actually I..." you mumble, a blush already heating up your face. "I''ve been uhh... starring in some... adult films...?"'
+			'"WHAT?" Albina''s eyes go wide and she recoils from you in horror.'
+			'"I''ve been doing porn..." you say fully.'
+			'"That''s disgusting!" she shrieks. "You let men... <i>do</i> that to you?"'
+			'"I admit, it''s not the most ideal job-" you start.'
+			'"It''s exploitive!" she says. "Degrading! Like-! Like-!"'
+			act'"I''m sorry"':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+				'Suddenly, you realize what it is that''s bothering her.'
+				'"I''m sorry Albina," you say. "I wasn''t thinking about your... <i>our</i>... history. It is a little degrading, but I like the money, but I should have known how you''d react."'
+				'"Just..." Albina closes her eyes, breathing slowly. "Just don''t tell me about your job anymore... And tell me if you quit. I''ll throw you a blow out party."'
+				'She manages to give you a weak smile.'
+				gs'albina_chat','small_talk'
+			end
+			
+			act'"This isn''t exploitive"':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+				'"Albina," you say, clenching your teeth, your embarrassment turning to anger. "This isn''t like that. I''m not being exploited."'
+				if age < 18:
+					'"You are! It''s not even legal! You''re <<age>>!"'
+					'"Albina," you say again, firmly. "<i>Stop.</i> Okay, yes, the work is a little degrading. Yes, I''m underage. But I''m under no illusions about how I got here. I didn''t get tricked, I''m not being blackmailed, I''m the one who initiated all of it. I''m an independent woman and I made my own choices to do this because <i>I</i> want the money. I''m shooting porn because I <i>want</i> to. And I need you to accept that."'
+				else
+					'"You are! It''s sex for money! You just don''t-"'
+					'"Albina," you say again, firmly. "<i>Stop.</i> Okay, yes, the work is a little degrading. It''s porn. But I''m under no illusions about how I got here. I didn''t get tricked, I''m not being blackmailed, I''m the one who initiated all of it. I''m an independent woman and I made my own choices to do this because <i>I</i> want the money. I''m shooting porn because I <i>want</i> to. And I need you to accept that."'
+				end
+				'"I..." She turns to face you, eyes shimmering. "I don''t know that I can..."'
+				*nl
+				'. . .'
+				gs'albina_chat','small_talk'
+			end
+		end
+		
+		act'Tell her you''ve shot porn (happy)':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+			'"Actually I..." you say, a smile tugging at the corners of your mouth. "I''ve been shooting some porn."'
+			'"WHAT?" Albina''s eyes go wide and she recoils from you in horror. Your building smile slips as you look back at her in confusion.'
+			'"What do you mean ''what''? I thought you''d think it was cool!"'
+			'"No!" She shrinks back. "It''s disgusting! You let men... <i>do</i> that to you?"'
+			'"Yeah, I get fucked and get paid. What''s not to love about it?"'
+			'"It''s exploitive!" she says. "Degrading! Like-! Like-!"'
+			act'"I''m sorry"':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+				'Suddenly, you realize what it is that''s bothering her.'
+				'"I''m sorry Albina," you say. "I wasn''t thinking about your... <i>our</i>... history. I don''t see it the way you do, but I should''ve realized."'
+				'"Just..." Albina closes her eyes, breathing slowly. "Just don''t tell me about your job anymore... And tell me if you quit. I''ll throw you a blow out party."'
+				'She manages to give you a weak smile.'
+				gs'albina_chat','small_talk'
+			end
+			
+			act'"This isn''t exploitive"':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+				'"Albina, I''m not being exploited."'
+				if age < 18:
+					'"You are! It''s not even legal! You''re <<age>>!"'
+				else
+					'"You are! It''s sex for money! You just don''t-"'
+				end
+				'"Albina," you say again, firmly. "This <i>isn''t</i> Starlets. I''m not being forced into this. I''m shooting porn because I want to. Nobody else gets to take credit for it. This is <i>my</i> choice. And I need you to be okay with that."'
+				'"I..." She turns to face you, eyes shimmering. "I don''t know that I can be..."'
+				*nl
+				'. . .'
+				gs'albina_chat','small_talk'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'sex_talk_start':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	'Albina is a girl who is comfortable about her sexuality and so you end up talking about sex.'
+	*nl
+	gs 'albina_chat', 'sex_talk2'
+end
+
+if $ARGS[0] = 'sex_talk':
+	act 'Stop talking': gt 'albinahome', 'bedroom'
+	act 'Change the subject': gt 'albina_chat', 'chat'
+	act 'Ask her about her sex life instead': gt 'albina_chat', 'Anal'
+end
+
+if $ARGS[0] = 'sex_talk2':
+	if pcs_vag = 0:
+		'Knowing that you don''t have much experience in the subject, she offers to change the topic.'
+		gs'albina_chat','sex_talk'
+	else
+!!		AlbinaQW['chat_rand'] = rand(1,3)
+!!		if AlbinaQW['chat_rand'] = 1:
 			'"So what''s your favourite position?" she asks.'
 			act 'Missionary': gt 'albina_chat', 'Missionary'
 			act 'Doggystyle': gt 'albina_chat', 'Doggystyle'
 			act 'Cowgirl': gt 'albina_chat', 'Cowgirl'
-		end
+!!		elseif AlbinaQW['chat_rand'] = 2:
+!!			gs'albina_chat','sex_talk'
+!!		else
+!!			gs'albina_chat','sex_talk'
+!!		end
 	end
 end
 
@@ -247,7 +765,7 @@ if $ARGS[0] = 'Missionary':
 	'"BO-RING!"'
 	act'It''s nice!':
 		cla & *nl
-		'"What''s wrong with missionary?" you protest. "It''s... nice."'
+		'"What''s wrong with missionary?" you protest. "I think it''s nice."'
 		'"You''re trying to tell me that lying on your back doing nothing is ''nice''?" She rolls her eyes. "Nuh uh. Bend me over and spank me! Grab me by the hair and pound my ass! Doggystyle is the way to go!"'
 		gs'albina_chat','Missionary2'
 	end
@@ -272,6 +790,7 @@ if $ARGS[0] = 'Missionary2':
 	gs'stat'
 	'You both agree to disagree, but find yourself a little turned on by her response. Judging by the way she''s rubbing her thighs together, you think she is too.'
 	act 'Change the subject': gt 'albina_chat', 'chat'
+	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'Anal'
 end
 
@@ -299,7 +818,7 @@ if $ARGS[0] = 'Doggystyle':
 	act'Easy spankings':
 		cla & *nl
 		'"I love getting spanked," you grin.'
-		'"Fuck yeah!" Albina shouts, high fiving you so hard it hurts. "There''s nothing I love more than having a cock balls deep up my ass and being spanked until it''s red and tender. If I can still sit down without wincing after, then you didn''t really fuck me."'
+		'"Fuck yeah!" Albina shouts, high fiving you so hard it hurts. "There''s nothing I love more than a cock balls deep up my ass and being spanked until it''s red and tender. If I can still sit down without wincing after, then you didn''t really fuck me."'
 		gs'albina_chat','Doggystyle2'
 	end
 end
@@ -309,6 +828,7 @@ if $ARGS[0] = 'Doggystyle2':
 	gs'stat'
 	'You giggle at her answer, feeling warmth blossoming between your hips and wetness seeping from your pussy. With the "fuck me eyes" Albina is giving you think she''s probably feeling something similar.'
 	act 'Change the subject': gt 'albina_chat', 'chat'
+	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'Anal'
 end
 
@@ -322,7 +842,7 @@ if $ARGS[0] = 'Cowgirl':
 	act'It feels better':
 		cla & *nl
 		'"It just feels better," you shrug. "I don''t know how to explain it. The angle? Just the way it fits inside when I''m on top? It feels good. What can I say?"'
-		'"I think it feels best in doggy," Albina says. "It goes way deeper and you can get surprise anal in that position, which is the <i>best</i> kind of anal. Plus spankings. If I can''t sit down after a fuck, it was a good fuck."'
+		'"I think it feels best in doggy," Albina says. "It goes way deeper and you can get surprise anal in that position, which is the <i>best</i> kind of anal. Plus spankings. If I can''t sit down after a fuck, it was a good fuck." She then gives you a sly grin. "But riding dick is a close second for me."'
 		gs'albina_chat','Cowgirl2'
 	end
 	
@@ -330,13 +850,14 @@ if $ARGS[0] = 'Cowgirl':
 		cla & *nl
 		'"I like being in control," you explain. "If I want to go slow, I can go slow. If I want to go fast, I can ride him as hard as I like. It makes me feel... powerful? Just knowing that I''m the one in charge is such a turn on for me."'
 		'"I don''t think that kind of stuff matters to me," Albina shrugs back. "I like it hard and rough every time. Don''t get all slow and gentle with me. If I''m gonna get fucked, I want to <i>feel</i> it. I''d rather have my face stuffed into the sheets with a cock balls deep up my ass being spanked until my eyes water. At the end of it, I want my makeup to look as fucked as I feel. Now <i>that''s</i> a good time!"'
+		'She then gives you a sly grin. "But riding dick is a close second for me."'
 		gs'albina_chat','Cowgirl2'
 	end
 		
 	act'I like it when he grabs my breasts':
 		cla & *nl
 		'"I like having my boobs grabbed," you grin. "If I''m on top, then his hands are free to grope me."'
-		'"But he can still grab your tits from behind," Albina argues. "Plus, he can spank you until you''re red and wriggling too. Why choose when you can have both?"'
+		'"But he can still grab your tits from behind," Albina argues. "Plus, he can spank you until you''re red and wriggling too. Why choose when you can have both?" She then gives you a sly grin. "I''l admit though, riding dick is a close second for me."'
 		gs'albina_chat','Cowgirl2'
 	end
 end
@@ -346,6 +867,7 @@ if $ARGS[0] = 'Cowgirl2':
 	gs'stat'
 	'You both agree to disagree, but find yourself a little turned on by her response. Judging by the way she''s rubbing her thighs together, you think she is too.'
 	act 'Change the subject': gt 'albina_chat', 'chat'
+	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'Anal'
 end
 
@@ -355,17 +877,18 @@ if $ARGS[0] = 'Anal':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'You''re curious about her anal fetish and now seems like a good time to ask.'
-	'"So..." you sheepishly ask. "... what is it you like about anal?"'
+	'"So..." you ask sheepishly. "... What is it you like about anal?"'
 	'"And why do you want to know?" She gives you a dry look.'
-	'You stutter, flustered by her response. "Oh, it''s just...you know there''s...stuff going around school about you?"'
-	'"Oh I know all about that. ''Albina is just a cheap butt slut whore.'' '
+	'Oh, it''s just..." You stutter, flustered by her response."You know there''s... stuff going around school about you?"'
+	'"Oh I know all about that," she says, rolling her eyes. "''Albina is just a cheap butt slut whore.'' '
 	'''I bet Albina''s asshole is looser than Lizeveta''s lips!'' '
 	'''I would fuck Albina''s asshole while slapping her juicy cheeks like I''m playing some bongos!'' '
 	'''I bet her pussy is tighter than a nun''s with all the anal she does.'' '
 	*nl
-	'"I''ve heard them all, but none of the perverted fucking cowards dare mention them in front of me. To answer your question, I just like anal, okay? I don''t even know why I''m justifying my sex life to you!" She then turns away and goes quiet.'
+	'"I''ve heard them all, but none of the perverted fucking cowards dare mention them in front of me. I just like anal, okay?! I don''t even know why I''m justifying my sex life to you!" She then turns away and goes quiet.'
 	'You''ve clearly hit a nerve and know better than to push her further, so you change the subject.'
 	act 'Stop talking': gt 'albinahome', 'bedroom'
+	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
 	act 'Change the subject': gt 'albina_chat', 'chat'
 end
 
@@ -386,7 +909,6 @@ if $ARGS[0] = 'telling_marrige_dreams':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'You sigh in a way only those who are in love can. "Hopefully <<$ARGS[1]>> and I can get married soon."'
 	'She gives you a somewhat skeptical look, then shrugs. "Best of luck with that, I guess. I''m happy just hooking up for casual sex. Relationships can suck it."'
-	'You''re not sure what more to say on the topic, so change the subject.'
 	act 'Stop talking': gt 'albinahome', 'bedroom'
 	act 'Change the subject': gt 'albina_chat', 'chat'
 end
@@ -399,14 +921,14 @@ end
 !!	'You blush as you answer. "Uhhh...You."'
 !!	'She raises her brow. "Really? Me?" she replies and you nod.'
 !!	'"Yeah, you. You really know what you''re doing and I always cum so hard when I''m with you..."'
-!!	'She seems surprised by your answer, but accepts your compliment anyway. "You''re pretty good yourself," she says with a wink and a slight hint of arousal.'
+!!	'She seems surprised by your answer, but accepts your compliment anyway. "You''re pretty good yourself." she says with a wink and a slight hint of arousal.'
 !!	act 'Her best':
 !!		*clr & cla
 !!		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 !!		'So what was your best?" you ask in turn.'
 !!		'She smiles. "It was this girl I met at a nightclub in the city. Long story short, I have a fake ID and you already know the police don''t question me. Anyway, I saw this cute girl at the bar. I can''t remember her name, but she said she worked in some BBQ place in the city. We had a few drinks together and ended up back at her place. I was expecting some good pussy on pussy action, but I can''t help but notice the bulge under her little dress..."'
-!!		'You raise a brow and she smiles. "Yeah, it''s what you think it was. She pulls up her dress and out springs this rock hard fucking cock! I''m just standing there staring at it, so she pushes me down to my knees in front of her and I just start jerking and sucking it before she makes me deepthroat her. After that, she threw me onto the bed, pulled my thong off and rammed it right into my pussy. My <i>god</i>, the sex we had was <i>amazing</i>, especially when she fucked me from behind and was pulling my hair and slapping my ass. I don''t know how many times she made me cum, but she made me <i>cum</i>.'
-!!		'She fucked me silly and next thing I know I feel her cum shooting into my pussy. I was too exhausted to say anything, but I''m on the pill anyway so I didn''t mind. We snuggled in bed afterwards and I fell asleep right there in her arms as she stroked my hair. She had already left by the time I woke up and I never seen her again. It''s the best sex I''ve ever fucking had and I still get horny just thinking about it." she says and softly bites her lip. "Don''t tell Mama though. She wouldn''t like me going all the way to the city that late at night and coming home in the morning hungover," she adds.'
+!!		'You raise a brow and she smiles. "Yeah, it''s what you think it was. She pulls up her dress and out springs this massive, rock hard fucking cock! I''m just standing there staring at it, so she pushes me down to my knees in front of her and I just start jerking and sucking it before she makes me deepthroat her as deep as I can go. After that, she threw me onto the bed, pulled my thong off and rammed it right into my pussy. My <i>god</i>, the sex we had was <i>amazing</i>, especially when she fucked me from behind and was pulling my hair and slapping my ass. I don''t know how many times she made me cum, but she made me <i>cum</i>.'
+!!		'She fucked me silly and next thing I know I feel her cum shooting into my pussy. I was too exhausted to say anything, but I''m on the pill anyway so I didn''t mind. We snuggled in bed afterwards and I fell asleep right there in her arms as she stroked my hair. She had already left by the time I woke up and I never seen her again. It''s the best sex I''ve ever fucking had and I still get horny just thinking about it." she says and softly bites her lip. "Don''t tell Mama though. She wouldn''t like me going all the way to the city that late at night and coming home in the morning hungover having clearly hooked up with a stranger." she adds.'
 !!		'You feel yourself getting turned on by her story and picture it in your head as you imagine yourself in her position. She snaps you out of it and you decide to do something else.'
 !!		act 'Change the subject': gt 'albina_chat', 'chat'
 !!		act 'Stop talking': gt 'albinahome', 'bedroom'
@@ -428,506 +950,5 @@ if NikoPayback = 2 and AlbVsNiko = 0:
 end
 
 
-if $ARGS[0] = 'wine_invite':
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
-	'As the two of you head back inside the house, Albina turns towards you and grabs your attention.'
-	if albina['wine'] = 0:
-		'"Hey, wanna break open a bottle of wine with me? Really warms you up after a quick dip."'
-	else
-		'"Hey, wanna drink some wine with me again?"'
-	end
-	act 'No thanks':
-	
-	end
-	
-	act 'Sure':
-		cla & *clr
-		!! IMAGE HERE
-		if albina['wine'] = 0:
-			'"Sure, that sounds nice. Should I just get dressed and meet you back-"'
-			'"Nah, fuck that," Albina cuts you off and drags you to the living room. "It tastes better the sooner you drink it after coming out."'
-			'She puts you down on the couch and saunters over to the wine cabinet, plucking out a bottle and two glasses. You wait awkwardly while she opens the bottle, feeling weird about sitting naked in the middle of her house. Soon, she hands you a glass and plops down next to you.'
-			'"Cheers!" she grins, clinking her glass against yours and takes a sip from her glass. You do the same, feeling the warmth spread through your chest almost immediately.'
-			*nl
-			'<i>Wow, that <b>is</b> really nice after getting out of the water,</i> you think, taking another sip.'
-		else
-			'"Sure," you smile.'
-			'"Great, I''ll go get the bottle."'
-			'You head over to her living room with her, sitting down on the couch while she procures the alcohol. A short time later, she places a glass in your hand and clinks hers against it.'
-			'"Cheers!" she grins, and you both start enjoying your wine together.'
-		end
-		act'Drink':
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
-			if albina['wine'] = 0:
-				'A short while later, you find yourself feeling very warm, fuzzy, and <i>very</i> dizzy, halfway through your second glass. Albina is already sipping from her third glass, head laid on your lap after emptying the bottle. The flush in her cheeks and the slur of her voice tells you she''s totally drunk. You''re not sure your own lips are working right either. Or is it your tongue? What makes you talk funny when you''re drunk? Is it your lips, your tongue, or your brain?'
-				*nl
-				'"<<$pcs_nickname>>!" Albina whines. "I''m fuckin'' talkin'' to you!"'
-				'You blink, confused.'
-				act '"What did you say?"':gt'albina_chat','wine_chat1'
-			else
-				'You''re not sure if you expected something else, but a short while later you find yourself drunk on the couch with Albina again.'
-				act 'Drunkenly converse with Albina':gt'albina_chat','wine_chat1'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'wine_chat1':
-	albina['wine_convo'] = rand(1,7)
-	cla & *clr
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
-	if albina['wine_convo'] = 1:
-		'"I loave the taste of my own pusshy," she says loudly. "Iz that weird?"'
-		act 'Super weird':
-			cla & *nl
-			'"Thad''s suhper fucking weird," you slur back.'
-			'"Bullshit!" she complains even louder. "You cahn''t tell me you dohn''t like the taste of ''ur own brand now and again."'
-			gs 'albina_chat','wine_chat2'
-		end
-		
-		act 'I like mine too':
-			cla & *nl
-			if stat['vaginal'] > 0 and stat['bj'] > 0:
-				'"I l''ke the taste of my pussy too," you slur back. "It tastdes even better when it''s on a dick."'
-				'"You''re a fuhcking slut <<$pcs_nickname>>," Albina blurts out, sending both of you into giggles.'
-			elseif stat['mast'] > 0:
-				'"I l''ke the taste of my pussy too," you slur back. "Sometimes I stdick my fingers in my mouf after I masdurbate, lick it all off."'
-				'"Oh fuck, I do that to! Suck my dildo fucking clean right after I cum. It mahkes me wahnt to rub another one out after!" Albina giggles while rubbing her thighs together.'
-			else
-				'"I l''ke the taste of my pussy too," you slur back.'
-				'"I fuhcking knew it!" Albina exclaims. "Every girl loves her own juice!"'
-				'"If you knew, then why are you asking if it''s weird?" you ask, puzzled.'
-				'"I jus'' wanted to see if <i>you</i> were the weird one!" Albina mumbles, her voice echoing off the inside of the glass as she takes another sip.'
-			end
-			gs 'albina_chat','wine_chat2'
-		end
-		if npc_sex['A23'] = 1:
-			act 'I like your taste too':
-				cla & *nl
-				'"I like the taste of your pussy too," you slur back while giving her a filthy grin.'
-				'"Nnnngh~!" Albina rolls her hips while squeezing her thighs together hard. "Fuhck! You make me want to shove your head between my legs right now!"'
-				gs 'albina_chat','wine_chat2'
-			end
-		end
-	elseif albina['wine_convo'] = 2:
-		'Shaving convo'
-	elseif albina['wine_convo'] = 3:
-		'"Honest question <<$pcs_nickname>>. How would dominate me in bed?" she asks and looks up at you with a drunk smile.'
-		act 'Pound your ass':
-			cla & *nl
-			'You drunkenly smile down at her. "I''d get the biggest, <i>thickest</i> strap-on dildo I could find..." You lean in and softly whisper in her ear. "Then I would shove it up your tight ass and pound you until you cum like the buttslut you are..."'
-			'Albina bites her lip while moaning softly and squeezing her thighs together. "Oh <<$pcs_nickname>>, you''re making me wet just thinking about it. I love it when my ass gets stretched and left gaping wide..."'
-			gs 'albina_chat', 'wine_chat2'
-		end
-	elseif albina['wine_convo'] = 4:
-		'"How often do you masturbate <<$pcs_nickname>>? Do you have any dildos? Ever double penetrated yourself with them? Ever wanted to try it?"'
-	elseif albina['wine_convo'] = 5:
-		'"What''s the sluttiest thing you''ve ever done?"'
-	elseif albina['wine_convo'] = 6:
-		'boob size'
-	elseif albina['wine_convo'] = 7:
-		if albina['commando_know'] = 0:gt'albina_chat','wine_chat1'
-		'"So, you really don''t wear panties?" Albina slurs, turning her head toward your pussy. "Like, ev''r?"'
-		if trait['commando_lvl'] = 3:
-			act 'Only when I have to':
-				cla & *nl
-				'"Only when I have to," you say, wrinkling your nose in annoyance. "Sometimes you just can''t get away with it."'
-				'"Like when?" she asks curiously.'
-				act 'School':
-					cla & *nl
-					'"At school," you sigh tiredly. "If I don''t, all the teachers will look up my skirt during class."'
-					'"All of them??" Albina looks confused. "I get the males, men are pigs. The women too? Whad ''bout Ms. Braakman??"'
-					'"Especially her!" you say, sending you both into fits of laughter.'
-					gs 'albina_chat','wine_chat2'
-				end
-				act 'Disco':
-					cla & *nl
-					'"At the disco," you sigh tiredly. "Everyone will think I''m a slut if they see me flash puss on the dance floor."'
-					'"That''s why I wear thongs," Albina smirks proudly. "All the ass, none of the slut shame."'
-					'"That''s why I wear <i>pants</i>," you retort. "No one can tell you''re going commando when you''re wearing pants."'
-					'"But don''t all commandos wear pants?"'
-					'Albina narrows her eyes and looks up at you, while you stare down at her.'
-					'"I... shuddup!"'
-					gs 'albina_chat','wine_chat2'
-				end
-			end
-
-			act 'Nope, never':
-				cla & *nl
-				'"Nope!" you say, popping the P with your lips. "Neverrrrrr."'
-				'"Doesn''t your pussy get cold?"'
-				'"Nneh," you shrug. "You ged used to it."'
-				gs 'albina_chat','wine_chat2'
-			end
-
-			act 'I hate them':
-				cla & *nl
-				'"Neverrr!" you say, wrinkling your nose. "I <i>hate</i> wearing them!"'
-				'"Doesn''t your pussy get itchy when you wear pants?" she asks back.'
-				'"My pussy is tough as nails!" you proclaim proudly. "My pussy doesn''t need no pussy soft panties to protect it!"'
-				'"What?" Albina looks confused. "That doesn''t make any sense at all..."'
-				gs 'albina_chat','wine_chat2'
-			end
-		elseif trait['commando_lvl'] < 0:
-			act 'Not never':
-				cla & *nl
-				'"Not <i>never</i>," you slur. "Sometimes I just... skip the part where I put them on..."'
-				'"Hah! Slut!" she shouts and takes another slurp of her wine.'
-				gs 'albina_chat','wine_chat2'
-			end
-
-			act'Rarely':
-				cla & *nl
-
-
-				gs 'albina_chat','wine_chat2'
-
-			end
-		else
-			albina['commando_know'] = 0
-			act 'Nope, never':
-				cla & *nl
-
-
-				gs 'albina_chat','wine_chat2'
-			end
-
-			act 'I hate them':
-				cla & *nl
-
-
-				gs 'albina_chat','wine_chat2'
-
-			end
-
-		end
-	elseif albina['wine_convo'] = 8:
-		'"Do you think I would make a good stripper?" Albina asks.'
-		act 'Probably':
-			cla & *nl
-			'"Probably," you mumble back. "You can dance and love shoving your ash in peopl''sh faces. Primo stripper qualities. Why do you ask?"'
-			'"Was thinking about how to pay for uni. Mama could probably do it for me, but what if I want some extra cash on the side?"'
-			gs 'albina_chat','wine_chat2'
-		end
-
-		act 'Too bitchy':
-			cla & *nl
-			'"Nah." You wave your glass dismissively. "You''re too bitchy."'
-			'"Bitchy?!" she gasps, mouth agape in indignation.'
-			'"Yeah, too bitchy."'
-			'"What the fuck is that supposed to mean?"'
-			'"You''d rip someone''s balls off first time you get called a slut or a whore. You couldn''t put up with enough bullshit to be a stripper."'
-			'"... fuck, you''re right."'
-			'"See? Bitchy," you smile, smuggly sipping your wine.'
-			'"Oh fuck off," she grumbles back before taking a much bigger gulp.'
-			gs 'albina_chat','wine_chat2'
-		end
-	end
-end
-
-if $ARGS[0] = 'wine_chat2':
-	act 'Call her a butt slut':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
-		'"You''re such a butt slut Albina," you remark, taking another sip from your glass.'
-		'"Fuck yeah, I am. And I <i>love</i> being one," she grins back, almost spilling her wine all over her face when you both cackle with uncontrollable laughter.'
-		act 'Continue':gt'albina_chat','wine_chat1'
-	end
-
-	act 'Spit or swallow?':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
-		'"So, spit or swallow?" you ask, looking down at Albina.'
-		'"Swallow, duh."'
-		act 'Ew, gross':
-			cla & *nl
-			'"Ewww," you wrinkle your nose in disgust. "Thad''s fucking gross! I can''t believe you do that!"'
-			'"Waht else am I suppozed do?"'
-			'"Just spit it out!"'
-			'"But if he cums in your mouth, that means he wants you to swallow, right?" she says, looking genuinely confused that you''re suggesting there''s a choice.'
-			act 'Continue':gt'albina_chat','wine_chat1'
-		end
-
-		act 'Me too':
-			cla & *nl
-			'"Me too," you mumble. "Spitting is quitting."'
-			'"Amen sizter," Albina says, throwing up her hand and high fiving you.'
-			act 'Continue':gt'albina_chat','wine_chat1'
-		end
-		if trt_cumeater > 0:
-			act 'I love the taste':
-				cla & *nl
-				'"Me too," you smile. "I love the way it feels, going down my throat. Taste is pretty good too."'
-				'"What the fuck?!" Albina says, looking at you with digust. "You actually like the taste of cum?!"'
-				'"Yeah, it''s why I swallow. You don''t like it?"'
-				'"No! It tastes like slimey shit!"'
-				'"Then why do you do it?"'
-				'"Cuz you''re supposed to? If he cums in my mouth, I can''t spit it out," she says, looking genuinely confused that you''re suggesting there''s a choice.'
-				act 'Continue':gt'albina_chat','wine_chat1'
-			end
-		end
-	end
-
-	act 'Your mom is is very pretty':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
-		'With Albina right on your lap, you find your thoughts drifting to her mother. Her hair, her facial structure, she really is her mother''s daughter. It''s easy to tell where she got her good looks from.'
-		'"Your mom is fucking hot," you suddenly blurt out, your mouth autocompleting your thought before it actually passes through your brain. You freeze in panic.'
-		'"Fucking hell, I <i>knowwwwwwww</i>," Albina whines beneath you. "I gots ass fer dayz, but she''s gots tits to match. Big fucking bootyful bounshy tits that give ''er cleavage in a t-shirt. <i>And</i> a great ass! Life is so un-fucking-fair..."'
-		act 'Continue':gt'albina_chat','wine_chat1'
-	end
-
-	act'':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
-
-		act 'Continue':gt'albina_chat','wine_chat1'
-	end
-
-	act'':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
-
-		act 'Continue':gt'albina_chat','wine_chat1'
-	end
-end
-
-if $ARGS[0] = 'first_visit':
-	AlbinaQW['albride'] = 2
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
-	'Albina leads you to the rather well furnished and decorated sitting room. "You''ll have to excuse the mess. The maid was... loyal to my father, so she had to go." She then disappears into the kitchen. While she''s gone, her phone vibrates on the table. You look and see that "Mama" is trying to call her.'
-	'<i>Strange. She''s never mentioned her mother. Hell, she barely talks about her father,</i> you think to yourself.'
-	'The phone rings out as Albina returns with a bottle of wine and two glasses. She places them on the table and notices her missed call. Quickly picking her phone up, she types a message before stuffing it in her pocket.'
-	act 'Continue':
-		*clr & cla
-		minut += 15
-		gs 'drugs', 'alcohol', 'wine'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
-		'"<i>This,</i>" Albina grunts, twisting a corkscrew into the top of the wine bottle, "was was one of my father''s favourite things. A bottle of stupidly expensive wine that he always refused to open. So let''s fucking open it!"'
-		'With a grin and a dramatic flourish, she yanks the cork out of the top and pours the contents into the glasses, handing one over before taking the seat next to you.'
-		'"He''s gone! He''s finally gone!" she squeals gleefully and chugs the whole glass in practically a single gulp.'
-		act 'What is going on?':
-			minut += 5
-			gs 'drugs', 'alcohol', 'wine'
-			gs 'stat'
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
-			'"What''s going on Albina? Seriously, what is this about? I don''t understand."'
-			'"He''s finally fucking gone!" she rants, as if that makes any more sense. "All his emails, text messages, phone calls, all the witnesses proving what a scumbag he is!"'
-			'"Albina, what are you talking about?!"'
-			'"Just shut up and drink!" she scorns while filling her glass a second time. You take a small sip while she downs the whole thing again. Several minutes go by in silence, broken only by your occasional sips and the glugging of Albina pouring herself glass after glass until the bottle is empty.'
-			act 'Continue':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
-				'"<i><b>FUCKING BASTARD!!</b></i>"'
-				'Without warning, Albina smashes her glass down on the table, causing you to jump. The glass snaps at the stem and she blankly stares at the broken remains in her hand, as if she doesn''t understand how they got there. You look at her in fright and watch tears begin to stream from her unblinking eyes before she hurls the rest of the glass across the room. It shatters against a cabinet as she lets out a loud scream.'
-				act 'Try to talk':
-					*clr & cla
-					minut += 15
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
-					'"Albina..." you start. "I-'
-					'"My father turned me into a whore!" she blurts out. "He sold me! Let men drag me away into hotel rooms and fuck me however they pleased! And they''d give him money. Donate right into his campaign fund like it was charity!"'
-					if AlbinaQW['StarletsWhore'] > 0:
-						'She turns to face you, eyes brimming. "And when it wasn''t enough, he sold my friends too. Sold <i>you</i>."'
-						'Albina suddenly breaks, bawling loudly as sobs rack her body. "I''m a monster, <<$pcs_nickname>>!" she wails. "I''m so sorry! I should''ve stopped them! But I didn''t! I just handed you over to be raped-! Because I didn''t want it to be me-! I had-! You-! I-! I''m-!"'
-						*nl
-						'You throw your arms around her, wrapping her in a tight hug as she continues to cry, her fingers gripped tight across the back of your top as her tears soak into your shoulder.'
-						act 'Forgive her':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort1.jpg"></center>'
-							'"Shhhh, shhhh. It''s okay..." you whisper comfortingly.'
-							'"It''s not okay!" she wails back. "I-! I-!"'
-							'"It''s okay..." you continue on cooing. "I forgive you Albina. I''m not holding this against you."'
-							'"But I-!"'
-							'"I don''t care. You''re still my friend." Your last words cause her to bawl even harder and she becomes completely unintelligable for the next few minutes as she releases what you can only imagine to be years of frustration and trauma.'
-							act 'Continue':gt'albina_chat','first_visit2'
-						end
-					else
-						'She turns to face you, eyes brimming. "And when it wasn''t enough, he sold my friends too."'
-						'Albina suddenly breaks, bawling loudly as sobs rack her body. "I''m a monster, <<$pcs_nickname>>!" she wails. "I didn''t want to! But I didn''t stop them! I just handed them over to be raped because I didn''t want it to be me! I had-! They-! I-! I''m-!"'
-						*nl
-						'You throw your arms around her, wrapping her in a tight hug as she continues to cry, her fingers gripped tight across the back of your top as her tears soak into your shoulder.'
-					end
-					act 'It''s not your fault':
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort1.jpg"></center>'
-						'"Shhhh, shhhh. It''s okay..." you whisper comfortingly.'
-						'"It''s not okay!" she wails back. "I-! I-!"'
-						'"It''s okay..." you continue on cooing. "It''s not your fault."'
-						'"But I-!"'
-						'"It''s not. No matter what you tell yourself, it wasn''t your fault. And no matter what you think, you''re still my friend." Your last words cause her to bawl even harder and she becomes completely unintelligable for the next few minutes as she releases what you can only imagine to be years of frustration and trauma.'
-						act 'Continue':gt'albina_chat','first_visit2'
-					end
-				end
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'first_visit2':
-	cla & *clr
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
-	'Eventually Albina''s body stops shuddering and she pulls back. Her eyes are bloodshot and the fierce sobs that coursed through her have been reduced to small hiccuping gasps.'
-	'"My mama is coming home you know," she whispers with a small smile. She glances up at you with eyes that look like they could burst into tears again at any moment, but this time with joy. "All these years after he chased her away... She''s going to come home. She''s going to come back to me! <i>For</i> me!" She is practically beaming.'
-	'"You really miss her, don''t you?"'
-	'Instead of answering you, she lunges forward and presses her lips against yours, forcing her tongue between them.'
-	gs 'willpower', 'kiss', 'resist', 'medium'
-	gs 'arousal', 'kiss', -5
-	if will_cost <= pcs_willpwr:
-		act 'Pull away (<<will_cost>> Willpower)':
-			*clr & cla
-			minut += 5
-			npc_rel['A23'] -= 5
-			gs 'willpower', 'pay', 'resist'
-			gs 'drugs', 'alcohol', 'wine'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome1.jpg"></center>'
-			'You jump back in fright, breaking the kiss and nearly falling off the sofa. In turn, Albina jumps back from you, looking distraught.'
-			'"I''m sorry <<$pcs_nickname>>! I-! I shouldn''t have... I don''t know what came over me! I... I''m sorry," she repeats. "You should go... I don''t want to..."'
-			act 'Do as she suggests':
-				cla & *clr
-				'Not saying anything else, you awkwardly pick up your things and walk towards the door. Albina sits in silence, her shoulders hunched as she stares downward. As far as you know, she doesn''t move even as you close the door behind you.'
-				act 'Leave':gt 'pav_residential'
-			end
-
-			act 'Comfort her':
-				cla & *clr
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
-				'"No, it''s okay," you shake your head. "I was just... surprised. I didn''t mean to react that way."'
-				'"You should go..." she says again, her voice flat.'
-				'"No, I''m not leaving you like this. If you want, I could just sit here and we could chat for a while?"'
-				'Raising her head, Albina looks at you with a sad smile. "I''d like that."'
-				*nl
-				act 'Continue':
-					cla & *clr
-					minut += 60
-					npc_rel['A23'] += 10
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome1.jpg"></center>'
-					'You sit by her side as she begins to tell you everything about herself that was once hidden from you. How her father never wanted children. How he abused her mother because of her birth. The way he chased her mother away and then blamed Albina for it after. Many of her rapes, described in graphic, painful detail. How she seeks comfort from women because of the abuse she''s endured at the hands of men. And finally, how she learned that Chernov had been investigating her father for years and so gathered enough evidence for him to have her father arrested. You do nothing but sit and nod along the entire time, listening intently.'
-					*nl
-					'At the end of an hour, it seems a weight has been lifted from her shoulders and she has <i>slightly</i> sobered up.'
-					'"I''ve never told anyone that before," she says. "You... you really don''t think worse of me?"'
-					act 'No I don''t':
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome.jpg"></center>'
-						'"No," you shake your head. "I don''t. I think you''re one of the bravest people I''ve ever met."'
-						'Your friend truly comforted, you finally collect your things and bid her farewell. She takes you to the door and as you walk down the driveway, both of you waving goodbye, you think you catch sight of the first genuine smile you''ve ever seen on Albina''s face.'
-						act 'Leave':gt 'pav_residential'
-					end
-
-					act 'Kiss her':
-						gs 'arousal', 'kiss', -5
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissing.jpg"></center>'
-						'Instead of answering with words, you lean in and press your lips against Albina''s. She practically melts into it, opening her mouth to brush her tongue across your lips. You oblige and open your mouth to press back against her with your own tongue. Her tongue piercing adds a surprisingly erotic sensation to your kiss as you feel heat spreading through your entire body before she suddenly breaks off the kiss.'
-						'"My room?" she asks breathlessly.'
-						'"Your room." Grabbing you by the arm, she practically drags you upstairs.'
-						act 'Follow her':gt 'albina_chat', 'first_sex'
-					end
-				end
-			end
-
-
-			act 'Kiss her':
-				cla & *clr
-				gs 'arousal', 'kiss', -5
-				cla & *clr
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissing.jpg"></center>'
-				'Unwilling to leave Albina like this, you lean in and press your lips against hers. She stiffens.'
-				'"No, <<$pcs_nickname>>," she says around your lips. "I don''t want to make you-"'
-				'"I was just surprised," you whisper back. "I don''t mind. I want this."'
-				'You press your tongue against her lips and Albina melts into it, opening her mouth to allow you in. Her tongue piercing adds a surprisingly erotic sensation to your kiss as you feel heat spreading through your entire body before she suddenly breaks off the kiss.'
-				'"My room?" she asks breathlessly.'
-				'"Your room." Grabbing you by the arm, she practically drags you upstairs.'
-				act 'Follow her':gt 'albina_chat', 'first_sex'
-			end
-		end
-	else
-		act 'Pull away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
-
-	act 'Kiss her back':
-		*clr & cla
-		gs 'arousal', 'kiss', 2
-		npc_rel['A23'] += 2
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissing.jpg"></center>'
-		'You''re not sure if it''s just the alcohol or if something else is compelling you, but you go right along with it, opening your mouth wider to let her plunge her tongue even deeper. Her tongue piercing adds a surprisingly erotic sensation to your kiss as you feel heat spreading through your entire body before she suddenly breaks off the kiss.'
-		'"My room?" she asks breathlessly.'
-		'"Your room." Grabbing you by the arm, she practically drags you upstairs.'
-		act 'Follow her':gt 'albina_chat', 'first_sex'
-	end
-end
-
-if $ARGS[0] = 'first_sex':
-	*clr & cla
-	gs 'stat'
-	'<center><video autoplay loop src="images/shared/sex/lesbian/kiss1.mp4"></video></center>'
-	'The moment you get into her room, you start tearing each other''s clothes off and tossing them aside without a care. Her thong is drenched and comes away with a trail of juices as she wiggles out of it. As soon as you''re completely naked, she pushes you back onto the bed and climbs on top of you. You wrap your legs around her back and you go right back to passionately making out again. But it isn''t enough. You can feel Albina''s juices smearing against your thigh and you''re pretty sure she can feel the same from you.'
-	gs 'arousal', 'kiss', 2, 'no_orgasm_msg'
-	gs 'arousal', 'massage', -2, 'no_orgasm_msg'
-	gs 'stat'
-
-	act 'Take it further':
-		gs 'arousal', 'rimming', 5, 'no_orgasm_msg'
-		gs 'arousal', 'vaginal_finger', -5, 'no_orgasm_msg'
-		gs 'stat'
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/uanuli22.jpg"></center>'
-		'Albina breaks the kiss and flips you around, shoving two fingers into your pussy and her tongue up your ass. The sensation of her piercing pushing into your ass causes you to gasp and she capitalizes on it, sending undulating motions through her tongue to drive you into a frenzy.'
-		'"Oh Albina!" you moan. "I want to make you feel good too!"'
-		act '69':
-			*clr & cla
-			if npc_sex['A23'] = 0: npc_sex['A23'] = 1 & girl += 1
-			lesbian += 1
-			$orgasm_or = 'yes'
-			gs 'arousal', 'cuni', 10, 'no_orgasm_msg'
-			gs 'arousal', 'cuni_give', -10, 'no_orgasm_msg'
-			gs 'arousal', 'rimming', 5, 'no_orgasm_msg'
-			gs 'stat'
-			'<center><video autoplay loop src="images/shared/sex/lesbian/69_1.mp4"></video></center>'
-			'You turn, forcing her tongue away from your ass and towards your other hole instead, wrapping your thighs around her torso. In the same motion, you dive between her legs and run your tongue across her pussy. It''s absolutely <i>soaked</i>. The two of you eat each other out with mutually reckless abandon as you relentlessly tease each other''s clits. Albina''s pierced tongue feels amazing as it swirls around your clit and occasionally slides up and rims your ass before moving back down to your pussy, which grows wetter and wetter.'
-			*nl
-			'Albina''s body begins to tense up and her legs pull you tight against her pussy, practically burying you in it. She''s close, and you feel exactly the same way, mimicking her actions as you feel her lips against your labia. She shrieks into your pussy, her cry of orgasm vibrating through you as a burst of fluid suddenly sprays into your face and the shock sends you over the edge. Your eyes roll back in your head as you too release a wordless groan into her dripping wet pussy. You can feel her spasming underneath your tongue and her juices spray directly into your mouth. It''s unbelievably hot, sustaining your orgasm for longer and longer.'
-			*nl
-			'Finally, the tension gives out and both of you are left panting. You can feel Albina''s breath between your legs.'
-			act'Continue':
-				pcs_hairbsh = 0
-				if pcs_makeup > 1: pcs_makeup = 0
-				gs 'arousal', 'kiss', 1, 'no_orgasm_msg'
-				gs 'arousal', 'end'
-				gs 'stat'
-				cla & *clr
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/nudealbina.jpg"></center>'
-				'Albina untangles herself from your legs and flops onto her back, still breathing hard. You do the same, staring up at the ceiling. The sheets are soaked beneath you.'
-				*nl
-				'Pulling her herself up, Albina turns herself around and gives you the most gentle kiss before pulling back. You can taste yourself on her lips.'
-				*nl
-				'"That might have been... the biggest orgasm... I''ve ever had..." Albina pants, giving you a sultry look as she combs back her deshevled hair. "Holy shit, you''re wasted on men!"'
-				'"You didn''t... tell me... you were a squirter!" you huff back.'
-				'"You never asked," she smirks and gives you another soft kiss.'
-				act 'Afterglow':
-					minut += rand(5,10)
-					gs 'stat'
-					cla & *clr
-					'The two of you lay on her bed, slowly recovering after your high-intensity orgasms. Incredibly, Albina''s pussy continues to trickle a steady stream of juices, even several minutes later.'
-					'"Oh fuck," she breathes. "I get so wet after I cum, but this is just ridiculous! What did you do to me <<$pcs_nickname>>?"'
-					'You laugh, finally managing to prop yourself up. You look over at her and her expression seems to change to something more tender.'
-					'"Thanks <<$pcs_nickname>>. It was nice to let it all out... and I''m not just talking about my feelings..." she says, expression turning mischevious again. "Thanks for being a good friend."'
-					act 'Get dressed':
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome.jpg"></center>'
-						'Albina helps you clean up before you get dressed and you finally collect your things, preparing to bid her farewell. She forgos her clothes, choosing to walk you to the door instead. As you walk down the driveway, you turn and see her, standing naked in the doorway waving you goodbye and you think you catch sight of the first genuine smile you''ve ever seen on Albina''s face.'
-						act 'Leave':gt 'pav_residential'
-					end
-				end
-			end
-		end
-	end
-end
 --- albina_chat ---------------------------------
 

+ 386 - 89
locations/albina_house_events.qsrc

@@ -11,12 +11,250 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 !!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 	if AlbinaQW['albride'] = 1:
-		gt'albina_chat','first_visit'
+		gt'albina_house_events','first_visit'
 	else
 		gt 'albinahome', 'hallway'
 	end
 end
 
+if $ARGS[0] = 'first_visit':
+	AlbinaQW['albride'] = 2
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
+	'Albina leads you to the rather well furnished and decorated sitting room. "You''ll have to excuse the mess. The maid was... loyal to my father, so she had to go." She then disappears into the kitchen. While she is gone, her phone vibrates on the table. You look and see that "Mama" is trying to call her.'
+	'<i>Strange. She''s never mentioned her mother. Hell, she barely talks about her father,</i> you think to yourself.'
+	'The phone rings out as Albina returns with a bottle of wine and two glasses. She places them on the table and notices her missed call. Quickly picking up her phone up, she types a message before stuffing it in her pocket.'
+	act 'Continue':
+		*clr & cla
+		minut += 15
+		gs 'drugs', 'alcohol', 'wine'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
+		'"<i>This,</i>" Albina grunts, twisting a corkscrew into the top of the wine bottle, "was was one of my father''s favourite things. A bottle of stupidly expensive wine that he always refused to open. So let''s fucking open it!"'
+		'With a grin and a dramatic flourish, she yanks the cork out of the top and pours the contents into the glasses, handing one over before taking the seat next to you.'
+		'"He''s gone! He''s finally gone!" she squeals gleefully and chugs the whole glass in practically a single gulp.'
+		act 'What is going on?':
+			minut += 5
+			gs 'drugs', 'alcohol', 'wine'
+			gs 'stat'
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
+			'"What''s going on Albina? Seriously, what is this about? I don''t understand."'
+			'"He''s finally fucking gone!" she rants, as if that makes any more sense. "All his emails, text messages, phone calls, all the witnesses proving what a scumbag he is!"'
+			'"Albina, what are you talking about?!"'
+			'"Just shut up and drink!" she scorns while filling her glass a second time. You take a small sip while she downs the whole thing again. Several minutes go by in silence, broken only by your occasional sips and the glugging of Albina pouring herself glass after glass until the bottle is empty.'
+			act 'Continue':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
+				'"<i><b>FUCKING BASTARD!!</b></i>"'
+				'Without warning, Albina smashes her glass down on the table, causing you to jump. The glass snaps at the stem and she blankly stares at the broken remains in her hand, as if she doesn''t understand how they got there. You look at her in fright and watch tears begin to stream from her unblinking eyes before she hurls the rest of the glass across the room. It shatters against a cabinet as she lets out a loud scream.'
+				act 'Try to talk':
+					*clr & cla
+					minut += 15
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
+					'"Albina..." you start. "I-'
+					'"My father turned me into a whore!" she blurts out. "He sold me! Let men drag me away into hotel rooms and fuck me however they pleased! And they''d give him money. Donate right into his campaign fund like it was charity."'
+					if AlbinaQW['StarletsWhore'] > 0:
+						'She turns to face you, eyes brimming. "And when it wasn''t enough, he sold my friends too. Sold <i>you</i>."'
+						'Albina suddenly breaks, bawling loudly as sobs rack her body. "I''m a monster, <<$pcs_nickname>>!" she wails. "I''m so sorry! I should''ve stopped them! But I didn''t! I just handed you over to be raped-! Because I didn''t want it to be me-! I had-! You-! I-! I''m-! <i>UWAHHHH!!</i>"'
+						*nl
+						'You throw your arms around her, wrapping her in a tight hug as she continues to cry, her fingers gripped tight across the back of your top as her tears soak into your shoulder.'
+						act 'Forgive her':
+							cla & *clr
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort1.jpg"></center>'
+							'"Shhhh, shhhh. It''s okay..." you whisper comfortingly.'
+							'"It''s not okay!" she wails back. "I-! I-!"'
+							'"It''s okay..." you continue on cooing. "I forgive you Albina. I''m not holding this against you."'
+							'"But I-!"'
+							'"I don''t care. You''re still my friend." Your last words cause her to bawl even harder and she becomes completely unintelligable for the next few minutes as she releases what you can only imagine to be years of frustration and trauma.'
+							act 'Continue':gt'albina_house_events','first_visit2'
+						end
+					else
+						'She turns to face you, eyes brimming. "And when it wasn''t enough, he sold my friends too."'
+						'Albina suddenly breaks, bawling loudly as sobs rack her body. "I''m a monster, <<$pcs_nickname>>!" she wails. "I didn''t want to! But I didn''t stop them! I just handed them over to be raped because I didn''t want it to be me! I had-! They-! I-! I''m-! <i>UWAHHHH!!</i>"'
+						*nl
+						'You throw your arms around her, wrapping her in a tight hug as she continues to cry, her fingers gripped tight across the back of your top as her tears soak into your shoulder.'
+					end
+					act 'It''s not your fault':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort1.jpg"></center>'
+						'"Shhhh, shhhh. It''s okay..." you whisper comfortingly.'
+						'"It''s not okay!" she wails back. "I-! I-!"'
+						'"It''s okay..." you continue on cooing. "It''s not your fault."'
+						'"But I-!"'
+						'"It''s not. No matter what you tell yourself, it wasn''t your fault. And no matter what you think, you''re still my friend." Your last words cause her to bawl even harder and she becomes completely unintelligable for the next few minutes as she releases what you can only imagine to be years of frustration and trauma.'
+						act 'Continue':gt'albina_house_events','first_visit2'
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'first_visit2':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
+	'Eventually Albina''s body stops shuddering and she pulls back. Her eyes are bloodshot and the fierce sobs that coursed through her have been reduced to small hiccuping gasps.'
+	'"My mama is coming home you know," she whispers with a small smile. She glances up at you with eyes that look like they could burst in to tears again at any moment, but this time with joy. "All these years after he chased her away... She''s going to come home. She''s going to come back to me! <i>For</i> me!" She is practically beaming.'
+	'"You really miss her, don''t you?"'
+	'Instead of answering you, she lunges forward and presses her lips against yours, forcing her tongue between them.'
+	gs 'willpower', 'kiss', 'resist', 'medium'
+	gs 'arousal', 'kiss', -5
+	if will_cost <= pcs_willpwr:
+		act 'Pull away (<<will_cost>> Willpower)':
+			*clr & cla
+			minut += 5
+			npc_rel['A23'] -= 5
+			gs 'willpower', 'pay', 'resist'
+			gs 'drugs', 'alcohol', 'wine'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome1.jpg"></center>'
+			'You jump back in fright, breaking the kiss and nearly falling off the sofa. In turn, Albina jumps back from you, looking distraught.'
+			'"I''m sorry <<$pcs_nickname>>! I-! I shouldn''t have... I don''t know what came over me! I... I''m sorry," she repeats. "You should go... I don''t want to..."'
+			act 'Do as she suggests':
+				cla & *clr
+				'Not saying anything else, you awkwardly pick up your things and walk towards the door. Albina sits in silence, her shoulders hunched as she stares downward. As far as you know, she doesn''t move even as you close the door behind you.'
+				act 'Leave':gt 'pav_residential'
+			end
+			
+			act 'Comfort her':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
+				'"No, it''s okay," you shake your head. "I was just... surprised. I didn''t mean to react that way."'
+				'"You should go..." she says again, her voice flat.'
+				'"No, I''m not leaving you like this. If you want, I could just sit here and we could chat for a while?"'
+				'Raising her head, Albina looks at you with a sad smile. "I''d like that."'
+				*nl
+				act 'Continue':
+					cla & *clr
+					minut += 60
+					npc_rel['A23'] += 10
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome1.jpg"></center>'
+					'You sit by her side as she begins to tell you everything about herself that was once hidden from you. How her father never wanted children. How he abused her mother because of her birth. The way he chased her mother away and then blamed Albina for it after. Many of her rapes, described in graphic, painful detail. How she seeks comfort from women because of the abuse she''s endured at the hands of men. And finally, how she gathered evidence for years before submitting it to the police and having him arrested. You do nothing but sit and nod along the entire time, listening intently.'
+					*nl
+					'At the end of an hour, it seems a weight has been lifted from her shoulders and she has <i>slightly</i> sobered up.'
+					'"I''ve never told anyone that before," she says. "You... you really don''t think worse of me?"'
+					act 'No I don''t':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome.jpg"></center>'
+						'"No," you shake your head. "I don''t. I think you''re one of the bravest people I''ve ever met."'
+						'Your friend truly comforted, you finally collect your things and bid her farewell. She takes you to the door and as you walk down the driveway, both of you waving goodbye, you think you catch sight of the first genuine smile you''ve ever seen on Albina''s face.'
+						act 'Leave':gt 'pav_residential'
+					end
+					
+					act 'Kiss her':
+						gs 'arousal', 'kiss', -5
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissing.jpg"></center>'
+						'Instead of answering with words, you lean in and press your lips against Albina''s. She practically melts into it, opening her mouth to brush her tongue across your lips. You oblige and open your mouth to press back against her with your own tongue. You feel heat spreading through your entire body when she suddenly breaks off the kiss.'
+						'"My room?" she asks breathlessly.'
+						'"Your room." Grabbing you by the arm, she practically drags you upstairs.'
+						act 'Follow her':gt 'albina_house_events','first_sex'
+					end
+				end
+			end
+			
+			
+			act 'Kiss her':
+				cla & *clr
+				gs 'arousal', 'kiss', -5
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissing.jpg"></center>'
+				'Unwilling to leave Albina like this, you lean in and press your lips against hers. She stiffens.'
+				'"No, <<$pcs_nickname>>," she says around your lips. "I don''t want to make you-"'
+				'"I was just surprised," you whisper back. "I don''t mind. I want this."'
+				'You press your tongue against her lips and Albina melts into it, opening her mouth to allow you in. Her tongue swirls around yours and you feel heat spreading through your entire body when she suddenly breaks off the kiss.'
+				'"My room?" she asks breathlessly.'
+				'"Your room." Grabbing you by the arm, she practically drags you upstairs.'
+				act 'Follow her':gt 'albina_house_events','first_sex'
+			end
+		end
+	else
+		act 'Pull away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	
+	act 'Kiss her back':
+		*clr & cla
+		gs 'arousal', 'kiss', 2
+		npc_rel['A23'] += 2
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissing.jpg"></center>'
+!!		'You''re not sure if it''s just the alcohol or if something else is compelling you, but go right along with it, opening your mouth wider to let her plunge her tongue even deeper. It swirls around yours and you feel heat spreading through your entire body when she suddenly breaks off the kiss.'
+		'You''re not sure if it''s just the alcohol or if something else is compelling you, but you go right along with it, opening your mouth wider to let her plunge her tongue even deeper. Her tongue piercing adds a surprisingly erotic sensation to your kiss as you feel heat spreading through your entire body before she suddenly breaks off the kiss.'
+		'"My room?" she asks breathlessly.'
+		'"Your room." Grabbing you by the arm, she practically drags you upstairs.'
+		act 'Follow her':gt 'albina_house_events','first_sex'
+	end
+end
+
+if $ARGS[0] = 'first_sex':
+	*clr & cla
+	gs 'stat'
+	'<center><video autoplay loop src="images/shared/sex/lesbian/kiss1.mp4"></video></center>'
+	'The moment you get into her room, you start tearing each other''s clothes off and tossing them aside without a care. Her thong is drenched and comes away with a trail of juices as she wiggles out of it. As soon as you''re completely naked, she pushes you back onto the bed and climbs on top of you. You wrap your legs around her back and you go right back to passionately making out again. But it isn''t enough. You can feel Albina''s juices smearing against your thigh and you''re pretty sure she can feel the same from you.'
+	gs 'arousal', 'kiss', 2, 'no_orgasm_msg'
+	gs 'arousal', 'massage', -2, 'no_orgasm_msg'
+	gs 'stat'
+
+	act 'Take it further':
+		gs 'arousal', 'rimming', 5, 'no_orgasm_msg'
+		gs 'arousal', 'vaginal_finger', -5, 'no_orgasm_msg'
+		gs 'stat'
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/uanuli22.jpg"></center>'
+		'Albina breaks the kiss and flips you around, shoving two fingers into your pussy and her tongue up your ass. The second one causes you to gasp and she capitalizes on it, sending undulating motions through her tongue to drive you into a frenzy.'
+		'"Oh Albina!" you moan. "I want to make you feel good too!"'
+		act '69':
+			*clr & cla
+			if npc_sex['A23'] = 0: npc_sex['A23'] = 1 & girl += 1
+			lesbian += 1
+			$orgasm_or = 'yes'
+			gs 'arousal', 'cuni', 10, 'no_orgasm_msg'
+			gs 'arousal', 'cuni_give', -10, 'no_orgasm_msg'
+			gs 'arousal', 'rimming', 5, 'no_orgasm_msg'
+			gs 'stat'
+			'<center><video autoplay loop src="images/shared/sex/lesbian/69_1.mp4"></video></center>'
+			'You turn, forcing her tongue away from your ass and towards your other hole instead, wrapping your thighs around her torso. In the same motion, you dive between her legs and run your tongue across her pussy. It''s absolutely <i>soaked</i>. The two of you eat each other out with mutually reckless abandon as you relentlessly tease each other''s clits. Albina''s tongue occasionally slides up and rims your ass before moving back down to your pussy, which grows wetter and wetter.'
+			*nl
+			'Albina''s body begins to tense up and her legs pull you tight against her pussy, practically burying you in it. She''s close, and you feel exactly the same way, mimicking her actions as you feel her lips against your labia. She shrieks into your pussy, her cry of orgasm vibrating through you as a burst of fluid suddenly sprays into your face and the shock sends you over the edge. Your eyes roll back in your head as you too release a wordless groan into her dripping wet pussy. You can feel her spasming underneath your tongue and her juices spray directly into your mouth. It''s unbelievably hot, sustaining your orgasm for longer and longer.'
+			*nl
+			'Finally, the tension gives out and both of you are left panting. You can feel Albina''s breath between your legs.'
+			act'Continue':
+				pcs_hairbsh = 0
+				if pcs_makeup > 1: pcs_makeup = 0
+				gs 'arousal', 'kiss', 1, 'no_orgasm_msg'
+				gs 'arousal', 'end'
+				gs 'stat'
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/nudealbina.jpg"></center>'
+				'Albina untangles herself from your legs and flops onto her back, still breathing hard. You do the same, staring up at the ceiling. The sheets are soaked beneath you.'
+				*nl
+				'Pulling her herself up, Albina turns herself around and gives you the most gentle kiss before pulling back. You can taste yourself on her lips.'
+				*nl
+				'"That might have been... the biggest orgasm... I''ve ever had..." Albina pants, giving you a sultry look as she combs back her deshevled hair. "Holy shit, you''re wasted on men!"'
+				'"You didn''t... tell me... you were a squirter!" you huff back.'
+				'"You never asked," she smirks and gives you another soft kiss.'
+				act 'Afterglow':
+					minut += rand(5,10)
+					gs 'stat'
+					cla & *clr
+					'The two of you lay on her bed, slowly recovering after your high-intensity orgasms. Incredibly, Albina''s pussy continues to trickle a steady stream of juices, even several minutes later.'
+					'"Oh fuck," she breathes. "I get so wet after I cum, but this is just ridiculous! What did you do to me <<$pcs_nickname>>?"'
+					'You laugh, finally managing to prop yourself up. You look over at her and her expression seems to change to something more tender.'
+					'"Thanks <<$pcs_nickname>>. It was nice to let it all out... and I''m not just talking about my feelings..." she says, expression turning mischevious again. "Thanks for being a good friend."' 
+					act 'Get dressed':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome.jpg"></center>'
+						'Albina helps you clean up before you get dressed and you finally collect your things, preparing to bid her farewell. She forgos her clothes, choosing to walk you to the door instead. As you walk down the driveway, you turn and see her, standing naked in the doorway waving you goodbye and you think you catch sight of the first genuine smile you''ve ever seen on Albina''s face.'
+						act 'Leave':gt 'pav_residential'
+					end
+				end
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'swim_winter1':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 	'You head up to Albina''s room and just as you reach for the doorknob, it flies open up and Albina nearly runs straight into you, wearing a silk robe that reaches just below her groin.'
@@ -118,7 +356,7 @@ if $ARGS[0] = 'winter_hot_tub':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hottub.jpg"></center>'
 		'The two of you spend several minutes soaking in the tub together before Albina stands up.'
-		'"Come on, let''s get out before we start pruning. We need to shower anyways."'
+		'"Come on, let''s get out before we start pruning."'
 		xgt 'albina_house_events','after_swim_shower'
 	end
 end
@@ -165,83 +403,89 @@ end
 
 
 if $ARGS[0] = 'after_swim_shower':
-	act'Continue':
-		minut +=6
-		gs 'stat'
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-		'The two of you walk through her house, leaving a trail of droplets and wet footprints until you end up just outside Albina''s room.'
-		*nl
-		'"The guest bathroom is just down the hall on the left. That is..." She trails off, looking you dead in the eye with a mischievous smile. "... unless you want to join me in the bath? It''s big enough for two..."'
-		'That twinkle is back in her eye again and you reflexively swallow, knowing exactly what will happen if you take her up on the offer.'
-		act 'Refuse':
-			cla & *nl
-			'You turn down her offer and she looks a little disappointed, but she directs you to the bathroom anyway. "Feel free to use whatever''s in there. There''s towels in the cupboard as well," she says before disappearing into her bedroom. You walk down to the bathroom, enter and place your clothes in a neat pile. You turn the shower on and lock the door as you wait for the water. When it''s the right temperature, you step in and start washing yourself.'
-			act'Shower':
-				cla & *clr
-				'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-				'A lot of expensive looking stuff litters the shelves, but you limit yourself to using only what you need.'
-				*nl
-				dynamic $showerdin
-				*nl
-				'After giving yourself a thorough wash, you turn the water off and step out. You find a towel and dry yourself before getting dressed. Once you''re finished, you step out into the hallway, walk down to Albina''s bedroom and knock on the door. She tells you to enter.'
-				act 'Enter':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/nudealbina.jpg"></center>'
-					'You enter the room and are taken aback slightly when you find a nude Albina laying on her bed, her legs spread. She smiles at you knowingly and winks. It''s obvious that she was rubbing one out before you disturbed her, but she doesn''t seem to care and and stands up and walks over to her closet. She slides on a lacy white thong and skimpy tank top and walks out. "My favourite show is about to start. I think you''ll like it."'
-					act 'Go and watch TV': gt 'albina_house_events', 'tv_1'
-				end
-			end
-		end
-		
-		act'Agree':
+	if rand(0,1) = 1:
+		act'Continue':gt'albina_wine_event','wine_invite'
+	else
+		act'Continue':
+			minut +=6
+			gs 'stat'
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/bathroom.jpg"></center>'
-			'"Sure," you say, returning her smile. "Why not?" Her smile turns into a grin and she grabs your hand, pulling you through her bedroom and into the bathroom.'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
+			'The two of you walk through her house, leaving a trail of droplets and wet footprints until you end up just outside Albina''s room.'
 			*nl
-			'Once inside, she releases you, bending over to turn on the water. She seems to be a little far away, needing to stretch to reach it. You can see all of the muscles in her toned legs go taut and her posture gives you a great view of both her holes. She hesitates just before turning the tap, glancing back at you, and you realize she''s doing this on purpose. Shit. What are you getting yourself into here?'
-
-			act'Continue':
+			'"The guest bathroom is just down the hall on the left. That is..." She trails off, looking you dead in the eye with a mischievous smile. "... unless you want to join me in the bath? It''s big enough for two..."'
+			'That twinkle is back in her eye again and you reflexively swallow, knowing exactly what will happen if you take her up on the offer.'
+			act 'Refuse':
+				cla & *nl
+				'You turn down her offer and she looks a little disappointed, but she directs you to the bathroom anyway.'
+				'"Use whatever you want in there. There''s towels in the cupboard," she says before disappearing into her bedroom. You walk down to the bathroom, enter and place your clothes in a neat pile. You turn the shower on and lock the door as you wait for the water. When it''s the right temperature, you step in and start washing yourself.'
+				act'Shower':
+					cla & *clr
+					shampoo += 1
+					'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+					'A lot of expensive looking stuff litters the shelves, but you limit yourself to using only what you need.'
+					*nl
+					dynamic $showerdin
+					*nl
+					'After giving yourself a thorough wash, you turn the water off and step out. You find a towel and dry yourself before getting dressed. Once you''re finished, you step out into the hallway, walk down to Albina''s bedroom and knock on the door. She tells you to enter.'
+					act 'Enter':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/nudealbina.jpg"></center>'
+						'You enter the room and are taken aback slightly when you find a nude Albina laying on her bed, her legs spread. She smiles at you knowingly and winks. It''s obvious that she was rubbing one out before you disturbed her, but she doesn''t seem to care and and stands up and walks over to her closet. She slides on a lacy white thong and skimpy tank top and walks out. "My favourite show is about to start. I think you''ll like it."'
+						act 'Go and watch TV': gt 'albina_house_events', 'tv_1'
+					end
+				end
+			end
+			
+			act'Agree':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/bathroom.jpg"></center>'
-				'Albina turns the faucet and steaming water immediately comes rushing out. She must pay a lot of money to have such good plumbing. As the tub begins to fill, you see her grab various bottles, squeezing a small squirt of liquid from each into the tumbling waterfall. They don''t seem to change the color of the water or add any bubbles, but a sharp aromatic scent immediately spreads through the room. She also grabs a few handfuls of salt, sprinkling them generously into the tub.'
+				'"Sure," you say, returning her smile. "Why not?" Her smile turns into a grin and she grabs your hand, pulling you through her bedroom and into the bathroom.'
 				*nl
-				'"Some of the best muscle relaxant money can buy. You''ll feel like a brand new woman when we''re finished," she smiles at you while stepping into the bath, one shapely leg at a time. Once fully submerged up to her shoulders, she gives you an innocent look. "Well? Are you just going to stare all day or are you coming in?"'
-				*nl
-				'Unable to resist her teasing, you smile and climb into the bath beside her.'
+				'Once inside, she releases you, bending over to turn on the water. She seems to be a little far away, needing to stretch to reach it. You can see all of the muscles in her toned legs go taut and her posture gives you a great view of both her holes. She hesitates just before turning the tap, glancing back at you, and you realize she''s doing this on purpose. Shit. What are you getting yourself into here?'
 
 				act'Continue':
 					cla & *clr
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/1.jpg"></center>'
-					'Albina doesn''t waste anytime and immediately soaps up her breasts before getting up on her knees and using a loofah to squeeze soapy water over her shapely ass. She then stands, bends over and spanks herself before wiggling her ass at you, giving you a clear invitation. She spreads her legs to let you slide underneath her and start gently tracing your tongue along her labia before you reach her clit. You start vigoursly eating her pussy, causing her to moan loudly in pleasure as she pushes a few of her fingers into her asshole and starts fingering herself, adding to her pleasure.' 
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/bathroom.jpg"></center>'
+					'Albina turns the faucet and steaming water immediately comes rushing out. She must pay a lot of money to have such good plumbing. As the tub begins to fill, you see her grab various bottles, squeezing a small squirt of liquid from each into the tumbling waterfall. They don''t seem to change the color of the water or add any bubbles, but a sharp aromatic scent immediately spreads through the room. She also grabs a few handfuls of salt, sprinkling them generously into the tub.'
 					*nl
-					'The minutes go by and Albina starts grinding against you, smearing you with her wetness as she loudly states "Yes, just like that <<$pcs_nickname>>! I''m going to fucking cum!" A few seconds later, she reaches her orgasm and screams loudly as her juices squirt down onto you. She keeps grinding against you as she rides through her orgasm before she climbs off and looks down at you through her legs, a satisfied smile on her face. She silently motions for you to sit on the edge of the tub.'
-					minut +=6
-					gs 'stat'
+					'"Some of the best muscle relaxant money can buy. You''ll feel like a brand new woman when we''re finished," she smiles at you while stepping into the bath, one shapely leg at a time. Once fully submerged up to her shoulders, she gives you an innocent look. "Well? Are you just going to stare all day or are you coming in?"'
+					*nl
+					'Unable to resist her teasing, you smile and climb into the bath beside her.'
 
-					act 'Continue':
-						*clr & cla
-						gs'arousal','vaginal_finger', 5, 'no_orgasm_msg'
-						gs'arousal','cuni', 5, 'no_orgasm_msg'
-						$orgasm_or = 'yes'
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/2.jpg"></center>'
-						'You sit on the edge and lean back. Albina spreads your legs and slides in front of you. She slowly starts rubbing your clit, eliciting a soft moan from you before she slides her finger into your pussy. She slowly fingers you before inserting a second finger, making you moan even louder. She then starts fingerbanging you, causing you to shriek loudly in pleasure. After a few minutes of this, she pulls her fingers out and holds them up to your mouth. You take them into your mouth and suck them, getting a good taste of yourself as she grins widely at you.' 
+					act'Continue':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/1.jpg"></center>'
+						'Albina doesn''t waste anytime and immediately soaps up her breasts before getting up on her knees and using a loofah to squeeze soapy water over her shapely ass. She then stands, bends over and spanks herself before wiggling her ass at you, giving you a clear invitation. She spreads her legs to let you slide underneath her and start gently tracing your tongue along her labia before you reach her clit. You start vigoursly eating her pussy, causing her to moan loudly in pleasure as she pushes a few of her fingers into her asshole and starts fingering herself, adding to her pleasure.' 
 						*nl
-						'Her face disappears into your crotch, causing you to gasp loudly in pleasured surprise when you suddenly feel her tongue piercing swirling over your clit. You place your hand on the back of her head and hold her down as you sit back and let her pleasure you, her tongue expertly running all over your labia and clit as she passionately eats your pussy. She''s <i>really</i> good at this and her piercing only adds to your pleasure. You don''t want her to stop and feel your orgasm building when she suddenly shoves her fingers back inside you and starts vigoursly fingerbanging you as she sucks on your clit. A few minutes of this is enough to send you over the edge and you scream loudly in pleasure as you have an explosive orgasm, smearing Albina''s face with your wetness.'
+						'The minutes go by and Albina starts grinding against you, smearing you with her wetness as she loudly states "Yes, just like that <<$pcs_nickname>>! I''m going to fucking cum!" A few seconds later, she reaches her orgasm and screams loudly as her juices squirt down onto you. She keeps grinding against you as she rides through her orgasm before she climbs off and looks down at you through her legs, a satisfied smile on her face. She silently motions for you to sit on the edge of the tub.'
+						minut +=6
+						gs 'stat'
+
 						act 'Continue':
-							gs'arousal','kiss', 5, 'no_orgasm_msg'
-							gs'arousal','end'
-							gs 'stat'
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/3.jpg"></center>'
-							'When you finally stop cumming, she climbs up and sits next to you on the edge of the tub. You both start passionately making out and groping each other''s bodies as you sit in your post-climax bliss. After a few minutes of this, you both climb out of the tub and she pulls the plug before grabbing a towel and walking out to her room, leaving you to get dressed.'
-							*nl
-							'You grab yourself a towel and dry off before getting dressed. When you walk into Albina''s room, you are greeted by the sight of her wearing only a lacy white thong as she dries her hair. "Just give me a few seconds to get dressed and we can do something, <<$pcs_nickname>>."'
+							gs'arousal','vaginal_finger', 5, 'no_orgasm_msg'
+							gs'arousal','cuni', 5, 'no_orgasm_msg'
+							$orgasm_or = 'yes'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/2.jpg"></center>'
+							'You sit on the edge and lean back. Albina spreads your legs and slides in front of you. She slowly starts rubbing your clit, eliciting a soft moan from you before she slides her finger into your pussy. She slowly fingers you before inserting a second finger, making you moan even louder. She then starts fingerbanging you, causing you to shriek loudly in pleasure. After a few minutes of this, she pulls her fingers out and holds them up to your mouth. You take them into your mouth and suck them, getting a good taste of yourself as she grins widely at you.' 
 							*nl
-							'She finishes drying her hair and pulls on a skimpy tank top before leading you out the door. "My favourite show is about to start. I think you''ll like it."'
-							
-							act 'Go and watch TV': gt 'albina_house_events', 'tv_1'
+							'Her face disappears into your crotch, causing you to gasp loudly in pleasured surprise when you suddenly feel her tongue piercing swirling over your clit. You place your hand on the back of her head and hold her down as you sit back and let her pleasure you, her tongue expertly running all over your labia and clit as she passionately eats your pussy. She''s <i>really</i> good at this and her piercing only adds to your pleasure. You don''t want her to stop and feel your orgasm building when she suddenly shoves her fingers back inside you and starts vigoursly fingerbanging you as she sucks on your clit. A few minutes of this is enough to send you over the edge and you scream loudly in pleasure as you have an explosive orgasm, smearing Albina''s face with your wetness.'
+							act 'Continue':
+								gs'arousal','kiss', 5, 'no_orgasm_msg'
+								gs'arousal','end'
+								gs 'stat'
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/3.jpg"></center>'
+								'When you finally stop cumming, she climbs up and sits next to you on the edge of the tub. You both start passionately making out and groping each other''s bodies as you sit in your post-climax bliss. After a few minutes of this, you both climb out of the tub and she pulls the plug before grabbing a towel and walking out to her room, leaving you to get dressed.'
+								*nl
+								'You grab yourself a towel and dry off before getting dressed. When you walk into Albina''s room, you are greeted by the sight of her wearing only a lacy white thong as she dries her hair. "Just give me a few seconds to get dressed and we can do something, <<$pcs_nickname>>."'
+								*nl
+								'She finishes drying her hair and pulls on a skimpy tank top before leading you out the door. "My favourite show is about to start. I think you''ll like it."'
+								
+								act 'Go and watch TV': gt 'albina_house_events', 'tv_1'
+							end
 						end
 					end
 				end
@@ -397,30 +641,52 @@ if $ARGS[0] = 'hot_tub_no_panties':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hottub.jpg"></center>'
 	'Stripping out of your clothes, you toss them in a pile on the floor.'
 	'"No panties <<$pcs_nickname>>?? How <i>daring</i> of you!" Albina teases.'
-
-	if trait['commando_lvl'] > 0 and trait['commando_lvl'] < 3:
-		albina['commando_know'] = 1
-		'"I don''t always wear them," you smirk back, stepping into the tub with her. Albina stares with a raised brow before smiling mischievously and wriggling around under the bubbling water. Her knees breach the surface for just a moment before going back down again and moments later, she tosses something over her shoulder. The black fabric wetly slaps onto the poolside and peering past her, you can see that it''s her thong.'
-		'"Oh <i>fuck...</i>" she moans. "I can see why. I should do this more often..."'
+	if albina['commando_know'] = 3:
+		'"You already know I don''t wear them," you smirk back.'
+	elseif albina['commando_know'] > 0:
+		'"You already know I consider panties to be optional," you smirk back.'
 	elseif trait['commando_lvl'] = 3:
-		albina['commando_know'] = 3
-		'"I hate wearing panties," you smirk while stepping into the tub with her. Albina stares with a raised brow before smiling mischievously and wriggling around under the bubbling water. Her knees breach the surface for just a moment before going back down again and moments later, she tosses something over her shoulder. The black fabric wetly slaps onto the poolside and peering past her, you can see that it''s her thong.'
-		'"Oh <i>fuck...</i>" she moans. "I should do this more often..."'
+		'"I hate wearing panties," you smirk, stepping into the tub with her.'
+	elseif trait['commando_lvl'] > 0:	
+		'"I don''t always wear them," you smirk back, stepping into the tub with her.'
+	else
+		'"I uhh, may have forgotten to wear them today..." you blush, stepping into the tub with her.'
+	end
+	if albina['commando_know'] = 0 and alterstrtimg = 24:
+		gs 'albina_house_events', 'goodie_two_shoes'
 	else
-		'"I uhh, may have forgotten to wear them today..." you blush before stepping into the tub with her. Albina just grins back at you. Moments later, you see a mischievous twinkling in her eye and she begins wriggling around under the bubbling water. Her knees breach the surface for just a moment before going back down again and moments later, she tosses something over her shoulder. The black fabric wetly slaps onto the poolside and peering past her, you can see that it''s her thong.'
-		'"Oh <i>fuck...</i>" she moans. "I should do this more often..."'
+		gs 'albina_house_events', 'hot_tub_no_panties2'
 	end
-	'You think she''s just teasing you until you sit down and gasp involuntarily. Hot water blasts directly across your pussy from the hot tub''s jets, softly tickling your clit. It''s turning you on and you can feel heat spreading through your hips that <i>isn''t</i> coming from the water. It seems to have the same effect on Albina, who reaches over and turns up the bubbles even more. You lose track of time, but it''s a very pleasurable experience.'
+	albina['commando_know'] = trait['commando_lvl']
+end
+	
+	
+if $ARGS[0] = 'hot_tub_no_panties2':
+	*nl
+	'She grins back at you and starts wriggling around beneath the bubbling water. Her knees briefly breach the surface and a moment later, she tosses something over her shoulder. Black fabric wetly slaps onto the poolside and peering past her, you realize it''s Albina''s thong. She leans back into the hot tub''s jets just before taking a sharp gasp.'
+	*nl
+	'"Oh <i>fuck...</i>" she moans. "I should do this more often..."'
+	*nl
+	gs 'albina_house_events', 'hot_tub_no_panties3'
+end
+
+if $ARGS[0] = 'hot_tub_no_panties3':
+	'You think she''s just teasing you until you sit down and gasp yourself. Hot water blasts directly across your pussy, softly tickling your clit. It''s turning you on and you can feel heat spreading through your hips that <i>isn''t</i> coming from the water. It seems to have the same effect on Albina, who reaches over and turns up the bubbles even more. She gives you a voyeuristic smile and openly panting to show you she''s getting off on this too. You lose track of time, but it''s a very pleasurable experience.'
+	gs 'albina_house_events', 'hot_tub_no_panties4'
+end
+
+if $ARGS[0] = 'hot_tub_no_panties4':
 	act 'Relax':
 		minut +=6
 		gs 'stat'
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
-		'After a while, you look up and see Albina has a mischievous twist in her lips. She slides through the water towards you and you feel her hand snaking up your leg.'
+		'After a while, you look up and see Albina has a mischievous twist in her lips. She slides through the water towards you and you feel her hand on your leg. It begins trailing up your leg until her fingers are right on top of your pussy. A finger starts to push it''s way in and-'
 		*nl
 		'"What on earth are you two doing?!"'
 		*nl
-		'You jump back from each other and turn, seeing Albina''s mother behind you. "Are you <i>naked</i>??" she scowls, eyeing Albina''s thong on the deck. "This is very unhygenic young lady! And who knows who could have seen you?! Don''t move young lady!" she barks before she disappears into the house. She returns a few minutes later with some towels and throws them at you before walking back into the house. Albina just rolls her eyes, but climbs out and dries herself with one of the towels.'
+		'You jump back from each other and turn, seeing Albina''s mother behind you.'
+		'"Are you <i>naked</i>??" she scowls, eyeing Albina''s thong on the deck. "This is very unhygenic! Hot tubs are full of bacteria. And who knows who could have seen you?! Don''t move young lady!" she barks before she disappears into the house. She returns a few minutes later with some towels and throws them at you before walking back into the house. Albina just rolls her eyes, but climbs out and dries herself with one of the towels.'
 		'"Mama will have a fit if you went in there naked, so you better get dressed," she warns as she passes you the other one.'
 		act'Get dressed':
 			cla & *clr
@@ -432,11 +698,11 @@ if $ARGS[0] = 'hot_tub_no_panties':
 			if CloDress = 1:
 				'"Just our luck for your mother to catch us skinny dipping!" you laugh, struggling to tug your dry dress down over your wet shoulders.'
 			elseif PCloSkirt > 0:
-				'"Just our luck for your mother to catch us skinny dipping!" you laugh, struggling to tug your dry top over your wet skin.'
+				'"Just our luck for your mother to catch us skinny dipping!" you laugh, struggling to tug your dry top over your moist skin.'
 			else
-				'"Just our luck for your mother to catch us skinny dipping!" you laugh, struggling to tug your dry pants up your wet legs.'
+				'"Just our luck for your mother to catch us skinny dipping!" you laugh, struggling to tug your dry pants up your still-moist legs.'
 			end
-			'"It was totally worth it! We should do it again sometime. I <i>really</i> enjoyed it..." she winks suggestively, leaving her wet towel on the deck and shrugging back into her robe.'
+			'"Totally worth it. We should do it again sometime. I <i>really</i> enjoyed it..." she winks suggestively, leaving her wet towel on the deck and shrugging into her robe.'
 			*nl
 			'You finish dressing before walking back into the house, where you find Zoya sitting at the kitchen counter, drinking wine and reading what you assume are work related papers. She gives you both a disapproving look, but otherwise ignores you. Albina leads you into the sitting room and plops down on the sofa. '
 			*nl
@@ -446,6 +712,37 @@ if $ARGS[0] = 'hot_tub_no_panties':
 	end
 end
 
+if $ARGS[0] = 'goodie_two_shoes':
+	'A look of genuine surprise flashes across Albina''s face. Her eyebrows scrunch together and she begins to study you more closely.'
+	'"You know," she starts. "Before we became friends, I always thought you were a stuck up goodie two shoes. But you''re actually kind of a slut aren''t you?"'
+	act'Offended':
+		cla & *nl
+		'"Look who''s talking, bitch," you scowl at Albina, making her laugh out loud.'
+		gs 'albina_house_events', 'hot_tub_no_panties2'
+	end
+	if trait['commando_lvl'] > 0:
+		albina['goodie_two_shoes_commando'] = 1
+		act'Guess you didn''t know me':
+			cla & *nl
+			'"Guess you didn''t know me so well back then," you shrug, smiling.'
+			gs 'albina_house_events', 'hot_tub_no_panties2'
+		end
+		
+		act'Rebellious phase':
+			cla & *nl
+			'"I''m going through my rebellious phase right now," you grin mischeviously.'
+			gs 'albina_house_events', 'hot_tub_no_panties2'
+		end
+	else
+		act'Protest':
+			cla & *nl
+			'"I''m not-" you stammer, blush deepening. "I told you, I just-"'
+			'"Forgot?" Albina laughs. "Not even I ''forget'' to wear panties <<$pcs_nickname>>. Only a slut would forget."'
+			gs 'albina_house_events', 'hot_tub_no_panties2'
+		end
+	end
+end
+
 if $ARGS[0] = 'tv_1':
     '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/watchtv.jpg"></center>'
 	'Albina grabs some snacks from the kitchen before leading you into the sitting room. You sit with her on the sofa as the show starts. It''s some American medical drama that''s been dubbed into Russian. Albina gets really engrossed in it, telling you everything she thinks you need to know about the plot and the characters. As the ending credits scroll, she turns to you with an excitement you never see, not even when she''s dancing.'
@@ -469,7 +766,7 @@ if $ARGS[0] = 'tv_1':
 		minut +=24
 		gs 'stat'
 		AlbinaQW['visiting'] = 0
-		act'Go home':gt 'pav_residential'
+		act'Leave':gt 'pav_residential'
 	end
 
 	act 'It was okay':
@@ -487,7 +784,7 @@ if $ARGS[0] = 'tv_1':
 		minut +=24
 		gs 'stat'
 		AlbinaQW['visiting'] = 0
-		act'Go home':gt 'pav_residential'
+		act'Leave':gt 'pav_residential'
 	end
 end
 
@@ -864,25 +1161,25 @@ if $ARGS[0] = 'albina_photos':
 		'You shrug your shoulders. "Maybe. It depends how good I can get."'
 
 		act 'Start':
-			photoskl_exp += rand(1,2)
+			gs 'exp_gain', 'photoskl', rand(1,2)
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/photo/pose2.jpg"></center>'
 			'After a few more photos, you decide to change the pose. "Your ass is your best feature, so why don''t you bend over and show it to me?" She grins and gets on all fours as you reposition yourself. "Like what you see <<$pcs_nickname>>?" You grin at her antics as you continue taking images. "Show me more of that ass!" She wiggles her ass at you and smiles, clearly enjoying herself. Her thong is peeking through her skimpy shorts, but you don''t think she cares. You feel like it adds to the erotic nature of the image.'
 
 			act 'Continue':
-				photoskl_exp += rand(1,2)
+				gs 'exp_gain', 'photoskl', rand(1,2)
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/photo/pose3.jpg"></center>'
 				'She takes you by surprise when she stands and pulls her shirt up to reveal her breasts. She quickly covers them before you can take a photo. "Not so fast. We''re not doing that kind of thing. Tasteful only!" You take a few images of her tastefully posing while hiding her breasts from you. After a few more shots, you decide to move on. "When I said show me more of that ass, I meant it Albina!" you say with a wink and she smiles. "How''s this then?"'
 
 				act 'Continue':
-					photoskl_exp += rand(1,2)
+					gs 'exp_gain', 'photoskl', rand(1,2)
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/photo/pose4.jpg"></center>'
 					'She pulls her shirt back down and faces away from you before slowly pulling her shorts down, exposing her thong clad ass. She pulls on her shorts, jiggling her ass as she giggles at you. "Come on <<$pcs_nickname>>, you wanted to see it, now photograph it." You compose yourself and take a few photos before moving in to get some close up shots. "Lose the shorts Albina. You know you want to..." you tell her in a commanding tone.'
 
 					act 'Continue':
-						photoskl_exp += rand(1,2)
+						gs 'exp_gain', 'photoskl', rand(1,2)
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/photo/pose5.jpg"></center>'
 						'"Oh I love it when you take charge <<$pcs_nickname>>! You should do it more often..." You hear just a hint of arousal in her voice. She wiggles out of her shorts, allowing them to drop to her ankles before stepping out of them and kicking them aside. You can''t help but appreciate the sight in front of you. You''ve seen her shapely ass plenty of times before, but being able to freely photograph it makes it even better. You take a number of close up shots as she poses for you.'
@@ -892,7 +1189,7 @@ if $ARGS[0] = 'albina_photos':
 						'"Okay, I know just the thing!" she replies.'
 
 						act 'Continue':
-							photoskl_exp += rand(1,2)
+							gs 'exp_gain', 'photoskl', rand(1,2)
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/photo/pose6.jpg"></center>'
 							'She gets down all fours before arching her back and smiling at you, her ass high in the air. "How''s this?" she asks.'
@@ -900,7 +1197,7 @@ if $ARGS[0] = 'albina_photos':
 							'She smiles at you. "Yeah, it was fun. I can see why Mama did this. It feels so... liberating."'
 
 							act 'Continue':
-								photoskl_exp += rand(1,2)
+								gs 'exp_gain', 'photoskl', rand(1,2)
 								portfolio_people[7] = 1
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/7.jpg"></center>'

+ 5 - 5
locations/albina_starlets.qsrc

@@ -253,10 +253,10 @@ if $ARGS[0] = 'starlets':
 
 	AlbinaQW['startletsday'] = daystart
 	starlets_practice = 0
-	gs 'exercise', 'tier2', 120, 'agil_exp', 'dancero_exp'
+	gs 'exercise', 'tier2', 120, 'agil', 'dancero'
 	pcs_mood -= 5
 	inhib_exp += rand(2,4)
-	if perform_lvl < 35: perform_exp += 1
+	if perform_lvl < 35: gs 'exp_gain', 'perform', 1
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dance_studio/fit1.jpg"></center>'
@@ -297,12 +297,12 @@ if $ARGS[0] = 'starlets':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stage.jpg"></center>'
 			'Albina calls for a car. Once the car arrives, you all bundle in. You arrive at the performance hall and are ushered into a small dressing room, where you all change into your outfits and group up at the edge of the stage.'
 			act 'Dance':
-				gs 'exercise', 'tier2', 120, 'agil_exp', 'danc_exp'
+				gs 'exercise', 'tier2', 120, 'agil', 'danc'
 				money += albpayrand * 1000
 				killvar 'albpayrand'
 				profiDanceTime += 1
 				inhib_exp += rand(3,5)
-				if perform_lvl < 35: perform_exp += rand(1,2)
+				if perform_lvl < 35: gs 'exp_gain', 'perform', rand(1,2)
 				gs 'stat'
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/dance.jpg"></center>'
@@ -1427,7 +1427,7 @@ if $ARGS[0] = 'parkrally':
 
 	act 'Do the show':
 		*clr & cla
-		gs 'exercise', 'tier2', 0, 'agil_exp', 'danc_exp'
+		gs 'exercise', 'tier2', 0, 'agil', 'danc'
 		profiDanceTime += 1
 		inhib_exp += rand(3,5)
 		noShampoo = 1

+ 343 - 41
locations/albina_wine_event.qsrc

@@ -81,9 +81,9 @@ if $ARGS[0] = 'start':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
 	if albina['wine'] = 0:
-		'A short while later, you find yourself feeling very warm, fuzzy, and <i>very</i> dizzy, halfway through your second glass. Albina is already sipping from her third glass, head laid on your lap after opening a second bottle. The flush in her cheeks and the slur of her voice tells you she''s totally drunk. You''re not sure your own lips are working right either. Or is it your tongue? What makes you talk funny when you''re drunk? Is it your lips, your tongue, or your brain?'
+		'A short while later, you find yourself feeling very warm, fuzzy, and <i>very</i> dizzy, halfway through your second glass. Albina is already sipping from her third glass, head laid on your lap after opening a second bottle. The flush in her cheeks and the slur of her voice tells you she''s totally drunk. And judging by the change in conversation and the wetness between her thighs, it seems Albina is a <i>horny</i> drunk.'
 		*nl
-		'"<<$pcs_nickname>>!" Albina whines. "I''m fucking talking to you!"'
+		'"<<$pcs_nickname>>!" Albina shouts, interrupting your thoughts. "I''m fucking talking to you!"'
 		'You blink, confused.'
 		act '"What did you say?"':albina['wine_start'] = 1 & gt 'albina_wine_event','wine_chat1'
 	else
@@ -464,10 +464,10 @@ if $ARGS[0] = 'wine_chat1':
 						'"Well <i>I</i> think it''s fucking gross. Agree to disagree <<$pcs_nickname>>."'
 					else
 						'"OH! Ew! Ew! Ew! Ew!" Albina abuptly sits up in your lap.'
-						'"What-" you start before she interrupts.'
+						'"What? Why are yo-"'
 						'"I shouldn''t have asked. I should have known with what you told me before," she says, making gagging noises. "I can''t believe you- no! Never mind! We''re not talking about this anymore!"'
 						'"But you-"'
-						'"Not! Discussing!"'
+						'"Not-! Discussing-!"'
 					end
 					gs 'albina_wine_event','wine_chat2'
 				end
@@ -529,30 +529,41 @@ if $ARGS[0] = 'wine_chat1':
 				albina['wine_convo_6'] = daystart
 			end
 			'boob size'
-			if pcs_cupsize <= 5:
-	!!			$titsize = 'AA cup'
+			if pcs_cupsize <= 15:
 				'"<<$pcs_nickname>>..." Albina says hesitantly. "Does it ever bother you...?"'
 				'"Huh?" you ask, completely lost what she''s trying to say.'
 				'"That... you know..." she continues, weirdly cupping her breasts with her hands while not looking you in the eye.'
 				'"I don''t know Albina," you say dryly. "You haven''t actually asked me anything."'
-				'"That your boobs are..." Shockingly, Albina <i>blushes</i> before continuing. "... flat...?"'
-			elseif pcs_cupsize <= 10:
-	!!			$titsize = 'A cup'
-				'"<<$pcs_nickname>>..." Albina says hesitantly. "Does it ever bother you...?"'
-				'"Huh?" you ask, completely lost what she''s trying to say.'
-				'"That... you know..." she continues, weirdly cupping her breasts with her hands while not looking you in the eye.'
-				'"I don''t know Albina," you say dryly. "You haven''t actually asked me anything."'
-				'"That your boobs are..." Shockingly, Albina <i>blushes</i> before continuing. "... small...?"'
-			elseif pcs_cupsize <= 15:
-	!!			$titsize = 'B cup'
-			elseif pcs_cupsize <= 20:
-	!!			$titsize = 'C cup'
-			elseif pcs_cupsize <= 30:
-	!!			$titsize = 'E cup'
+				if pcs_cupsize <= 5:
+		!!			$titsize = 'AA cup'
+					'"That you''re... flat...?"'
+					'Shockingly, Albina seems... <i>embarrassed?</i> Have you ever seen her embarrassed about anything before?'
+					gs'albina_wine_event','small_tits'
+		!!		elseif pcs_cupsize <= 10:
+		!!			$titsize = 'A cup'
+				else
+					'"That your... boobs are... small...?"'
+					'Shockingly, Albina seems... <i>embarrassed?</i> Have you ever seen her embarrassed about anything before?'
+		!!		elseif pcs_cupsize <= 15:
+		!!			$titsize = 'B cup'
+					gs'albina_wine_event','small_tits'
+				end
 			else
-	!!			$titsize = 'K cup'
+				if pcs_cupsize <= 20:
+		!!			$titsize = 'C cup'
+					'"I wish I had bigger tits," Albina sighs, staring longingly at your shapely breasts that hang above her.'
+					gs'albina_wine_event','medium_tits'
+				elseif pcs_cupsize <= 30:
+		!!			$titsize = 'E cup'
+					'"Your tits are so fucking hot," Albina sighs, staring longingly at your large breasts that hang above her. "Why couldn''t I get boobs as big as yours? How did I get stuck with these?"'
+					gs'albina_wine_event','large_tits'
+				else
+		!!			$titsize = 'K cup'
+					'"Your tits are so fucking huge," Albina says, staring in wide eyed awe at your enormous breasts that hang above her. "How do you survive carrying those puppies around?"'
+					gs'albina_wine_event','huge_tits'
+				end
 			end
-			gs 'albina_wine_event','wine_chat2'
+		!!	gs 'albina_wine_event','wine_chat2'
 		elseif albina['wine_convo'] = 7:
 			if albina['commando_know'] = 0: gt'albina_wine_event','wine_chat1'
 			if albina['wine_convo_7'] = daystart: 
@@ -569,7 +580,7 @@ if $ARGS[0] = 'wine_chat1':
 					act 'School':
 						cla & *nl
 						'"At school," you sigh tiredly. "If I don''t, all the teachers will look up my skirt during class."'
-						'"All of them??" Albina looks confused. "I get the males, men are pigs, but the women too? Whad about Ms. Braakman??"'
+						'"All of them??" Albina looks confused. "I get the males, men are pigs, but the women too? What about Ms. Braakman??"'
 						'"Especially her!" you say, sending you both into fits of laughter.'
 						gs 'albina_wine_event','wine_chat2'
 					end
@@ -592,7 +603,7 @@ if $ARGS[0] = 'wine_chat1':
 							'"That''s why I wear <i>pants</i>," you snort. "No one can tell you''re going commando when you''re wearing pants."'
 							'"But don''t all commandos wear pants?"'
 							'Albina narrows her eyes and looks up at you while you stare down at her.'
-							'"I... shuddup!"'
+							'"I... shut up!"'
 							gs 'albina_wine_event','wine_chat2'
 						end
 					end
@@ -629,7 +640,7 @@ if $ARGS[0] = 'wine_chat1':
 					act 'School':
 						cla & *nl
 						'"At school," you sigh tiredly. "If I don''t, all the teachers will look up my skirt during class."'
-						'"All of them??" Albina looks confused. "I get the males, men are pigs, but the women too? Whad about Ms. Braakman??"'
+						'"All of them??" Albina looks confused. "I get the males, men are pigs, but the women too? What about Ms. Braakman??"'
 						'"Especially her!" you say, sending you both into fits of laughter.'
 						gs 'albina_wine_event','wine_chat2'
 					end
@@ -765,10 +776,66 @@ if $ARGS[0] = 'wine_chat2':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
 		'With Albina right on your lap, you find your thoughts drifting to her mother. Her hair, her facial structure, she really is her mother''s daughter. It''s easy to tell where she got her good looks from.'
-		'"Your mom is fucking hot," you suddenly blurt out, your mouth autocompleting your thought before it actually passes through your brain. You freeze in panic.'
-		'"Fucking shit, I <i>knowwwwwwww</i>," Albina whines beneath you. "I got ass for days, but she''s gots tits to match. Big fucking bootyful bouncy tits that give her cleavage in a motherfucking t-shirt. <i>And</i> a great ass! Life is so un-fucking-fair..."'
+		*nl
+		'"Your mom is fucking hot," you blurt out. Your mouth autocompleted your thought before it actually passed through your brain and you freeze in panic.'
+		'"Fucking shit, I <i>know!</i>" Albina whines beneath you. "I got ass for days, but she''s gots tits to match. Big fucking bootyful bouncy tits that give her cleavage in a motherfucking t-shirt. <i>And</i> a great ass! Life is so un-fucking-fair!"'
 		act 'Continue':gt'albina_wine_event','wine_chat1'
 	end
+	
+	act 'Why do you like it rough?':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+		'"What''s the deal with you and rough sex?" you ask, idly swirling your wine around. "I know it''s pretty common to like it rough, but you''re like, on another level."'
+		'Albina purses her lips, her expression growing... <i>ashamed?</i>'
+		'"I... I can''t feel it anymore unless it''s rough," she says, looking away from you.'
+		'"What do you mean, ''can''t feel it''?"'
+		'"I mean I can''t feel it. If a guy is anything other than rough with me... it just doesn''t feel like anything. It might as well just be a girl humping me with her pants on. It''s like my body is numb to it."'
+		'You keep quiet, sensing there''s something more to this. And sure enough, Albina continues on.'
+		act 'Continue':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+			if AlbinaQW['StarletsWhore'] > 0:
+				'"When I was 15," she says. "There was a time when I was being fucked constantly almost every day. I''d practically go straight from school to a hotel room, and then from hotel room to hotel room until the day was over. And <i>that</i> was rough. You know what they''re like."'
+				'You nod understandingly.'
+			else
+				'"When I was 15," she says. "There was a time when I was being fucked constantly almost every day. I''d practically go straight from school to a hotel room, and then from hotel room to hotel room until the day was over. And none of it was gentle. You don''t know it, but they don''t hold back. And they haven''t changed. At least I managed to protect you from that much."'
+				'You nod appreciatively.'
+			end
+			'"And after months of this, I couldn''t take it anymore. I was tired of the pain, tired of crying into the sheets, tired of feeling sore and used. So... I made myself learn to like it." Tears glimmer in her eyes. "I thought, ''If I can''t make it stop, maybe I can at least take away the pain.'' And it worked. I started to feel good. I started <i>anticipating</i> it. I got wet when they ripped off my panties. I moaned when they spanked me. My nipples stiffened when they grabbed my hair."'
+			act'Keep listening':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+				'"Eventually, I stopped being so... ''busy,'' and there was a boy who was really nice to me, and he wanted to do things with me and I wanted to do things with him, he made me feel happy when we were together. So I let him fuck me. But I couldn''t feel it. He was kind and gentle and he was asking me if I was okay the whole time but... I just couldn''t feel <i>anything</i>."'
+				'Albina wipes her eyes, voice hardening.'
+				'"So, there you have it. That''s why I like it rough. Because I''m a slut who gave her first orgasms to the men who raped her for years. Because I''m a freak who can''t be loved. That''s just who I am now."'
+				act'Comfort her':
+					minut += 2
+					gs 'stat'
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+					'Despite her supposed acceptance, it''s easy to tell that Albina is trying to be stoic, covering up for the still-open wounds inside her. Taking her head in your arm, you pull her close against your chest. She stiffens at your touch, but slowly loosens up, closing her eyes and nuzzling her face into your breasts. The two of you sit like that for a few minutes and when you finally release her, a real smile is spread across her face.'
+					*nl
+					'No further words are necessary between you.'
+					act 'Continue':gt'albina_wine_event','wine_chat1'
+				end
+				
+!!{				if npc_sex['A23'] = 1:
+					act'Even by me?':
+						minut += 2
+						gs 'stat'
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+						'"Can''t be loved?" you ask. "Not even by me?"'
+						'You stare into her eyes tenderly and see years of hurt and pain welling up inside them, but also a glimmer of hope staring back at you.'
+						*nl
+						'Albina doesn''t say anything, but her breathing grows heavy and hot against your skin. Her thighs rub together and you can see she''s already soaking wet.'
+						act 'Kiss her':gt'albina_wine_event','kiss1'
+					end
+				end}
+			end
+		end
+	end
+	
 end
 
 if $ARGS[0] = 'masturbate_answer2':
@@ -807,7 +874,7 @@ if $ARGS[0] = 'masturbate_answer2':
 		act 'Shower dildo':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
-			'"I use a dildo too," you say. "But not on my ass. And I usualy do it in the shower."'
+			'"I use a dildo too," you say. "But not on my ass. And I usually do it in the shower."'
 			'"Oh, you''ve got a shower dildo too?"'
 			'"Yeah. Showering is a good time for it. Privacy, can take my time, and I can use the showerhead to make it even better."'
 			'"Mmmm..." Albina rubs her thighs together unconsciously. "I love that too. Except I-"'
@@ -941,41 +1008,276 @@ if $ARGS[0] = 'shave_elaborate':
 end
 
 if $ARGS[0] = 'small_tits':
-
 	if pcs_cupsize <= 5:
 		act'I love being flat':
-		
+			cla & *nl
+			'"Are you kidding me? I love being flat!" She looks back at you completely bewildered.'
+			'"You''re not serious."'
+			act'I think it suits me':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+				'"I think I look good like this," you say, looking down and smiling at your barren chest. "I can''t imagine what it would be like to have boobs, even small ones."'
+				'"No way!" Albina says, shaking her head. "I don''t believe you! It has to bother you on some level! I''m not even as small as you and I still get jealous as <i>fuck</i> whenever I catch a glimpse of nerdy Natasha''s tits!"'
+				act'I don''t care':
+					cla & *nl
+					'"I don''t care," you shrug, taking a sip of wine. "They''re her tits. I''m happy with mine."'
+					gs 'albina_wine_event','wine_chat2'
+				end
+				gs'albina_wine_event','mom_boobs'
+			end
+			
+			act'No bras':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+				'"I never have to wear a bra," you sigh blissfully. "No sweat rashes, no strap lines, I can just throw on a shirt and go out whenever I feel like it and I don''t have to worry!"'
+				'"But don''t you ever feel... lacking?" Albina mumbles, groping herself self-consciously. "Guys like big boobs..."'
+				act'I don''t care':
+					cla & *nl
+					'"I don''t care," you shrug, taking a sip of wine. "As long as I don''t have to wear a bra, I''m fine with being flat."'
+					gs 'albina_wine_event','wine_chat2'
+				end
+				act'Worth it':
+					cla & *nl
+					'"A small price to pay," you shrug, taking a sip of wine. "As long as I don''t have to wear a bra, I''m fine with being flat."'
+					gs 'albina_wine_event','wine_chat2'
+				end
+				gs'albina_wine_event','mom_boobs'
+			end
+			
+			act'No back pain':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+				'"No back pain," you sigh blissfully. "No bounce pain when I go running, no need for sports bras, it''s the best! What''s not to love?"'
+				'"Well... Guys like big boobs," Albina mumbles, groping herself self-consciously. "Doesn''t that bother you?"'
+				act'I''m happy like this':
+					cla & *nl
+					'"I''m happy like this," you shrug, taking another sip of wine.'
+					gs 'albina_wine_event','wine_chat2'
+				end
+				gs'albina_wine_event','mom_boobs'
+			end
+			
+			act'Sleeping on my stomach':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+				'"I love sleeping on my stomach," you smirk. "Even my sister complains her boobs are always sore when she wakes up. But not me!"'
+				'"I do like to sleep on my side or my back because of these," Albina mumbles, groping herself self-consciously. "But mine are still too small to be considered sexy..."'
+				gs 'albina_wine_event','wine_chat2'
+			end
 		end
 	elseif pcs_cupsize <= 10:
 		act'I love having small boobs':
-		
+			cla & *nl
+			'"Are you kidding me? I love having small boobs!" She looks back at you completely bewildered.'
+			'"You''re not serious."'
+			act'They''re perky and cute':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+				'"I like how perky they are," you say, looking down and smiling at your modest chest. "I think they make me look cute."'
+				'"No way!" Albina says, shaking her head. "I don''t believe you! It has to bother you on some level! I''m not even as small as you and I still get jealous as <i>fuck</i> whenever I catch a glimpse of nerdy Natasha''s tits!"'
+				act'I don''t care':
+					cla & *nl
+					'"I don''t care," you shrug, taking a sip of wine. "They''re her tits. I''m happy with mine."'
+					gs 'albina_wine_event','wine_chat2'
+				end
+				gs'albina_wine_event','mom_boobs'
+			end
+			
+			act'No bras':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+				'"I never have to wear a bra," you sigh blissfully. "No sweat rashes, no strap lines, I can just throw on a shirt and go out whenever I feel like it and I don''t have to worry!"'
+				'"But don''t you ever feel... lacking?" Albina mumbles, groping herself self-consciously. "Guys like big boobs..."'
+				act'I don''t care':
+					cla & *nl
+					'"I don''t care," you shrug, taking a sip of wine. "As long as I don''t have to wear a bra, I''m fine with being small."'
+					gs 'albina_wine_event','wine_chat2'
+				end
+				act'Worth it':
+					cla & *nl
+					'"A small price to pay," you shrug, taking a sip of wine. "As long as I don''t have to wear a bra, I''m fine with being small."'
+					gs 'albina_wine_event','wine_chat2'
+				end
+				gs'albina_wine_event','mom_boobs'
+			end
+			
+			act'No back pain':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+				'"No back pain," you sigh blissfully. "No bounce pain when I go running, no need for sports bras, but still round enough to look feminine. It''s the best! What''s not to love?"'
+				'"Well... Guys like big boobs," Albina mumbles, groping herself self-consciously. "Doesn''t that bother you?"'
+				act'I''m happy like this':
+					cla & *nl
+					'"I''m happy like this," you shrug, taking another sip of wine.'
+					gs 'albina_wine_event','wine_chat2'
+				end
+				gs'albina_wine_event','mom_boobs'
+			end
 		end
 	end
 	
 	act'It bothers me a little':
+		cla & *nl
+		if pcs_cupsize <= 5:
+			'"I guess it bothers me a little," you say, frowning in displeasure as you look down at your flat chest. "It would be nice to have at least a <i>little</i> bounce in my boobs. Why? Does it bother <i>you</i>?"'
+		else
+			'"I guess it bothers me a little," you say, frowning in displeasure as you look down at your modest chest. "It would be nice to be a <i>little</i> bigger. Then I''d be average at least. Why? Does it bother <i>you</i>?"'
+		end
+		'"Y-yeah," she stammers, a furious blush spreading through her cheeks. "Whenever I look at the other girls in our class, I get jealous. It''s bad enough that I have to hang out with Irina and Bella, but even nerdy Natasha has bigger tits than me. It drives me crazy!"'
+		
+		act'Me too':
+			cla & *nl
+			'"Me too," you pout. Albina starts shouting into the ceiling from your lap.'
+			'"It''s not fucking fair! Why did all the other girls get bigger boobs? Why not us?!"'
+			gs 'albina_wine_event','wine_chat2'
+		end
 		
+		gs'albina_wine_event','mom_boobs'
+	end
+	
+	act'It bothers me a lot':
+		cla & *nl
 		if pcs_cupsize <= 5:
-			
+			'"Of course it bothers me," you say uncomfortably, looking down at your flat chest. "I''m flatter than drywall, Albina. Guys like big boobs, things they can grab and play with. At the least, they want a view. I can''t even give them that. I''m practically a boy!"'
 		elseif pcs_cupsize <= 10:
-			
+			'"Of course it bothers me," you say uncomfortably, looking down at your modest chest. "I barely have any curve to me. I wouldn''t have cleavage if I wore a V-neck down to my stomach. I see the looks that other girls get that I don''t. Including you!"'
+		else
+			'"Of course it bothers me," you say uncomfortably, looking down at your modest chest. "Big boobs draw all the attention. They''re so much hotter than small boobs."'
+		end
+		'"It''s the worst when I''m with Irina and Bella," she mumbles, a furious blush spreading through her cheeks. "But even nerdy Natasha has bigger tits than us. It drives me crazy!"'
+		
+		act'Me too':
+			cla & *nl
+			'"Me too," you pout. Albina starts shouting into the ceiling from your lap.'
+			'"It''s not fucking fair! Why did all the other girls get bigger boobs? Why not us?!"'
+			gs 'albina_wine_event','wine_chat2'
 		end
+		
+		gs'albina_wine_event','mom_boobs'
 	end
 	
-	act'It bothers me a lot':
+!!{	act'Does it really bother you that much?':
+		cla & *nl
 		if pcs_cupsize <= 5:
-			
+			'"Does it really bother you that much?" you ask, your brow scrunched with incomprehension. '
 		elseif pcs_cupsize <= 10:
 			
 		end
+	end}
+end
+
+if $ARGS[0] = 'medium_tits':
+	gs'albina_wine_event','like_your_boobs'
+	
+	act'Me too':
+		cla & *nl
+		'"Me too," you sigh in return. "I get so jealous of the girls in our class who have big boobs."'
+		'"It''s not fair!" she moans. "I want big tits! I want them! I want them! I want them!"'
+		gs'albina_wine_event','mom_boobs'
 	end
-		
+	
+	act'I wish I were smaller':
+		cla & *nl
+		'"I wish I were smaller actually," you sigh in return. "Like you. I feel like your tits are so much cuter than mine!"'
+		'"No way!" she says, looking shocked. "Big tits are so much sexier than small tits! Better to be your size than my size. And even better to be bigger than both of us."'
+		'She looks down at her chest, seeming almost ashamed of her perky B-cups. A slow blush spreads across her face and shockingly, Albina seems... <i>embarrassed?</i> Have you ever seen her embarrassed about anything before?'
+		gs'albina_wine_event','each_their_own'
+		gs'albina_wine_event','mom_boobs'
+	end
+end
+
+if $ARGS[0] = 'large_tits':
+	gs'albina_wine_event','like_your_boobs'
+	act'I wish I were smaller':
+		cla & *nl
+		'"I wish I were smaller actually," you sigh in return. "Like you. I feel like your tits are so much cuter than mine!"'
+		'"No way!" she says, looking shocked. "Big tits are so much sexier than small tits! Your tits are the best size! Big, bouncy, beautiful, they''re super sexy! I-"'
+		'Albina cuts off suddenly and looks away, a slow blush spreading across her face. Shockingly, Albina seems... <i>embarrassed?</i> Have you ever seen her embarrassed about anything before?'
+		gs'albina_wine_event','each_their_own'
+		gs'albina_wine_event','mom_boobs'
+	end
+end
+
+
+if $ARGS[0] = 'huge_tits':
+	act'It hurts':
+		cla & *nl
+		'"Barely," you grimace. "It really sucks having boobs this big. I think it''s giving my back problems to be honest."'
+		gs 'albina_wine_event','wine_chat2'
+	end
+	
+	act'A good bra':
+		cla & *nl
+		'"A really good bra," you say, sighing deeply. "If it weren''t for that, my back would hurt constantly. I even have to wear it at night or it hurts my chest."'
+		gs 'albina_wine_event','wine_chat2'
+	end
+	
+	act'I wish I were smaller':
+		cla & *nl
+		'"I wish they weren''t so big," you say, sighing deeply. "If I were like, your size, then I wouldn''t have to spend all this money on bras, deal with all this back pain and it would be so much more convenient."'
+		'"I wish I were bigger," she mumbles and you watch her face go red. "Maybe not as big as you, but bigger would be nice. A D-cup or an E-cup would make me feel super sexy."'
+		'Shockingly, Albina seems <i>embarrassed</i> by the admission. Have you ever seen her embarrassed about anything before?'
+		gs'albina_wine_event','each_their_own'
+		gs'albina_wine_event','mom_boobs'
+	end
+end
+
+
+if $ARGS[0] = 'like_your_boobs':
+	act'I like your boobs':
+		cla & *nl
+		'"What''s with the complaints?" you ask. "I love your boobs! They''ve got such a nice shape and are still bouncy without being dramatic. Your tits are super hot!"'
+		'"But big boobs are sexier!" she moans. "It''s not fair! I want big tits! I want them! I want them! I want them!"'
+		act'Your boobs are perfect':
+			cla & *nl
+			'"Well <i>I</i> think your boobs are perfect," you say above Albina''s loud tantruming. "You should learn to love them too."'
+			gs 'albina_wine_event','wine_chat2'
+		end
+		gs'albina_wine_event','mom_boobs'
+	end
+end
+
+if $ARGS[0] = 'each_their_own':
+	act'To each their own':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+		'"To each their own I guess," you say, shrugging. "Big boob girls aren''t happy, small boob girls aren''t happy, is anybody happy?"'
+		'"Boys with big dicks are happy," Albina grins, rubbing her thighs together. "Nnngh~! I wish I had a big fat cock up my ass right now! Don''t you?"'
+		gs 'albina_wine_event','wine_chat2'
+	end
+end
+
+if $ARGS[0] = 'mom_boobs':
+	act'Is this because of your mom?':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
+		'You stare at Albina for a moment, judging her exppression, peering deep into her psyche.'
+		*nl
+		'"Is this because your mom has big boobs?" you blurt out.'
+		'"No!" Albina says immediately and her face grows even more red.'
+		'You continue to stare at her until she relents.'
+		*nl
+		'"Okay, maybe a little. Ever since I was a girl, I thought Mama was beautiful. <i>Is</i> beautiful. I always remembered how she looked after she left and even now, more than twice our age, she looks just as good as when I was little. She''s got legs and ass for days, flat abs, a toned figure, and big sexy fucking tits! I want to be like her so bad... I managed to get my ass like her''s, but you can''t squat your way to bigger tits."'
+		*nl
+		'Albina sighs deeply.'
+		'"So... yeah. I guess you could say I''m a little jealous of my mom''s boobs."'
+		'"Makes sense," You nod sagely. "But your mom''s tall? Being short doesn''t seem to bother you?"'
+		'"That''s cause I found out being short makes it easy to get manhandled in bed," Albina grins and both of you explode into giggles.'
+		gs 'albina_wine_event','wine_chat2'
+	end
+end
+
+if $ARGS[0] = 'kiss1':
+	cla & *clr
+	'<center><video autoplay loop src="images/shared/sex/lesbian/kiss1.mp4"></video></center>'
+	
 end
 
 if $ARGS[0] = 'end':
 	act'Continue':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk_blur.jpg"></center>'
-		'As you take another sip of your wine everything begins to get hazy. You try to sit up and the room spins and the next thing you know-'
+		'As you take another sip of your wine everything begins to get hazy. You try to sit up, but the room spins and the next thing you know-'
 		act'Continue':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/11.jpg"></center>'
@@ -1011,10 +1313,10 @@ if $ARGS[0] = 'caught':
 				minut += 15
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/etaj2.jpg"></center>'
-				'The car door slams behind you and you suddenly find yourself just outside the door of your family''s apartment.'
-				'"Huh? How did I-?" you turn around and Zoya pushes you from behind.'
-				'"Now get inside. I won''t tell your mother seeing as Albina probably... seduced you... But you need to get to bed and sleep off all that alcohol. Drink a full bottle of water before you do. You''ll thank me in the morning."'
-				'She gives you another gentle push as you open the door and she gently closes it behind you.'
+				'The mansion door slams behind you and suddenly you find yourself outside the door of your family''s apartment.'
+				'"Huh? How did I-?" you try to turn around but a pair of hands give you a gentle push on your back.'
+				'"Now get inside," Zoya''s voice sounds from behind you. "I won''t tell your mother about this as I expect Albina probably... ''seduced'' you into it, but you need to get to bed and sleep off all that alcohol. Drink a full bottle of water before you do. You''ll thank me in the morning."'
+				'After managing to fumble your key into the door, you stumble inside and Zoya gently closes it behind you.'
 				act 'Continue':gt 'korrPar'
 			end
 		end

+ 16 - 16
locations/albinahome.qsrc

@@ -272,13 +272,13 @@ if $ARGS[0] = 'stripping':
 	if pcs_inhib < 60:inhib_exp += rand(2,3)
 
 	if pcs_danc >= 40:
-		gs 'exercise', 'tier2', 120, 'agil_exp', 'dancero_exp'
+		gs 'exercise', 'tier2', 120, 'agil', 'dancero'
 		gs 'stat'
 		'"Okay, we need some space. Follow me." She leads you down to the home gym, where she teaches you how to passionately dance to the music while stripping.'
 
 		if pcs_dancero >= 100:'You didn''t learn anything new since you already know everything she can teach you.'
 	else
-		gs 'exercise', 'tier3', 120, 'agil_exp', 'danc_exp'
+		gs 'exercise', 'tier3', 120, 'agil', 'danc'
 		gs 'stat'
 		'A striptease is too complex for you. You''re not able to dance and strip at the same time. Albina recommends that you start with learning to dance first.'
 	end
@@ -292,7 +292,7 @@ if $ARGS[0] = 'poledancing':
 	npc_rel['A23'] += 1
 	if pcs_stren >= 40 and pcs_dancero > 50:
 		if pcs_inhib < 60:inhib_exp += rand(2,3)
-		gs 'exercise', 'tier2', 120, 'stren_exp', 'vital_exp', 'dancpol_exp'
+		gs 'exercise', 'tier2', 120, 'stren', 'vital', 'dancpol'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/poledance.jpg"></center>'
 		'Albina leads you down to the home gym, where she teaches you various acrobatic moves on the pole there and the two of you greatly enjoy yourselves.'
@@ -305,7 +305,7 @@ if $ARGS[0] = 'poledancing':
 		'You nod at her and she pulls you to your feet before checking your head. "It might bruise, but otherwise you look fine."'
 		act 'Develop strength (2:00)':
 			*clr & cla
-			gs 'exercise', 'tier2', 120, 'stren_exp', 'vital_exp'
+			gs 'exercise', 'tier2', 120, 'stren', 'vital'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/stren.jpg"></center>'
 			'Albina shows you how to develop your strength using various exercises.'
@@ -319,13 +319,13 @@ if $ARGS[0] = 'poledancing':
 		if pcs_inhib < 60:inhib_exp += rand(2,3)
 		'Albina grins. "You still can''t strip well enough for poledancing. We should practice that first."'
 		if pcs_danc >= 40:
-			gs 'exercise', 'tier2', 120, 'agil_exp', 'dancero_exp'
+			gs 'exercise', 'tier2', 120, 'agil', 'dancero'
 			gs 'stat'
 			'Albina teaches you how to passionately dance to the music while stripping.'
 
 			if pcs_dancero >= 100:'You didn''t learn anything new since you already know everything she can teach you.'
 		else
-			gs 'exercise', 'tier3', 120, 'agil_exp', 'danc_exp'
+			gs 'exercise', 'tier3', 120, 'agil', 'danc'
 			gs 'stat'
 			'A striptease is too complex for you. You''re not able to dance and strip at the same time. Albina recommends that you start with learning to dance first.'
 		end
@@ -377,8 +377,8 @@ if $ARGS[0] = 'game':
 		menu_off = 1
 		minut += 30
 		pcs_mood += 15
-		react_exp += rand(0, 1)
-		gaming_exp += rand(1, 2)
+		gs 'exp_gain', 'react', rand(0, 1)
+		gs 'exp_gain', 'gaming', rand(1, 2)
 		npc_rel['A23'] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
@@ -392,8 +392,8 @@ if $ARGS[0] = 'game':
 					menu_off = 1
 					minut += 60
 					pcs_mood += 15
-					react_exp += rand(0, 1)
-					gaming_exp += rand(1, 2)
+					gs 'exp_gain', 'react', rand(0, 1)
+					gs 'exp_gain', 'gaming', rand(1, 2)
 					npc_rel['A23'] -= 1
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
@@ -422,8 +422,8 @@ if $ARGS[0] = 'playgame':
 	menu_off = 1
 	minut += 30
 	pcs_mood += 15
-	react_exp += rand(0, 1)
-	gaming_exp += rand(1, 2)
+	gs 'exp_gain', 'react', rand(0, 1)
+	gs 'exp_gain', 'gaming', rand(1, 2)
 	npc_rel['A23'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
@@ -442,8 +442,8 @@ if $ARGS[0] = 'playgame':
 				menu_off = 1
 				minut += 60
 				pcs_mood += 15
-				react_exp += rand(0, 1)
-				gaming_exp += rand(1, 2)
+				gs 'exp_gain', 'react', rand(0, 1)
+				gs 'exp_gain', 'gaming', rand(1, 2)
 				npc_rel['A23'] -= 2
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
@@ -474,8 +474,8 @@ if $ARGS[0] = 'game_bet':
 	AlbinaQW['gamebet'] = 1
 	minut += 30
 	pcs_mood += 15
-	react_exp += rand(0, 1)
-	gaming_exp += rand(1, 2)
+	gs 'exp_gain', 'react', rand(0, 1)
+	gs 'exp_gain', 'gaming', rand(1, 2)
 	npc_rel['A23'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'

+ 2 - 2
locations/alexandriaChat.qsrc

@@ -760,7 +760,7 @@ if $ARGS[0] = 'sword':
 							'"Sorry <<$pcs_lastname>>, that was a waste of our valuable time, that could have been used for more worthy endeavours... sigh... let get that for late and indulge us on something more worthy of our time."'
 							'The rest of the trip towards his home, go without problems, and when you arrive, Aleksei don''t lose time in taking you to his room.'
 						else
-							numrand = rand(1, 160)
+							numrand = rand(1, 100)
 
 							gs 'clothing_attributes', 'moncheri_gown', numrand
 							if CloBimbo = 1:jump 'markbuycloalexandria'
@@ -772,7 +772,7 @@ if $ARGS[0] = 'sword':
 								moncheri_gown_b[numrand] = pcs_hips
 								'<center><img <<$set_imgh>> src="images/pc/items/moncheri/gown/<<numrand>>.jpg"></center>'
 							else
-								jump 'markbuyclomother'
+								jump 'markbuycloalexandria'
 							end
 						end
 

+ 24 - 24
locations/alexandriaEv.qsrc

@@ -524,7 +524,7 @@ end
 if $ARGS[0] = 'persufilipp':
     *clr & cla
     minut += 5
-    persuas_exp += rand(0,4)
+    gs 'exp_gain', 'persuas', rand(0,4)
 	gs 'stat'
 	'<center><b><font color="maroon">Filipp</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/ana/bribes.jpg"></center>'
@@ -639,7 +639,7 @@ if $ARGS[0] = 'anachase2':
     act 'The chase is on!': 
 		*clr & cla
 	    minut += 1
-        run_exp += rand(1, 5)   
+        gs 'exp_gain', 'run', rand(1, 5)   
 	    gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/ana/chase.jpg"></center>'
         '"EPP!!!" Ana, give a little yelp, surprise plastered all over her face, as you launch yourself after her. If she thinks that you are going to back off, Ana is going to be disappointed, and with the surprise in your side, you rush to grab the annoying nut.'
@@ -665,8 +665,8 @@ if $ARGS[0] = 'anachase2':
             *clr & cla
 	        minut += 2
 	        pcs_mana -= 60
-	        splcstng_exp += rand(1,5)
-	        run_exp += rand(1, 5)
+	        gs 'exp_gain', 'splcstng', rand(1,5)
+	        gs 'exp_gain', 'run', rand(1, 5)
 	        gs 'fame', 'city', 'acting', 5
 	        AlexandriaMissionQW += 2 
 	        gs 'stat'
@@ -679,7 +679,7 @@ if $ARGS[0] = 'anachase2':
 			
 			act 'Run!':
 			    *clr & cla
-			    run_exp += rand(1, 5)
+			    gs 'exp_gain', 'run', rand(1, 5)
 			    dummy = rand(1,100)
 	            gs 'stat'
 	            if dummy <= pcs_run: 
@@ -702,7 +702,7 @@ if $ARGS[0] = 'anachase3':
 	minut += 10
 	fat -= 5
 	pcs_mood += 10
-	run_exp += rand (1,5)
+	gs 'exp_gain', 'run', rand (1,5)
 	gs 'fame', 'city', 'running', 5
 	gs 'sweat', 'add', 10
 	pcs_stam -= 8
@@ -881,7 +881,7 @@ if $ARGS[0] = 'heal1':
     AlexandriaMissionQW += 3
     if sound = 0:PLAY 'sound/rington.mp3',10
     pcs_mana -= 400
-	splcstng_exp += rand(1,5)
+	gs 'exp_gain', 'splcstng', rand(1,5)
 	gs 'stat'
 	'<center><b><font color="maroon">Ana''s number</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/ana/selfie.jpg"></center>'
@@ -1079,7 +1079,7 @@ if $ARGS[0] = 'anachase5':
             *clr & cla
             if sound = 0:PLAY 'sound/rington.mp3',10
 	        minut += 5
-	        persuas_exp += rand(1,5)
+	        gs 'exp_gain', 'persuas', rand(1,5)
 	        gs 'stat'
 	        '<center><b><font color="maroon">Ana''s number?</font></b></center>'
 	        '<center><img <<$set_imgh>> src="images/characters/city/ana/selfie.jpg"></center>'
@@ -1095,7 +1095,7 @@ if $ARGS[0] = 'anachase5':
 	    else
 	        *clr & cla
 	        minut += 1
-	        persuas_exp += rand(0,4)
+	        gs 'exp_gain', 'persuas', rand(0,4)
 	        AlexandriaMissionQW += 1
 	        gs 'stat'
 	        '<center><img <<$set_imgh>> src="images/characters/city/ana/gopniks.jpg"></center>'
@@ -1119,7 +1119,7 @@ if $ARGS[0] = 'heal2':
     AlexandriaMissionQW += 3
     if sound = 0:PLAY 'sound/rington.mp3',10
     pcs_mana -= 400
-	splcstng_exp += rand(1,5)
+	gs 'exp_gain', 'splcstng', rand(1,5)
 	gs 'stat'
 	'<center><b><font color="maroon">Ana''s number</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/ana/selfie.jpg"></center>'
@@ -1140,11 +1140,11 @@ if $ARGS[0] = 'anachase6':
 	    minut += 10
 	    fat -= 10
 	    pcs_mood += 20
-	    run_exp += rand (5,10)
-	    stren_exp += rand (5,10)
-	    agil_exp += rand (5,10)
-	    vital_exp += rand (5,10)
-	    react_exp += rand (5,10) 
+	    gs 'exp_gain', 'run', rand (5,10)
+	    gs 'exp_gain', 'stren', rand (5,10)
+	    gs 'exp_gain', 'agil', rand (5,10)
+	    gs 'exp_gain', 'vital', rand (5,10)
+	    gs 'exp_gain', 'react', rand (5,10) 
 	    gs 'fame', 'city', 'running', 10
 	    gs 'sweat', 'add', 20
 	    pcs_stam -= 16
@@ -1200,11 +1200,11 @@ if $ARGS[0] = 'anachase6':
 	    minut += 5
 	    fat -= 5
 	    pcs_mood -= 40
-	    run_exp += rand (0,5)
-	    stren_exp += rand (0,5)
-	    agil_exp += rand (0,5)
-	    vital_exp += rand (0,5)
-	    react_exp += rand (0,5) 
+	    gs 'exp_gain', 'run', rand (0,5)
+	    gs 'exp_gain', 'stren', rand (0,5)
+	    gs 'exp_gain', 'agil', rand (0,5)
+	    gs 'exp_gain', 'vital', rand (0,5)
+	    gs 'exp_gain', 'react', rand (0,5) 
 	    gs 'sweat', 'add', 10
 	    pcs_stam -= 8
 	    if temper >= 25 and sunWeather = 1:
@@ -1268,7 +1268,7 @@ if $ARGS[0] = 'heal3':
     AlexandriaMissionQW += 3
     if sound = 0:PLAY 'sound/rington.mp3',10
     pcs_mana -= 400
-	splcstng_exp += rand(1,5)
+	gs 'exp_gain', 'splcstng', rand(1,5)
 	gs 'stat'
 	'<center><b><font color="maroon">Ana''s number</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/ana/selfie.jpg"></center>'
@@ -1287,7 +1287,7 @@ if $ARGS[0] = 'anachase7':
         *clr & cla
         minut += 1
         pcs_mana -= 20
-	    splcstng_exp += rand(1,5)
+	    gs 'exp_gain', 'splcstng', rand(1,5)
 	    dummy = rand(1,100)
 	    gs 'stat'
 	    '<center><img <<$set_imgh>> src="images/characters/city/ana/zap.jpg"></center>'
@@ -1326,7 +1326,7 @@ if $ARGS[0] = 'anachase7':
         *clr & cla
         minut += 1
         pcs_mana = 0
-	    splcstng_exp += rand(0,4)
+	    gs 'exp_gain', 'splcstng', rand(0,4)
 	    pain['fingers'] += rand (10,20)
 	    pain['hands'] += rand(10,20)
         gs 'stat'
@@ -1435,7 +1435,7 @@ if $ARGS[0] = 'heal4':
     minut += 1
     AlexandriaMissionQW += 3
     pcs_mana -= 400
-    splcstng_exp += rand(1,5)
+    gs 'exp_gain', 'splcstng', rand(1,5)
     gs 'stat'
     '<center><b><font color="maroon">Ana</font></b></center>'
     '<center><img <<$set_imgh>> src="images/characters/city/ana/ana4.jpg"></center>'

+ 4 - 4
locations/anushapt.qsrc

@@ -1103,7 +1103,7 @@ if $ARGS[0] = 'guitar':
 				*clr & cla
 				minut += 10
 				pcs_mood += 10
-				instrmusic_exp += rand(0,1)
+				gs 'exp_gain', 'instrmusic', rand(0,1)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/guitar.jpg"></center>'
 				'You decide to live out one of your fantasies. You''ve always wanted to play the guitar. You grab hold of the guitar then you begin to pretend to play, putting on a show as if you were a real rock star. After a while, you need to catch your breath. Playing was a lot harder than you thought.'
@@ -1113,7 +1113,7 @@ if $ARGS[0] = 'guitar':
 		act 'Try to play it':
 			*clr & cla
 			if pcs_instrmusic < 10:
-				instrmusic_exp += rand(0,2)
+				gs 'exp_gain', 'instrmusic', rand(0,2)
 				pcs_mood += 5
 				minut += 20
 				gs 'pain', 1, 'fingers', 'ache'
@@ -1124,7 +1124,7 @@ if $ARGS[0] = 'guitar':
 				'You realize now that learning how to play the guitar can be a frustrating, painful experience. Yet, you cannot help but to gently stroke the guitar once more before putting it back on its stand. You look forward to trying to play again.'
 				act 'Put the guitar back':gt 'anushapt','anushroom'
 			elseif pcs_instrmusic < 20:
-				instrmusic_exp += rand(0,20)
+				gs 'exp_gain', 'instrmusic', rand(0,20)
 				pcs_mood += 5
 				minut += 20
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/guitar.jpg"></center>'
@@ -1132,7 +1132,7 @@ if $ARGS[0] = 'guitar':
 				'Finally, you put the guitar back on its stand.'
 				act 'Put the guitar back':gt 'anushapt','anushroom'
 			else
-				instrmusic_exp += rand(0,20)
+				gs 'exp_gain', 'instrmusic', rand(0,20)
 				pcs_mood += 5
 				minut += 20
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/guitar.jpg"></center>'

+ 4 - 4
locations/anushaptbr.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'brotherroom':
 			act 'Sit down and play':
 				*clr & cla
 				minut += 15
-				gaming_exp += rand(1,3)
+				gs 'exp_gain', 'gaming', rand(1,3)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
 				'The brothers turn away from you and start whispering amongst themselves. They must be planning something.'
@@ -255,7 +255,7 @@ if $ARGS[0] = 'brotherroom':
 					act 'Deal':
 						*clr & cla
 						minut += 20
-						gaming_exp += rand(1,3)
+						gs 'exp_gain', 'gaming', rand(1,3)
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksimplay.jpg"></center>'
 						if pcs_gaming <= 40:
@@ -339,7 +339,7 @@ if $ARGS[0] = 'rematch':
 		act 'Sit down and play':
 			*clr & cla
 			minut += 15
-			gaming_exp += rand(1, 3)
+			gs 'exp_gain', 'gaming', rand(1, 3)
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
 			'The brothers turn away from you and start whispering. You''re sure that they must be planning something.'
@@ -400,7 +400,7 @@ if $ARGS[0] = 'rematch':
 		'Maksim looks mad at that. "Just shut up and play!" Anushka just laughs again and mimics what he said in a mutter that taunts him.'
 		act 'Play':
 			*clr & cla
-			gaming_exp += rand(1,3)
+			gs 'exp_gain', 'gaming', rand(1,3)
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'

+ 10 - 10
locations/anushkachat.qsrc

@@ -1100,13 +1100,13 @@ if $ARGS[0] = 'photoshoot1':
 	*clr & cla
 	nush_photoshoot += 1
 	minut += 5
-	photoskl_exp += rand(1,2)
+	gs 'exp_gain', 'photoskl', rand(1,2)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/set1/pose1.jpg"></center>'
 	'Once out on the fire escape, you find a spot on the other side of the landing and pull your camera out. You start snapping photos of her standing on the fire escape landing.'
 	act 'Spice this up':
 		*clr & cla
-		photoskl_exp += rand(1,2)
+		gs 'exp_gain', 'photoskl', rand(1,2)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/set1/pose2.jpg"></center>'
 		'You want more and you know she loves showing off. "Come on famous model, let''s do something a little more risque!" Anushka reaches up under her skirt, pulls her panties off and tosses them at you. You snap a few more photos as she leans forward, making her skirt ride up. At this angle you can just see her pussy, but keep shooting.'
@@ -1114,19 +1114,19 @@ if $ARGS[0] = 'photoshoot1':
 		gs 'stat'
 		act 'Keep taking photos':
 			*clr & cla
-			photoskl_exp += rand(1,2)
+			gs 'exp_gain', 'photoskl', rand(1,2)
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/set1/pose3.jpg"></center>'
 			'She turns sideways towards you and squats down, with her legs slightly apart. At this angle you can''t see anything other than her teasing smile. "Okay, now turn towards me." you tell her.'
 			act 'She turns':
 				*clr & cla
-				photoskl_exp += rand(1,2)
+				gs 'exp_gain', 'photoskl', rand(1,2)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/set1/pose4.jpg"></center>'
 				'She moves close to the wall and turns to face you before squatting down again and pulling her skirt down between her legs. You snap a few more photos and shake your head at her teasing. Normally she loves flaunting her body, but now that you''re trying to do a serious photoshoot, she''s acting shy. "Ha ha, Nush. Come on, show me the goods girl. You know you want to..."'
 				act 'Keep taking photos':
 					*clr & cla
-					photoskl_exp += rand(1,2)
+					gs 'exp_gain', 'photoskl', rand(1,2)
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/set1/pose5.jpg"></center>'
 					'She leans forward and pulls her tank top down and to the sides, exposing her perfectly round and firm tits. "That''s it, work the camera for me Nush!" You both hear a wolf whistle from somewhere below, but you both ignore it.'
@@ -1134,7 +1134,7 @@ if $ARGS[0] = 'photoshoot1':
 					gs 'stat'
 					act 'Working the camera':
 						*clr & cla
-						photoskl_exp += rand(1,2)
+						gs 'exp_gain', 'photoskl', rand(1,2)
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/set1/pose6.jpg"></center>'
 						'She puts her tank top back in place and spreads her legs wide, giving you a full few of her pussy. After some suggestions on poses, she moves to the outside corner of the fire escape to give you a better view of Pavlovsk behind her as you keep taking photos. "That''s it girl, give the camera some love."'
@@ -1142,7 +1142,7 @@ if $ARGS[0] = 'photoshoot1':
 						gs 'stat'
 						act 'Move again':
 							*clr & cla
-							photoskl_exp += rand(1,2)
+							gs 'exp_gain', 'photoskl', rand(1,2)
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/set1/pose7.jpg"></center>'
 							'Following your instructions to move again, she moves back next to the building for a few shoots and teases you by pulling on her tank top, just shy of showing off her nipples. "Okay, back to the other side. I want to get the town in the background." There''s a catcall from below, but you''re unsure if it''s the same person from before.'
@@ -1150,7 +1150,7 @@ if $ARGS[0] = 'photoshoot1':
 							gs 'stat'
 							act 'Moving back':
 								*clr & cla
-								photoskl_exp += rand(1,2)
+								gs 'exp_gain', 'photoskl', rand(1,2)
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/set1/pose8.jpg"></center>'
 								'Moving back, she squats again and spreads her legs wide to give you a perfect view of her shaved pussy. After you take a few more photos, she pulls her tank top down again. "Nice, nice. But how about you lose the top?" you tell her as you keep taking photos.'
@@ -1158,7 +1158,7 @@ if $ARGS[0] = 'photoshoot1':
 								gs 'stat'
 								act 'Losing the shirt':
 									*clr & cla
-									photoskl_exp += rand(1,2)
+									gs 'exp_gain', 'photoskl', rand(1,2)
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/set1/pose9.jpg"></center>'
 									'She pulls off her tank top and tosses it at you. It lands on and covers your camera and face. You pull it off and toss it aside to find her sitting with her back against the rail, on the outer corner of the fire escape. Her legs are spread wide, showing off her pussy and breasts. Only her tennis shoes and skirt bunched up around her waist remain. "That''s it," you tell her and take several more photos. There are a few hoots and lewd comments directed at you and you''re fairly certain that it''s Dan and Vasily.'
@@ -1166,7 +1166,7 @@ if $ARGS[0] = 'photoshoot1':
 									gs 'stat'
 									act 'Final photos':
 										*clr & cla
-										photoskl_exp += rand(1,2)
+										gs 'exp_gain', 'photoskl', rand(1,2)
 										portfolio_people[5] = 1
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/5.jpg"></center>'

+ 2 - 2
locations/artem_events.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 		if will_cost <= pcs_willpwr:
 			act 'Reassure Vitek he can trust you (<<will_cost>> Willpower)':
 				! I think passing this warrants some chrsm_exp. If you dont think so just remove this line
-				chrsm_exp += rand(0,will_cost)
+				gs 'exp_gain', 'chrsm', rand(0,will_cost)
 				gs 'willpower', 'pay', 'force'
 				cla
 				artemVitokQW = 1
@@ -101,7 +101,7 @@ if $ARGS[0] = 'learn':
 	end
 	lern += rand(3, 6)
 !!counts as doing 2 hours of homework alone
-	intel_exp += rand(1, 2)
+	gs 'exp_gain', 'intel', rand(1, 2)
 	gs 'stat'
 	!act 'Take a break from studying':gt 'artemhome', 'artemroom'
 	!act 'Talk instead': gt 'artemhome', 'chat'

+ 1 - 1
locations/artemhome.qsrc

@@ -836,7 +836,7 @@ if $ARGS[0] = 'livingroom':
 					artfall += 1
 					artfalling = daystart
 				end
-				gaming_exp +=1
+				gs 'exp_gain', 'gaming',1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/livingroom/playgames.jpg"></center>'
 				'You smile to him. "Yeah thanks I would like that."'

+ 3 - 3
locations/bass.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'a':
 			*clr
 			kisameQW = 1
 			minut += 60
-			gs 'exercise', 'tier1', 1, 'stren_exp'
+			gs 'exercise', 'tier1', 1, 'stren'
 			pcs_sweat = 10 + rand(0,4)
 							
 			'<center><img <<$set_imgh>> src="images/characters/city/kisame/kisame.jpg"></center>'
@@ -111,7 +111,7 @@ if $ARGS[0] = 'a':
 			if pcs_sweat > 15 : pcs_sweat = 10 + rand(0,4)
 			pcs_mood += 5
 
-			if pcs_stren < 40:stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+			if pcs_stren < 40:gs 'exp_gain', 'stren', 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 			if KisameSex = 0:KisameSex = 1 & Set guy += 1
 			gs 'boyStat', 'A40'
 			'<center><img <<$set_imgh>> src="images/characters/city/kisame/sex/kisamebj.jpg"></center>'
@@ -132,7 +132,7 @@ if $ARGS[0] = 'a':
 		pcs_makeup = 1
 		cumspclnt = 10
 		gs 'cum_cleanup'
-		gs 'exercise', 'tier1', 60, 'stren_exp'
+		gs 'exercise', 'tier1', 60, 'stren'
 		pcs_sweat = 10 + rand(0,4)
 		if pcs_inhib < 50:inhib_exp += rand(1,2)
 		if func('body_din','pregnancyVisibility') = 0:

+ 30 - 30
locations/bbgamein.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'girls':
 	gs 'gschool_events', 'rand_girl_arg', 0, 1, 0, 0, 0, 0
 	gs 'gschool_events', 'rand_girl_arg1', 0, 1, 0, 0, 0, 0
 	*clr & cla
-	bkbll_exp += rand(0,2)
+	gs 'exp_gain', 'bkbll', rand(0,2)
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/pregame.jpg"></center>'
@@ -113,7 +113,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 40
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -143,7 +143,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 40
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -173,7 +173,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 40
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -246,7 +246,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 20
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -278,7 +278,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 20
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -310,7 +310,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 20
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -383,7 +383,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 30
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -415,7 +415,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 30
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -447,7 +447,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 30
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -494,7 +494,7 @@ if $ARGS[0] = 'mixed':
 	gs 'gschool_events', 'rand_boy_arg', 0, 1, 0, 0, 0, 0
 	gs 'gschool_events', 'rand_girl_arg', 0, 1, 0, 0, 0, 0
 	*clr & cla
-	bkbll_exp += rand(0,2)
+	gs 'exp_gain', 'bkbll', rand(0,2)
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/pregame.jpg"></center>'
@@ -527,7 +527,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -559,7 +559,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -590,7 +590,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -653,7 +653,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -685,7 +685,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -717,7 +717,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -780,7 +780,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -812,7 +812,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -844,7 +844,7 @@ if $ARGS[0] = 'mixed':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -890,7 +890,7 @@ if $ARGS[0] = 'boys':
 	gs 'gschool_events', 'rand_boy_arg', 0, 1, 0, 0, 0, 0
 	gs 'gschool_events', 'rand_boy_arg1', 0, 1, 0, 0, 0, 0
 	*clr & cla
-	bkbll_exp += rand(0,2)
+	gs 'exp_gain', 'bkbll', rand(0,2)
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bbinside/boys.jpg"></center>'
@@ -923,7 +923,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -955,7 +955,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -987,7 +987,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1049,7 +1049,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1081,7 +1081,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1112,7 +1112,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1175,7 +1175,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1207,7 +1207,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1238,7 +1238,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'

+ 37 - 37
locations/bbgameout.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = 'girls':
 	gs 'gschool_events', 'rand_girl_arg', 0, 1, 0, 0, 0, 0
 	gs 'gschool_events', 'rand_girl_arg1', 0, 1, 0, 0, 0, 0
 	*clr & cla
-	bkbll_exp += rand(0,2)
+	gs 'exp_gain', 'bkbll', rand(0,2)
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidebasketball.jpg"></center>'
@@ -116,7 +116,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 40
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 40
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -180,7 +180,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 40
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -255,7 +255,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 20
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -287,7 +287,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 20
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -319,7 +319,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 20
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -393,7 +393,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 30
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -425,7 +425,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 30
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -457,7 +457,7 @@ if $ARGS[0] = 'girls':
 							*clr & cla
 							grupvalue[2] += 1
 							pcs_mood += 30
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -549,7 +549,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							npc_rel['A27'] += 1
 							pcs_mood += 40
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -583,7 +583,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							npc_rel['A27'] += 1
 							pcs_mood += 40
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -617,7 +617,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							npc_rel['A27'] += 1
 							pcs_mood += 40
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 40
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -685,7 +685,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							npc_rel['A27'] += 1
 							pcs_mood += 20
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -719,7 +719,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							npc_rel['A27'] += 1
 							pcs_mood += 20
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -753,7 +753,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							npc_rel['A27'] += 1
 							pcs_mood += 20
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 20
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -821,7 +821,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							npc_rel['A27'] += 1
 							pcs_mood += 30
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -856,7 +856,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							npc_rel['A27'] += 1
 							pcs_mood += 30
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -890,7 +890,7 @@ if $ARGS[0] = 'mixed':
 							grupvalue[2] += 1
 							npc_rel['A27'] += 1
 							pcs_mood += 30
-							bkbll_exp += rand(0,2)
+							gs 'exp_gain', 'bkbll', rand(0,2)
 							gs 'sweat', 'add', 30
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
@@ -981,7 +981,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1013,7 +1013,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1045,7 +1045,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1108,7 +1108,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1140,7 +1140,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1172,7 +1172,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1234,7 +1234,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1266,7 +1266,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1298,7 +1298,7 @@ if $ARGS[0] = 'marcusno':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1374,7 +1374,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1406,7 +1406,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1437,7 +1437,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 40
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 40
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1499,7 +1499,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1531,7 +1531,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1563,7 +1563,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 20
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 20
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1627,7 +1627,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1659,7 +1659,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -1691,7 +1691,7 @@ if $ARGS[0] = 'boys':
 					*clr & cla
 					grupvalue[2] += 1
 					pcs_mood += 30
-					bkbll_exp += rand(0,2)
+					gs 'exp_gain', 'bkbll', rand(0,2)
 					gs 'sweat', 'add', 30
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'

+ 5 - 0
locations/bed2.qsrc

@@ -366,6 +366,11 @@ if $ARGS[0] = 'dream':
 	if stime >= 60:
 		stime = 0
 		pcs_sleep += 15
+		if pcs_sleep >= 100:
+			pcs_condition['lack_of_sleep'] = 0
+		elseif pcs_condition['lack_of_sleep'] > 0:
+			pcs_condition['lack_of_sleep'] -= 1
+		end
 		gs 'stat'
 	end
 

+ 1 - 1
locations/bedrPar.qsrc

@@ -240,7 +240,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 					*clr & cla
 					menu_off = 1
 					minut+=60
-					sewng_exp += rand(pcs_intel/10, pcs_intel/5)
+					gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
 					gobramax = (pcs_sewng - 70) * 6
 					gobramin = (pcs_sewng - 70) * 2
 					newgobelen += rand(gobramin,gobramax)

+ 1 - 1
locations/beg.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'start':
 		*clr
 		abonement -= 1
 		pcs_mood += 2
-		gs 'exercise', 'tier2', 30, 'run_exp'
+		gs 'exercise', 'tier2', 30, 'run'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit5.jpg"></center>'
 		'You spend half an hour practising 100 meter dashes to improve your speed, as well as doing several rounds around the stadium to work on your stamina. You are sweaty all over by the end of it, obviously, but you also feel that you''re a little better than before.'
 

+ 5 - 5
locations/beg1.qsrc

@@ -49,7 +49,7 @@ end
 
 if $ARGS[0] = 'br':
 	cla
-	gs 'exercise', 'tier2', 30, 'run_exp'
+	gs 'exercise', 'tier2', 30, 'run'
 
 	begminus = 0
 	if pcs_bmi > 25:
@@ -109,7 +109,7 @@ end
 
 if $ARGS[0] = 'kms':
 	cla
-	gs 'exercise', 'tier2', 30, 'run_exp'
+	gs 'exercise', 'tier2', 30, 'run'
 
 	begminus = 0
 	if pcs_bmi > 25:
@@ -171,7 +171,7 @@ end
 
 if $ARGS[0] = 'ross':
 	cla
-	gs 'exercise', 'tier2', 30, 'run_exp'
+	gs 'exercise', 'tier2', 30, 'run'
 
 	begminus = 0
 	if pcs_bmi > 25:
@@ -233,7 +233,7 @@ end
 
 if $ARGS[0] = 'kval':
 	cla
-	gs 'exercise', 'tier2', 30, 'run_exp'
+	gs 'exercise', 'tier2', 30, 'run'
 	razradbeg += 1
 	minut += 60
 
@@ -300,7 +300,7 @@ end
 
 if $ARGS[0] = 'evro':
 	cla
-	gs 'exercise', 'tier2', 30, 'run_exp'
+	gs 'exercise', 'tier2', 30, 'run'
 	minut += 120
 
 	begminus = 0

+ 6 - 7
locations/belpicknick.qsrc

@@ -240,7 +240,7 @@ if $ARGS[0] = 'dance':
 		'You get down on your knees as the four men surround you, slapping their cocks against your cheeks and forehead. Dutifully keeping your hands behind your back, you do your best to serve them with your mouth alone as you suck on them in turns, licking the heads and teasing the balls as good as you can while trying to not make anyone feel left out.'
 		gang += 1
 		belsexpayment = 900
-		gs 'arousal', 'bj', 5, 'gangbang', 'sub'
+		gs 'arousal', 'bj', 5, 'gangbang', 'sub', 'prostitution'
 		gs 'stat'
 		
 		fuckerrand = rand(1,4)
@@ -289,7 +289,7 @@ if $ARGS[0] = 'missionary':
 	gs 'dinsex','vaginal_sex',10
 	gs 'dinsex','sexcum'
 	
-	gs 'arousal', 'vaginal', 10, 'sub'
+	gs 'arousal', 'vaginal', 10, 'sub', 'prostitution'
 	gs 'stat'
      
 	if times_picknick <= 0:
@@ -339,7 +339,7 @@ if $ARGS[0] = 'doggy':
 		gs 'dinsex','vaginal_sex',10
 		gs 'dinsex','sexcum'
 		
-		gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+		gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'prostitution'
 		gs 'stat'
 	else
 		spafinloc = 3
@@ -349,7 +349,7 @@ if $ARGS[0] = 'doggy':
 		
 		gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 		
-		gs 'arousal', 'anal', 5, 'sub'
+		gs 'arousal', 'anal', 5, 'sub', 'prostitution'
 		gs 'stat'
 		
 	end
@@ -443,8 +443,8 @@ if $ARGS[0] = 'gang':
 	if vagmembergang = analmembergang:jump'markpoiskanalmembergang'
 	gs 'boyStat', 'A<<analmembergang>>','b'
 	'<<$boydesc1>> gets on his back, and tells you to mount him. You do as he says, and as you feel his cock sinking into your pussy you feel the rough hands of <<$boydesc2>> pushing against your back. Leaning forward, you raise your ass up in the air involuntarily. Seconds later you feel his erection poking against your asshole, and he slams it in with little regard for your feelings. Meanwhile, the other two men move towards your face and put their cocks at your mouth''s height, telling you to please them too. You struggle to keep track of all the cocks around you as you get pounded mercilessly in all holes, but the men are very pleased with your performance.'
-	gs 'dinsex2','doublepenetration',20,'sub','gangbang'
-	gs 'arousal', 'bj', 20, 'group'
+	gs 'dinsex2','doublepenetration',20,'sub','gangbang', 'prostitution'
+	gs 'arousal', 'bj', 20, 'group', 'prostitution'
 	minut -= 20
 	gs 'stat'
 
@@ -488,7 +488,6 @@ if $ARGS[0] = 'end':
 	cls
 	gs 'stat'
 	minut += 5
-	slutty += 1
 	gs 'fame', 'pav', 'prostitute', 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/Strela/vadimbely.jpg"></center>'
 	'Once they are spent, the criminals back away from you and gather their things.'

+ 14 - 14
locations/bicycle.qsrc

@@ -36,8 +36,8 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 				*clr & cla
 				menu_off = 1
 				minut += 60
-				run_exp += rand(0,2)
-				stren_exp += rand(0,2)
+				gs 'exp_gain', 'run', rand(0,2)
+				gs 'exp_gain', 'stren', rand(0,2)
 				fat -= 2
 				pcs_mood += 10
 				pcs_sweat += 2
@@ -111,8 +111,8 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 				menu_off = 1
 				if BikeLoc = 2:
 					minut += 12
-					run_exp += rand(0,1)
-					stren_exp += rand(0,1)
+					gs 'exp_gain', 'run', rand(0,1)
+					gs 'exp_gain', 'stren', rand(0,1)
 					fat -= 1
 					pcs_mood += 5
 					pcs_sweat += 1
@@ -123,8 +123,8 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 					end
 				elseif BikeLoc = 3:
 					minut += 44
-					run_exp += rand(0,3)
-					stren_exp += rand(0,3)
+					gs 'exp_gain', 'run', rand(0,3)
+					gs 'exp_gain', 'stren', rand(0,3)
 					fat -= 3
 					pcs_mood += 15
 					pcs_sweat += 3
@@ -156,15 +156,15 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 				menu_off = 1
 				if BikeLoc = 1:
 					minut += 12
-					run_exp += rand(0,1)
-					stren_exp += rand(0,1)
+					gs 'exp_gain', 'run', rand(0,1)
+					gs 'exp_gain', 'stren', rand(0,1)
 					fat -= 1
 					pcs_mood += 5
 					pcs_sweat += 1
 				elseif BikeLoc = 3:
 					minut += 32
-					run_exp += rand(0,2)
-					stren_exp += rand(0,2)
+					gs 'exp_gain', 'run', rand(0,2)
+					gs 'exp_gain', 'stren', rand(0,2)
 					fat -= 2
 					pcs_mood += 0
 					pcs_sweat += 2
@@ -191,15 +191,15 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 				menu_off = 1
 				if BikeLoc = 1:
 					minut += 44
-					run_exp += rand(0,3)
-					stren_exp += rand(0,3)
+					gs 'exp_gain', 'run', rand(0,3)
+					gs 'exp_gain', 'stren', rand(0,3)
 					fat -= 3
 					pcs_mood += 15
 					pcs_sweat += 3
 				elseif BikeLoc = 2:
 					minut += 32
-					run_exp += rand(0,2)
-					stren_exp += rand(0,2)
+					gs 'exp_gain', 'run', rand(0,2)
+					gs 'exp_gain', 'stren', rand(0,2)
 					fat -= 2
 					pcs_mood += 10
 					pcs_sweat += 2

+ 2 - 2
locations/billiard.qsrc

@@ -20,7 +20,7 @@ if hour >= 8 and hour <= 20:
 			money -= 125
 			minut += 60
 			billvar = 0
-			pool_exp += rand(0,3)
+			gs 'exp_gain', 'pool', rand(0,3)
 			billrand = rand(0,5)
 			gs 'stat'
 			
@@ -89,7 +89,7 @@ if hour >= 8 and hour <= 20:
 		act 'Play for money (250 <b>₽</b>)':
 			menu_off = 1
 			minut += 60
-			pool_exp += rand(0,1)
+			gs 'exp_gain', 'pool', rand(0,1)
 			billvar = 3
 			gt 'billiard', 'randwin'
 		end

+ 0 - 12
locations/booty_call.qsrc

@@ -1,17 +1,5 @@
 # booty_call
 
-if $ARGS[0] = 'draw':
-	! this routine should invoke a the booty call sms from random friend in $lover list
-	! but I cannnot randomize the time because the probability is 100 % now
-	! I suppose that the routine will be modified later to take in account the lovers preferences
-	if booty_call['A0'] ! daystart :
-		$lover_drawn = $fuckbuddy[rand(0,arrsize('$fuckbuddy')-1)]
-		gs 'booty_call_sms', 'start',$lover_drawn
-		gs 'booty_call_sms', 'Add SMS', $lover_drawn
-		booty_call['A0'] = daystart
-	end
-end
-
 if $ARGS[0] = 'text':
 	!! boy code?
 	!! IMAGE HERE

+ 554 - 183
locations/booty_call_after.qsrc

@@ -38,13 +38,20 @@ if $ARGS[0] = 'exit':
 end
 
 if $ARGS[0] = 'ending':
-	gs 'booty_call_stats', 'save'
+!!	gs 'booty_call_stats', 'save'
 	gs 'arousal', 'end'
-	if $clothingworntype = 'nude': gs'shortgs', 'dress'
+	if $clothingworntype = 'nude': gs'booty_call_after', 'dress'
 	if pcs_vag > 0 and booty_call['fuck'] > 0: know_virgin[$boy] = 0
 	killvar 'booty_call'
 end
 
+if $ARGS[0] = 'dress':
+	gs'clothing','wear_last_worn'
+	gs 'panties', 'wear', $lastwornpantytype['booty_call'], lastwornpantynumber['booty_call']
+	gs 'bras', 'wear', $lastwornbratype['booty_call'], lastwornbranumber['booty_call']
+	gs 'stat'
+end
+
 
 if $ARGS[0] = 'quit':
 	act'Leave in anger':
@@ -70,35 +77,120 @@ end
 if $ARGS[0] = 'stop_here':
 	act'Finish here?':
 		cla & *clr
-		$npc_apt_bedroom[$boy]
-		'"I think I''m good here," you say. "How about you?"'
-		if booty_call['cum_count'] < npc_sexdrive[$boy] - 5:
+		if booty_call['blowjob_continue_ask'] = 1:
+			'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
+			'"There, happy now?" you ask, playing with his cock.'
+		elseif booty_call['keep_going_continue'] > 0:
+			$npc_apt_bedroom[$boy]
+			'"Is that good enough for you now?" you ask.'
+		else
+			$npc_apt_bedroom[$boy]
+			'"I think I''m good here," you say. "How about you?"'
+		end
+		if booty_call['cum_count'] < npc_sexdrive[$boy] - rand(1,3) and booty_call['blowjob_continue_ask'] ! 1:
 			booty_call['blue_ball'] = 1
-			'"You''re seriously done already?" <<$npc_firstname[$boy]>> protests. "I still want to get off a few more times with you."'
-			act'I can''t keep going':
-				cla & *nl
-				'"I''m sorry <<$npc_firstname[$boy]>>," you say, rubbing his arm, genuinely apologetic. "But I just can''t keep up with your sex drive. I''m all tapped out. Maybe next time?"'
+			if booty_call['keep_going_continue'] > 0 and npc_caretaker[$boy] = 1:
+				gs'booty_call_after', 'finish'
+			elseif booty_call['keep_going_continue'] > 0:
+				'"Just a couple more times?" <<$npc_firstname[$boy]>> begs. "I still want to get off a few more times with you."'
+				gs'booty_call_after', 'stop_here_options'
+			else
+				'"You''re done already?" <<$npc_firstname[$boy]>> complains. "I still want to get off a few more times with you."'
+				gs'booty_call_after', 'stop_here_options'
+			end
+			
+		else
+			gs'booty_call_after', 'finish'
+		end
+	end
+end
+
+if $ARGS[0] = 'stop_here_options':
+	act'I can''t keep going':
+		cla & *nl
+!!		if booty_call['fuck_count'] > 0:
+			'"I''m sorry <<$npc_firstname[$boy]>>," you say, rubbing his arm, genuinely apologetic. "But I just can''t keep up with your sex drive. I''m all tapped out. Maybe next time?"'
+		if npc_caretaker[$boy] = 1:
+			'<<$npc_firstname[$boy]>> smiles wistfully at you.'
+			'"I guess it''s okay then..."'
+			gs'booty_call_after', 'after_sex1'
+		else
+			if booty_call['cum_count'] < npc_sexdrive[$boy] - 5:
+				if rand(0,1) = 1:
+					'"Come on, please? Just a couple more times?"'
+					act'Not happening':
+						cla & *nl
+						'"Sorry," you shake your head. "But I just can''t."'
+						gs'booty_call_after', 'after_sex1'
+					end
+				else
+					'"Can I at least get a blowjob?"'
+					booty_call['blowjob_continue_ask'] = 1
+					act'Not happening':
+						cla & *nl
+						'"Sorry," you shake your head. "But I just can''t."'
+						gs'booty_call_after', 'after_sex1'
+					end
+					gs 'booty_call_start', 'bj_ask2'
+				end
+			else
 				'<<$npc_firstname[$boy]>> seems really disappointed, almost upset.'
 				gs'booty_call_after', 'after_sex1'
 			end
+		end
+	end
+	
+	gs'booty_call_after', 'well_continue'
 
-			act'Well...':
-				cla & *nl
-				'"Well... I guess I might be able to keep going a <i>little</i> longer," you say with a soft smile.'
-				gs'booty_call_sex', 'reset'
-				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-				act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_sex', 'condoms'
+	act'I don''t have time':
+		cla & *nl
+		booty_call['no_time'] += 1
+		if booty_call['keep_going_continue'] >= 1:
+			'"Seriously <<$npc_firstname[$boy]>>," you say. "I can''t. You''re gonna make me late."'
+		else
+			'"I wish I could, but I don''t have time <<$npc_firstname[$boy]>>," you shake your head. "I really need to get going soon."'
+		end
+		if npc_caretaker[$boy] = 1:
+			'"Well, I don''t want to make you late," he says softly.'
+		else
+			if booty_call['cum_count'] < npc_sexdrive[$boy] - 5:
+				'"Come on, please? Just a couple more times?"'
+			else
+				'<<$npc_firstname[$boy]>> seems really disappointed, almost upset.'
 			end
-
-			act'I don''t have time':
-				cla & *nl
-				'"I wish I could, but I don''t have time <<$npc_firstname[$boy]>>," you shake your head. "I really need to get going soon."'
+		end
+		gs'booty_call_after', 'after_sex1'
+		gs'booty_call_after', 'well_continue'
+	end
+	
+	if booty_call['fuck_count'] > 3:
+		act'Sore pussy':
+			cla & *nl
+			booty_call['sore_pussy'] = 1
+			'"You''ve ," you say, rubbing his arm, genuinely apologetic. "But I just can''t keep up with your sex drive. I''m all tapped out. Maybe next time?"'
+			if npc_caretaker[$boy] = 1:
+				'<<$npc_firstname[$boy]>> smiles apologetically at you.'
+				'"Oh. Sorry about that..."'
+			else
 				'<<$npc_firstname[$boy]>> seems really disappointed, almost upset.'
-				gs'booty_call_after', 'after_sex1'
 			end
+			gs'booty_call_after', 'after_sex1'
+		end
+	end
+end
+
+if $ARGS[0] = 'well_continue':
+	act'Well...':
+		cla & *nl
+		if booty_call['no_time'] > 0:
+			'"Well... Maybe I could be a <i>little</i> late..." you say with a soft smile.'
 		else
-			gs'booty_call_after', 'finish'
+			'"Well... I guess I might be able to keep going a <i>little</i> longer," you say with a soft smile.'
 		end
+		booty_call['keep_going_continue'] += 1
+		gs'booty_call_sex', 'reset'
+		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
 	end
 end
 
@@ -117,7 +209,7 @@ if $ARGS[0] = 'keep_going':
 				gs'booty_call_sex', 'reset'
 				act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
 				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-				act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_sex', 'condoms'
+				act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
 			else
 				cla & *nl
 				$booty_call['reset_pos'] = $booty_call['pos_speed']
@@ -126,7 +218,7 @@ if $ARGS[0] = 'keep_going':
 				gs'booty_call_sex', 'reset'
 				act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
 				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-				act'Keep fucking':gs'booty_call_sex', 'reset' & gs 'booty_call_sex', 'condoms' & gt'booty_call_sex',$booty_call['reset_pos']
+				act'Keep fucking':gs'booty_call_sex', 'reset' & gs 'booty_call_condoms', 'condoms' & gt'booty_call_sex',$booty_call['reset_pos']
 			end
 		else
 			cla & *clr
@@ -142,7 +234,7 @@ if $ARGS[0] = 'keep_going':
 			gs'booty_call_sex', 'reset'
 			act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
 			act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-			act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_sex', 'condoms'
+			act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
 		end
 	end
 end
@@ -202,6 +294,93 @@ if $ARGS[0] = 'fucked_out':
 	end
 end
 
+if $ARGS[0] = 'wipes':
+	gs'stat'
+	if hypnoAddict > 0:
+		cumspclnt = 18
+	else
+		cumspclnt = 1
+	end
+	cla & *clr
+	if cumloc[11] > 0 or $booty_call['cum_choice'] = 'facial':
+		!! face
+		'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial36.jpg"></center>'
+		if booty_call['wipes'] = 2:
+			'"Hey, got anything I can use to clean up?" you trying not to smile under the spunk covering your face.'
+			'"Oh yeah, right here." <<$npc_firstname[$boy]>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.'
+		else
+			'You reach up and poke at the sperm coating your face. Ew. You really need to clean that up before you do anything else. Reaching down to your purse, you pull some wipes out of your purse.'
+		end
+		*nl
+
+		if cumloc[16] > 0:
+			!! hair
+			'You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<$npc_firstname[$boy]>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.'
+		else
+			'You carefully wipe the cum from your face, making sure to get every last drop. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.'
+		end
+		booty_call['wipes'] = 0
+	elseif cumloc[12] > 0 or $booty_call['cum_choice'] = 'stomach':
+		!! stomach
+		'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum3.jpg"></center>'
+		if booty_call['wipes'] = 2:
+			'"Hey, got anything I can use to clean up?" you ask, looking at your belly, cum still spattered over it.'
+			'"Oh yeah, right here." <<$npc_firstname[$boy]>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.'
+		else
+			'You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse.'
+		end
+		booty_call['wipes'] = 0
+	elseif cumloc[4] > 0 or $booty_call['cum_choice'] = 'ass' or $booty_call['cum_choice'] = 'back':
+		!! butt
+		'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
+		if booty_call['wipes'] = 2:
+			'"Hey, got anything I can use to clean up?" you ask, looking over your shoulder and wiggling your ass to emphasize the cum resting on it.'
+			'"Oh yeah, right here." <<$npc_firstname[$boy]>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work awkwardly trying to wipe your ass and up your back.'
+		else
+			'You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse, awkwardly wiping your ass and back with it.'
+		end
+		booty_call['wipes'] = 0
+	elseif cumloc[0] > 0 or $booty_call['cum_choice'] = 'creampie':
+		!! vagina
+		if hypnoAddict > 0:
+			'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
+			$npc_apt_bedroom[$boy]
+			if booty_call['wipes'] = 1:
+				'You reach down to your purse and pull out your bag of wipes before you stop, suddenly confused.'
+				'<i>Why did I get out my wipes?</i> you think to yourself. You frown at the packet, befuddled as to what you wanted to do with the,.'
+				'<i>Meh. If it''s important, it will come back to me later,</i> you think to yourself as you put it back into your purse, oblivious to the liquid dribbling down the inside of your thigh.'
+			elseif booty_call['wipes'] = 2:
+				'"Hey, do you-" you start and then suddenly lose track of what you were trying to say. You frown to yourself as <<$npc_firstname[$boy]>> looks at you quizically.'
+				'"Did you need something?"'
+				'"I uhh..." Your frown deepens. "I wanted to ask you something... but I forgot what it was... I guess it doesn''t really matter..."'
+				'<i>Meh. If it''s important, it will come back to me later,</i> you think to yourself, oblivious to the liquid dribbling down the inside of your thigh.'
+			end
+		else
+			if booty_call['wipes'] = 2:
+				'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/after1.mp4"></video></center>'
+				'"Hey, got anything I can use to clean up?" you say, holding your fingers over your pussy, trying to keep the cum from spilling out any further.'
+				'"Oh yeah, right here." <<$npc_firstname[$boy]>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.'
+			else
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum111.jpg"></center>'
+				'You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse before reaching between your legs to wipe yourself up.'
+				*nl
+				'It takes a few tries, more cum seemingly coming out with every next wipe, but eventually you feel like you got most of it out. At least enough that nothing is going to be running down your legs walking home.'
+			end
+		end
+	end
+
+	if cumloc[13] > 0:
+		*nl
+		!! hands
+		'Once you''re satisfied that the rest of your body is clean, you wipe your hands off and toss the wipes into the trash.'
+	end
+
+	booty_call['wipes'] = 0
+	gs'cum_cleanup'
+	gs'booty_call_after', 'after_sex2'
+end
+
+
 if $ARGS[0] = 'wipe_hands':
 	act'Wipe your hands':
 		cla & *clr
@@ -367,6 +546,7 @@ end
 
 if $ARGS[0] = 'black_out':
 	cla & *clr
+	booty_call['pass_out'] = 1
 	if booty_call['cum_together'] > 0:
 		if $booty_call['position'] = 'miss':
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
@@ -789,7 +969,7 @@ if $ARGS[0] = 'after_sex2':
 		act'Pillow talk':gt'booty_call_pillow_talk', 'start'
 	end
 
-	if hour >= 20 and booty_call['spend_night'] = 0:
+	if (hour >= 20 or hour < 5) and booty_call['spend_night'] = 0:
 		act'Ask to spend the night':
 			booty_call['spend_night'] = 1
 			cla & *clr
@@ -806,11 +986,11 @@ if $ARGS[0] = 'after_sex2':
 				act'I''m sick of my mom':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
-					'"Mind if I spend the night?" you ask. "My mom has been such a pain in the ass lately and I don''t want to see her."'
+					'"Mind if I spend the night?" you ask. "My mom has been such a bitch lately and I don''t want to see her."'
 					gs'booty_call_after', 'spend_night'
 				end
 			end
-			if pcs_boyfriend > 0:
+			if pcs_lovers - pcs_girlfriends > 0:
 				act'I don''t want to see my boyfriend(annoyed)':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
@@ -1002,77 +1182,31 @@ if $ARGS[0] = 'dressing1':
 			gs'booty_call_after', 'after_sex_dressed'
 		end
 	end
+	if mid($start_type,1,2) = 'sg' and hour >= 20:
+		act'Mom will kill me':
+			booty_call['mom_kill'] = 1
+			cla & *nl
+			if hour < 3:
+				'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "I''m already going to be in trouble as it is, but if I don''t come home at all tonight, my mom will kill me."'
+			else
+				'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "My mom will kill me if I don''t come home before curfew."'
+			end
+			act'Finish getting dressed':
+				gs'booty_call_after', 'dress_loop'
+				cla & *clr
+				$npc_apt_bedroom[$boy]
+				'You finish <<$booty_call[''dress_describe'']>>'
+				gs'booty_call_after', 'after_sex_dressed'
+			end
+		end
+	end
 
 
 !!	act'Talk while you dress':
-!!		gs'booty_call_after', 'dress_talk'
+!!		gs'booty_call_after', 'dress_talk_start'
 !!	end
 end
 
-!!{
-if $ARGS[0] = 'dress_talk':
-	if rand(0,1) = 1:
-		!! he initiates
-		if booty_call['dress_talk1'] = 0:
-			'"You busy tomorrow? Want to come by and do this again?"'
-
-		end
-
-		if booty_call['dress_talk2'] = 0:
-			'"What''re you up to later?"'
-			if date_variable > 0:
-				act'I have a date with my boyfriend':
-					cla & *clr
-					gs'booty_call_after', 'dress_image'
-					'"I have a date with my boyfriend later."'
-				end
-			end
-		end
-
-		if booty_call['dress_talk3'] = 0:
-
-
-		end
-
-		if booty_call['dress_talk4'] = 0:
-
-
-		end
-
-		if booty_call['dress_talk5'] = 0:
-
-
-		end
-	else
-		!! player initiates
-		if booty_call['dress_talk1'] = 0:
-
-
-		end
-
-		if booty_call['dress_talk2'] = 0:
-
-
-		end
-
-		if booty_call['dress_talk3'] = 0:
-
-
-		end
-
-		if booty_call['dress_talk4'] = 0:
-
-
-		end
-
-		if booty_call['dress_talk5'] = 0:
-
-
-		end
-	end
-
-end}
-
 if $ARGS[0] = 'dress_image':
 	if booty_call['CloDress'] = 1:
 		'<center><img <<$set_imgh>> src="images/shared/romance/lovers/misc/bed_dress.jpg"></center>'
@@ -1083,11 +1217,11 @@ end
 
 if $ARGS[0] = 'dress_loop':
 	:dress_loop_start
-	if $lastwornpantytype ! 'none' and $pantyworntype = 'none':
-		gs'panties', 'wear'
+	if $lastwornpantytype['booty_call'] ! 'none' and $pantyworntype = 'none':
+		gs 'panties', 'wear', $lastwornpantytype['booty_call'], lastwornpantynumber['booty_call']
 		$booty_call['dress_describe'] = 'pulling your panties up your legs'
-	elseif $lastwornbratype ! 'none' and $braworntype = 'none':
-		gs'bras', 'wear'
+	elseif $lastwornbratype['booty_call'] ! 'none' and $braworntype = 'none':
+		gs 'bras', 'wear', $lastwornbratype['booty_call'], lastwornbranumber['booty_call']
 		$booty_call['dress_describe'] = 'throwing your arms through the straps of your bra and clasping it behind your back.'
 	elseif $clothingworntype = 'nude':
 		gs'clothing', 'wear'
@@ -1123,12 +1257,14 @@ if $ARGS[0] = 'after_sex_dressed':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		'"I can''t do this anymore," you say, stiffly.'
-		'"Huh?" <<$npc_firstname[$boy]>> sits up. "What are you talking about?"'
+		'"Huh?" <<$npc_firstname[$boy]>> looks at you oddly. "What are you talking about?"'
 		'"I can''t keep hooking up with you like this. Not anymore."'
 		'"Why not?" he asks.'
 		act'Don''t explain':
-			cla & *nl
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			'"I just can''t," you say. "I''m sorry."'
+			'You grab your things and leave.'
 			gs 'lover', 'remove fuckbuddy', $boy
 			act'Leave':gt'booty_call_after', 'exit'
 		end
@@ -1136,29 +1272,94 @@ if $ARGS[0] = 'after_sex_dressed':
 		if pcs_lovers > 0:
 			act'I''ve started seeing somebody':
 				cla & *clr
+				npc_know_cheat[$boy] = 1
 				$npc_apt_bedroom[$boy]
-				'"The truth is, I''ve started seeing somebody. Sex with you has been good, but... I can''t keep doing this. I don''t want to fuck things up with them."'
-
-			end
-			act'I can''t keep cheating like this':
-				cla & *clr
-				$npc_apt_bedroom[$boy]
-				if npc_know_cheat[$boy] = 1:
-					'"I can''t keep cheating on my boyfriend like this," you say, hanging your head shamefully. "It''s wrong, and I just can''t do this anymore. I have to go."'
+				'"The truth is, I''ve started seeing somebody. The sex has been good, but..." You shake your head, grabbing your purse. "I can''t keep doing this. I don''t want to fuck things up."'
+				if npc_fidelity[$boy] < 7:
+					'"Come on," he says. "We''re just having fun. It''s not cheating if it''s just physical. When you masturbate in the shower, it''s not cheating hom him with your showerhead are you?"'
+					act'No means no':
+						cla & *clr
+						'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
+						'"You''re not going to change my mind," you say. "We''re done."'
+						*nl
+						'And with that, you head out the door.'
+						gs 'lover', 'remove fuckbuddy', $boy
+						act'Leave':gt'booty_call_after', 'exit'
+					end
+					
+					act'Well...':
+						cla & *nl
+						'You pause, biting your lip in consideration.'
+						act'As long as it''s just phsyical':
+							cla & *clr
+							$npc_apt_bedroom[$boy]
+							'"Well..." you say slowly. "As long as it''s <i>just</i> physical..."'
+							'"Thatta girl," <<$npc_firstname[$boy]>> grins from bed.'
+							gs'booty_call_after', 'cheating_end'
+						end
+						
+						act'Set some rules':
+							cla & *nl
+							'"Okay..." you say. "But there have to be rules!"'
+							gs'booty_call_after', 'cheating_rules'
+						end
+					end
 				else
-					'"The truth is, I''m in a relationship with somebody," you say, hanging your head shamefully. "I''ve been cheating on them with you this whole time. It''s wrong, and I— I just can''t do this anymore!"'
+					gs 'lover', 'remove fuckbuddy', $boy
+					'"Oh." <<$npc_firstname[$npclastsaved]>> looks at you. "I guess that''s fair. So... I''ll see you around?"'
+					act'See you':
+						cla & *nl
+						'"Yeah," you mumble wistfully. "See you..."'
+						*nl
+						'And with that, you head out the door.'
+						act'Leave':gt'booty_call_after', 'exit'
+					end
+					
+					act'No I won''t':
+						cla & *clr
+						'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
+						'"No, I won''t," you frown. "That''s the point."'
+						*nl
+						'And with that, you head out the door.'
+						act'Leave':gt'booty_call_after', 'exit'
+					end
+				end
+			end
+			
+			if pcs_lovers - pcs_girlfriends > 0:
+				act'I can''t keep cheating on my boyfriend':
+					cla & *clr
+					'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
+					if npc_know_cheat[$boy] = 1:
+						'"I can''t keep cheating on my boyfriend like this," you say, hanging your head shamefully. "It''s wrong, and I just can''t do this anymore. I have to go."'
+					else
+						'"The truth is, I''m in a relationship with somebody," you say, hanging your head shamefully. "I''ve been cheating on them with you this whole time. It''s wrong, and I— I just can''t do this anymore!"'
+					end
+					'You grab your things and rush out the door.'
+					gs 'lover', 'remove fuckbuddy', $boy
+					act'Leave':gt'booty_call_after', 'exit'
+				end
+			end
+			if pcs_girlfriends > 0:
+				act'I can''t keep cheating on my girlfriend':
+					cla & *clr
+					'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
+					if npc_know_cheat[$boy] = 1:
+						'"I can''t keep cheating on my girlfriend like this," you say, hanging your head shamefully. "It''s wrong, and I just can''t do this anymore. I have to go."'
+					else
+						'"The truth is, I''m in a relationship with somebody," you say, hanging your head shamefully. "I''ve been cheating on them with you this whole time. It''s wrong, and I— I just can''t do this anymore!"'
+					end
+					'You grab your things and rush out the door.'
+					gs 'lover', 'remove fuckbuddy', $boy
+					act'Leave':gt'booty_call_after', 'exit'
 				end
-				'You grab your things and rush out the door.'
-				gs 'lover', 'remove fuckbuddy', $boy
-				act'Leave':gt'booty_call_after', 'exit'
 			end
 		end
+!!		gs'booty_call_after', 'isnt_going_to_work'
+
 	end
 !!{
-		act'You don''t satisfy me anymore':
-
-
-		end
+	
 
 		act'This is getting too complicated':
 
@@ -1169,93 +1370,263 @@ if $ARGS[0] = 'after_sex_dressed':
 	}
 end
 
-if $ARGS[0] = 'wipes':
-	gs'stat'
-	if hypnoAddict > 0:
-		cumspclnt = 18
-	else
-		cumspclnt = 1
-	end
-	cla & *clr
-	if cumloc[11] > 0 or $booty_call['cum_choice'] = 'facial':
-		!! face
-		'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial36.jpg"></center>'
-		if booty_call['wipes'] = 2:
-			'"Hey, got anything I can use to clean up?" you trying not to smile under the spunk covering your face.'
-			'"Oh yeah, right here." <<$npc_firstname[$boy]>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.'
+!!{
+if $ARGS[0] = 'isnt_going_to_work':
+	act'You don''t satisfy me':
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'"You''re just not what I want out of a fuckbuddy," you say flatly.'
+		act'Sexually incompatible':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
+			'"You''re just not what I want out of a fuckbuddy," you say flatly. "I just don''t think we''re sexually compatible."'
+			*nl
+			'You shrug once, grab your things, and leave without another word.'
+			gs 'lover', 'remove fuckbuddy', $boy
+			act'Leave':gt'booty_call_after', 'exit'
+		end
+		if npc_sexdrive[$boy] = 1 or npc_two_pump[$boy] = 1:
+			act'You''re a two pump chump':
+				cla & *clr
+				$npc_apt_bedroom[$boy]
+				'"You''re just not what I want out of a fuckbuddy," you say flatly. "You come too fast. I can''t trust you to get me off."'
+				*nl
+				'"Wait but-"'
+				gs'booty_call_after', 'isnt_going_to_work'
+			end
+		elseif npc_sexdrive[$boy] < 5:
+			act'You don''t last long enough for me':
+				cla & *clr
+				$npc_apt_bedroom[$boy]
+				'"You''re just not what I want out of a fuckbuddy," you say flatly. "You can''t keep it up and I can''t trust you to get me off."'
+				*nl
+				'"Wait but-"'
+				gs'booty_call_after', 'isnt_going_to_work'
+			end
 		else
-			'You reach up and poke at the sperm coating your face. Ew. You really need to clean that up before you do anything else. Reaching down to your purse, you pull some wipes out of your purse.'
+			act'You last too long':
+				cla & *clr
+				$npc_apt_bedroom[$boy]
+				'"You''re just not what I want out of a fuckbuddy," you say flatly. "Honestly, your sex drive is way too high. By the time you''re satisfied, my pussy is sore."'
+				*nl
+				'"Wait but-"'
+				gs'booty_call_after', 'isnt_going_to_work'
+			end
 		end
+		
+		act'You''re boring':
+	end
+end
+if $ARGS[0] = 'isnt_going_to_work':
+	act'Grab your things':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
+		'"This just isn''t going to work," you say, cutting him off. "We''re done."'
 		*nl
+		'And with that, you head out the door.'
+		gs 'lover', 'remove fuckbuddy', $boy
+		act'Leave':gt'booty_call_after', 'exit'
+	end
+end
 
-		if cumloc[16] > 0:
-			!! hair
-			'You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<$npc_firstname[$boy]>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.'
+if $ARGS[0] = 'dress_talk_start':
+	act'Finish getting dressed':
+		gs'booty_call_after', 'dress_loop'
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'You finish <<$booty_call[''dress_describe'']>>'
+		gs'booty_call_after', 'after_sex_dressed'
+	end
+	if booty_call['dress_end'] ! 1:
+		if rand(0,1) = 1:
+			!! he initiates
+			gs 'booty_call_after', 'dress_talk_him'
 		else
-			'You carefully wipe the cum from your face, making sure to get every last drop. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.'
+			!! player initiates
+			gs 'booty_call_after', 'dress_talk_her'
 		end
-		booty_call['wipes'] = 0
-	elseif cumloc[12] > 0 or $booty_call['cum_choice'] = 'stomach':
-		!! stomach
-		'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum3.jpg"></center>'
-		if booty_call['wipes'] = 2:
-			'"Hey, got anything I can use to clean up?" you ask, looking at your belly, cum still spattered over it.'
-			'"Oh yeah, right here." <<$npc_firstname[$boy]>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.'
-		else
-			'You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse.'
+	else
+		gs 'booty_call_after', 'after_sex_dressed'
+	end
+end}
+
+if $ARGS[0] = 'dress_talk_him':
+	if booty_call['dress_talk1'] = 0:
+		'"You busy tomorrow? Want to come by and do this again?"'
+
+	end
+
+	if booty_call['dress_talk2'] = 0:
+		'"What''re you up to later?"'
+		if date_variable > 0:
+			!! CHANGE THIS PLACEHOLDER VARIABLE
+			act'I have a date with my boyfriend':
+				cla
+				act'Embarrassed':
+					gs'booty_call_after', 'dress_image'
+					'"I have a date with my boyfriend later," you say, blushing shyly.'
+					if npc_know_cheat[$boy] = 1:
+						if npc_fidelity[$boy] < 7:
+							'"You''re still with that stick in the mud?" <<$npc_firstname[$boy]>> scoffs.'
+						else
+						
+						end
+					else
+						'"Oh." <<$npc_firstname[$boy]>> looks away uncomfortably.'
+					end
+				end
+				
+				act'Casual':
+					gs'booty_call_after', 'dress_image'
+					'"I have a date with my boyfriend later,"'
+				end
+				
+				act'Exhasperated':
+					gs'booty_call_after', 'dress_image'
+					'"I have a date with my boyfriend later,"'
+				end
+			end
 		end
-		booty_call['wipes'] = 0
-	elseif cumloc[4] > 0 or $booty_call['cum_choice'] = 'ass' or $booty_call['cum_choice'] = 'back':
-		!! butt
-		'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
-		if booty_call['wipes'] = 2:
-			'"Hey, got anything I can use to clean up?" you ask, looking over your shoulder and wiggling your ass to emphasize the cum resting on it.'
-			'"Oh yeah, right here." <<$npc_firstname[$boy]>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work awkwardly trying to wipe your ass and up your back.'
+	end
+
+	if booty_call['dress_talk3'] = 0:
+
+
+	end
+
+	if booty_call['dress_talk4'] = 0:
+
+
+	end
+
+	if booty_call['dress_talk5'] = 0:
+
+
+	end
+end
+
+if $ARGS[0] = 'dress_talk_her':
+	if booty_call['dress_talk1'] = 0:
+
+
+	end
+
+	if booty_call['dress_talk2'] = 0:
+
+
+	end
+
+	if booty_call['dress_talk3'] = 0:
+
+
+	end
+
+	if booty_call['dress_talk4'] = 0:
+
+
+	end
+
+	if booty_call['dress_talk5'] = 0:
+
+
+	end
+end
+
+
+if $ARGS[0] = 'cheating_end':
+	act'Smile back':
+		cla & *nl
+		pcs_horny += 10
+		gs'stat'
+		if $pantyworntype ! 'none':
+			'You return his smile, the prospect of future encounters already seeping into your panties as you head out the door.'
+		elseif CloSkirtShortness > 0:
+			'You return his smile, the prospect of future encounters already creating moisture between your thighs as you head out the door.'
 		else
-			'You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse, awkwardly wiping your ass and back with it.'
+			'You return his smile, the prospect of future encounters already seeping into your pants as you head out the door.'
 		end
-		booty_call['wipes'] = 0
-	elseif cumloc[0] > 0 or $booty_call['cum_choice'] = 'creampie':
-		!! vagina
-		if hypnoAddict > 0:
-			'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
+		act'Leave':gt'booty_call_after', 'exit'
+	end
+	
+	act'Guilt':
+		cla & *nl
+		'You return the smile, but a stab of guilt pierces your chest anyways.'
+		*nl
+		'<i>Are you just rationalizing? Making excuses? Why aren''t you just ending things?</i>'
+		*nl
+		'But you just keep smiling all the way until you close the door behind you.'
+		act'Leave':gt'booty_call_after', 'exit'
+	end
+end
+
+if $ARGS[0] = 'cheating_rules':
+	act'Done':
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'"Those are the rules," you say. "So..."'
+		'"See you next time," <<$npc_firstname[$boy]>> smiles.'
+		
+	end
+	if npc_no_kiss[$boy] ! 1:
+		act'No kissing':
+			npc_no_kiss[$boy] = 1
+			cla & *clr
 			$npc_apt_bedroom[$boy]
-			if booty_call['wipes'] = 1:
-				'You reach down to your purse and pull out your bag of wipes before you stop, suddenly confused.'
-				'<i>Why did I get out my wipes?</i> you think to yourself. You frown at the packet, befuddled as to what you wanted to do with the,.'
-				'<i>Meh. If it''s important, it will come back to me later,</i> you think to yourself as you put it back into your purse, oblivious to the liquid dribbling down the inside of your thigh.'
-			elseif booty_call['wipes'] = 2:
-				'"Hey, do you-" you start and then suddenly lose track of what you were trying to say. You frown to yourself as <<$npc_firstname[$boy]>> looks at you quizically.'
-				'"Did you need something?"'
-				'"I uhh..." Your frown deepens. "I wanted to ask you something... but I forgot what it was... I guess it doesn''t really matter..."'
-				'<i>Meh. If it''s important, it will come back to me later,</i> you think to yourself, oblivious to the liquid dribbling down the inside of your thigh.'
+			'"No kissing," you say.'
+			'"That''s fine," <<$npc_firstname[$boy]>> nods.'
+			gs'booty_call_after', 'cheating_rules'
+		end
+	end
+	
+	if npc_boyfriend_creampie_rule[$boy] ! 2:
+		act'No creampies':
+			npc_boyfriend_creampie_rule[$boy] = 2
+			cla & *clr
+			$npc_apt_bedroom[$boy]
+			'"You can''t come inside me," you say. "That''s too far."'
+			if npc_condom_conscious[$boy] < 1:
+				'"We always use condoms anyways," <<$npc_firstname[$boy]>> shrugs.'
+			elseif $npc_cum_pref[$npclastgenerated] = 'creampie':
+				'"But that''s the best part about fucking you," <<$npc_firstname[$boy]>> grins.'
+				'"I''m serious," you say sternly. "No creampies."'
+			elseif $npc_cum_pref[$npclastgenerated] = 'mouth':
+				'"So long as I can watch you swallow," <<$npc_firstname[$boy]>> grins.'
+			elseif $npc_cum_pref[$npclastgenerated] = 'facial':
+				'"So long as I can come all over your pretty face," <<$npc_firstname[$boy]>> grins.'
+			elseif $npc_cum_pref[$npclastgenerated] = 'tits':
+				'"So long as I can come all over your beautiful tits," <<$npc_firstname[$boy]>> grins.'
+			elseif $npc_cum_pref[$npclastgenerated] = 'pullout':
+				'"I prefer the pullout method anyways," <<$npc_firstname[$boy]>> grins.'
 			end
-		else
-			if booty_call['wipes'] = 2:
-				'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/after1.mp4"></video></center>'
-				'"Hey, got anything I can use to clean up?" you say, holding your fingers over your pussy, trying to keep the cum from spilling out any further.'
-				'"Oh yeah, right here." <<$npc_firstname[$boy]>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.'
+			gs'booty_call_after', 'cheating_rules'
+		end
+	end
+	
+	if npc_condom_rule[$boy] ! 1:
+		act'Always condoms':
+			npc_condom_rule[$boy] = 1
+			cla & *clr
+			$npc_apt_bedroom[$boy]
+			'"We always have to use a condom," you say.'
+			if npc_no_condoms[$boy] > 0:
+				'"Oh, come on. We don-"'
+				'"I''m serious!" you say sternly. "No condoms, no deal."'
+			elseif npc_condom_conscious[$boy] > 0:
+				'"We already do," <<$npc_firstname[$boy]>> smiles.'
+			elseif npc_boyfriend_creampie_rule[$boy] > 0:
+				'"A little redundant, don''t you think?" <<$npc_firstname[$boy]>> smirks.'
 			else
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum111.jpg"></center>'
-				'You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse before reaching between your legs to wipe yourself up.'
-				*nl
-				'It takes a few tries, more cum seemingly coming out with every next wipe, but eventually you feel like you got most of it out. At least enough that nothing is going to be running down your legs walking home.'
+				'"I guess that''s fair," <<$npc_firstname[$boy]>> says.'
 			end
+			gs'booty_call_after', 'cheating_rules'
 		end
 	end
-
-	if cumloc[13] > 0:
-		*nl
-		!! hands
-		'Once you''re satisfied that the rest of your body is clean, you wipe your hands off and toss the wipes into the trash.'
-	end
-
-	booty_call['wipes'] = 0
-	gs'cum_cleanup'
-	gs'booty_call_after', 'after_sex2'
 end
 
 
+!!if $ARGS[0] = '':
+
+!!end
 
 if $ARGS[0] = 'bed':
 	minut += rand(1,2)

+ 413 - 0
locations/booty_call_condoms.qsrc

@@ -0,0 +1,413 @@
+# booty_call_condoms
+
+if $ARGS[0] = 'condoms':
+	if booty_call['condom_count'] = 0 and booty_call['fuck_count'] = 0 and npc_no_condoms[$boy] ! 1:booty_call['condom_count'] = rand(1,5)
+	if booty_call['condom_count'] = 0 and npc_condom_conscious[$boy] = 1: booty_call['condom'] = 1 & booty_call['condom_count'] = 100
+	if npc_know_bc[$boy] = 1 and npc_condom_conscious[$boy] ! 2: booty_call['no_condom'] = 1
+	if booty_call['no_condom'] = 0:
+		if booty_call['condom'] = 1 and booty_call['out_of_condoms'] ! 1:
+			if booty_call['condom_count'] > 0:
+				if booty_call['fuck_count'] > 1:
+					'<<$npc_firstname[$boy]>> swaps out his used condom for a new one.'
+					gs 'booty_call_sex', 'position_choose'
+				else
+					'<<$npc_firstname[$boy]>> reaches for a condom from his bedside table.'
+					gs 'booty_call_sex', 'position_choose'
+					gs 'booty_call_condoms', 'condom_why2'
+				end
+			elseif booty_call['out_of_condoms'] = 0:
+				booty_call['out_of_condoms'] = 1
+				'"We got a problem. I''m out of condoms."'
+				cla 
+				act'We could skip the condom':
+					booty_call['condom'] = 2
+					booty_call['must_fuck'] = 1
+					cla & *clr
+					!! IMAGE HERE
+					$npc_apt_bedroom[$boy]
+					'"We could... skip the condom? Just this once?"'
+					'"Just this once," he smiles back.'
+					gs 'booty_call_sex', 'position_choose'
+				end
+				if prezik > 0:
+					act'Use one of your condoms':
+						booty_call['out_of_condoms'] = 2
+						booty_call['condom'] = 1
+						booty_call['must_fuck'] = 1
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
+						prezik -= 1
+						if prezik > 1:
+							'"That''s okay, I''ve got some more."'
+						elseif prezik = 1:
+							'"That''s okay, I''ve got one more."'
+						end
+						'You reach into your bag and pull out a condom, rolling it onto his cock.'
+						gs 'booty_call_sex', 'position_choose'
+					end
+
+					act'Use one of your condoms (mouth)':
+						booty_call['out_of_condoms'] = 2
+						booty_call['condom'] = 1
+						booty_call['must_fuck'] = 1
+						cla & *clr
+						'<center><video autoplay loop src="images/shared/sex/misc/condom_mouth.mp4"></video></center>'
+						prezik -= 1
+						'"That''s okay, I''ve got some."'
+						'You reach into your bag and pull out a condom, rolling it onto his cock with your mouth.'
+						gs 'booty_call_sex', 'position_choose'
+					end
+				end
+			elseif booty_call['out_of_condoms'] = 2:
+				'"Got anymore condoms?"'
+				!!act'I could give you head':
+				if prezik = 0:
+					'"I think that was my last one..."'
+					booty_call['out_of_condoms'] = 3
+					act'Guess that''s it':
+						cla & *clr
+						!! IMAGE HERE
+						$npc_apt_bedroom[$boy]
+						'"Guess that''s it?"'
+						'"Guess so."'
+						gs 'booty_call_after', 'after_sex1'
+					end
+					
+					act'We could skip the condom':
+						cla & *clr
+						!! IMAGE HERE
+						$npc_apt_bedroom[$boy]
+						booty_call['condom'] = 2
+						booty_call['must_fuck'] = 1
+						'"We could just... not use one..." you smile shyly. "Just this once?"'
+						'"Just this once," he smiles back.'
+						gs 'booty_call_sex', 'position_choose'
+					end
+				else
+					'"Yeah, I''ve got some."'
+					'You put another condom on him.'
+					gs 'booty_call_sex', 'position_choose'
+				end
+			end
+		elseif booty_call['condom'] = 0 and booty_call['out_of_condoms'] = 0:
+			act'Ask him to put on a condom':
+				cla & *nl
+				'"Could you put on a condom?" you ask.'
+	!!			if npc_no_condoms[$boy] = 1:
+	!!				gs 'booty_call_condoms', 'condom_why1'
+				if rand(1,10) >= 7:
+					if booty_call['condom_count'] > 0:
+						'"Come on, do we have to? We don''t need to use a condom."'
+						gs 'booty_call_condoms', 'no_condom1'
+					else
+						'"Don''t have any left. I''m all out."'
+						gs 'booty_call_condoms', 'no_condom2'
+					end
+				else
+					booty_call['condom'] = 1
+					booty_call['condom_count'] -= 1
+					booty_call['must_fuck'] = 1
+					'He nods, reaching over to his nightstand and retrieving one, rolling the rubber onto his cock. While he works that out, you consider how you want to do this with him...'
+					gs 'booty_call_sex', 'position_choose'
+				end
+			end
+			gs 'booty_call_condoms', 'condom_on'
+		elseif npc_condom_rule[$boy] = 1:
+			if booty_call['fuck_count'] = 1:
+				'"Condom?" you ask.'
+				if (npc_selfish[$boy] = 1 or npc_no_condoms[$boy] = 1) and npc_condom_conscious < 1:
+					if npc_know_bc[$boy] = 1:
+						'"Come on, we don''t need a condom. You''re on birth control anyways."'
+					else
+						'"Come on, we don''t need a condom."'
+					end
+					gs 'booty_call_condoms', 'no_condom1'
+				else
+					if booty_call['condom_count'] > 0:
+						booty_call['condom'] = 1
+						booty_call['must_fuck'] = 1
+						'"Yeah, I got one right here," he says, fishing it out and rolling it onto his cock.'
+						gs 'booty_call_sex', 'position_choose'
+					else
+						'"I think I''m all out," he says.'
+						gs 'booty_call_condoms', 'no_condom2'
+					end
+				end
+			else
+				'"Another condom?" you ask.'
+				if booty_call['condom_count'] > 0:
+					booty_call['condom'] = 1
+					booty_call['must_fuck'] = 1
+					'He nods, putting on a new one.'
+					gs 'booty_call_sex', 'position_choose'
+				else
+					'"I think I''m all out," he says.'
+					gs 'booty_call_condoms', 'no_condom2'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'condom_why1':
+	!! boy says he doesn''t use condoms
+	
+end
+
+if $ARGS[0] = 'condom_why2':
+	!! player says they don''t want to use a condom
+	act'We don''t need a condom (feel better)':
+		cla & *nl
+		'"Come on," you say, grabbing his arm. "Let''s skip the condom. It''ll feel better without one."'
+		if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and npc_childfree[$boy] = 1):
+			'"Don''t want to risk it," <<$npc_firstname[$boy]>> says, shaking his head and opens the condom anyways, rolling it onto his cock.'
+		else
+			if rand(npc_willpwr[$boy],100) < pcs_persuas:
+				booty_call['no_condom'] = 1
+				'<<$npc_firstname[$boy]>> stops, looking back at you for a moment before smiling.'
+				'"Okay," he says and leaves the rubber where it is.'
+			else
+				'"Don''t want to risk it," <<$npc_firstname[$boy]>> says, shaking his head and opens the condom anyways, rolling it onto his cock.'
+			end
+		end
+		gs 'booty_call_sex', 'position_choose'
+	end
+	
+	if birth_control['think_safe'] = 1:
+		if tabletkishot > 0:
+			act'We don''t need a condom (on the shot)':
+				npc_know_bc[$boy] = 1
+				booty_call['must_fuck'] = 1
+				cla & *nl
+				'"Hey," you smile, grabbing his arm. "We don''t need condoms. I''m on the shot."'
+				if npc_condom_conscious[$boy] = 2:
+					'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaches back for the condom. "Better to be safe."'
+					'Your jaw drops.'
+					*nl
+					'<i>A free pass to skip a condom and he doesn''t take it? What''s with him??</i>'
+				else
+					booty_call['no_condom'] = 1
+					'<<$npc_firstname[$boy]>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.'
+				end
+				gs 'booty_call_sex', 'position_choose'
+			end
+		elseif pillcon2 > 0:
+			act'We don''t need a condom (on the pill)':
+				npc_know_bc[$boy] = 1
+				booty_call['must_fuck'] = 1
+				cla & *nl
+				'"Hey," you smile, grabbing his arm. "We don''t need condoms. I''m on the pill."'
+				if npc_condom_conscious[$boy] = 2:
+					'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaches back for the condom. "Better to be safe."'
+					'Your jaw drops.'
+					*nl
+					'<i>A free pass to skip a condom and he doesn''t take it? What''s with him??</i>'
+				else
+					booty_call['no_condom'] = 1
+					'<<$npc_firstname[$boy]>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.'
+				end
+				gs 'booty_call_sex', 'position_choose'
+			end
+		end
+	else
+		act'Lie about birth control':
+			booty_call['must_fuck'] = 1
+			npc_know_bc[$boy] = 1
+			cla & *nl
+			'"Hey," you smile, grabbing his arm. "We don''t need condoms. I''m on birth control."'
+			if npc_condom_conscious[$boy] = 2:
+				'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaches back for the condom. "Better to be safe."'
+				'Your jaw drops.'
+				*nl
+				'<i>Son of a bitch! Why is this guy so fucking careful?!</i>'
+			else
+				booty_call['no_condom'] = 1
+				'Upon hearing your barefaced lie, <<$npc_firstname[$boy]>> stops reaching and turns to meet your gaze, eyes filled with desire. Your smile widens into a full blown grin.'
+			end
+			gs 'booty_call_sex', 'position_choose'
+		end
+	end
+end
+
+if $ARGS[0] = 'no_condom1':
+	!! he says he doesnt want to use a condom
+	act'No way':
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		if npc_condom_rule[$boy] = 1:
+			'"You know my rule," you say sternly. "We''re not fucking without one!"'
+		else
+			'"We''re not fucking without one," you say sternly.'
+		end
+		if rand(1,10) < 8:
+			'"Ugh, fine."'
+			'He puts on a condom.'
+			booty_call['condom'] = 1
+			booty_call['must_fuck'] = 1
+			booty_call['condom_count'] -= 1
+			gs 'booty_call_sex', 'position_choose'
+		else
+			'"Come on," he complains. "It''ll be fine. Let''s skip it. Just this once."'
+			act'Not a big deal?!':
+				cla & *clr
+				$npc_apt_bedroom[$boy]
+				if npc_condom_rule[$boy] = 1:
+					'"Not a big deal?! We said- You know what? <i>Fuck</i> you!"'
+				else
+					'"Not a big deal?! You don''t have any idea how dangerous it is for m- You know what? <i>Fuck</i> you!"'
+				end
+				'"I''m trying to but you won''t let me!"'
+				!!if booty_call['rape_chance'] > 0:
+				!!put in chance he rapes you
+				'<<$npc_firstname[$boy]>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.'
+				*nl
+				'Just because he''s your fuckbuddy doesn''t mean he can take advantage of you!'
+				act'Leave':gt 'booty_call_after', 'exit'
+			end
+
+			act'Maybe just this once':
+				booty_call['condom'] = 2
+				booty_call['must_fuck'] = 1
+				cla & *nl
+				'"Well... Maybe just this once..." you say hesitantly.'
+				gs 'booty_call_sex', 'position_choose'
+			end
+
+			act'Just don''t come inside me':
+				booty_call['condom'] = 3
+				booty_call['must_fuck'] = 1
+				cla & *nl
+				'"Well... Alright..." you say heistantly. "But don''t you dare come inside me, okay?"'
+				gs 'booty_call_sex', 'position_choose'
+			end
+		end
+	end
+
+	act'Maybe just this once':
+		booty_call['condom'] = 2
+		booty_call['must_fuck'] = 1
+		cla & *nl
+		'"Well... Maybe just this once..." you say hesitantly.'
+		gs 'booty_call_sex', 'position_choose'
+	end
+
+	act'Just don''t come inside me':
+		booty_call['condom'] = 3
+		booty_call['must_fuck'] = 1
+		cla & *nl
+		'"Well... Alright..." you say hesitantly. "But don''t you dare come inside me, okay?"'
+		gs 'booty_call_sex', 'position_choose'
+	end
+end
+
+if $ARGS[0] = 'no_condom2':
+	!! he says he has no condoms
+	act'Seriously?':
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		if npc_condom_rule[$boy] = 1:
+			'"Are you serious?" you ask exhasperatedly. "You know my rule! We need a condom!"'
+		else
+			'"Are you serious?" you ask exhasperatedly. "We''re not fucking without one!"'
+		end
+		if rand(1,10) < 8:
+			'"Do you have some?" he asks.'
+			gs 'booty_call_condoms', 'no_condom2.1'
+		else
+			'"Come on," he says. "It''ll be fine. Let''s skip it. Just this once."'
+			act'Not a big deal?!':
+				'"Not a big deal??? You don''t have any idea how dangerous it is for m- You know what? <i>Fuck</i> you!"'
+				'"I''m trying to but you won''t let me!"'
+				!!if booty_call['rape_chance'] > 0:
+				!!put in chance he rapes you
+				'<<$npc_firstname[$boy]>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.'
+				*nl
+				'The nerve of some people.'
+				act'Leave':gt 'booty_call_after', 'exit'
+			end
+		end
+		
+		act'Maybe just this once':
+			booty_call['condom'] = 2
+			booty_call['must_fuck'] = 1
+			cla & *nl
+			'"Well... Maybe just this once..." you say hesitantly.'
+			gs 'booty_call_sex', 'position_choose'
+		end
+
+		act'Just don''t come inside me':
+			booty_call['condom'] = 3
+			booty_call['must_fuck'] = 1
+			cla & *nl
+			'"Well... Alright..." you say heistantly. "But don''t you dare come inside me, okay?"'
+			gs 'booty_call_sex', 'position_choose'
+		end
+	end
+
+	gs 'booty_call_condoms', 'no_condom2.1'
+
+	act'How many girls are you fucking? (tease)':
+		cla & *nl
+		'"Fucking hell! How many of these things do you go through?" you laugh, giving him a look. "Are you fucking 20 girls a day?"'
+		'"Hey, when you''re as good as I am," he says, a smug grin on his face.'
+		gs 'booty_call_condoms', 'no_condom2.1'
+	end
+end
+
+if $ARGS[0] = 'no_condom2.1':
+	if prezik > 0:
+		act'I''ve got some':
+			cla & *clr
+			prezik -= 1
+			booty_call['condom'] = 1
+			booty_call['must_fuck'] = 1
+			'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
+			'"I''ve got some right here," you say, pulling a rubber from your bag and tearing it open.'
+			'You smile at <<$npc_firstname[$boy]>> as you roll it onto his cock for him.'
+			gs 'booty_call_sex', 'position_choose'
+		end
+	end
+
+	act'Maybe just this once':
+		booty_call['condom'] = 2
+		booty_call['must_fuck'] = 1
+		cla & *nl
+		'"Well... Maybe just this once..." you say hesitantly.'
+		gs 'booty_call_sex', 'position_choose'
+	end
+
+	act'Just don''t come inside me':
+		booty_call['condom'] = 3
+		booty_call['must_fuck'] = 1
+		cla & *nl
+		'"Well... Alright..." you say hesitantly. "But don''t you dare come inside me, okay?"'
+		gs 'booty_call_sex', 'position_choose'
+	end
+end
+
+if $ARGS[0] = 'condom_on':
+	if prezik > 0:
+		act'Put a condom on him':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
+			prezik -= 1
+			booty_call['condom'] = 1
+			booty_call['must_fuck'] = 1
+			'You lean over the side of the bed and reach down to your purse. After fishing around for a few moments, you pull out a condom. You tear the packaging open and roll it onto his cock for him.'
+			'"Gotta practice safe sex," you wink.'
+			gs 'booty_call_sex', 'position_choose'
+		end
+
+		act'Put a condom on him with your mouth':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/misc/condom_mouth.mp4"></video></center>'
+			prezik -= 1
+			booty_call['condom'] = 1
+			booty_call['must_fuck'] = 1
+			'You lean over the side of the bed and reach down to your purse. After fishing around for a few moments, you pull out a condom. You tear the packaging open, and place the rubber onto the tip of his penis, kissing it through the rubber. Then, using your fingers, you unroll it smoothly over the length of his cock, your lips following all the way down. You bob your head up and down a few more times to make sure it''s all the way on before glancing up at him.'
+			'"Gotta practice safe sex," you smile.'
+			gs 'booty_call_sex', 'position_choose'
+		end
+	end
+end
+--- booty_call_condoms ---------------------------------

+ 27 - 8
locations/booty_call_cum.qsrc

@@ -1620,7 +1620,7 @@ if $ARGS[0] = 'what_now':
 		gs'booty_call_sex','reset'
 		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
 		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-		act'Sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_sex', 'condoms'
+		act'Sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_condoms', 'condoms'
 	end
 	
 	act'Keep going (no condoms)':
@@ -1640,7 +1640,7 @@ if $ARGS[0] = 'what_now':
 		gs'booty_call_sex','reset'
 		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
 		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-		act'Sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_sex', 'condoms'
+		act'Sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_condoms', 'condoms'
 	end
 end
 
@@ -1678,11 +1678,12 @@ if $ARGS[0] = 'cum_condom':
 	if condom_break > 0:
 		booty_call['broken_condom'] = 1
 		if booty_call['orgasm'] < orgasm:
+			booty_call['cum_together'] = 1
 			'<<$npc_firstname[$boy]>> buries his cock inside your pussy. It throbs inside you through the condom, causing you to come as well. You ride out your orgasms together, oblivious to everything except the pleasure.'
 			act'Continue':gs'booty_call_cum','broken_condom2'
 		else
 			'<<$npc_firstname[$boy]>> buries his cock inside your pussy and you can feel it pulse inside you, straining against the rubber coat around it.'
-			gt'booty_call_cum','broken_condom1'
+			act'Continue':gs'booty_call_cum','broken_condom1'
 		end
 	else
 		if booty_call['orgasm'] < orgasm:
@@ -1725,20 +1726,38 @@ if $ARGS[0] = 'broken_condom1':
 		gs'booty_call_talk','creampie_accident_birth_control'
 	end
 	
-!!{	act'Come':
+	act'Come':
 		$orgasm_or = 'yes'
-		gs'arousal','vaginal',-1,,'no_orgasm_msg'
+		booty_call['cum_together'] = 1
+		gs'arousal','vaginal',-1,'no_orgasm_msg'
 		cla & *clr
 		if $booty_call['position'] = 'miss':
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/orgasm1.mp4"></video></center>'
-			'The sudden explosion of warmth inside you overwhelms your senses and you gasp. It causes you to orgasm, '
 		elseif $booty_call['position'] = 'doggy':
 			'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
 		elseif $booty_call['position'] = 'cowgirl':
 			'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/orgasm1.mp4"></video></center>'
 		end
-		
-	end}
+		'The sudden explosion of warmth inside you overwhelms your senses and you gasp. It causes you to orgasm and your whole body shudders around <<$npc_firstname[$boy]>>''s cock as heat fills you to the brim.'
+		act'Continue':
+			cla & *clr
+			if $booty_call['position'] = 'miss':
+				'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
+				'Eventually your orgasm comes down and you look up at <<$npc_firstname[$boy]>>, still quivering with his cock inside you.'
+				'"I think... the condom... broke..." you pant.'
+			elseif $booty_call['position'] = 'doggy':
+				'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+				'Eventually your orgasm comes down and your knees give out underneath you, falling down to the bed with <<$npc_firstname[$boy]>> on top of you.'
+				'"I think... the condom... broke..." you pant from beneath him.'
+			elseif $booty_call['position'] = 'cowgirl':
+				'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+				'Eventually your orgasm comes down and you let yourself collapse on top of <<$npc_firstname[$boy]>>, feeling your breasts pressed against his chest, which rises and falls with the same laboured breathing as your own.'
+				'"I think... the condom... broke..." you pant laying on his chest.'
+			end
+			gs'booty_call_talk','oh_shit_options'
+			gs'booty_call_talk','creampie_accident_birth_control'
+		end
+	end
 end
 
 if $ARGS[0] = 'broken_condom2':

+ 3 - 0
locations/booty_call_morning.qsrc

@@ -17,6 +17,9 @@ if $ARGS[0] = 'morning':
 			gs'booty_call_morning','late_for_school'
 		end
 	end
+	if booty_call['pass_out'] = 1:
+		
+	end
 !!	if pcs_lovers > 0:act'Guilt':gt'booty_call_morning','guilt'
 end
 

+ 24 - 5
locations/booty_call_pillow_talk.qsrc

@@ -69,13 +69,13 @@ if $ARGS[0] = 'good_for_you_too':
 	if booty_call['fuck_count'] > 0:
 		act'Good dicking':
 			cla & *nl
-			'"You dicked me good," you grin back. "So, I''m happy."'
+			'"You dicked me good," you grin back.'
 			gs'booty_call_pillow_talk','topics'
 		end
 		
 		act'Dick drunk':
 			cla & *nl
-			'"You fucked me so good I''m still dick drunk," you giggle, rubbing your thighs together. "So yeah, I''d say it was pretty good too."'
+			'"You were so good," you giggle, rubbing your wet thighs together, giddy with after fuck endorphins. "I think I''m still dick drunk."'
 			gs'booty_call_pillow_talk','topics'
 		end
 		
@@ -83,16 +83,26 @@ if $ARGS[0] = 'good_for_you_too':
 			act'Won''t walk right':
 				cla & *nl
 				booty_call['keep_it_up'] = 1
+				booty_call['sore_pussy_talk'] = 1
 				if booty_call['cum_count'] = npc_sexdrive[$boy]:
-					'"I might not be able to walk right for a week either," you grin. "You might have fucked me bowlegged."'
+					'"I might not be able to walk right for a week either," you grin, rubbing your thighs over your wonderfully sore pussy. "You might have fucked me bowlegged."'
 				else
-					'"You practically fucked me bowlegged," you grin. "I''m not gonna be able to walk right for a week."'
+					'"I''m not gonna be able to walk right for a week," you grin, rubbing your thighs over your wonderfully sore pussy. "You might have fucked me bowlegged."'
 				end
 				gs'booty_call_pillow_talk','topics'
 			end
 		end
 	end
 	
+	if booty_call['fuck_count'] > 3:
+		act'Sore pussy':
+			booty_call['sore_pussy_talk'] = 1
+			cla & *nl
+			'"My pussy kind of hurts," you say with a half smile, half grimace, rubbing your thighs together. "Went a few more times than I hoped."'
+			gs'booty_call_pillow_talk','topics'
+		end
+	end
+	
 	if booty_call['orgasm_count'] + booty_call['fake_orgasm_count'] > 3:
 		act'Lots of orgasms':
 			cla & *nl
@@ -125,7 +135,6 @@ if $ARGS[0] = 'good_for_you_too':
 				'"You''ve endured such hardship, getting fucked by me so many times," you say flatly.'
 				gs'booty_call_pillow_talk','topics'
 			end
-			
 		end
 	end
 end
@@ -161,6 +170,7 @@ if $ARGS[0] = 'long_time':
 	if booty_call['start_hour'] > hour and booty_call['fuck_count'] > 0 and booty_call['long_time_talk'] = 0:
 		act'We were at it a long time':
 			booty_call['long_time_talk'] = 1
+			booty_call['keep_it_up'] = 1
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			'"Damn," you pant, reaching over to check your phone. "We were at it for a long time."'
@@ -174,6 +184,7 @@ if $ARGS[0] = 'ran_out_of_condoms':
 	if booty_call['out_of_condoms'] >= 1 and booty_call['used_condoms_talk'] = 0:
 		act'Can''t believe we ran out of condoms':
 			booty_call['used_condoms_talk'] = 1
+			booty_call['keep_it_up'] = 1
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			if booty_call['out_of_condoms'] >= 1 and prezik = 0:
@@ -537,6 +548,8 @@ if $ARGS[0] = 'boy_topic_check':
 	booty_call['boy_topics'] = 0
 	if booty_call['cum_count'] >= (npc_sexdrive[$boy] / 4 * 3) and booty_call['good_for_you'] ! 1: booty_call['boy_topics'] += 1
 	if booty_call['broken_condom'] >= 1 and booty_call['broken_condom_talk'] ! 1: booty_call['boy_topics'] += 1
+!!	if booty_call['broken_condom'] >= 1 and booty_call['boy_pube_talk'] ! 1: booty_call['boy_topics'] += 1
+	if if booty_call['condom'] ! 1 and booty_call['boy_condom_rule_talk'] ! 1: booty_call['boy_topics'] += 1
 	
 end
 
@@ -558,4 +571,10 @@ if $ARGS[0] = 'boy_pube_talk':
 	end
 end
 
+if $ARGS[0] = 'boy_condom_rule':
+	if booty_call['condom'] ! 1:
+	
+	end
+end
+
 --- booty_call_pillow_talk ---------------------------------

+ 50 - 368
locations/booty_call_sex.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'sex_start':
 			else
 				cla
 				gs 'booty_call_sex', 'reset'
-				gs 'booty_call_sex', 'condoms'
+				gs 'booty_call_condoms', 'condoms'
 				gs 'booty_call_sex', 'position_change'
 			end
 		end
@@ -93,361 +93,11 @@ if $ARGS[0] = 'sex_pre':
 		end
 	else
 		gs 'booty_call_sex', 'position_choose'
-		gs 'booty_call_sex', 'condoms'
+		gs 'booty_call_condoms', 'condoms'
 	end
 end
 
-if $ARGS[0] = 'condoms':
-	if booty_call['condom_count'] = 0 and booty_call['fuck_count'] = 0 and npc_no_condoms[$boy] ! 1:booty_call['condom_count'] = rand(1,5)
-	if booty_call['condom_count'] = 0 and npc_condom_conscious[$boy] = 1: booty_call['condom'] = 1 & booty_call['condom_count'] = 100
-	if npc_know_bc[$boy] = 1 and npc_condom_conscious[$boy] ! 2: booty_call['no_condom'] = 1
-	if booty_call['no_condom'] = 0:
-		if booty_call['condom'] = 1 and booty_call['out_of_condoms'] ! 1:
-			if booty_call['condom_count'] > 0:
-				if booty_call['fuck_count'] > 1:
-					'<<$npc_firstname[$boy]>> swaps out his used condom for a new one.'
-					gs 'booty_call_sex', 'position_choose'
-				else
-					'<<$npc_firstname[$boy]>> reaches for a condom from his bedside table.'
-					gs 'booty_call_sex', 'position_choose'
-					act'We don''t need a condom (feel better)':
-						cla & *nl
-						'"Come on," you say, grabbing his arm. "Let''s skip the condom. It''ll feel better without one."'
-						if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and npc_childfree[$boy] = 1):
-							'"Don''t want to risk it," <<$npc_firstname[$boy]>> says, shaking his head and opens the condom anyways, rolling it onto his cock.'
-						else
-							if rand(npc_willpwr[$boy],100) < pcs_persuas:
-								booty_call['no_condom'] = 1
-								'<<$npc_firstname[$boy]>> stops, looking back at you for a moment before smiling.'
-								'"Okay," he says and leaves the rubber where it is.'
-							else
-								'"Don''t want to risk it," <<$npc_firstname[$boy]>> says, shaking his head and opens the condom anyways, rolling it onto his cock.'
-							end
-						end
-						gs 'booty_call_sex', 'position_choose'
-					end
-					
-					if birth_control['think_safe'] = 1:
-						if tabletkishot > 0:
-							act'We don''t need a condom (on the shot)':
-								npc_know_bc[$boy] = 1
-								cla & *nl
-								'"Hey," you smile, grabbing his arm. "We don''t need condoms. I''m on the shot."'
-								if npc_condom_conscious[$boy] = 2:
-									'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaches back for the condom. "Better to be safe."'
-									'Your jaw drops.'
-									*nl
-									'<i>A free pass to skip a condom and he doesn''t take it? What''s with him??</i>'
-								else
-									booty_call['no_condom'] = 1
-									'<<$npc_firstname[$boy]>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.'
-								end
-								gs 'booty_call_sex', 'position_choose'
-							end
-						elseif pillcon2 > 0:
-							act'We don''t need a condom (on the pill)':
-								npc_know_bc[$boy] = 1
-								cla & *nl
-								'"Hey," you smile, grabbing his arm. "We don''t need condoms. I''m on the pill."'
-								if npc_condom_conscious[$boy] = 2:
-									'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaches back for the condom. "Better to be safe."'
-									'Your jaw drops.'
-									*nl
-									'<i>A free pass to skip a condom and he doesn''t take it? What''s with him??</i>'
-								else
-									booty_call['no_condom'] = 1
-									'<<$npc_firstname[$boy]>> stops reaching and turns to meet your gaze, eyes filled with desire, and your smile widens into a full blown grin.'
-								end
-								gs 'booty_call_sex', 'position_choose'
-							end
-						end
-					else
-						act'Lie about birth control':
-							npc_know_bc[$boy] = 1
-							cla & *nl
-							'"Hey," you smile, grabbing his arm. "We don''t need condoms. I''m on birth control."'
-							if npc_condom_conscious[$boy] = 2:
-								'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaches back for the condom. "Better to be safe."'
-								'Your jaw drops.'
-								*nl
-								'<i>Son of a bitch! Why is this guy so fucking careful?!</i>'
-							else
-								booty_call['no_condom'] = 1
-								'Upon hearing your barefaced lie, <<$npc_firstname[$boy]>> stops reaching and turns to meet your gaze, eyes filled with desire. Your smile widens into a full blown grin.'
-							end
-							gs 'booty_call_sex', 'position_choose'
-						end
-					end
-				end
-			elseif booty_call['out_of_condoms'] = 0:
-				booty_call['out_of_condoms'] = 1
-				'"We got a problem. I''m out of condoms."'
-				cla 
-				act'We could skip the condom':
-					booty_call['condom'] = 2
-					cla & *clr
-					!! IMAGE HERE
-					$npc_apt_bedroom[$boy]
-					'"We could... skip the condom? Just this once?"'
-					'"Just this once," he smiles back.'
-					gs 'booty_call_sex', 'position_choose'
-				end
-				if prezik > 0:
-					act'Use one of your condoms':
-						booty_call['out_of_condoms'] = 2
-						booty_call['condom'] = 1
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
-						prezik -= 1
-						if prezik > 1:
-							'"That''s okay, I''ve got some more."'
-						elseif prezik = 1:
-							'"That''s okay, I''ve got one more."'
-						end
-						'You reach into your bag and pull out a condom, rolling it onto his cock.'
-						gs 'booty_call_sex', 'position_choose'
-					end
-
-					act'Use one of your condoms (mouth)':
-						booty_call['out_of_condoms'] = 2
-						booty_call['condom'] = 1
-						cla & *clr
-						'<center><video autoplay loop src="images/shared/sex/misc/condom_mouth.mp4"></video></center>'
-						prezik -= 1
-						'"That''s okay, I''ve got some."'
-						'You reach into your bag and pull out a condom, rolling it onto his cock with your mouth.'
-						gs 'booty_call_sex', 'position_choose'
-					end
-				end
-			elseif booty_call['out_of_condoms'] = 2:
-				'"Got anymore condoms?"'
-				!!act'I could give you head':
-				if prezik = 0:
-					'"I think that was my last one..."'
-					booty_call['out_of_condoms'] = 3
-					act'Guess that''s it':
-						cla & *clr
-						!! IMAGE HERE
-						$npc_apt_bedroom[$boy]
-						'"Guess that''s it?"'
-						'"Guess so."'
-						gs 'booty_call_after', 'after_sex1'
-					end
-					
-					act'We could skip the condom':
-						cla & *clr
-						!! IMAGE HERE
-						$npc_apt_bedroom[$boy]
-						booty_call['condom'] = 2
-						'"We could just... not use one..." you smile shyly. "Just this once?"'
-						'"Just this once," he smiles back.'
-						gs 'booty_call_sex', 'position_choose'
-					end
-				else
-					'"Yeah, I''ve got some."'
-					'You put another condom on him.'
-					gs 'booty_call_sex', 'position_choose'
-				end
-			end
-		elseif booty_call['condom'] = 0 and booty_call['out_of_condoms'] = 0:
-			act'Ask him to put on a condom':
-				cla & *nl
-				'"Could you put on a condom?" you ask.'
-	!!			if npc_no_condoms[$boy] = 1:
-	!!				gs 'booty_call_sex', 'condom_why1'
-				if rand(1,10) >= 7:
-					if booty_call['condom_count'] > 0:
-						'"Come on, do we have to? We don''t need to use a condom."'
-						gs 'booty_call_sex', 'no_condom1'
-					else
-						'"Don''t have any left. I''m all out."'
-						gs 'booty_call_sex', 'no_condom2'
-					end
-				else
-					booty_call['condom'] = 1
-					booty_call['condom_count'] -= 1
-					'He nods, reaching over to his nightstand and retrieving one, rolling the rubber onto his cock. While he works that out, you consider how you want to do this with him...'
-					gs 'booty_call_sex', 'position_choose'
-				end
-			end
-			if prezik > 0:
-				act'Put a condom on him':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
-					prezik -= 1
-					booty_call['condom'] = 1
-					'You lean over the side of the bed and reach down to your purse. After fishing around for a few moments, you pull out a condom. You tear the packaging open and roll it onto his cock for him.'
-					'"Gotta practice safe sex," you wink.'
-					gs 'booty_call_sex', 'position_choose'
-				end
-
-				act'Put a condom on him with your mouth':
-					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/misc/condom_mouth.mp4"></video></center>'
-					prezik -= 1
-					booty_call['condom'] = 1
-					'You lean over the side of the bed and reach down to your purse. After fishing around for a few moments, you pull out a condom. You tear the packaging open, and place the rubber onto the tip of his penis, kissing it through the rubber. Then, using your fingers, you unroll it smoothly over the length of his cock, your lips following all the way down. You bob your head up and down a few more times to make sure it''s all the way on before glancing up at him.'
-					'"Gotta practice safe sex," you smile.'
-					gs 'booty_call_sex', 'position_choose'
-				end
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'condom_why1':
-	!! boy says he doesn''t use condoms
-	
-end
-
-if $ARGS[0] = 'condom_why2':
-	!! player says they don''t want to use a condom
-	
-end
-
-if $ARGS[0] = 'no_condom1':
-	!! he says he doesnt want to use a condom
-	act'No way':
-		cla & *clr
-		$npc_apt_bedroom[$boy]
-		'"We''re not fucking without one," you say sternly.'
-		if rand(1,10) < 8:
-			'"Ugh, fine."'
-			'He puts on a condom.'
-			booty_call['condom'] = 1
-			booty_call['condom_count'] -= 1
-			gs 'booty_call_sex', 'position_choose'
-		else
-			'"Come on," he complains. "It''ll be fine. Let''s skip it. Just this once."'
-			act'Not a big deal?!':
-				cla & *clr
-				$npc_apt_bedroom[$boy]
-				'"Not a big deal??? You don''t have any idea how dangerous it is for m- You know what? <i>Fuck</i> you!"'
-				'"I''m trying to but you won''t let me!"'
-				!!if booty_call['rape_chance'] > 0:
-				!!put in chance he rapes you
-				'<<$npc_firstname[$boy]>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.'
-				*nl
-				'Just because he''s your fuckbuddy doesn''t mean he can take advantage of you!'
-				act'Leave':gt 'booty_call_after', 'exit'
-			end
-
-			act'Maybe just this once':
-				booty_call['condom'] = 2
-				cla & *nl
-				'"Well... Maybe just this once..." you say hesitantly.'
-				gs 'booty_call_sex', 'position_choose'
-			end
-
-			act'Just don''t come inside me':
-				booty_call['condom'] = 3
-				cla & *nl
-				'"Well... Alright..." you say heistantly. "But don''t you dare come inside me, okay?"'
-				gs 'booty_call_sex', 'position_choose'
-			end
-		end
-	end
-
-	act'Maybe just this once':
-		booty_call['condom'] = 2
-		cla & *nl
-		'"Well... Maybe just this once..." you say hesitantly.'
-		gs 'booty_call_sex', 'position_choose'
-	end
-
-	act'Just don''t come inside me':
-		booty_call['condom'] = 3
-		cla & *nl
-		'"Well... Alright..." you say hesitantly. "But don''t you dare come inside me, okay?"'
-		gs 'booty_call_sex', 'position_choose'
-	end
-end
-
-if $ARGS[0] = 'no_condom2':
-	!! he says he has no condoms
-	act'No way':
-		cla & *clr
-		$npc_apt_bedroom[$boy]
-		'"We''re not fucking without one," you say sternly.'
-		if rand(1,10) < 8:
-			'"Ugh, fine."'
-			'He puts on a condom.'
-			booty_call['condom'] = 1
-			booty_call['condom_count'] -= 1
-			gs 'booty_call_sex', 'position_choose'
-		else
-			'"Come on," he complains. "It''ll be fine. Let''s skip it. Just this once."'
-			act'Not a big deal?!':
-				'"Not a big deal??? You don''t have any idea how dangerous it is for m- You know what? <i>Fuck</i> you!"'
-				'"I''m trying to but you won''t let me!"'
-				!!if booty_call['rape_chance'] > 0:
-				!!put in chance he rapes you
-				'<<$npc_firstname[$boy]>> continues to complain at you while you grab all of your belongings and rush your way out the door, slamming it behind you.'
-				*nl
-				'The nerve of some people.'
-				act'Leave':gt 'booty_call_after', 'exit'
-			end
-
-			act'Maybe just this once':
-				booty_call['condom'] = 2
-				cla & *nl
-				'"Well... Maybe just this once..." you say hesitantly.'
-				gs 'booty_call_sex', 'position_choose'
-			end
-
-			act'Just don''t come inside me':
-				booty_call['condom'] = 3
-				cla & *nl
-				'"Well... Alright..." you say heistantly. "But don''t you dare come inside me, okay?"'
-				gs 'booty_call_sex', 'position_choose'
-			end
-		end
-	end
-
-	gs 'booty_call_sex', 'no_condom2.1'
-
-	act'How many girls are you fucking? (tease)':
-		cla & *nl
-		'"Fucking hell! How many of these things do you go through?" you laugh, giving him a look. "Are you fucking 20 girls a day?"'
-		'"Hey, when you''re as good as I am," he says, a smug grin on his face.'
-		gs 'booty_call_sex', 'no_condom2.1'
-	end
-
-	act'Ugh, seriously?':
-		cla & *nl
-		'"Ugh! Seriously?" you say, giving him a look. "Come on, are you really out of condoms at a time like this?"'
-		'""We don''t need one," he says insistently. "It''ll be fine."'
-		gs 'booty_call_sex', 'no_condom2.1'
-	end
-end
-
-if $ARGS[0] = 'no_condom2.1':
-	if prezik > 0:
-		act'I''ve got some':
-			cla & *clr
-			prezik -= 1
-			booty_call['condom'] = 1
-			'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
-			'"That''s okay, I''ve got some," you say, pulling a rubber from your bag and tearing it open.'
-			'You smile at <<$npc_firstname[$boy]>> as you roll it onto his cock for him.'
-			gs 'booty_call_sex', 'position_choose'
-		end
-	end
-
-	act'Maybe just this once':
-		booty_call['condom'] = 2
-		cla & *nl
-		'"Well... Maybe just this once..." you say hesitantly.'
-		gs 'booty_call_sex', 'position_choose'
-	end
 
-	act'Just don''t come inside me':
-		booty_call['condom'] = 3
-		cla & *nl
-		'"Well... Alright..." you say hesitantly. "But don''t you dare come inside me, okay?"'
-		gs 'booty_call_sex', 'position_choose'
-	end
-end
 
 if $ARGS[0] = 'position_choose':
 	!! initiative roll
@@ -505,8 +155,12 @@ if $ARGS[0] = 'he_choose_position':
 			gs 'booty_call_sex', 'doggy_start'
 		elseif $npc_fav_pos[$boy] = 'cowgirl':
 			gs 'booty_call_sex', 'cowgirl_start'
-		elseif $npc_fav_pos[$boy] = 'blowjob':
+		elseif $npc_fav_pos[$boy] = 'blowjob' and booty_call['must_fuck'] ! 1:
 			gs 'booty_call_start', 'bj_ask'
+		elseif npc_pussyeater[$boy] = 1 and booty_call['must_fuck'] ! 1:
+			*nl
+			'<<$npc_firstname[$boy]>> starts leading a trail of kisses down your stomach towards your pussy.'
+			gs 'booty_call_start', 'kuni_start'
 		else
 			gs 'booty_call_sex', 'rand_position'
 		end
@@ -516,7 +170,7 @@ if $ARGS[0] = 'he_choose_position':
 end
 
 if $ARGS[0] = 'rand_position':
-	booty_call['position_rand'] = rand(1,4)
+	booty_call['position_rand'] = rand(1,5)
 	if booty_call['position_rand'] = 1:
 		!! missionary
 		gs 'booty_call_sex', 'missionary_start'
@@ -526,9 +180,13 @@ if $ARGS[0] = 'rand_position':
 	elseif booty_call['position_rand'] = 3:
 		!! cowgirl
 		gs 'booty_call_sex', 'cowgirl_start'
-	elseif booty_call['position_rand'] = 4:
+	elseif booty_call['position_rand'] = 4 and booty_call['must_fuck'] ! 1:
 		!! blowjob
 		gs 'booty_call_start', 'bj_ask'
+	elseif booty_call['position_rand'] = 5 and booty_call['must_fuck'] ! 1:
+		*nl
+		'<<$npc_firstname[$boy]>> starts leading a trail of kisses down your stomach towards your pussy.'
+		gs 'booty_call_start', 'kuni_start'
 	else
 		!! failsafe: default to missionary
 		gs 'booty_call_sex', 'missionary_start'
@@ -1916,7 +1574,7 @@ if $ARGS[0] = 'cowgirl2.2':
 	elseif booty_call['dirty_talk'] = 1:
 		'"You''re so deep inside me," you moan. "I love riding you like this! Your cock feels so good!"'
 	else
-		'You keep fucking him at a medium pace. You enjoy it.'
+		'You bounce up and down on <<$npc_firstname[$boy]>>''s cock, focusing on the hammering you feel deep inside you, letting the reverberations of your hips and his course through your body from your sex to the tips of your nipples.'
 	end
 	gs 'booty_call_cum', 'fuck_cum'
 end
@@ -2003,17 +1661,40 @@ if $ARGS[0] = 'cowgirl3.2':
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
 	cla & *clr
-	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/hard1.mp4"></video></center>'
-	if booty_call['moan'] = 1:
-		'You groan in pleasure as you continue to violently ride <<$npc_firstname[$boy]>>.'
-	elseif booty_call['moan'] = 2:
-		'"<i>Ah~! Yes~! Mmm~!</i>"'
-		*nl
-		'You moan loudly, letting your voice fill the room as you slam your pussy down <<$npc_firstname[$boy]>>''s cock over and over again.'
-	elseif booty_call['dirty_talk'] = 1:
-		'"I love riding your cock!" you scream. "Fuck my pussy with your fat cock! Fill me with your fucking dick!"'
+	if rand(0,1) = 1:
+		booty_call['cowgirl_rand'] = 1
 	else
-		'You keep riding him hard. You enjoy it.'
+		booty_call['cowgirl_rand'] = rand(2,4)
+	end
+	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/hard<<booty_call[''cowgirl_rand'']>>.mp4"></video></center>'
+	if booty_call['cowgirl_rand'] = 2:
+		if booty_call['moan'] = 1:
+			'"<i>Ah~! Ahh~! Nngh~! Ahh~!</i>"'
+			*nl
+			'You groan in pleasure as you violently bounce your hips up and down on <<$npc_firstname[$boy]>>''s cock.'
+		elseif booty_call['moan'] = 2:
+			'"<i>Ah~! Yes~! Mmm~!</i>"'
+			*nl
+			'You moan loudly, letting your voice fill the room as you slam your pussy down <<$npc_firstname[$boy]>>''s cock over and over again.'
+		elseif booty_call['dirty_talk'] = 1:
+			'"I love riding your cock!" you scream loudly as you plunge yourself down onto it. "You''re so hard! So fucking good!"'
+		else
+			'You pant loudly, breasts bouncing in the air while you bounce on <<$npc_firstname[$boy]>>''s dick, loving every thrust and every second.'
+		end
+	else
+		if booty_call['moan'] = 1:
+			'"<i>Ah~! Ah~! Ah~! Ah~!</i>"'
+			*nl
+			'You pant desperately as <<$npc_firstname[$boy]>> thrusts into you from below, so hard it''s like he''s fucking the breath from your lungs. It''s <i>amazing.</i>'
+		elseif booty_call['moan'] = 2:
+			'"<i>AH~! AH~! YES~! YES~! AHH~!</i>"'
+			*nl
+			'Your voice echoes off the walls mixing with the sound of <<$npc_firstname[$boy]>>''s hips slamming into yours from below over and over again.'
+		elseif booty_call['dirty_talk'] = 1:
+			'"Ahh~! Yes! Just like that!" you scream loudly as <<$npc_firstname[$boy]>> jackhammers into your pussy from below you. "Fill me with your dick! Fuck me in half!"'
+		else
+			'You groan wordlessly, letting your eyes roll back in your skull while <<$npc_firstname[$boy]>> does all the work, violently thrusting up into you over and over and over, sending earthquakes of pleasure coursing through your entire body.'
+		end
 	end
 	gs 'booty_call_cum', 'fuck_cum'
 end
@@ -2123,6 +1804,7 @@ if $ARGS[0] = 'reset':
 	booty_call['gag'] = 0
 	booty_call['react'] = 0
 	booty_call['fuck_again'] = 0
+	booty_call['must_fuck'] = 0
 end
 
 if $ARGS[0] = 'harden_hand':
@@ -2157,7 +1839,7 @@ if $ARGS[0] = 'harden_hand':
 				gs 'booty_call_start', 'handjob_dom1'
 				gs 'booty_call_start', 'foreplay_choose'
 				if booty_call['fuck_count'] > 0:
-					act'Back to sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_sex', 'condoms'
+					act'Back to sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_condoms', 'condoms'
 				else
 					act'Sex':gs'booty_call_sex','sex_start'
 				end
@@ -2200,7 +1882,7 @@ if $ARGS[0] = 'harden_mouth':
 				act'Keep blowing him':cla & *clr & gs 'booty_call_start', 'bj_dom2'
 				gs 'booty_call_start', 'foreplay_choose'
 				if booty_call['fuck_count'] > 0:
-					act'Back to sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_sex', 'condoms'
+					act'Back to sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_condoms', 'condoms'
 				else
 					act'Have sex':gs'booty_call_sex','sex_start'
 				end

+ 22 - 13
locations/booty_call_start.qsrc

@@ -14,6 +14,10 @@ if $ARGS[0] = 'draw':
 end
 
 if $ARGS[0] = 'starting_stats':
+	$lastwornpantytype['booty_call'] = $pantyworntype
+	lastwornpantynumber['booty_call'] = pantywornnumber
+	$lastwornbratype['booty_call'] = $braworntype
+	lastwornbranumber['booty_call'] = brawornnumber
 	booty_call['starting_makeup'] = pcs_makeup
 	booty_call['cum_vagina'] = cum_loc['vagina']
 	booty_call['cum_labia'] = cum_loc['labia']
@@ -33,6 +37,8 @@ if $ARGS[0] = 'starting_stats':
 	booty_call['cum_tits'] = cum_loc['tits']
 	booty_call['cum_hair'] = cum_loc['hair']
 	booty_call['sweat'] = pcs_sweat
+	booty_call['orgasm'] = orgasm
+	booty_call['orgasm_limit'] = orgasm + 6
 end
 
 if $ARGS[0] = 'start':
@@ -42,8 +48,7 @@ if $ARGS[0] = 'start':
 		booty_call['start_hour'] = hour
 	end
 	gs 'boystat', $ARGS[1]
-	booty_call['orgasm'] = orgasm
-	booty_call['orgasm_limit'] = orgasm + 6
+	gs 'booty_call_start', 'starting_stats'
 	$npc_apt_hall[$boy]
 	'You knock on the door and <<$npc_firstname[$boy]>> opens up.'
 	if pcs_sweat > 29:
@@ -249,7 +254,7 @@ if $ARGS[0] = 'selfish_initiative':
 			'"Okay, like what then?" he asks.'
 			gs 'booty_call_start', 'foreplay_choose'
 			if booty_call['fuck_count'] > 0:
-				act'Back to sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_sex', 'condoms'
+				act'Back to sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_condoms', 'condoms'
 			else
 				act'Skip the foreplay':gs'booty_call_sex','sex_start'
 			end
@@ -570,7 +575,7 @@ if $ARGS[0] = 'nipple_play':
 				act'Let him take your virginity':gs'booty_call_virgin','start3'
 			else
 				gs 'booty_call_sex', 'missionary_start'
-				gs 'booty_call_sex', 'condoms'
+				gs 'booty_call_condoms', 'condoms'
 			end
 		end
 	end
@@ -581,6 +586,10 @@ end
 if $ARGS[0] = 'bj_ask':
 	cla
 	'"How about a blowjob?" <<$npc_firstname[$boy]>> asks.'
+	gs 'booty_call_start', 'bj_ask2'
+end
+
+if $ARGS[0] = 'bj_ask2':
 	act'Reluctant':
 		cla & *nl
 		booty_call['reluctant_bj'] = 1
@@ -678,7 +687,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 	act'Continue':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow5.mp4"></video></center>'
-		$booty_call['last_cum']
+		$booty_call['last_cum'] = mouth
 		booty_call['cum_mouth_surprise'] = 1
 		if pcs_throat <= 10:
 			'Without any warning <<$npc_firstname[$boy]>> grabs your head and shoves it down to the base of his cock. It stretches your jaw wide, making you gag reflexively, and just as you''re about to protest, something spurts out into your throat.'
@@ -693,8 +702,8 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow5.mp4"></video></center>'
 			'You hum in surprise, but take it in stride anyways, continuing to suck as <<$npc_firstname[$boy]>> comes right down your throat. You swallow it all as best you can until his hips stop bucking beneath you and you slowly pull away, gulping one last time to get the last drops.'
 			gs 'booty_call_start', 'bj_warning_next_time'
-			'booty_call_talk', 'bj_tasty'
-			'booty_call_talk', 'bj_already'
+			gs 'booty_call_talk', 'bj_tasty'
+			gs 'booty_call_talk', 'bj_already'
 		end
 
 		act'Take it in stride (spit)':
@@ -706,7 +715,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit6.mp4"></video></center>'
 			'You hum in surprise, but take it in stride anyways, continuing to suck as <<$npc_firstname[$boy]>> straight into the back of your throat. You carefully let it pool there, waiting until his hips stop bucking beneath you. When he finally stops, you gather it to the front of your mouth and spit it out, letting it spill past your lips and all over <<$npc_firstname[$boy]>>''s dick.'
 			gs 'booty_call_start', 'bj_warning_next_time'
-			'booty_call_talk', 'bj_already'
+			gs 'booty_call_talk', 'bj_already'
 		end
 
 		act'Gag':
@@ -864,7 +873,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth2':
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/deep1.mp4"></video></center>'
 		'With a mischievous grin, you work his cock with your hand, building up his climax right to the brink. You can tell just by the expression on his face and the swelling of flesh in your hand that he''s about to blow. At that moment, you plunge your lips straight down to the base of his cock, right as he explodes inside your mouth.'
 		gs 'booty_call_talk', 'bj_warning_thanks'
-		'booty_call_talk', 'bj_tasty'
+		gs 'booty_call_talk', 'bj_tasty'
 		gs 'booty_call_start', 'bj_swallow_gross'
 		gs 'booty_call_start', 'bj_sub_cum_mouth_spit'
 !!		gs 'booty_call_start', 'bj_sub_cum_mouth_swallow'
@@ -889,7 +898,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_spit':
 			gs 'booty_call_talk', 'bj_warning_thanks'
 		end
 		if booty_call['cum_mouth_surprise'] = 1:
-			'booty_call_talk', 'bj_already'
+			gs 'booty_call_talk', 'bj_already'
 		end
 	end
 end
@@ -946,13 +955,13 @@ if $ARGS[0] = 'bj_sub_cum_mouth_swallow':
 			'"Blech!" you shudder. "That''s awful!"'
 			if booty_call['bj_cum_choice'] > 6 and booty_call['bj_cum_choice'] <= 8:
 				'"If you hate swallowing so much, then why didn''t you just let me cum on your face like I wanted to?" <<$npc_firstname[$boy]>> asks quizzically.'
-				'booty_call_talk', 'cum_mouth_swallow_why'
+				gs 'booty_call_talk', 'cum_mouth_swallow_why'
 			elseif booty_call['bj_cum_choice'] > 4 and booty_call['bj_cum_choice'] <= 8:
 				'"If you hate swallowing so much, then why didn''t you just let me cum on your tits?" <<$npc_firstname[$boy]>> asks quizzically.'
-				'booty_call_talk', 'cum_mouth_swallow_why'
+				gs 'booty_call_talk', 'cum_mouth_swallow_why'
 			else
 				'"Then why''d you do it?" <<$npc_firstname[$boy]>> asks, a dumbfounded look on his face.'
-				'booty_call_talk', 'cum_mouth_swallow_why'
+				gs 'booty_call_talk', 'cum_mouth_swallow_why'
 
 				act'Cause boys like it':
 					cla & *clr

+ 2 - 2
locations/booty_call_talk.qsrc

@@ -981,7 +981,7 @@ if $ARGS[0] = 'oh_shit_options':
 	act'This isn''t good':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
-		npc_birh
+		npc_know_not_bc[$boy] = 1
 		'"Well this isn''t good," you gulp, looking horrified at <<$npc_firstname[$boy]>>. "I''m not on birth control..."'
 		gs'booty_call_cum','what_now'
 	end
@@ -989,7 +989,7 @@ if $ARGS[0] = 'oh_shit_options':
 		booty_call['pill_tomorrow'] = 1
 		cla & *clr
 		$npc_apt_bedroom[$boy]
-		'"I guess I''m going to need a pill tomorrow," you say, frowning at your still-dripping pussy.'
+		'"I guess I''m going to need a pill tomorrow," you say, frowning.'
 		gs'booty_call_cum','what_now'
 	end
 	

+ 1 - 0
locations/brothel.qsrc

@@ -261,6 +261,7 @@ if $ARGS[0] = 'abducted3':
 	:abdrapeloop
 	gs 'npcgeneratec', 0, 'Rapist', rand(35,50)
 	gs 'boyStat', $npclastgenerated
+	gs 'arousal', 'vaginal', 5
 	gs 'arousal', 'anal', 10
 	gs 'arousal', 'end'
 	cumarrcon = 0

+ 2 - 2
locations/brother.qsrc

@@ -392,9 +392,9 @@ if $ARGS[0] = 'playfootball':
 		*clr & cla
 		minut += 60
 		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
-		agil_exp += rand(0, 2)
+		gs 'exp_gain', 'agil', rand(0, 2)
 		gs 'sweat', 'add', 30
-		run_exp += rand(0, 2)
+		gs 'exp_gain', 'run', rand(0, 2)
 		fat -= rand(2, 7)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football3.jpg"></center>'

+ 4 - 4
locations/buklinik_event.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'pos7':
 	*clr & cla
 	menu_off = 1
 	buklinikDay = daystart
-	medcn_exp += rand (0,3)
+	gs 'exp_gain', 'medcn', rand (0,3)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_eat2.jpg"></center>'
 	if bumtolik > 7:
@@ -102,7 +102,7 @@ end
 if $ARGS[0] = 'pos8':
 	*clr & cla
 	menu_off = 1
-    medcn_exp += rand (0,3)
+    gs 'exp_gain', 'medcn', rand (0,3)
 	if bumtolik = 8:bumtolik = 9
 	buklinikDay = daystart
 	minut += 120
@@ -137,7 +137,7 @@ if $ARGS[0] = 'pos10':
 	menu_off = 1
 	bumtolik = 10
 	pcs_horny += 10
-	medcn_exp += rand (0,3)
+	gs 'exp_gain', 'medcn', rand (0,3)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_mission1.jpg"></center>'
 	'You have the perfect idea that might persuade the old drunk. You set in front of the makeshift shelter and tell the others to back off while you tell him that you have something to show him.'
@@ -328,7 +328,7 @@ if $ARGS[0] = 'event1':
 	buklinik = 11
 	buklinikDay = daystart
 	minut += 20
-	medcn_exp += rand (0,3)
+	gs 'exp_gain', 'medcn', rand (0,3)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/vika/3.jpg"></center>'
 	'You came to the address and knocked on the door. You opened the young girl and asked:

+ 19 - 19
locations/camera.qsrc

@@ -227,7 +227,7 @@ if $ARGS[0] = 'mother':
 	act 'Take her photo':
 		cla & *clr
 		minut += 15
-		photoskl_exp += rand(3,5)
+		gs 'exp_gain', 'photoskl', rand(3,5)
 		portfolio_people[1] = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/1.jpg"></center>'
@@ -251,7 +251,7 @@ if $ARGS[0] = 'anya':
 	act 'Take her photo':
 		cla & *clr
 		minut += 15
-		photoskl_exp += rand(3,5)
+		gs 'exp_gain', 'photoskl', rand(3,5)
 		portfolio_people[2] = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/2.jpg"></center>'
@@ -273,7 +273,7 @@ if $ARGS[0] = 'lazar':
 	act 'Take his photo':
 		cla & *clr
 		minut += 15
-		photoskl_exp += rand(3,5)
+		gs 'exp_gain', 'photoskl', rand(3,5)
 		portfolio_people[3] = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/3.jpg"></center>'
@@ -285,7 +285,7 @@ end
 if $ARGS[0] = 'city_library':
 	*clr & cla
 	minut += 15
-	photoskl_exp += rand(3,5)
+	gs 'exp_gain', 'photoskl', rand(3,5)
 	portfolio_locations[1] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
@@ -296,7 +296,7 @@ end
 if $ARGS[0] = 'city_uni':
 	*clr & cla
 	minut += 25
-	photoskl_exp += rand(5,7)
+	gs 'exp_gain', 'photoskl', rand(5,7)
 	portfolio_locations[2] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
@@ -307,7 +307,7 @@ end
 if $ARGS[0] = 'gadukino':
 	*clr & cla
 	minut += 25
-	photoskl_exp += rand(5,7)
+	gs 'exp_gain', 'photoskl', rand(5,7)
 	portfolio_locations[4] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
@@ -318,7 +318,7 @@ end
 if $ARGS[0] = 'gadforest':
 	*clr & cla
 	minut += 15
-	photoskl_exp += rand(3,5)
+	gs 'exp_gain', 'photoskl', rand(3,5)
 	portfolio_locations[6] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
@@ -329,7 +329,7 @@ end
 if $ARGS[0] = 'pav_church':
 	*clr & cla
 	minut += 25
-	photoskl_exp += rand(5,7)
+	gs 'exp_gain', 'photoskl', rand(5,7)
 	portfolio_locations[12] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
@@ -340,7 +340,7 @@ end
 if $ARGS[0] = 'pav_train_hall':
 	*clr & cla
 	minut += 15
-	photoskl_exp += rand(3,5)
+	gs 'exp_gain', 'photoskl', rand(3,5)
 	portfolio_locations[8] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
@@ -351,7 +351,7 @@ end
 if $ARGS[0] = 'pav_complex':
 	*clr & cla
 	minut += 15
-	photoskl_exp += rand(3,5)
+	gs 'exp_gain', 'photoskl', rand(3,5)
 	portfolio_locations[7] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
@@ -362,7 +362,7 @@ end
 if $ARGS[0] = 'pav_school':
 	*clr & cla
 	minut += 15
-	photoskl_exp += rand(3,5)
+	gs 'exp_gain', 'photoskl', rand(3,5)
 	portfolio_locations[9] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
@@ -373,7 +373,7 @@ end
 if $ARGS[0] = 'pav_park':
 	*clr & cla
 	minut += 15
-	photoskl_exp += rand(3,5)
+	gs 'exp_gain', 'photoskl', rand(3,5)
 	portfolio_locations[10] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
@@ -384,7 +384,7 @@ end
 if $ARGS[0] = 'pav_lake':
 	*clr & cla
 	minut += 15
-	photoskl_exp += rand(3,5)
+	gs 'exp_gain', 'photoskl', rand(3,5)
 	portfolio_locations[11] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
@@ -403,7 +403,7 @@ if $ARGS[0] = 'pav_lake_sonia':
 	act 'Take her photograph':
 		*clr & cla
 		camera_found['sonia'] = 1
-		photoskl_exp += rand(1,2)
+		gs 'exp_gain', 'photoskl', rand(1,2)
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo1.jpg"></center>'
 		'You get a little closer and start taking her photograph, moving around and taking a number of shots from different angles before she suddenly sits up and looks in your direction.'
@@ -411,7 +411,7 @@ if $ARGS[0] = 'pav_lake_sonia':
 		gs 'stat'
 		act 'Caught':
 			*clr & cla
-			photoskl_exp += rand(1,2)
+			gs 'exp_gain', 'photoskl', rand(1,2)
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo2.jpg"></center>'
 			'She covers herself up and looks at you in surprise. "What the fuck <<$pcs_nickname>>?! What are you doing?"'
@@ -424,13 +424,13 @@ if $ARGS[0] = 'pav_lake_sonia':
 			act 'Take more photos':
 				*clr & cla
 				minut += 5
-				photoskl_exp += rand(1,2)
+				gs 'exp_gain', 'photoskl', rand(1,2)
 				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo3.jpg"></center>'
 				'She is a little awkward at first, not knowing what to do, but as you continue taking more photos, she starts to relax and become more natural in her poses. She even starts to get into it herself and enjoying it.'
 				act 'Take more photos':
 					*clr & cla
-					photoskl_exp += rand(1,2)
+					gs 'exp_gain', 'photoskl', rand(1,2)
 					gs 'stat'
 					'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo4.jpg"></center>'
 					'As you continue photographing her, she starts teasing you by pulling on her bottoms while her hands run along her body or play with her breasts.'
@@ -439,7 +439,7 @@ if $ARGS[0] = 'pav_lake_sonia':
 					gs 'stat'
 					act 'No bottoms':
 						*clr & cla
-						photoskl_exp += rand(1,2)
+						gs 'exp_gain', 'photoskl', rand(1,2)
 						gs 'stat'
 						'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo5.jpg"></center>'
 						'She grins and unties her bottoms from one hip, which lets them partially fall off her, exposing her pussy. You take more photos as she pulls the other tie loose and her bottoms fall away.'
@@ -447,7 +447,7 @@ if $ARGS[0] = 'pav_lake_sonia':
 						gs 'stat'
 						act 'Naked':
 							*clr & cla
-							photoskl_exp += rand(1,2)
+							gs 'exp_gain', 'photoskl', rand(1,2)
 							portfolio_people[4] = 1
 							gs 'stat'
 							'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo6.jpg"></center>'

+ 4 - 4
locations/castSpell.qsrc

@@ -34,19 +34,19 @@ if spellKnown[$SpellID] = 1:
 	if spellRoll > 50:
 		!Critical Success
 		spellSuccess = 2
-		splcstng_exp += rand(1,spellDiff[$SpellID]) + rand(0,5)
+		gs 'exp_gain', 'splcstng', rand(1,spellDiff[$SpellID]) + rand(0,5)
 	elseif spellRoll > 10:
 		!Success
 		spellSuccess = 1
-		splcstng_exp += rand(1,spellDiff[$SpellID])
+		gs 'exp_gain', 'splcstng', rand(1,spellDiff[$SpellID])
 	elseif spellRoll > -20:
 		!Failure
 		spellSuccess = 0
-		splcstng_exp += rand(1,spellDiff[$SpellID]) / 2
+		gs 'exp_gain', 'splcstng', rand(1,spellDiff[$SpellID]) / 2
 	else
 		!Critical Failure
 		spellSuccess = -1
-		splcstng_exp += rand(1,spellDiff[$SpellID]) / 2
+		gs 'exp_gain', 'splcstng', rand(1,spellDiff[$SpellID]) / 2
 	end
 	killvar 'spellRoll'
 

+ 2 - 2
locations/chessplay.qsrc

@@ -32,8 +32,8 @@ if $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'game':
-	chess_exp += rand(0,1)
-	intel_exp += rand(0,1)
+	gs 'exp_gain', 'chess', rand(0,1)
+	gs 'exp_gain', 'intel', rand(0,1)
 	chess_move += 1
 	chess_time = rand(1,3)
 	minut += chess_time

+ 1 - 1
locations/city_church.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'liturgy':
 	PLAY 'sound/church/t' + rand(1,19) + '.mp3',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(1,8) +'.jpg"></center>'
 	'You join the congregation for the Divine Liturgy. You see mostly older people around, but there are some people around your age present as well. You participate in the singing, but that''s about it. Your presence seems to go largely unnoticed and you have the chance to rest. You feel a lot better.'
-    vokal_exp += rand(0,3)
+    gs 'exp_gain', 'vokal', rand(0,3)
     gs 'stat'
 	act 'Leave the church': gt 'city_church' , 'start'
 end

+ 1 - 1
locations/city_house_res_misc.qsrc

@@ -334,7 +334,7 @@ if $ARGS[0] = 'livroom':
 				*clr & cla
 				menu_off = 1
 				minut += 60
-				sewng_exp += rand(pcs_intel/10, pcs_intel/5)
+				gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
 				gobramax = (pcs_sewng - 70) * 6
 				gobramin = (pcs_sewng - 70) * 2
 				newgobelen += rand(gobramin,gobramax)

+ 2 - 2
locations/city_kafe.qsrc

@@ -362,8 +362,8 @@ if $ARGS[0] = 'workPred':
 			znarand = rand(0, 1200)
 			chai = rand(0, pcs_apprnc/4 + pcs_servng/2)
 
-			if pcs_servng < 100:servng_exp += 1
-			if pcs_vital < 30:vital_exp += 1 + rand(0,steroid_dose) & steroidcheck = 1
+			if pcs_servng < 100:gs 'exp_gain', 'servng', 1
+			if pcs_vital < 30:gs 'exp_gain', 'vital', 1 + rand(0,steroid_dose) & steroidcheck = 1
 			if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1) & killvar 'steroidcheck'
 
 			money += chai

+ 1 - 1
locations/city_kafeevents2.qsrc

@@ -39,7 +39,7 @@ end
 if $ARGS[0] = 'dance':
 	cla
 
-	if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
+	if pcs_danc < 50 and pcs_agil >= pcs_danc:gs 'exp_gain', 'danc', 1
 
 	minut += 3
 	gs 'stat'

+ 2 - 2
locations/city_lake.qsrc

@@ -112,7 +112,7 @@ if $ARGS[0] = 'start':
 				cumspclnt = 4
 				gs 'cum_cleanup'
 				minut += 60
-				gs 'exercise', 'tier1', 1, 'stren_exp'
+				gs 'exercise', 'tier1', 1, 'stren'
 				pcs_sweat = 10 + rand(0,4)
 				if pcs_inhib < 40:inhib_exp += rand(1,2)
 
@@ -1303,7 +1303,7 @@ if $ARGS[0] = 'andrey1':
 		cumspclnt = 4
 		gs 'cum_cleanup'
 		minut += 30
-		gs 'exercise', 'tier1', 1, 'stren_exp'
+		gs 'exercise', 'tier1', 1, 'stren'
 		pcs_sweat = 10 + rand(0,4)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/andrey1/andrey1.jpg"></center>'

+ 1 - 1
locations/city_library.qsrc

@@ -49,7 +49,7 @@ act 'Leave': minut += 5 & gt 'city_center'
 
 if hour >= 8 and hour <= 18:
 	act 'Read a science book':
-		intel_exp += 4 + (mentats_dose - rand(0,mentats_dose))
+		gs 'exp_gain', 'intel', 4 + (mentats_dose - rand(0,mentats_dose))
 
 		dynamic $downlibrary['BookStudy'], ''
 

+ 3 - 3
locations/city_mansion_residence_2.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'ylounge':
 					*clr & cla
 					menu_off = 1
 					minut += 60
-					sewng_exp += rand(pcs_intel/10, pcs_intel/5)
+					gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
 					gobramax = (pcs_sewng - 70) * 6
 					gobramin = (pcs_sewng - 70) * 2
 					newgobelen += rand(gobramin,gobramax)
@@ -141,7 +141,7 @@ if $ARGS[0] = 'ylibrary':
 			if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
 			if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
 			minut += 60
-			intel_exp += rand(3,6) + (mentats_dose - rand(0,mentats_dose))
+			gs 'exp_gain', 'intel', rand(3,6) + (mentats_dose - rand(0,mentats_dose))
 			blizoruk += 1
 			grupvalue[3] +=1
 			gs'stat'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'ylibrary':
 			if blizoruk = 500 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
 			if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
 			minut += 60
-			sprt_exp += rand(3,6)
+			gs 'exp_gain', 'sprt', rand(3,6)
 			blizoruk += 1
 			grupvalue[3] +=2
 			gs'stat'

+ 1 - 1
locations/city_mansion_residence_3.qsrc

@@ -56,7 +56,7 @@ if $ARGS[0] = 'ypool':
 		minut += 60
 		pcs_mood += 50
 		if pcs_sweat > 10:pcs_sweat = 10 + rand(0,4)
-		if pcs_stren < 40:stren_exp += 2
+		if pcs_stren < 40:gs 'exp_gain', 'stren', 2
 		fat -= 1
 		gs 'stat'
 

+ 2 - 2
locations/city_nightclub.qsrc

@@ -276,7 +276,7 @@ if $ARGS[0] = 'dance':
 			pcs_stam -= 5
 			gs 'sweat', 'add', 3
 			fat -= 1
-			danc_exp += 1
+			gs 'exp_gain', 'danc', 1
 			if pcs_inhib < 40:inhib_exp += rand(1,2)
 			pcs_mood += 10
 
@@ -1303,7 +1303,7 @@ if $ARGS[0] = 'work':
 			if pcs_inhib < 60:inhib_exp += rand(1,2)
 			*clr & cla
 			minut += 60
-			danc_exp += rand (1,3)
+			gs 'exp_gain', 'danc', rand (1,3)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club12.jpg"></center>'
 			if pcs_danc > rand (30, 100):
 				money += 300

+ 4 - 4
locations/city_park.qsrc

@@ -127,7 +127,7 @@ if $ARGS[0] = 'start':
 				*clr & cla
 				menu_off = 1
 				parkrunday = daystart
-				gs 'exercise', 'tier1', 60, 'run_exp'
+				gs 'exercise', 'tier1', 60, 'run'
 				'<center><b><font color="maroon">Park</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
 				'You choose paths randomly, running them up and down, and about an hour later, you are out of breath and heavily sweating.'
@@ -354,7 +354,7 @@ if $ARGS[0] = 'luna':
 				minut += 30
 				money -= 50
 
-				sprt_exp += 2
+				gs 'exp_gain', 'sprt', 2
 
 				pcs_mood += 10
 				'<center><img <<$set_imgh>> src="images/locations/city/centralpark/karusel.jpg"></center>'
@@ -406,7 +406,7 @@ if $ARGS[0] = 'luna':
 						'You can''t even hit one target.'
 					end
 
-					shoot_exp += 1
+					gs 'exp_gain', 'shoot', 1
 
 					act 'Move away':gt 'city_park', 'luna'
 				end
@@ -427,7 +427,7 @@ if $ARGS[0] = 'luna':
 					stKo = pcs_stren * 20/100
 					damage = rand(pcs_stren - stKo, pcs_stren + stKo)
 
-					gs 'exercise', 'tier2', 1, 'stren_exp'
+					gs 'exercise', 'tier2', 1, 'stren'
 					
 					'A LED screen lights up and shows you your score:<<damage>>'
 					if damage > maxdamage:

+ 1 - 1
locations/city_sauna.qsrc

@@ -258,7 +258,7 @@ if $ARGS[0] = 'saunafitness':
 	cla
 	*clr
 	'<center><video autoplay loop src="images/pc/activities/exercises/push_nude.mp4"></video></center>'
-	gs 'exercise', 'tier2', 30, 'stren_exp'
+	gs 'exercise', 'tier2', 30, 'stren'
 	'You do push-ups for 30 minutes, improving your strength.'
 
 	randpushfact = rand(-5,5)

+ 0 - 1
locations/city_saunawhore.qsrc

@@ -231,7 +231,6 @@ if $ARGS[0] = 'saunawork':
 						act 'Go with the client':
 							saunaWorkKlient = 1
 							guy += 1
-							slutty += 1
 							SaunaWhore += 1
 							menu_off = 1
 							gt 'city_saunawhore', 'clientGate'

+ 1 - 1
locations/crossfit_north_box.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'box':
 				abonement -= 1
 				'You start with the workout.'
 				gs 'crossfit_north_wod', $todays_crossfit_wod
-				gs 'exercise', 'tier4', 20, 'stren_exp', 'vital_exp', 'agil_exp'
+				gs 'exercise', 'tier4', 20, 'stren', 'vital', 'agil'
 				'<center><video autoplay loop src="<<$crossfit_north_image_dir>><<$wod_video[$todays_crossfit_wod]>>.mp4"></video></center>'
 				current_wod_score = max(1,(100 - ((100 * pcs_health * (rand(40,100) + pcs_sleep  + pcs_vital + pcs_agil + pcs_stren))/ (healthmax * 500))))
 				cla

+ 6 - 6
locations/danceclass.qsrc

@@ -12,7 +12,7 @@ gs 'themes', 'indoors'
 if pcs_energy >= 10:
 	act 'Modern dance class (0:30)':
 		*clr & cla
-		gs 'exercise', 'tier2', 30, 'agil_exp', 'stren_exp', 'danc_exp'
+		gs 'exercise', 'tier2', 30, 'agil', 'stren', 'danc'
 		abonement -= 1
 		if pcs_inhib < 40:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/moderndance.jpg"></center>'
@@ -25,18 +25,18 @@ if pcs_energy >= 10:
 
 	act 'Burlesque class (0:30)':
 		*clr & cla
-		gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'danc_exp', 'dancero_exp'
+		gs 'exercise', 'tier2', 0, 'agil', 'stren', 'danc', 'dancero'
 		abonement -= 1
 		if pcs_inhib < 60:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/burlesque.jpg"></center>'
 
 		if pcs_danc >= 50:
-			gs 'exercise', 'tier2', 0, 'dancero_exp'
+			gs 'exercise', 'tier2', 0, 'dancero'
 			'You study the art of burlesque, imaging yourself stripping to the music.'
 
 			if pcs_dancero >= 100:'You''ve finally managed to master the art of burlesque, there is no need taking this class anymore.'
 		else
-			gs 'exercise', 'tier2', 0, 'danc_exp'
+			gs 'exercise', 'tier2', 0, 'danc'
 			'This class isn''t just about taking your clothes off, it''s a difficult dance style and your basics aren''t sufficent. Instead, the teacher helps you with your basic modern dance steps.'
 		end
 
@@ -46,13 +46,13 @@ if pcs_energy >= 10:
 	if pcs_stren >=40 or needstrength = 0:
 		act 'Pole dance class (0:30)':
 			*clr & cla
-			gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'dancpol_exp'
+			gs 'exercise', 'tier2', 0, 'agil_exp', 'stren', 'dancpol'
 			abonement -= 1
 			if pcs_inhib < 60:inhib_exp += rand(1,2)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/poledance.jpg"></center>'
 
 			if pcs_dancero >= 50 and pcs_stren >= 40:
-				gs 'exercise', 'tier2', 0, 'dancpol_exp'
+				gs 'exercise', 'tier2', 0, 'dancpol'
 				'You study various acrobatics on the pole.'
 
 				if pcs_dancpol >= 100:'You''ve already mastered the art of pole dancing, there is nothing more left to teach you.'

+ 2 - 2
locations/djibril.qsrc

@@ -149,7 +149,7 @@ if $ARGS[0] = 'djibril_playgames':
 	reccoldorm = 0
 	djibrilflag = 0
 	*clr & cla
-	gaming_exp += rand(1, 2)
+	gs 'exp_gain', 'gaming', rand(1, 2)
 	minut += 60
 	npc_rel['A82'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'djibril_chat':
 	reccoldorm = 0
 	djibrilflag = 0
 	*clr & cla
-	chrsm_exp += rand(1,2)
+	gs 'exp_gain', 'chrsm', rand(1,2)
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
 	'The two of you sit on the couch together and he talks about a few different subjects. You could ask him about something in particular or just make small talk.'
 	act 'Leave': gt 'uni_dorm', 'eighth_floor'

+ 2 - 2
locations/djibrilev1.qsrc

@@ -414,7 +414,7 @@ if $ARGS[0] = 'djibril_anya':
 	menu_off = 1
 	*clr & cla
 	minut += 60
-	gaming_exp += rand(1, 2)
+	gs 'exp_gain', 'gaming', rand(1, 2)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibril_anya.jpg"></center>'
 	'You sit around playing video games with Djibril before you finally hear a knock on the door. Djibril answers it and you see Anya standing there as he looks her over while she introduces herself to him. He invites her in and they walk over and sit on the couch with you. The three of you talk for a few minutes, but you can tell everyone is eager to get things going.'
@@ -648,7 +648,7 @@ if $ARGS[0] = 'djibril_nush':
 	menu_off = 1
 	*clr & cla
 	minut +60
-	gaming_exp += rand(1, 2)
+	gs 'exp_gain', 'gaming', rand(1, 2)
 	gs 'drugs', 'alcohol', 'wine', 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'

+ 4 - 4
locations/dk.qsrc

@@ -83,7 +83,7 @@ if $ARGS[0] = 'holl':
 				menu_off = 1
 				alexeyQW += 1
 				minut += 60
-				vokal_exp += rand(5,10)
+				gs 'exp_gain', 'vokal', rand(5,10)
 				vokalday = daystart
 				pcs_horny += 30
 				gs 'stat'
@@ -142,7 +142,7 @@ if $ARGS[0] = 'holl':
 				money -= 500
 				minut += 60
 				alexeyQW += 1
-				vokal_exp += rand(5,10)
+				gs 'exp_gain', 'vokal', rand(5,10)
 				vokalday = daystart
 				gs 'stat'
 				'You and your teacher Alexei engage in vocal training for an hour. Nothing he does, not even the way he looks at you would suggest that he had filled all of your holes after your last session.'
@@ -154,7 +154,7 @@ if $ARGS[0] = 'holl':
 				*clr & cla
 				menu_off = 1
 				alexeyQW += 1
-				vokal_exp += rand(5,10)
+				gs 'exp_gain', 'vokal', rand(5,10)
 				vokalday = daystart
 				gs 'stat'
 				'You enter Alexei''s office. He looks at you with guilt in his eyes. "I''m sorry, <<$pcs_nickname>>, I''m a musician and an artist first and foremost... but sometimes, I''m no better than a drunk redneck."'
@@ -189,7 +189,7 @@ if $ARGS[0] = 'holl':
 				minut += 60
 				money -= 500
 				alexeyQW += 1
-				vokal_exp += rand(5,10)
+				gs 'exp_gain', 'vokal', rand(5,10)
 				vokalday = daystart
 				gs 'stat'
 				!!'<center><img <<$set_imgh>> src="images/locations/city/industrial/community/dk2.jpg"></center>'

+ 1 - 1
locations/dom_gor.qsrc

@@ -22,7 +22,7 @@ if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and
 		parkrunday = daystart
 		minut += 30
 		pcs_mood += 10
-		run_exp += 2
+		gs 'exp_gain', 'run', 2
 		fat -= 8
 		gs 'sweat', 'add', 30
 		'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'

+ 1 - 0
locations/drugs.qsrc

@@ -36,6 +36,7 @@ if $ARGS[0] = 'smoke':
 	end
 	if pcs_energy < 80: pcs_energy += 4
 	gs 'stat'
+	if siga = 0: msg'That was your last cigarette.'
 elseif $ARGS[0] = 'joint':
 	minut += 10
 	if NarkImmune = 0: 

+ 6 - 6
locations/etoexhib.qsrc

@@ -542,7 +542,7 @@ if $ARGS[0] = 'pos16':
 			gs 'cum_cleanup'
 			inhib_exp += rand(1,2)
 			minut += 60
-			gs 'exercise', 'tier1', 1, 'stren_exp'
+			gs 'exercise', 'tier1', 1, 'stren'
 			pcs_sweat = 10 + rand(0,4)
 
 			'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_bikini_<<rand(0,8)>>.jpg"></center>'
@@ -561,7 +561,7 @@ if $ARGS[0] = 'pos16':
 			gs 'cum_cleanup'
 			inhib_exp += 3
 			minut += 60
-			gs 'exercise', 'tier1', 1, 'stren_exp'
+			gs 'exercise', 'tier1', 1, 'stren'
 			pcs_sweat = 10 + rand(0,4)
 			gs 'arousal', 'foreplay', 60, 'exhibition'
 			gs 'arousal', 'end'
@@ -622,7 +622,7 @@ if $ARGS[0] = 'pos18':
 				minut += 30
 				fat -= 1
 
-				if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
+				if pcs_danc < 50 and pcs_agil >= pcs_danc:gs 'exp_gain', 'danc', 1
 
 				pcs_mood += 10
 				frost = 0
@@ -681,7 +681,7 @@ if $ARGS[0] = 'pos18':
 				minut += 30
 				fat -= 1
 
-				if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
+				if pcs_danc < 50 and pcs_agil >= pcs_danc:gs 'exp_gain', 'danc', 1
 
 				pcs_mood += 10
 				frost = 0
@@ -1168,8 +1168,8 @@ if $ARGS[0] = 'pos27':
 			minut += 60
 			pcs_mood -= 5
 
-			if mentats_dose > 0:intel_exp += mentats_dose - rand(0,mentats_dose)
-			if pcs_intel < 80:intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
+			if mentats_dose > 0:gs 'exp_gain', 'intel', mentats_dose - rand(0,mentats_dose)
+			if pcs_intel < 80:gs 'exp_gain', 'intel', 1 + (mentats_dose - rand(0,mentats_dose))
 			if CloStyle3 = 4 and (pcs_makeup = 1 or pcs_makeup = 2) and teachlevel < 70:teachlevel += 1
 			if pcs_makeup = 4:teachlevel -= 1
 

+ 1 - 1
locations/eugeneev1.qsrc

@@ -445,7 +445,7 @@ if $ARGS[0] = 'photography':
 			'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/6.jpg"></center>'
 			'You think about it before nodding. "Okay, sure. You can fuck me however you want <i>after</i> I get the photo I want. Now go put on something sexy for me." She laughs before going to try on a few different outfits until she finds something she likes. She then starts posing for you and you take a few photos until you''re sure you have the one. With the one you want taken, you put the camera aside. "Okay, I''ve got it."'
 			'She smiles at you and beckons you over. "Well get that sexy body of yours over here. I''m going to do all sorts of things to it."'
-			photoskl_exp += rand(3,5)
+			gs 'exp_gain', 'photoskl', rand(3,5)
 			portfolio_people[6] = 1
 			gs 'arousal', 'erotic_nudity', 10
 			gs 'stat'

+ 7 - 7
locations/events.qsrc

@@ -192,10 +192,10 @@ if $ARGS[0] = 'read':
 				if tractatus = 0:totalbook += 1
 				pcs_mood += 10
 				pcs_mana -= 400
-				def_exp += rand(7,10)
-				jab_exp += rand(7,10)
-				kick_exp += rand(7,10)
-				punch_exp += rand(7,10)
+				gs 'exp_gain', 'def', rand(7,10)
+				gs 'exp_gain', 'jab', rand(7,10)
+				gs 'exp_gain', 'kick', rand(7,10)
+				gs 'exp_gain', 'punch', rand(7,10)
 				minut += 15
 				gs 'stat'
 				if $clothingworntype = 'nude' and $braworntype = 'none' and $pantyworntype = 'none':
@@ -258,7 +258,7 @@ if $ARGS[0] = 'read':
 					fashmag = 0
 					pcs_mood += 5
 					minut += 30
-					makupskl_exp += 1
+					gs 'exp_gain', 'makupskl', 1
 					'You relax for half an hour reading your fashion magazine.'
 					act 'Return':gt $loc, $loc_arg
 				end
@@ -274,7 +274,7 @@ if $ARGS[0] = 'read':
 					compmag = 0
 					pcs_mood += 5
 					minut += 30
-					compskl_exp += 1 
+					gs 'exp_gain', 'compskl', 1 
 					'You relax for half an hour reading your computing magazine.'
 					act 'Return':gt $loc, $loc_arg
 				end
@@ -305,7 +305,7 @@ if $ARGS[0] = 'read':
 					knitmag = 0
 					pcs_mood += 5
 					minut += 30
-					if pcs_sewng <= 100: sewng_exp += rand(1,3)
+					if pcs_sewng <= 100: gs 'exp_gain', 'sewng', rand(1,3)
 					'You relax for half an hour reading your knitting magazine.'
 					act 'Return':gt $loc, $loc_arg
 				end

+ 40 - 28
locations/exercise.qsrc

@@ -6,9 +6,9 @@ $ARGS[0] is the workout tier and the higher the tier, the greater the workout in
 	Values: 'tier1' 'tier2' 'tier3' 'tier4'
 ARG[1] is the time override. By default the tiers are in 15 minute segments if being called from an event with predetermined time set this to 1
 	Values: 0 (default of 15 minutes) 1 (time set to 0)
-$ARGS[2] and on are the stats to be affected by the workout NOTE: use the _exp variant, not the pcs_!!!!
-	Values: 'stren_exp' 'vital_exp' 'agil_exp' 'sprt_exp' 'react_exp'
-	Other stats can be added if desired - for a dance-a-thon you might use gs 'exercise', 'tier1', 0, 'agil_exp', 'danc_exp'
+$ARGS[2] and on are the stats to be affected by the workout NOTE: use the gs 'exp_gain', 'name of varibale' variant, not the pcs_!!!!
+	Values: 'stren' 'vital' 'agil' 'sprt' 'react'
+	Other stats can be added if desired - for a dance-a-thon you might use gs 'exercise', 'tier1', 0, 'agil', 'danc'
 }
 
 if $ARGS[0] = 'start':
@@ -335,7 +335,7 @@ end
 if $ARGS[0] = 'hula':
 	cla
 	*clr
-	gs 'exercise', 'tier2', (timemult*15), 'agil_exp', 'react_exp'
+	gs 'exercise', 'tier2', (timemult*15), 'agil', 'react'
 	timemult = 0
 	if $clothingworntype ! 'nude':
 		if $location_type = 'secluded':
@@ -370,7 +370,7 @@ if $ARGS[0] = 'yoga':
 		pcs_willpwr += rand(1,2)
 		if yoga_counter < min(timemult - 1,4): yoga_counter += 1 & jump 'timeloopyoga'
 	end
-	gs 'exercise', 'tier2', (timemult*15), 'sprt_exp', 'agil_exp'	
+	gs 'exercise', 'tier2', (timemult*15), 'sprt', 'agil'	
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
@@ -397,7 +397,7 @@ end
 if $ARGS[0] = 'rope':
 	cla
 	*clr
-	gs 'exercise', 'tier3', (15*timemult), 'agil_exp', 'react_exp'
+	gs 'exercise', 'tier3', (15*timemult), 'agil', 'react'
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
@@ -420,7 +420,7 @@ end
 if $ARGS[0] = 'press':
 	cla
 	*clr
-	gs 'exercise', 'tier3', (15*timemult), 'vital_exp'
+	gs 'exercise', 'tier3', (15*timemult), 'vital'
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
@@ -443,7 +443,7 @@ end
 if $ARGS[0] = 'push':
 	cla
 	*clr
-	gs 'exercise', 'tier3', (15*timemult), 'stren_exp'
+	gs 'exercise', 'tier3', (15*timemult), 'stren'
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
@@ -493,17 +493,20 @@ if $ARGS[0] = 'tier1':
 	mcnt = 0
 	:timeexploop1
 	if $ARGS[3] = '':
-		dynamic '<<$ARGS[2]>> += 1'
-		if $ARGS[2] = 'vital_exp' or $ARGS[2] = 'stren_exp':
-			dynamic '<<$ARGS[2]>> += rand(0,steroid_dose)'
+		gs 'exp_gain', $ARGS[2], 1
+		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
+			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
 			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
 		end
 	else
 		i = 2
 		:exploop1
 		if $ARGS[i] ! '':
-			dynamic '<<$ARGS[i]>> += rand(0,1)'
-			if $ARGS[i] = 'vital_exp' or $ARGS[i] = 'stren_exp': dynamic '<<$ARGS[i]>> += rand(0,steroid_dose) & steroidcheck = 1'
+			gs 'exp_gain', $ARGS[i], rand(0,1)
+			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
+				gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
+				steroidcheck = 1
+			end
 			i += 1
 			jump 'exploop1'
 		else
@@ -538,17 +541,20 @@ if $ARGS[0] = 'tier2':
 	mcnt = 0
 	:timeexploop2
 	if $ARGS[3] = '':
-		dynamic '<<$ARGS[2]>> += rand(2,3)'
-		if $ARGS[2] = 'vital_exp' or $ARGS[2] = 'stren_exp':
-			dynamic '<<$ARGS[2]>> += rand(0,steroid_dose)'
+		gs 'exp_gain', $ARGS[2], rand(2,3)
+		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
+			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
 			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
 		end
 	else
 		i = 2
 		:exploop2
 		if $ARGS[i] ! '':
-			dynamic '<<$ARGS[i]>> += rand(1,2)'
-			if $ARGS[i] = 'vital_exp' or $ARGS[i] = 'stren_exp': dynamic '<<$ARGS[i]>> += rand(0,steroid_dose) & steroidcheck = 1'
+			gs 'exp_gain', $ARGS[i], rand(1,2)
+			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
+				gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
+				steroidcheck = 1
+			end
 			i += 1
 			jump 'exploop2'
 		else
@@ -583,17 +589,20 @@ if $ARGS[0] = 'tier3':
 	mcnt = 0
 	:timeexploop3
 	if $ARGS[3] = '':
-		dynamic '<<$ARGS[2]>> += rand(3,5)'
-		if $ARGS[2] = 'vital_exp' or $ARGS[2] = 'stren_exp':
-			dynamic '<<$ARGS[2]>> += rand(0,steroid_dose)'
+		gs 'exp_gain', $ARGS[2], rand(3,5)
+		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
+			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
 			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
 		end
 	else
 		i = 2
 		:exploop3
 		if $ARGS[i] ! '':
-			dynamic '<<$ARGS[i]>> += rand(2,3)'
-			if $ARGS[i] = 'vital_exp' or $ARGS[i] = 'stren_exp': dynamic '<<$ARGS[i]>> += rand(0,steroid_dose) & steroidcheck = 1'
+			gs 'exp_gain', $ARGS[i], rand(2,3)
+			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
+				gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
+				steroidcheck = 1
+			end
 			i += 1
 			jump 'exploop3'
 		else
@@ -628,17 +637,20 @@ if $ARGS[0] = 'tier4':
 	mcnt = 0
 	:timeexploop4
 	if $ARGS[3] = '':
-		dynamic '<<$ARGS[2]>> += rand(7,10)'
-		if $ARGS[2] = 'vital_exp' or $ARGS[2] = 'stren_exp':
-			dynamic '<<$ARGS[2]>> += rand(0,steroid_dose)'
+		gs 'exp_gain', $ARGS[2], rand(7,10)
+		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
+			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
 			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
 		end
 	else
 		i = 2
 		:exploop4
 		if $ARGS[i] ! '':
-			dynamic '<<$ARGS[i]>> += rand(3,5)'
-			if $ARGS[i] = 'vital_exp' or $ARGS[i] = 'stren_exp': dynamic '<<$ARGS[i]>> += rand(0,steroid_dose) & steroidcheck = 1'
+			gs 'exp_gain', $ARGS[i], rand(3,5)
+			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
+				gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
+				steroidcheck = 1
+			end
 			i += 1
 			jump 'exploop4'
 		else

+ 22 - 0
locations/exp_gain.qsrc

@@ -0,0 +1,22 @@
+# exp_gain
+!2022/08/07
+
+!gosup that exp gain is run through to be able to modify exp gain by conditions of the player character
+
+!Modify exp gain if Sveta does not get enough sleep.
+if ARGS[1] > 0:
+	if pcs_condition['lack_of_sleep'] >= 20:
+		dynamic "<<$ARGS[0]>>_exp += <<ARGS[1]>>/4"
+	elseif pcs_condition['lack_of_sleep'] >= 10:
+		dynamic "<<$ARGS[0]>>_exp += <<ARGS[1]>>/2"
+	elseif pcs_condition['lack_of_sleep'] >= 5:
+		dynamic "<<$ARGS[0]>>_exp += (<<ARGS[1]>>*3)/4"
+	elseif pcs_condition['lack_of_sleep'] >= 2 and ARGS[1] > 1:
+		dynamic "<<$ARGS[0]>>_exp += (<<ARGS[1]>>*9)/10"
+	else
+		dynamic "<<$ARGS[0]>>_exp += <<ARGS[1]>>"
+	end
+end
+
+--- exp_gain ---------------------------------
+

+ 3 - 3
locations/fame.qsrc

@@ -17,7 +17,7 @@
 
 !!ARGS[2] is the value of the increase this can be an integer or one on the following keywords:
 !!tiny (Adding a small amount of fame which even at low level of fame only will make the fame grow if the are performed daily)
-!!small (Adding a small amount of fame, that at low level of fame will make the fame grow if done a couble times a week, but for medium levels of fame need to be done daily)
+!!small (Adding a small amount of fame, that at low level of fame will make the fame grow if done a couple times a week, but for medium levels of fame need to be done daily)
 !!medium (Adding a medium amount of fame, that at low level of fame can make the fame grow if done once a week, and even at high levels can make the fame grow if done daily.)
 !!large (Adding a large amount of fame which will make the fame grow fast at low level of fame, and even at high level of fame it will make the fame grow if performed a couple of times a week.)
 !!huge (Adding a large amount of fame will increase the fame drastically at low levels of fame, make it grow if done weekly at high levels of fame and even keep the fame steady at extreme levels of fame.) 
@@ -566,7 +566,7 @@ if $ARGS[0] = 'calculate':
 
 
 
-	!!This calculates fame in Pavlovks. Adding the core and local and the contributions trom other places. Each time we add two numbers we do it weigthed by the formula (1000*pav_fame+(1000-pav_fame)*contribution) with a chech such that pav_fame never decrease in a step. Excepte in the first if pav_fame_local is negative).
+	!!This calculates fame in Pavlovks. Adding the core and local and the contributions trom other places. Each time we add two numbers we do it weigthed by the formula (1000*pav_fame+(1000-pav_fame)*contribution) with a chech such that pav_fame never decrease in a step. Excepte in the first if pav_fame_local is negative). 
 	if dyneval ('RESULT = fame[''pav_<<$ARGS[1]>>_core'']') >= 1000:
 		dynamic 'fame[''pav_<<$ARGS[1]>>''] = fame[''pav_<<$ARGS[1]>>_core'']+ fame[''pav_<<$ARGS[1]>>_local'']/1000'
 	else
@@ -773,4 +773,4 @@ if $ARGS[0] = 'calculateSlut':
 	end	
 end
 
---- fame ---------------------------------
+--- fame ---------------------------------

+ 1 - 1
locations/father.qsrc

@@ -236,7 +236,7 @@ if (hour > 10 and week < 6) or week >= 6:
                             '"Sorry <<$pcs_nickname>>, like I said, I have no money. Go ask your mother."'
                         else
                             money += rand(200,300)
-                            persuas_exp += rand(0,2)
+                            gs 'exp_gain', 'persuas', rand(0,2)
                             fatherPayDay = daystart
                             gs 'stat'
                             '"Oh, alright then. Just don''t tell your mother!" he says in a tired voice, keeping his eyes on the doorway as he gives you the money. You act genuinely happy as you take the money from him, giving him a kiss on the cheek as you go.'

+ 23 - 23
locations/fbgameout.qsrc

@@ -57,7 +57,7 @@ end
 if $ARGS[0] = 'football':
 	*clr & cla
 	minut += 5
-	ftbll_exp += rand(0,2)
+	gs 'exp_gain', 'ftbll', rand(0,2)
 	grupvalue[2] += 1
 	gs 'stat'
 	*clr & cla
@@ -108,8 +108,8 @@ if $ARGS[0] = 'football':
 				act 'Tackle':
 					*clr & cla
 					minut += 5
-					ftbll_exp += rand(0,2)
-					stren_exp += 1
+					gs 'exp_gain', 'ftbll', rand(0,2)
+					gs 'exp_gain', 'stren', 1
 					grupvalue[2] -= 1
 					gs 'npc_relationship', 'modify', 'A18', 'dislike'
 					gs 'npc_relationship', 'modify', 'A19', 'dislike'
@@ -146,7 +146,7 @@ if $ARGS[0] = 'football':
 								act 'React (<<will_cost>> Willpower)':
 									*clr & cla
 									gs 'willpower', 'pay', 'self'
-									ftbll_exp += rand(0,2)
+									gs 'exp_gain', 'ftbll', rand(0,2)
 									gs 'stat'
 									'You feel pressured to act. You must decide, otherwise the attack will go to waste...'
 									
@@ -159,8 +159,8 @@ if $ARGS[0] = 'football':
 											npc_rel['A3'] -= 1
 											pcs_mood += 20
 											gs 'sweat', 'add', 20
-											vital_exp += 1
-											ftbll_exp += 1
+											gs 'exp_gain', 'vital', 1
+											gs 'exp_gain', 'ftbll', 1
 											grupvalue[2] += 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/pass.jpg"></center>'
@@ -174,7 +174,7 @@ if $ARGS[0] = 'football':
 										else
 											pcs_mood -= 20
 											gs 'sweat', 'add', 20
-											vital_exp += 1
+											gs 'exp_gain', 'vital', 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/passfail.jpg"></center>'
 											'You decide to pass the ball to Svyatoslav. You can clearly see him waving his hands, yelling that he''s free.'
@@ -194,8 +194,8 @@ if $ARGS[0] = 'football':
 											npc_rel['A8'] += 1
 											pcs_mood += 20
 											gs 'sweat', 'add', 20
-											vital_exp += 1
-											ftbll_exp += 1
+											gs 'exp_gain', 'vital', 1
+											gs 'exp_gain', 'ftbll', 1
 											grupvalue[2] += 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/shoot.jpg"></center>'
@@ -208,7 +208,7 @@ if $ARGS[0] = 'football':
 										else
 											pcs_mood -= 20
 											gs 'sweat', 'add', 20
-											vital_exp += 1
+											gs 'exp_gain', 'vital', 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/shootfail.jpg"></center>'
 											'You take aim and kick the ball. However, it wobbles over the goal as you''ve not put enough force into your shot.'
@@ -230,8 +230,8 @@ if $ARGS[0] = 'football':
 											npc_rel['A13'] += 1
 											pcs_mood += 20 
 											gs 'sweat', 'add', 20
-											vital_exp += 1
-											ftbll_exp += 1
+											gs 'exp_gain', 'vital', 1
+											gs 'exp_gain', 'ftbll', 1
 											grupvalue[2] += 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/dribble.jpg"></center>'
@@ -245,7 +245,7 @@ if $ARGS[0] = 'football':
 										else
 											pcs_mood -= 20
 											gs 'sweat', 'add', 20
-											vital_exp += 1
+											gs 'exp_gain', 'vital', 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/dribblefail.jpg"></center>'
 											'With Christina closing in you take a step to the right, making her follow you. As soon as she catches up, you quickly jump to the left and dribble past her.'
@@ -329,7 +329,7 @@ if $ARGS[0] = 'football':
 								act 'React (<<will_cost>> Willpower)':
 									*clr & cla
 									gs 'willpower', 'pay', 'self'
-									ftbll_exp += rand(0,2)
+									gs 'exp_gain', 'ftbll', rand(0,2)
 									gs 'stat'
 									'You feel pressured to act. You must decide, otherwise the attack will go to waste...'
 									
@@ -341,8 +341,8 @@ if $ARGS[0] = 'football':
 											npc_rel['A149'] += 1
 											pcs_mood += 20
 											gs 'sweat', 'add', 20
-											vital_exp += 1
-											ftbll_exp += 1
+											gs 'exp_gain', 'vital', 1
+											gs 'exp_gain', 'ftbll', 1
 											grupvalue[2] += 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/pass.jpg"></center>'
@@ -356,7 +356,7 @@ if $ARGS[0] = 'football':
 										else
 											pcs_mood -= 20
 											gs 'sweat', 'add', 20
-											vital_exp += 1
+											gs 'exp_gain', 'vital', 1
 											gs 'stat'		
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/passfail.jpg"></center>'											
 											'You decide to pass the ball to Svyatoslav. You can clearly see him waving his hands, yelling that he''s free.'
@@ -376,8 +376,8 @@ if $ARGS[0] = 'football':
 											npc_rel['A8'] += 1
 											pcs_mood += 20
 											gs 'sweat', 'add', 20
-											vital_exp += 1
-											ftbll_exp += 1
+											gs 'exp_gain', 'vital', 1
+											gs 'exp_gain', 'ftbll', 1
 											grupvalue[2] += 1
 											grupvalue[2] += 1
 											gs 'stat'		
@@ -391,7 +391,7 @@ if $ARGS[0] = 'football':
 										else
 											pcs_mood -= 20
 											gs 'sweat', 'add', 20
-											vital_exp += 1
+											gs 'exp_gain', 'vital', 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/shootfail.jpg"></center>'
 											'You take aim and kick the ball. However, it wobbles over the goal as you''ve not put enough force into the shot.'
@@ -413,8 +413,8 @@ if $ARGS[0] = 'football':
 											npc_rel['A13'] += 1
 											pcs_mood += 20 
 											gs 'sweat', 'add', 20
-											vital_exp += 1
-											ftbll_exp += 1
+											gs 'exp_gain', 'vital', 1
+											gs 'exp_gain', 'ftbll', 1
 											grupvalue[2] += 1
 											gs 'stat'		
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/dribble.jpg"></center>'
@@ -428,7 +428,7 @@ if $ARGS[0] = 'football':
 										else
 											pcs_mood -= 20
 											gs 'sweat', 'add', 20
-											vital_exp += 1
+											gs 'exp_gain', 'vital', 1
 											gs 'stat'	
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/dribblefail.jpg"></center>'
 											'With Christina closing in you take a step to the right, making her follow you. As soon as she catches up, you quickly jump to the left and dribble past her...'

+ 11 - 11
locations/fit.qsrc

@@ -349,7 +349,7 @@ if $ARGS[0] = 'gym':
 			cla
 			*clr
 			abonement -= 1
-			gs 'exercise', 'tier1', 30, 'vital_exp', 'react_exp'
+			gs 'exercise', 'tier1', 30, 'vital', 'react'
 			fat -= rand(0,4)
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
 
@@ -369,7 +369,7 @@ if $ARGS[0] = 'gym':
 			cla
 			*clr
 			abonement -= 1
-			gs 'exercise', 'tier3', 30, 'stren_exp'
+			gs 'exercise', 'tier3', 30, 'stren'
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit2.jpg"></center>'
 			'You pump iron, building strength.'
@@ -386,7 +386,7 @@ if $ARGS[0] = 'gym':
 		act 'Cross trainer (endurance)':
 			cla & *clr
 			abonement -= 1
-			gs 'exercise', 'tier3', 30, 'vital_exp'
+			gs 'exercise', 'tier3', 30, 'vital'
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit3.jpg"></center>'
 			'You spend a half hour doing reps on the cross trainer developing your endurance.'
@@ -404,7 +404,7 @@ if $ARGS[0] = 'gym':
 			cla
 			*clr
 			abonement -= 1
-			gs 'exercise', 'tier3', 30, 'agil_exp'
+			gs 'exercise', 'tier3', 30, 'agil'
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit4.jpg"></center>'
 			'You run tennis exercises, concentrating on defensive drills.'
@@ -422,7 +422,7 @@ if $ARGS[0] = 'gym':
 			cla
 			*clr
 			abonement -= 1
-			gs 'exercise', 'tier3', 30, 'react_exp'
+			gs 'exercise', 'tier3', 30, 'react'
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit4.jpg"></center>'
 			'You run tennis exercises, concentrating on court reactions.'
@@ -595,7 +595,7 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		abonement -= 1
-		gs 'exercise', 'tier3', 30, 'jab_exp', 'react_exp'
+		gs 'exercise', 'tier3', 30, 'jab', 'react'
 		if pcs_inhib < 30:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kik1.jpg"></center>'
 		'You practice your jabs on the speed bag and double-end bag, straight punches with a step forward. These strikes are not so powerful, but they are fast.'
@@ -607,7 +607,7 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		abonement -= 1
-		gs 'exercise', 'tier3', 30, 'stren_exp', 'punch_exp'
+		gs 'exercise', 'tier3', 30, 'stren', 'punch'
 		if pcs_inhib < 30:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kik1.jpg"></center>'
 		'You practice your power punches on the heavy bag. These are high impact and powerful, but they are hard to get to their target.'
@@ -619,7 +619,7 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		abonement -= 1
-		gs 'exercise', 'tier3', 30, 'stren_exp', 'kick_exp'
+		gs 'exercise', 'tier3', 30, 'stren', 'kick'
 		if pcs_inhib < 30:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kik1.jpg"></center>'
 		'You practice your powerful kicks on a kickboxing bag. These impacts are very powerful and able to cut down an opponant, but are very difficult to hit with.'
@@ -631,7 +631,7 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		abonement -= 1
-		gs 'exercise', 'tier3', 30, 'def_exp', 'agil_exp'
+		gs 'exercise', 'tier3', 30, 'def', 'agil'
 		if pcs_inhib < 30:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kik1.jpg"></center>'
 		'You practice your defense movements.'
@@ -647,7 +647,7 @@ if $ARGS[0] = 'kickboxing':
 		act 'Pick a random partner':
 			abonement -= 1
 			pcs_mood += 2
-			gs 'exercise', 'tier3', 30, 'jab_exp', 'punch_exp', 'kick_exp', 'def_exp'
+			gs 'exercise', 'tier3', 30, 'jab', 'punch', 'kick', 'def'
 			pointKik = 0
 			pointKikV = 0
 			round = 1
@@ -681,7 +681,7 @@ if $ARGS[0] = 'kickboxing':
 		act 'Amateur fight':
 			kickbox['amateur_fight_day'] = daystart
 			pcs_mood += 2
-			gs 'exercise', 'tier3', 30, 'jab_exp', 'punch_exp', 'kick_exp', 'def_exp'
+			gs 'exercise', 'tier3', 30, 'jab', 'punch', 'kick', 'def'
 			pointKik = 0
 			pointKikV = 0
 			round = 1

+ 47 - 27
locations/foto.qsrc

@@ -71,19 +71,24 @@ if $ARGS[0] = 'start':
 			'You really wish you had brought panties today...'
 		end
 		if mesec > 0 and isprok = 0: msg'As your panties come off you realize you''re going to have a problem when your pad goes with it and blood immediately starts running down your legs. Maybe you should switch to tampons...'
-		$lastwornpantytype['foto'] = $pantyworntype
-		lastwornpantynumber['foto'] = pantywornnumber
-		$lastwornbratype['foto'] = $braworntype
-		lastwornbranumber['foto'] = brawornnumber
-		gs 'clothing', 'strip_all'
+		if underwear['type'] = 2:
+			$lastwornbodysuittype['foto'] = $bodysuitworntype
+			lastwornbodysuitnumber['foto'] = bodysuitwornnumber
+		else
+			$lastwornpantytype['foto'] = $pantyworntype
+			lastwornpantynumber['foto'] = pantywornnumber
+			$lastwornbratype['foto'] = $braworntype
+			lastwornbranumber['foto'] = brawornnumber
+		end
+		if $clothingworntype ! 'nude': gs 'clothing', 'strip'
 		gs 'stat'
 		act'Go back to the main floor':gt'foto','studio'
 	end
 
-	if $pantyworntype ! 'none' and pcs_inhib < 60 and studio_strip < 5:
+	if $pantyworntype ! 'none' and pcs_inhib < 60 and studio_strip < 5 and underwear['type'] ! 2:
 		if studio_strip_talk < 3:
 			act'Just strip to your panties':
-				gs 'clothing', 'strip'
+				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
 				$lastwornpantytype['foto'] = $pantyworntype
 				lastwornpantynumber['foto'] = pantywornnumber
 				$lastwornbratype['foto'] = $braworntype
@@ -94,7 +99,7 @@ if $ARGS[0] = 'start':
 				if studio_strip_talk = 0:
 					gt'foto_events','studio_strip_talk1'
 				elseif studio_underwear > 0:
-					gs 'bras', 'remove'
+					if $braworntype ! 'none':gs 'bras', 'remove'
 					'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video></center>'
 					'As you drop your clothes into the locker, you can''t help but take small comfort in the warmth of the panties you still wear. It''s not much, but as long as you have time to put this off, you''ll take solace in what little coverage they provide.'
 					act'Go to the main floor':
@@ -110,13 +115,18 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if studio_strip_talk < 2 and $braworntype ! 'none':
+		if studio_strip_talk < 2 and ($braworntype ! 'none' or underwear['type'] = 2):
 			act'Just strip to your underwear':
-				gs 'clothing', 'strip'
-				$lastwornpantytype['foto'] = $pantyworntype
-				lastwornpantynumber['foto'] = pantywornnumber
-				$lastwornbratype['foto'] = $braworntype
-				lastwornbranumber['foto'] = brawornnumber
+				if $clothingworntype ! 'nude': gs 'clothing', 'strip'
+				if underwear['type'] = 2:
+					$lastwornbodysuittype['foto'] = $bodysuitworntype
+					lastwornbodysuitnumber['foto'] = bodysuitwornnumber
+				else
+					$lastwornpantytype['foto'] = $pantyworntype
+					lastwornpantynumber['foto'] = pantywornnumber
+					$lastwornbratype['foto'] = $braworntype
+					lastwornbranumber['foto'] = brawornnumber
+				end
 				gs 'stat'
 				cla & *clr
 				menu_off = 1
@@ -125,7 +135,11 @@ if $ARGS[0] = 'start':
 				if studio_strip_talk = 0:
 					gt'foto_events','studio_strip_talk1'
 				else
-					'You strip down to your underwear, putting the rest of your belongings into your locker. You know that you need to get over this eventually but you''re still not confident enough yet.'
+					if underwear['type'] = 2:
+						'You just strip down to your bodysuit, putting the rest of your belongings into your locker. You know that you need to get over this eventually but you''re still not confident enough yet.'
+					else
+						'You just strip down to your underwear, putting the rest of your belongings into your locker. You know that you need to get over this eventually but you''re still not confident enough yet.'
+					end
 					*nl
 					'You bang your locker shut and go to get to work.'
 					act'Go to the main floor':
@@ -141,17 +155,19 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'studio_closing':
+	menu_off = 1
+	gs 'clothing', 'wear_last_worn'
+	gs 'foto', 'underwear'
+	gs 'stat'
+	'<center><b><font color="maroon">Photography studio</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+	'It''s after midnight and the studio is closing down. You get dressed and leave before you get locked in.'
+	act'Leave':gt'city_center'
+end
+
 if $ARGS[0] = 'studio':
-	if hour < 2:
-		menu_off = 1
-		gs 'clothing', 'wear_last_worn'
-		gs 'foto', 'underwear'
-		gs 'stat'
-		'<center><b><font color="maroon">Photography studio</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-		'It''s after midnight and the studio is closing down. You get dressed and leave before you get locked in.'
-		act'Leave':gt'city_center'
-	end
+	if hour < 3:gt'foto','studio_closing'
 	
 	$loc_arg = 'studio'
 	$menu_loc = 'foto'
@@ -1321,8 +1337,12 @@ end
 
 
 if $ARGS[0] = 'underwear':
-	gs 'panties', 'wear', $lastwornpantytype['foto'], lastwornpantynumber['foto']
-	gs 'bras', 'wear', $lastwornbratype['foto'], lastwornbranumber['foto']
+	if underwear['lastworntype'] = 2:
+		gs 'underwear_bodysuits', 'wear', $lastwornbodysuittype['foto'], lastwornbodysuitnumber['foto']
+	else
+		gs 'panties', 'wear', $lastwornpantytype['foto'], lastwornpantynumber['foto']
+		gs 'bras', 'wear', $lastwornbratype['foto'], lastwornbranumber['foto']
+	end
 end
 
 --- foto ---------------------------------

+ 135 - 56
locations/foto_events.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'skill':
 	elseif mdlng_skill_event = 4 and hour <= 18:
 		gt'foto_events','runway2'
 	elseif mdlng_skill_event = 5:
-		gt'foto_events','wet'
+		gt'foto_events','wet1'
 	else
 		jump 'reroll_2'
 	end
@@ -120,7 +120,7 @@ if $ARGS[0] = 'studio_strip_talk2':
 	'You step out into the studio and you hear someone calling your name.'
 	'"Hey! <<$model[''firstname'']>>! It''s been two weeks, what are you still doing in your underwear? We had a deal, now take that off. Right now!"'
 	act'Do as he says and strip':gt'foto_events','underwear_steal'
-	if pcs_inhib < 30:
+	if pcs_inhib < 30 and underwear['type'] ! 2:
 		gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act'Try to bargain again (<<will_cost>> Willpower)':
@@ -164,19 +164,30 @@ if $ARGS[0] = 'underwear_steal':
 	cla & *clr
 	studio_strip_talk = 3
 	if $braworntype ! 'none':
-		gs 'underwear', 'remove'
-		gs 'stat'
 		'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/strip2.mp4"></video></center>'
 		if pcs_inhib < 30:
-			'Blushing hard, you nervously do as he says. As hot as your face feels from removing your bra in front of him and exposing your breasts, it somehow manages to burn even hotter when your panties come down after exposing your pussy. Clutching your underwear to your body, you stand back up to see the manager holding out his hand.'
+			if underwear['type'] = 2:
+				'Blushing hard, you nervously do as he says. You peel your bodysuit down exposing your breasts, your face managing to burn even hotter when you have to pull it down your legs, exposing your pussy. Clutching your it to your body, you stand back up to see the manager holding out his hand.'
+			else
+				'Blushing hard, you nervously do as he says. As hot as your face feels from removing your bra in front of him and exposing your breasts, it somehow manages to burn even hotter when your panties come down after exposing your pussy. Clutching your underwear to your body, you stand back up to see the manager holding out his hand.'
+			end
 		else
 			'You blush hard but do as he says. As you slide down your panties you have to admit to yourself that even if you aren''t fully comfortable with this, you''re also not shy enough to make it a big deal. You don''t have any more excuses not to comply with the dress code. Picking your underwear back up, you turn towards the locker room but stop when you see the manager holding out his hand.'
 		end
 		'"What?"'
 		'"Give me your underwear."'
 		'"What?!"'
-		'"I don''t want you changing back into this after I leave. You can collect it from me when you''re ready to leave for the day, now give it to me." Reluctantly, you slowly extend your arm before he snatches your panties and bra from your grasp. "Thank you. And remember: unless you''re doing a shoot, I''m not going to see you wearing anything but your birthday suit in this studio again. Now get to work." He walks away without a second glance at you, leaving you shivering naked in the middle of the studio.'
-		studio_underwear_steal = 2
+		if underwear['type'] = 2:
+			studio_underwear_steal = 3
+			'"I don''t want you changing back into this after I leave. You can collect it from me when you''re ready to leave for the day, now give it to me." Reluctantly, you slowly extend your arm before he snatches the underwear from your grasp. "Thank you. And remember: unless you''re doing a shoot, I''m not going to see you wearing anything but your birthday suit in this studio again. Now get to work." '
+		else
+			studio_underwear_steal = 2
+			'"I don''t want you changing back into this after I leave. You can collect it from me when you''re ready to leave for the day, now give it to me." Reluctantly, you slowly extend your arm before he snatches your panties and bra from your grasp. "Thank you. And remember: unless you''re doing a shoot, I''m not going to see you wearing anything but your birthday suit in this studio again. Now get to work."'
+		end
+		*nl
+		'He walks away without a second glance at you, leaving you shivering naked in the middle of the studio.'
+		gs 'underwear', 'remove'
+		gs 'stat'
 		act'Continue':gt'foto','studio'
 	else
 		gs 'underwear', 'remove'
@@ -190,7 +201,9 @@ if $ARGS[0] = 'underwear_steal':
 		'"What?"'
 		'"Give me your underwear."'
 		'"What?!"'
-		'"I don''t want you changing back into this after I leave. You can collect it from me when you''re ready to leave for the day, now give me your panties." Reluctantly, you slowly extend your arm before he snatches your panties from your grasp. "Thank you. And remember: unless you''re doing a shoot, I''m not going to see you wearing anything but your birthday suit in this studio again. Now get to work." He walks away without a second glance at you, leaving you shivering naked in the middle of the studio.'
+		'"I don''t want you changing back into this after I leave. You can collect it from me when you''re ready to leave for the day, now give me your panties." Reluctantly, you slowly extend your arm before he snatches your panties from your grasp. "Thank you. And remember: unless you''re doing a shoot, I''m not going to see you wearing anything but your birthday suit in this studio again. Now get to work."'
+		*nl
+		'He walks away without a second glance at you, leaving you shivering naked in the middle of the studio.'
 		studio_underwear_steal = 1
 		act'Continue':gt'foto','studio'
 	end
@@ -198,52 +211,58 @@ end
 
 if $ARGS[0] = 'underwear_steal2':
 	cla & *clr
-	underwear_steal = 0
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	minut += 2
 	'Walking through the studio you find the manager you''re looking for. He sits at a desk flipping through a magazine that looks to be produced by the studio. Is that a new copy? Is he proof reading or something? Stepping up to him, you awkwardly clear your throat and he looks up at you.'
 	'"Hey... It''s me. I''m here for, my... you know..."'
 	'"Your... what?" He gives you a dry look. "I can''t give you what you want if I don''t know what it is."'
 	if studio_underwear_steal = 1:'"My... panties..." you force out with some effort, heat flushing through your face.'
-	if studio_underwear_steal = 2:'"My... underwear..." you force out with some effort, heat flushing through your face.'
+	if studio_underwear_steal >= 2:'"My... underwear..." you force out with some effort, heat flushing through your face.'
 	'"Ahh, those!" he says, face brightening with false understanding. He reaches down behind his desk and pulls out your unmentionables, dangling them in front of you.'
 	'"Thank you..." you mutter bashfully as you take your belongings back from him. Suddenly you realize that you got dressed without remembering you had to put these on anyways. The manager looks back at you noticing the same thing.'
 	'"So, were you planning to put that back on now or were you planning on just carrying those home?"'
 	if PCloSkirt > 0:
 		'You blush at the thought of walking home without panties in a skirt.'
+		*nl
 		if studio_underwear_steal = 2:'A bra is one thing but your panties...'
+		if studio_underwear_steal = 3:'But it''s a bodysuit... You''d have to get completely undressed to put it back on...'
+		*nl
 		'But also, doing that here in front of him? He already forced you to undress, you suppose. Getting dressed can''t be worse than that right?'
 		act'Go to the back room and re-dress':gt'foto_events','re-dress'
-		act'Just put your panties on under your skirt':
-			cla & *clr
-			gs 'panties','wear'
-			'<center><video autoplay loop src="images/locations/city/citycenter/photo/panties.mp4"></video></center>'
-			'Well, you''re wearing a skirt today right? It wouldn''t be too difficult to just slip your panties on that way right?'
-			if studio_underwear_steal = 2:'Going home without a bra isn''t nearly as bad as going home without your panties.'
-			'As you bend down you suddenly realize you were completely wrong. Putting your legs through your panties, you feel the manager leering at you as you pull them up around your legs. Despite having been nude in front of him, somehow pulling your panties up under your skirt is more shameful.'
-			'After standing back up, you see the manager still looking at you expectantly.'
-			'"What?"'
-			'"Don''t you have something to promise me?" he says, nodding at the <a href="exec:gs ''shortgs'',''img msg'',''images/locations/city/citycenter/photo/dress_code.jpg''">sign</a> by the door.'
-			act'Make your promise':
+		if studio_underwear_steal <= 2:
+			act'Just put your panties on under your skirt':
 				cla & *clr
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-				'Sighing deeply, you stammer out what he wants you to say.'
-				'"I promise that from now I will always be completely naked in the studio unless it''s for a shoot."'
-				'"Good. Feel free to go home now. Hope to see you again soon."'
-				'With your underwear returned and safely covering your hips, you awkwardly make your exit.'
-				studio_underwear_steal = 0
-				act'Leave':gt 'city_center'
+				gs 'panties','wear'
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/panties.mp4"></video></center>'
+				'Well, you''re wearing a skirt today right? It wouldn''t be too difficult to just slip your panties on that way right?'
+				if studio_underwear_steal = 2:'Going home without a bra isn''t nearly as bad as going home without your panties.'
+				'As you bend down you suddenly realize you were completely wrong. Putting your legs through your panties, you feel the manager leering at you as you pull them up around your legs. Despite having been nude in front of him, somehow pulling your panties up under your skirt is more shameful.'
+				'After standing back up, you see the manager still looking at you expectantly.'
+				'"What?"'
+				'"Don''t you have something to promise me?" he says, nodding at the <a href="exec:gs ''shortgs'',''img msg'',''images/locations/city/citycenter/photo/dress_code.jpg''">sign</a> by the door.'
+				act'Make your promise':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+					'Sighing deeply, you stammer out what he wants you to say.'
+					'"I promise that from now I will always be completely naked in the studio unless it''s for a shoot."'
+					'"Good. Feel free to go home now. Hope to see you again soon."'
+					'With your underwear returned and safely covering your hips, you awkwardly make your exit.'
+					studio_underwear_steal = 0
+					act'Leave':gt 'city_center'
+				end
 			end
 		end
 		act'Leave':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'Your brain freezing in panic, you just walk away and leave the studio, blushing furiously at the cool air flowing between your legs under your skirt.'
+			studio_underwear_steal = 0
 			act'Continue':gt 'city_center'
 		end
 	else
 		'You''re wearing pants today so if you wanted to put your panties back on you''d have to take everything off again.'
 		if studio_underwear_steal = 2:'Not to mention taking your top off to put on your bra...'
+		if studio_underwear_steal = 3:'But it''s a bodysuit... You''d have to get completely undressed to put it back on...'
 		'But also, doing that here in front of him? He already forced you to undress, you suppose. Getting dressed can''t be worse than that right?'
 		act'Go to the back room and re-dress':gt'foto_events','re-dress'
 		
@@ -251,6 +270,7 @@ if $ARGS[0] = 'underwear_steal2':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'Your brain freezing in panic, you just walk away and leave the studio, blushing furiously at the fabric of your pants rubbing raw against your uncovered pussy.'
+			studio_underwear_steal = 0
 			act'Continue':gt 'city_center'
 		end
 	end
@@ -262,7 +282,7 @@ if $ARGS[0] = 're-dress':
 	minut += 10
 	gs 'underwear', 'wear'
 	gs 'stat'
-	'Unable to do it in front of the manager, you go all the way back to the back room to completely undress and re-dress to get your underwear in place before leaving again. It takes a lot more time than you''d like but it''s at least less shameful than doing it in front of the manager...'
+	'Unable to do it in front of the manager, you go all the way back to the back room to completely undress and re-dress to get your underwear in place before leaving again. It takes a more time than you''d like but it''s at least less shameful than doing it in front of the manager...'
 	studio_underwear_steal = 0
 	act'Leave':gt 'city_center'
 end
@@ -385,7 +405,7 @@ if $ARGS[0] = 'commercial':
 							cla
 							*nl
 							'"No," you say with some regret. "Even with all that money, that''s not the kind of model or actress I want to be known for."'
-							'"Ahh, well that''s a shame. Anyways, I''ll let you go now. See you later <<$pcs_firstname>>"'
+							'"Ahh, well that''s a shame. Anyways, I''ll let you go now. See you later <<$model[''firstname'']>>"'
 							act 'Go back to modelling':gt 'foto', 'studio'
 						end
 					end
@@ -440,7 +460,7 @@ if $ARGS[0] = 'fashion_persuasion':
 			act'Clothing':
 				modelfoto['catalog'] += 1
 				cla & *clr
-				mdlng_exp += rand(2,5)
+				gs 'exp_gain', 'mdlng', rand(2,5)
 				minut += 120
 				money += 450
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion3.mp4"></video></center>'
@@ -452,7 +472,7 @@ if $ARGS[0] = 'fashion_persuasion':
 			act'Swimsuits':
 				modelfoto['catalog'] += 1
 				cla & *clr
-				mdlng_exp += rand(2,5)
+				gs 'exp_gain', 'mdlng', rand(2,5)
 				minut += 120
 				money += 450
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini<<rand(3,5)>>.mp4"></video></center>'
@@ -1015,7 +1035,7 @@ if $ARGS[0] = 'high_fashion':
 			minut += 120
 			modelpayfin = 1800 + (modelpay * 2) + (50*rand(0,7))
 			modelfoto['pussy'] += 1
-			mdlng_exp += rand(1,2)
+			gs 'exp_gain', 'mdlng', rand(1,2)
 			if rand(0,1) = 1:
 				gs 'fame', 'city', 'modelling', 'medium'
 			else
@@ -1188,7 +1208,7 @@ if $ARGS[0] = 'fine_art2':
 	modelfoto['topless'] += 1
 	modelfoto['nude'] += 1
 	modelfoto['pussy'] += 1
-	mdlng_exp += rand(10,20)
+	gs 'exp_gain', 'mdlng', rand(10,20)
 	if rand(0,1) = 1:
 		gs 'fame', 'city', 'modelling', 'medium'
 	else
@@ -1316,7 +1336,7 @@ if $ARGS[0] = 'modern_art':
 				modelfoto['earnings'] += modelpayfin
 				modelfoto['topless'] += 1
 				modelfoto['nude'] += 1
-				mdlng_exp += rand(9,10)
+				gs 'exp_gain', 'mdlng', rand(9,10)
 				if rand(0,1) = 1:
 					gs 'fame', 'city', 'modelling', 'medium'
 				else
@@ -1358,7 +1378,7 @@ if $ARGS[0] = 'aphrodite_advert':
 			modelfoto['earnings'] += modelpayfin
 			modelfoto['topless'] += 1
 			modelfoto['nude'] += 1
-			mdlng_exp += rand(1,10)
+			gs 'exp_gain', 'mdlng', rand(1,10)
 			if rand(0,1) = 1:
 				gs 'fame', 'city', 'modelling', 'high'
 			else
@@ -1399,7 +1419,7 @@ if $ARGS[0] = 'independent_art':
 			money += modelpayfin
 			modelfoto['earnings'] += modelpayfin
 			modelfoto['nip'] += 1
-			mdlng_exp += rand(2,8)
+			gs 'exp_gain', 'mdlng', rand(2,8)
 			if rand(0,1) = 1:
 				gs 'fame', 'city', 'modelling', 'medium'
 			else
@@ -1434,7 +1454,7 @@ if $ARGS[0] = 'designer_wedding':
 			modelfoto['earnings'] += modelpayfin
 			modelfoto['nip'] += 1
 			modelfoto['pussy'] += 1
-			mdlng_exp += rand(2,4)
+			gs 'exp_gain', 'mdlng', rand(2,4)
 			if rand(0,1) = 1:
 				gs 'fame', 'city', 'modelling', 'medium'
 			else
@@ -1583,7 +1603,7 @@ if $ARGS[0] = 'topless1.1':
 								modelfoto['earnings'] += modelpayfin
 								modelfoto['nip'] += 1
 								modelfoto['topless'] += 1
-								mdlng_exp += rand(8,10)
+								gs 'exp_gain', 'mdlng', rand(8,10)
 								gs 'fame', 'city', 'modelling', 'medium'
 								act'Leave':
 									msg'You''ve shown the studio that you''re willing to go above and beyond what is normally asked of you and that you''re willing to capitalize on your popularity as a model. The photographers might come to you for more off-site shoots like this in the future. Additionally, you are now considered a viable candidate for special requests that might be asked of the studio. Each day there may or may not be such work available for you. Check with the photographers if you want to supplement your income with these specialized jobs.'
@@ -1678,7 +1698,7 @@ if $ARGS[0] = 'pool1':
 						modelfoto['nip'] += 1
 						modelfoto['topless'] += 1
 						modelfoto['nude'] += 1
-						mdlng_exp += 10
+						gs 'exp_gain', 'mdlng', 10
 						if rand(0,1) = 1:
 							gs 'fame', 'city', 'modelling', 'medium'
 						else
@@ -1791,7 +1811,7 @@ if $ARGS[0] = 'tennis':
 							modelfoto['earnings'] += modelpayfin
 							modelfoto['nip'] += 1
 							modelfoto['topless'] += 1
-							mdlng_exp += 8
+							gs 'exp_gain', 'mdlng', 8
 							if rand(0,1) = 1:
 								gs 'fame', 'city', 'modelling', 'medium'
 							else
@@ -1866,7 +1886,7 @@ if $ARGS[0] = 'topless2':
 							money += modelpayfin
 							modelfoto['earnings'] += modelpayfin
 							gs 'fame', 'city', 'modelling', 'medium'
-							mdlng_exp += rand(8,10)
+							gs 'exp_gain', 'mdlng', rand(8,10)
 							modelfoto['nip'] += 1
 							modelfoto['topless'] += 1
 							gs 'underwear', 'wear'
@@ -1950,7 +1970,7 @@ if $ARGS[0] = 'beach2':
 								modelfoto['earnings'] += modelpayfin + 1000
 								modelfoto['topless'] += 1
 								gs 'fame', 'city', 'modelling', 'medium'
-								mdlng_exp += rand(8,10)
+								gs 'exp_gain', 'mdlng', rand(8,10)
 								modelfoto['topless'] += 1
 								modelfoto['nip'] += 1
 								gs 'stat'
@@ -2020,7 +2040,7 @@ if $ARGS[0] = 'pool2':
 						money += modelpayfin
 						modelfoto['earnings'] += modelpayfin
 						gs 'fame', 'city', 'modelling', 'medium'
-						mdlng_exp += rand(8,10)
+						gs 'exp_gain', 'mdlng', rand(8,10)
 						modelfoto['topless'] += 1
 						modelfoto['nip'] += 1
 						gs 'underwear', 'wear'
@@ -2129,7 +2149,7 @@ if $ARGS[0] = 'runway2':
 							else
 								gs 'fame', 'city', 'modelling', 'small'
 							end
-							mdlng_exp += rand(8,10)
+							gs 'exp_gain', 'mdlng', rand(8,10)
 							modelfoto['nip'] += 1
 							gs'stat'
 							*clr & cla
@@ -2185,24 +2205,25 @@ if $ARGS[0] = 'runway2':
 end
 
 
-if $ARGS[0] = 'wet':
+if $ARGS[0] = 'wet1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-	'"<<$pcs_firstname>>!"'
+	'"<<$model[''firstname'']>>!"'
 	'As you walk out of the changing room you hear someone call your name.'
 	act'Turn around':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 		'As you turn you see a photographer walking towards you, waving you over. You walk over to talk to him.'
 		act'"What''s up?"':
+			if modelfoto['wet_shoot'] = 1:gt'foto_events','wet2'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-			'"Hey <<$pcs_firstname>>, we were thinking about doing a special shoot and since you''ve shown you''re willing to go the extra mile around here, we hoped you might like to do it.'
+			'"Hey <<$model[''firstname'']>>, we were thinking about doing a special shoot and since you''ve shown you''re willing to go the extra mile around here, we hoped you might like to do it."'
 			'You regard him somewhat suspiciously as he never actually says what the shoot is.'
 			act'"And the shoot is...?"':
 				*clr & cla
-				'"And the shoot is...?"  you ask leadingly.'
-				'He looks awkward like he doesn''t know what to say for a moment until he finally explains, "Well, it''s a shoot here in the studio but we need you to be wet for it. So we''re going to need you to get on set naked and then we''ll take a hose and spray you for the duration of the shoot. Most girls say no when we tell them what we''re going to do because they find it unpleasent. So? How about it? We''ll pay you for it and it won''t count as your weekly job."'
+				'"And the shoot is...?"'
+				'He looks awkward like he doesn''t know what to say for a moment until he finally explains, "Well, it''s a normal full exposure shoot... we''re just going to spray you with a hose while we do it. A lot of girls say no when we tell them what we''re going to do because they find it unpleasent. So? How about it? We''ll pay you for it and it won''t count as your weekly job."'
 				
 				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
@@ -2224,24 +2245,27 @@ if $ARGS[0] = 'wet':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 					'"Sure! Why not? I don''t mind getting a little wet."'
-					'"Really?" he pipes up. "Wow! I didn''t think you''d actually say yes. Alright! Let''s do it then!"'
+					'"Really?" he perks up. "Wow! I didn''t think you''d actually say yes. Alright! Let''s do it then!"'
 					act'Continue':
 						*clr & cla
 						minut += 120
 						pcs_hairbsh = 1
 						pcs_makeup = 5
 						pcs_lipbalm += 8
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/wet.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/wet/wet.mp4"></video></center>'
 						'You put on your makeup and follow him over to the water proof set in the studio and spend the next two hours shrieking and giggling as you get blasted with water while photographed nude.'
 						'He wasn''t kidding! That water is cold!'
 						act'Continue':
-							cla
+							cla & *clr
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/wet/wet1.jpg"><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/wet/wet2.jpg"><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/wet/wet3.jpg"></center>'
 							modelpayfin = 1000 + (modelpay * 2) + (50*rand(0,7))
 							modelfoto['nip'] += 1
-							modelfoto['topless'] += 1
+							modelfoto['pussy'] += 1
 							modelfoto['nude'] += 1
+							modelfoto['fullnude'] += 1
+							modelfoto['wet_shoot'] = 1
 							if pcs_makeup > 1:pcs_makeup = 0
-							mdlng_exp += rand(9,10)
+							gs 'exp_gain', 'mdlng', rand(9,10)
 							if rand(0,1) = 1:
 								gs 'fame', 'city', 'modelling', 'medium'
 							else
@@ -2249,7 +2273,7 @@ if $ARGS[0] = 'wet':
 							end
 							money += modelpayfin
 							modelfoto['earnings'] += modelpayfin
-							'Eventually, the shoot is over and they leave you cold, shivering, and with really hard nipples. But at least you''ve also got a dry wad of cash that counts out to <<modelpayfin>> <b>₽</b>.'
+							'Eventually, the shoot is over and they leave you with chattering teeth, really hard nipples and a dry wad of <<modelpayfin>> <b>₽</b> in your shiving hands. But you have to admit photos do look pretty nice.'
 							act'Back to the studio':gt'foto','studio'
 						end
 					end
@@ -2259,5 +2283,60 @@ if $ARGS[0] = 'wet':
 	end
 end
 
+if $ARGS[0] = 'wet2':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'"Hey <<$model[''firstname'']>>, we wanted to do another full exposure wet shoot. Since you were so accommodating last time, I thought I''d ask you again"'
+	'You regard him somewhat suspiciously as he never actually says what the shoot is.'
+	act'No way!':
+		*clr & cla
+		gs 'willpower', 'exhib', 'resist'
+		gs 'willpower', 'pay', 'resist'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'"No way!" You shiver just at the thought of it. "It was freezing cold last time! I''m not doing that again!'
+		'He sighs, muttering as he walks away. "They never come back the second time..."'
+		act'Back to the studio':gt'foto','studio'
+	end
+
+	act'"Sure! Why not?"':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'"Sure! Why not?" you shrug. "Money''s still the same, right?"'
+		'"Yes!" He looks very pleased with himself for asking you. "Okay, go meet with the photographer at set <<rand(1,99)>>."'
+		act'Continue':
+			*clr & cla
+			minut += 120
+			pcs_hairbsh = 1
+			pcs_makeup = 5
+			pcs_lipbalm += 8
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/wet/wet.mp4"></video></center>'
+			'You put on your makeup and head over to the water proof set in the studio and spend the next two hours shrieking and giggling as you get blasted with water while photographed nude.'
+			'<i>Is this somehow colder than last time?</i> you wonder, as another icy splash sprays across you.'
+			act'Continue':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/wet/wet1.jpg"><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/wet/wet2.jpg"><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/wet/wet3.jpg"></center>'
+				modelpayfin = 1000 + (modelpay * 2) + (50*rand(0,7))
+				modelfoto['nip'] += 1
+				modelfoto['pussy'] += 1
+				modelfoto['nude'] += 1
+				modelfoto['fullnude'] += 1
+				modelfoto['wet_shoot'] = 1
+				if pcs_makeup > 1:pcs_makeup = 0
+				gs 'exp_gain', 'mdlng', rand(9,10)
+				if rand(0,1) = 1:
+					gs 'fame', 'city', 'modelling', 'medium'
+				else
+					gs 'fame', 'city', 'modelling', 'small'
+				end
+				money += modelpayfin
+				modelfoto['earnings'] += modelpayfin
+				'Eventually, the shoot is over and they leave you with chattering teeth, really hard nipples and a dry wad of <<modelpayfin>> <b>₽</b> in your shiving hands. But you have to admit photos do look pretty nice.'
+				act'Back to the studio':gt'foto','studio'
+			end
+		end
+	end
+end
+
 --- foto_events ---------------------------------
 

+ 3 - 3
locations/foto_events2.qsrc

@@ -84,7 +84,7 @@ if $ARGS[0] = 'champagne1.2':
 	modelfoto['fullnude']  += 1
 	modelfoto['nip']  += 1
 	modelfoto['pussy']  += 1
-	mdlng_exp += rand(9,10)
+	gs 'exp_gain', 'mdlng', rand(9,10)
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 	'You walk over to the makeup department and the dressers get your hair and face ready before going to meet the photographer on set. Just before you leave, they have you slip on a gold thong and then send you on your way.'
 	act'Continue':
@@ -138,7 +138,7 @@ if $ARGS[0] = 'kickboxing_documentary':
             minut += 120
             modelpayfin = 900 + (modelpay * 2) + (50*rand(0,7)) + ((fame['city_kickboxing'] + pcs_apprnc)/2)*2
             modelfoto['nude']  += 1
-            mdlng_exp += rand(1,2)
+            gs 'exp_gain', 'mdlng', rand(1,2)
 			gs 'fame', 'city', 'kickboxing', 'medium'
             gs 'fame', 'city', 'modelling', 'medium'
 			gs 'arousal', 'flash', 5
@@ -213,7 +213,7 @@ if $ARGS[0] = 'track_&_field_documentary':
             minut += 120
             modelpayfin = 1800 + (modelpay * 2) + (50*rand(0,7)) + ((fame['city_running'] + pcs_apprnc)/2)*2
             modelfoto['nude']  += 1
-            mdlng_exp += rand(1,2)
+            gs 'exp_gain', 'mdlng', rand(1,2)
 			gs 'fame', 'city', 'running', 'small'
             gs 'fame', 'city', 'modelling', 'small'
             money += modelpayfin

+ 1 - 1
locations/foto_model_documentary.qsrc

@@ -1117,7 +1117,7 @@ if $ARGS[0] = '1st_documentary_end':
 	minut += 10
 	modelpay = (pcs_mdlng/2 * 10) + min(fame['city_modelling'], 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
-	mdlng_exp += rand(9,10)
+	gs 'exp_gain', 'mdlng', rand(9,10)
 	if pcs_inhib < 55: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'medium'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', 'small'

+ 13 - 13
locations/foto_models2.qsrc

@@ -198,7 +198,7 @@ if $ARGS[0] = 'emily_2':
 	else
 		'Walking through the studio, you round the corner of a set and nearly bump into Emily.'
 		'"Oh. It''s you," she says flatly.'
-		'"Uhh, yeah... I never introduced myself the last time we saw each other. I''m <<$pcs_firstname>>, I''m a new model here at the agency."'
+		'"Uhh, yeah... I never introduced myself the last time we saw each other. I''m <<$model[''firstname'']>>, I''m a new model here at the agency."'
 		'"Yeah, I know, I knew. Models are the only ones who walk around here naked, I''m not stupid."'
 		'"Right... So-" you start to say something but she interrupts you.'
 		'"Look, are you just here to waste my time?"'
@@ -245,7 +245,7 @@ if $ARGS[0] = 'emily_resolve':
 	emily['hate'] -= 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/3.jpg"></center>'
-	'You take a deep breath to calm down before saying, "Listen. Maybe we got off on the wrong foot yesterday. I just started here and I don''t want to be making enemies right out of the gate. I''m <<$pcs_firstname>> and I''m sorry for what happened yesterday. Can we just try to forget about it?"'
+	'You take a deep breath to calm down before saying, "Listen. Maybe we got off on the wrong foot yesterday. I just started here and I don''t want to be making enemies right out of the gate. I''m <<$model[''firstname'']>> and I''m sorry for what happened yesterday. Can we just try to forget about it?"'
 	'You hold out your hand as an apology.'
 	'She seems genuinely caught off guard by your actions and takes an actual step back. She quickly composes herself and grabs your hand saying, "Fine. Just... Pay more attention next time," before hurridly walking out of the room.'
 	'You release the breath you didn''t realize you had been holding. You hope you made the right choice and have fixed things for the future.'
@@ -356,7 +356,7 @@ if $ARGS[0] = 'emily_chat':
 			act'Suck up to her':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/2.jpg"></center>'
-				mdlng_exp += 2
+				gs 'exp_gain', 'mdlng', 2
 				'"Oh. I mean, I just thought I''d ask you because you''re the best model here. I thought you would have the best advice to give."'
 				'"Well, it''s not like you''re wrong." She shrugs and acts like what you said was just stating facts but you can tell she''s secretly pleased by what you said. "I suppose I could give some advice to a poor unfortunate soul like you. At the very least maybe you''d stop embarrassing yourself on set and making the studio look bad." You stomach the verbal abuse and keep yourself in check, recognizing that with Emily you''re going to have to take her attitude if you want to get anywhere with her.'
 				'"The most important things about modelling is how to hold yourself. If you can''t pull off the pose to make yourself or the clothes you''re wearing look sexy then you''ve failed. Practice the poses, spend time in front of the mirror testing looks. And when you''re on set, keep changing it up. Taking direction from the photographers is important but if you want to act like a professional then you need to take initiative. Every time the camera flashes, alter your position, even if just a little bit. They''re only looking for one perfect shot, either they have it or they don''t. But help them search. And don''t waste their time."'
@@ -365,7 +365,7 @@ if $ARGS[0] = 'emily_chat':
 			act'Taunt her into helping you':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/emily_r/talking/5.jpg"></center>'
-				mdlng_exp += 2
+				gs 'exp_gain', 'mdlng', 2
 				'"What? You''re so afraid of your position that if you give help to a silly amateur like me it''ll knock you off your pedestal? Huh. Maybe you''re not good enough for me to be asking after all."'
 				'Emily''s eyes narrow at your words before re-adjusting herself to respond. "I suppose I could give some advice to a poor unfortunate soul like you. At the very least maybe you''d stop embarrassing yourself on set and making the studio look bad. I can''t have you bringing down Aphrodite''s name and my fame just by association."'
 				'You smirk inwardly, pleased with how easy it was to manipulate her into doing this and listen as she starts giving you real advice.'
@@ -437,7 +437,7 @@ if $ARGS[0] = 'jeff_1':
 			act'Introduce yourself':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/3.jpg"></center>'
-				'"I''m <<$pcs_firstname>>."'
+				'"I''m <<$model[''firstname'']>>."'
 				'"What a cute name!"'
 				'<i>She''s got quite a bubbly personality doesn''t she?</i> you think to yourself before you realize she''s still standing in silence, continuing to smile at you.'
 				'"And your name is...?" you say awkwardly.'
@@ -493,7 +493,7 @@ if $ARGS[0] = 'jeff_2':
 					'"What is it you said you were studying in university?"'
 					'"Economy and management!" she says proudly.'
 					'<i>This airhead? Economy and management?!</i>'
-					'"Well, I guess I should go now. Gotta get paid! Bye <<$pcs_nickname>>!" she says and then runs off.'
+					'"Well, I guess I should go now. Gotta get paid! Bye <<$model[''nickname'']>>!" she says and then runs off.'
 					act'Leave':gt 'foto','studio'
 				end
 			end
@@ -512,7 +512,7 @@ if $ARGS[0] = 'jeff_2':
 					'"What is it you said you were studying in university?"'
 					'"Economy and management!" she says proudly.'
 					'<i>This airhead? Economy and management?!</i>'
-					'"Well, I guess I should go now. Gotta get paid! Bye <<$pcs_nickname>>!" she says and then runs off.'
+					'"Well, I guess I should go now. Gotta get paid! Bye <<$model[''nickname'']>>!" she says and then runs off.'
 					act'Leave':gt 'foto','studio'
 				end
 			end
@@ -537,7 +537,7 @@ if $ARGS[0] = 'jeff_2':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/8.jpg"></center>'
 								'"I-," you try to respond before Jeff suddenly jumps up.'
-								'"Anyways, gotta run! Got dirty pics to take and money to get paid! Bye <<$pcs_nickname>>!" she says and then runs off.'
+								'"Anyways, gotta run! Got dirty pics to take and money to get paid! Bye <<$model[''nickname'']>>!" she says and then runs off.'
 								act'Leave':gt 'foto','studio'
 							end
 						elseif anastasia < 4:
@@ -547,7 +547,7 @@ if $ARGS[0] = 'jeff_2':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/8.jpg"></center>'
 								'"I-," you try to respond before Jeff suddenly jumps up.'
-								'"Anyways, gotta run! Got dirty pics to take and money to get paid! Bye <<$pcs_nickname>>!" she says and then runs off.'
+								'"Anyways, gotta run! Got dirty pics to take and money to get paid! Bye <<$model[''nickname'']>>!" she says and then runs off.'
 								act'Leave':gt 'foto','studio'
 							end
 						else
@@ -563,7 +563,7 @@ if $ARGS[0] = 'jeff_2':
 									'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/8.jpg"></center>'
 									'"Thanks for the advice Jeff!"'
 									'"Nooooo problem!" she says before jumping out of her seat.'
-									'"Anyways, gotta run! Got dirty pics to take and money to get for it! Bye <<$pcs_nickname>>!" she says and then runs off.'
+									'"Anyways, gotta run! Got dirty pics to take and money to get for it! Bye <<$model[''nickname'']>>!" she says and then runs off.'
 									act'Leave':gt 'foto','studio'
 								end
 							end
@@ -590,7 +590,7 @@ if $ARGS[0] = 'jeff_3':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/face.jpg"></center>'
 		'A bit startled, you turn around to see Jeff''s cheerful face.'
-		'"<<$pcs_nickname>>! Hang out with me!"'
+		'"<<$model[''nickname'']>>! Hang out with me!"'
 		act'"Busy right now"':
 			cla
 			*nl
@@ -674,7 +674,7 @@ if $ARGS[0] = 'jeff_chat':
 		act'Ask for modelling advice':
 			*clr & cla
 			jeff['model_exp'] = daystart
-			mdlng_exp += 1
+			gs 'exp_gain', 'mdlng', 1
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/9.jpg"></center>'
 			'"How to be a better model? Oh that''s easy! Just have fun!" she says.'
 			'<i>Typical answer from her... Couldn''t have expected more I guess...</i>'
@@ -824,7 +824,7 @@ if $ARGS[0] = 'jeff_modelling':
 	act'Continue':
 		if jeff['model'] = 1:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy1.jpg"></center>'
 			'"Whooo! Yipee!"'
 			'You find her in the middle of a photoshoot and she''s jumping up and down on the bed kicking her legs and striking poses mid air.'
 			'The photographer seems really excited saying, "Yes! I love that Jeff! Do you think you can do that again but get your leg higher so we can get a better look at your pussy?"'

+ 16 - 16
locations/foto_practice.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'fashion':
 			*clr & cla
 			minut += 120
 			modelpayfin = 0
-			mdlng_exp += rand(3,5)
+			gs 'exp_gain', 'mdlng', rand(3,5)
 			fashionshoot = rand(1,4)
 			gs 'stat'
 			if fashionshoot <= 2:'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion/<<rand(1,5)>>.mp4"></video></center>'
@@ -107,7 +107,7 @@ if $ARGS[0] = 'bikini':
 				*clr & cla
 				minut += 120
 				modelpayfin = 0
-				mdlng_exp += 1
+				gs 'exp_gain', 'mdlng', 1
 				if pcs_inhib < 50:inhib_exp += rand(1,3)
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(4,5)>>.mp4"></video></center>'
@@ -145,7 +145,7 @@ if $ARGS[0] = 'bikini':
 				*clr & cla
 				minut += 120
 				modelpayfin = 0
-				mdlng_exp += rand(6,10)
+				gs 'exp_gain', 'mdlng', rand(6,10)
 				if pcs_inhib < 50:inhib_exp += 1
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(4,5)>>.mp4"></video></center>'
@@ -191,7 +191,7 @@ if $ARGS[0] = 'lingerie':
 				*clr & cla
 				minut += 120
 				modelpayfin = 0
-				mdlng_exp += 1
+				gs 'exp_gain', 'mdlng', 1
 				if pcs_inhib < 50:inhib_exp += rand (1,3)
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie/<<rand(1,2)>>.mp4"></video></center>'
@@ -229,7 +229,7 @@ if $ARGS[0] = 'lingerie':
 				*clr & cla
 				minut += 120
 				modelpayfin = 0
-				mdlng_exp += rand(6,10)
+				gs 'exp_gain', 'mdlng', rand(6,10)
 				if pcs_inhib < 50:inhib_exp += 2
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie/<<rand(1,2)>>.mp4"></video></center>'
@@ -274,7 +274,7 @@ if $ARGS[0] = 'sexy':
 				*clr & cla
 				minut += 120
 				modelpayfin = 0
-				mdlng_exp += 1
+				gs 'exp_gain', 'mdlng', 1
 				inhib_exp += rand(1,4)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/sexy/<<rand(1,12)>>.jpg"></center>'
@@ -312,7 +312,7 @@ if $ARGS[0] = 'sexy':
 				*clr & cla
 				minut += 120
 				modelpayfin = 0
-				mdlng_exp += rand(5,8)
+				gs 'exp_gain', 'mdlng', rand(5,8)
 				inhib_exp += 2
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/sexy/<<rand(1,12)>>.jpg"></center>'
@@ -359,7 +359,7 @@ if $ARGS[0] = 'transparent':
 
 				minut += 120
 				modelpayfin = 0
-				mdlng_exp += 1
+				gs 'exp_gain', 'mdlng', 1
 				inhib_exp += rand(1,4)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru/<<rand(1,9)>>.jpg"><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru2.jpg"></center>'
@@ -382,7 +382,7 @@ if $ARGS[0] = 'transparent':
 
 				minut += 120
 				modelpayfin = 0
-				mdlng_exp += 1
+				gs 'exp_gain', 'mdlng', 1
 				inhib_exp += rand(1,4)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru/<<rand(1,9)>>.jpg"><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru2.jpg"></center>'
@@ -414,7 +414,7 @@ if $ARGS[0] = 'trans_ling':
 				*clr & cla
 				minut += 120
 				modelpayfin = 0
-				mdlng_exp += 1
+				gs 'exp_gain', 'mdlng', 1
 				inhib_exp += rand(1,2)
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/ling_trans/<<rand(1,3)>>.mp4"></video></center>'
@@ -456,7 +456,7 @@ if $ARGS[0] = 'trans_ling':
 				*clr & cla
 				minut += 120
 				modelpayfin = 0
-				mdlng_exp += rand(8,10)
+				gs 'exp_gain', 'mdlng', rand(8,10)
 				inhib_exp += 4
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/ling_trans/<<rand(1,3)>>.mp4"></video></center>'
@@ -503,7 +503,7 @@ if $ARGS[0] = 'topless':
 				*clr & cla
 				minut += 120
 				modelpayfin = 0
-				mdlng_exp += 1
+				gs 'exp_gain', 'mdlng', 1
 				inhib_exp += rand(2,5)
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/model4.mp4"></video></center>'
@@ -542,7 +542,7 @@ if $ARGS[0] = 'topless':
 				*clr & cla
 				minut += 120
 				modelpayfin = 0
-				mdlng_exp += rand(6,10)
+				gs 'exp_gain', 'mdlng', rand(6,10)
 				inhib_exp += 3
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/model4.mp4"></video></center>'
@@ -610,7 +610,7 @@ if $ARGS[0] = 'nude':
 					'"Well, if you''re sure. But I''m telling you, it won''t help very much until you''re more comfortable."'
 					act'Continue':
 						cla & *clr
-						mdlng_exp += rand(1,3)
+						gs 'exp_gain', 'mdlng', rand(1,3)
 						inhib_exp += 1
 						gs 'stat'
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/nudepractice3.mp4"></video></center>'
@@ -623,7 +623,7 @@ if $ARGS[0] = 'nude':
 				
 				act'Yes':
 					cla & *clr
-					mdlng_exp += 1
+					gs 'exp_gain', 'mdlng', 1
 					gs 'stat'
 					'<center><video autoplay loop src="images/locations/city/citycenter/photo/nudepractice2.mp4"></video></center>'
 					if pcs_inhib >= 60:
@@ -676,7 +676,7 @@ if $ARGS[0] = 'nude':
 					end
 				end
 			else
-				mdlng_exp += rand(9,10)
+				gs 'exp_gain', 'mdlng', rand(9,10)
 				inhib_exp += 2
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/nudepractice.mp4"></video></center>'

+ 18 - 18
locations/foto_shoot.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'model':
 			model_week = (daystart - week) / 7
 			modelfoto['catalog'] += 1
 			model_job_week += 1
-			mdlng_exp += rand(2,5)
+			gs 'exp_gain', 'mdlng', rand(2,5)
 			gs 'fame', 'city', 'modelling', 'tiny'
 			minut += 120
 			money += 450
@@ -74,7 +74,7 @@ if $ARGS[0] = 'model':
 			model_week = (daystart - week) / 7
 			modelfoto['catalog'] += 1
 			model_job_week += 1
-			mdlng_exp += rand(2,5)
+			gs 'exp_gain', 'mdlng', rand(2,5)
 			gs 'fame', 'city', 'modelling', 'tiny'
 			minut += 120
 			money += 450
@@ -199,7 +199,7 @@ end
 !!			minut += 120
 !!			modelpayfin = 700 + (modelpay) + (15*rand(0,5))
 !!			modelfoto['nip'] += 1
-!!			mdlng_exp += rand(6,10)
+!!			gs 'exp_gain', 'mdlng', rand(6,10)
 !!			fame['city_modelling'] += rand(7,13)
 !!			pav_modelling += rand(1,fame['city_modelling'])/10
 !!			inhib_exp += 2
@@ -551,7 +551,7 @@ if $ARGS[0] = 'fashion':
 	minut += 120
 	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(fame['city_modelling'], 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto['fashion'] += 1
-	mdlng_exp += rand(5,8)
+	gs 'exp_gain', 'mdlng', rand(5,8)
 	gs 'fame', 'city', 'modelling', 'small'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,10)
 	fashionshoot = rand(1,2)
@@ -579,7 +579,7 @@ if $ARGS[0] = 'bikini':
 	if pcs_inhib < 20: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,10)
-	mdlng_exp += rand(6,10)
+	gs 'exp_gain', 'mdlng', rand(6,10)
 	if pcs_inhib < 50:inhib_exp += rand(0,1)
 	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(4,5)>>.mp4"></video></center>'
@@ -599,7 +599,7 @@ if $ARGS[0] = 'lingerie':
 	minut += 120
 	modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(fame['city_modelling'], 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto['lingerie'] += 1
-	mdlng_exp += rand(6,10)
+	gs 'exp_gain', 'mdlng', rand(6,10)
 	if pcs_inhib < 25: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,6)
@@ -626,7 +626,7 @@ if $ARGS[0] = 'sexy':
 	modelpayfin = 500 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(fame['city_modelling'], 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto['glamour'] += 1
 	modelfoto['sexy'] += 1
-	mdlng_exp += rand(5,10)
+	gs 'exp_gain', 'mdlng', rand(5,10)
 	if pcs_inhib < 30: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(1,6)
@@ -651,7 +651,7 @@ if $ARGS[0] = 'transparent':
 	modelfoto['sexy'] 
 	modelfoto['transparent'] += 1
 	modelfoto['nip'] += 1
-	mdlng_exp += rand(6,10)
+	gs 'exp_gain', 'mdlng', rand(6,10)
 	if pcs_inhib < 45: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,8)
@@ -676,7 +676,7 @@ if $ARGS[0] = 'trans_ling':
 	modelfoto['trans_ling'] += 1
 	modelfoto['nip'] += 1
 	modelfoto['lingerie'] += 1
-	mdlng_exp += rand(8,10)
+	gs 'exp_gain', 'mdlng', rand(8,10)
 	if pcs_inhib < 45: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,8)
@@ -705,7 +705,7 @@ if $ARGS[0] = 'topless':
 	modelpayfin = 700 + (modelpay) + (pcs_apprnc) + (15*rand(0,5))
 	modelfoto['nip'] += 1
 	modelfoto['topless'] += 1
-	mdlng_exp += rand(6,10)
+	gs 'exp_gain', 'mdlng', rand(6,10)
 	if pcs_inhib < 50: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,8)
@@ -729,7 +729,7 @@ if $ARGS[0] = 'tasteful':
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto['tastenude'] += 1
 	modelfoto['nude'] += 1
-	mdlng_exp += rand(9,10)
+	gs 'exp_gain', 'mdlng', rand(9,10)
 	if pcs_inhib < 40: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,10)
@@ -752,7 +752,7 @@ if $ARGS[0] = 'topless_nude':
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto['nude'] += 1
 	modelfoto['toplessnude'] += 1
-	mdlng_exp += rand(9,10)
+	gs 'exp_gain', 'mdlng', rand(9,10)
 	if pcs_inhib < 55: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'medium'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(3,10)
@@ -778,7 +778,7 @@ if $ARGS[0] = 'nude':
 	modelfoto['fullnude'] += 1
 	modelfoto['nip'] += 1
 	modelfoto['pussy'] += 1
-	mdlng_exp += rand(9,10)
+	gs 'exp_gain', 'mdlng', rand(9,10)
 	if pcs_inhib < 60: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'medium'
 	if fame['city_modelling'] > 200: gs 'fame', 'city', 'modelling', rand(5,10)
@@ -817,7 +817,7 @@ if $ARGS[0] = 'erotic':
 	modelfoto['nip'] += 1
 	modelfoto['pussy'] += 1
 	modelfoto['asshole'] += 1
-	mdlng_exp += rand(1,4)
+	gs 'exp_gain', 'mdlng', rand(1,4)
 	if pcs_inhib < 65: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'small'
 	gs 'fame', 'city', 'porn', 'small'
@@ -844,7 +844,7 @@ if $ARGS[0] = 'sportswear':
 	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (fame['city_modelling']/2) + (pcs_mdlng/2 * 10) + (city_sport/2)
 	modelfoto['fitness'] += 1
 	pcs_sweat = 60
-	mdlng_exp += rand(2,4)
+	gs 'exp_gain', 'mdlng', rand(2,4)
 	gs 'fame', 'city', 'modelling', 'small'
 	gs 'stat'
 	if bodset = 2 and salocatnow >= 2:
@@ -873,7 +873,7 @@ if $ARGS[0] = 'sports_underwear':
 	modelfoto['fitness'] += 1
 	pcs_sweat = 60
 	gs 'fame', 'city', 'modelling', 'small'
-	mdlng_exp += rand(3,6)
+	gs 'exp_gain', 'mdlng', rand(3,6)
 	if pcs_inhib < 50:inhib_exp += 1
 	gs 'stat'
 	if bodset = 2 and salocatnow >= 2:
@@ -899,7 +899,7 @@ if $ARGS[0] = 'fitness_artistic_nude':
 	modelfoto['fitness'] += 1
 	modelfoto['nude'] += 1
 	pcs_sweat = 60
-	mdlng_exp += rand(4,5)
+	gs 'exp_gain', 'mdlng', rand(4,5)
 	gs 'fame', 'city', 'modelling', 'small'
 	inhib_exp += 2
 	gs 'stat'	
@@ -930,7 +930,7 @@ end
 !!				*clr & cla
 !!				minut += 120
 !!				modelpayfin = 825 + (modelpay * 2) + (15*rand(0,7))
-!!				mdlng_exp += 10
+!!				gs 'exp_gain', 'mdlng', 10
 !!				fame['city_modelling'] += rand(10,20)
 !!				pav_modelling += rand(0,fame['city_modelling'])/10
 !!				inhib_exp += 3

+ 1 - 1
locations/gad_church.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'liturgy':
 	PLAY 'sound/church/t' + rand(1,19) + '.mp3',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(1,8) +'.jpg"></center>'
 	'You join the congregation for the Divine Liturgy. You see mostly older people around, but some people around your age are also present. You participate in the singing, but that''s about it. Your presence seems to go largely unnoticed, and you have the chance to rest. You feel a lot better.'
-    vokal_exp += rand(0,3)
+    gs 'exp_gain', 'vokal', rand(0,3)
     gs 'stat'
 	act 'Leave the church': gt 'gad_church' , 'start'
 end

+ 2 - 2
locations/gaddvor.qsrc

@@ -80,7 +80,7 @@ if $ARGS[0]='':
 				pcs_stam -= 5
 				gs 'sweat', 'add', 10
 			else
-				stren_exp += 1
+				gs 'exp_gain', 'stren', 1
 				fat -= rand(1,5)
 				pcs_stam -= 10
 				gs 'sweat', 'add', 5
@@ -240,7 +240,7 @@ if $ARGS[0] = 'chickens':
 			'You decide to feed the chickens. You pick up a bucket full of bird''s seed and grain mix and toss it on the ground. They immediately rush over and start to greedily eat. You watch them for a bit before you go about your business.'
 			minut += 30
 			grandmaQW['chore_feed_chickens'] = 2
-			hndiwrk_exp += rand(0,3)
+			gs 'exp_gain', 'hndiwrk', rand(0,3)
 			gs 'stat'
 
 			act 'Finish':gt'gaddvor'

+ 14 - 14
locations/gadfield.qsrc

@@ -65,11 +65,11 @@ if $ARGS[0] = 'field':
 				'Almost all of the villagers have shown up to help out with the fresh cut hay. You spend most of the day working hard and sweating as you help gather the fresh-cut hay. It is difficult, but you get a great workout and end the day feeling exhausted, but quite satisfied.'
 			end
 
-			gs 'exercise', 'tier1', 60, 'stren_exp', 'vital_exp'
+			gs 'exercise', 'tier1', 60, 'stren', 'vital'
 			minut += 300
 			if sunWeather = 1:pcs_tan += 1
 			grandpaQW['chore_bale_hay'] = 2
-			hndiwrk_exp += rand(0,8)
+			gs 'exp_gain', 'hndiwrk', rand(0,8)
 			gs 'stat'
 
 			act 'Continue':gt'gadfield','field'
@@ -104,7 +104,7 @@ if $ARGS[0] = 'horse':
 			'You spot your grandfather''s horse wandering loose in the field and decide to help by taking Desperado home. Reaching for the harness, you start leading Desperado towards the village.'
 			minut += 60
 			grandmaQW['help_amount'] += rand(0,1)
-			hndiwrk_exp += rand(0,3)
+			gs 'exp_gain', 'hndiwrk', rand(0,3)
 			gs 'stat'
 
 			act 'Continue':gt'gadsarai',''
@@ -138,7 +138,7 @@ if $ARGS[0] = 'cow':
 			'Seeing the cow herd on the field, you decide to help your grandfather bring the cows home...'
 			minut += 60
 			grandmaQW['help_amount'] += 1
-			hndiwrk_exp += rand(0,3)
+			gs 'exp_gain', 'hndiwrk', rand(0,3)
 			gs 'stat'
 
 			act 'Continue':gt'gadfield','cow'
@@ -155,7 +155,7 @@ if $ARGS[0] = 'cow':
 
 				if hour >= 9:minut += 20
 				if hour < 9:minut += 60
-				hndiwrk_exp += rand(0,4)
+				gs 'exp_gain', 'hndiwrk', rand(0,4)
 				gs 'stat'
 
 				act 'Continue':gt'gadfield','cow'
@@ -180,7 +180,7 @@ if $ARGS[0] = 'cow':
 				end
 				grandpaQW['chore_herd_cattle_experience'] = 1
 				if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
-				hndiwrk_exp += rand(0,3)
+				gs 'exp_gain', 'hndiwrk', rand(0,3)
 				gs 'stat'
 
 				act 'Continue':gt'gadfield','cow'
@@ -196,7 +196,7 @@ if $ARGS[0] = 'cow':
 					frost = 0
 					minut += 60
 					fat -= 5
-					run_exp += 1
+					gs 'exp_gain', 'run', 1
 					gs 'sweat', 'add', 10
 					pcs_mood += 5
 					pcs_stam -= 8
@@ -309,7 +309,7 @@ if $ARGS[0] = 'cow':
 			end
 			grandmaQW['help_amount'] += 1
 			minut += 60
-			hndiwrk_exp += rand(0,3)
+			gs 'exp_gain', 'hndiwrk', rand(0,3)
 			gs 'stat'
 
 			act 'Herd the cows nearer to the river (0:15)': minut += 15 & gt'gadfield','cow2'
@@ -381,7 +381,7 @@ if $ARGS[0] = 'cow2':
 				end
 				grandpaQW['chore_herd_cattle_experience'] = 1
 				if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
-				hndiwrk_exp += rand(0,3)
+				gs 'exp_gain', 'hndiwrk', rand(0,3)
 				gs 'stat'
 
 				act 'Continue':gt'gadfield','cow2'
@@ -398,7 +398,7 @@ if $ARGS[0] = 'cow2':
 					pcs_stam -= 3
 					pcs_mood += 5
 					if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
-					if pcs_stren < 30:stren_exp += 1
+					if pcs_stren < 30:gs 'exp_gain', 'stren', 1
 					gs 'stat'
 
 					act 'Continue':gt'gadfield','cow2'
@@ -463,7 +463,7 @@ if $ARGS[0] = 'cow2':
 				pcs_stam -= 5
 			end
 			if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
-			hndiwrk_exp += rand(0,3)
+			gs 'exp_gain', 'hndiwrk', rand(0,3)
 			gs 'stat'
 
 			act 'Herd the cows nearer to the forest (0:30)': minut += 15 & gt'gadfield','cow3'
@@ -510,7 +510,7 @@ if $ARGS[0] = 'cow3':
 				end
 				grandpaQW['chore_herd_cattle_experience'] = 1
 				if rand(0,1) = 1:grandmaQW['help_amount'] += rand(0,1)
-				hndiwrk_exp += rand(0,3)
+				gs 'exp_gain', 'hndiwrk', rand(0,3)
 				gs 'stat'
 
 				act 'Continue':gt'gadfield','cow3'
@@ -525,7 +525,7 @@ if $ARGS[0] = 'cow3':
 					frost = 0
 					minut += 60
 					fat -= 5
-					run_exp += 1
+					gs 'exp_gain', 'run', 1
 					gs 'sweat', 'add', 10
 					pcs_mood += 5
 					pcs_stam -= 8
@@ -641,7 +641,7 @@ if $ARGS[0] = 'cow3':
 			mira = 0
 			grandpaQW['chore_herd_cattle'] = 0
 			grandmaQW['help_amount'] += 2
-			hndiwrk_exp += rand(0,3)
+			gs 'exp_gain', 'hndiwrk', rand(0,3)
 			gs 'stat'
 
 			act 'Back to the village':gt'gadukino'

+ 1 - 1
locations/gadforest.qsrc

@@ -553,7 +553,7 @@ if $ARGS[0] = 'bushcraft':
 
 		! bushcraft exp gained is random to keep it from increasing too fast
 		if rand(0,1) = 0:
-			bushcraft_exp += rand(1,bushcraft_rand)
+			gs 'exp_gain', 'bushcraft', rand(1,bushcraft_rand)
 		end
 	else
 		! use the lower chance of ripping clothes when Sveta has higher bushcraft

+ 16 - 16
locations/gadforestlost.qsrc

@@ -83,7 +83,7 @@ if $ARGS[0] = 'bushcraft':
 		torncloth_low_bushcraft = 5
 	end
 	! No limit on earning bushcraft while lost but still random
-	bushcraft_exp += rand(0,bushcraft_rand)
+	gs 'exp_gain', 'bushcraft', rand(0,bushcraft_rand)
 
 	ripclothesrand = rand(1,10)
 	if pcs_bushcraft < bushcraft_limit:
@@ -407,7 +407,7 @@ if $ARGS[0] = 'finish':
 	menu_off = 1
 	bonfire = 0
 	pcs_mood += 20
-	bushcraft_exp += rand(1,5)
+	gs 'exp_gain', 'bushcraft', rand(1,5)
 	gs 'clothing', 'swamp_clothes', 0
 	gs 'stat'
 
@@ -488,7 +488,7 @@ if $ARGS[0] = 'rescue':
 	menu_off = 1
 	bonfire = 0
 	pcs_mood += 20
-	bushcraft_exp += rand(1,5)
+	gs 'exp_gain', 'bushcraft', rand(1,5)
 	lost_girl = 0
 	if swamp_clothes = 1:
 		'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear at your grandparents house.'
@@ -611,7 +611,7 @@ if $ARGS[0] = 'wolves':
 
 	act 'Run away':
 		*clr & cla
-		gs 'exercise', 'tier4', 1, 'run_exp'
+		gs 'exercise', 'tier4', 1, 'run'
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run.jpg"></center>'
@@ -625,19 +625,19 @@ if $ARGS[0] = 'wolves':
 				foresteventrand = rand(1,6)
 			end
 			if foresteventrand <= 3:
-				bushcraft_exp += rand(1,3)
+				gs 'exp_gain', 'bushcraft', rand(1,3)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, but unfortunately are still in the forest.'
 			elseif foresteventrand <= 6:
-				bushcraft_exp += rand(1,5)
+				gs 'exp_gain', 'bushcraft', rand(1,5)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, and also are no longer in the forest.'
 			elseif foresteventrand <= 7:
-				bushcraft_exp += rand(1,2)
+				gs 'exp_gain', 'bushcraft', rand(1,2)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
 				*nl
@@ -657,19 +657,19 @@ if $ARGS[0] = 'wolves':
 				foresteventrand = rand(1,9)
 			end
 			if foresteventrand <= 5:
-				bushcraft_exp += rand(1,3)
+				gs 'exp_gain', 'bushcraft', rand(1,3)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, but unfortunately are still lost in the forest.'
 			elseif foresteventrand <= 9:
-				bushcraft_exp += rand(1,5)
+				gs 'exp_gain', 'bushcraft', rand(1,5)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, and also are no longer lost as you recognize your surroundings.'
 			elseif foresteventrand <= 10:
-				bushcraft_exp += rand(1,2)
+				gs 'exp_gain', 'bushcraft', rand(1,2)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
 				*nl
@@ -691,19 +691,19 @@ if $ARGS[0] = 'wolves':
 				foresteventrand = rand(1,2)
 			end
 			if foresteventrand <= 6:
-				bushcraft_exp += rand(1,3)
+				gs 'exp_gain', 'bushcraft', rand(1,3)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, but unfortunately are still lost in the forest.'
 			elseif foresteventrand <= 12:
-				bushcraft_exp += rand(1,5)
+				gs 'exp_gain', 'bushcraft', rand(1,5)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, and also are no longer lost as you recognize your surroundings.'
 			elseif foresteventrand <= 13:
-				bushcraft_exp += rand(1,2)
+				gs 'exp_gain', 'bushcraft', rand(1,2)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
 				*nl
@@ -727,19 +727,19 @@ if $ARGS[0] = 'wolves':
 				foresteventrand = rand(1,13)
 			end
 			if foresteventrand <= 8:
-				bushcraft_exp += rand(1,3)
+				gs 'exp_gain', 'bushcraft', rand(1,3)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, but unfortunately are still lost in the forest.'
 			elseif foresteventrand <= 13:
-				bushcraft_exp += rand(1,5)
+				gs 'exp_gain', 'bushcraft', rand(1,5)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, and also are no longer in the forest.'
 			elseif foresteventrand <= 14:
-				bushcraft_exp += rand(1,2)
+				gs 'exp_gain', 'bushcraft', rand(1,2)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
 				*nl

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.