Browse Source

Merge branch 'original-master' into mine

alecsp 3 months ago
parent
commit
fb330a37c4
100 changed files with 9005 additions and 6144 deletions
  1. 3 0
      .gitignore
  2. 8 8
      MakeQSP.bat
  3. 21 0
      buildHTML.bat
  4. 1 1
      glife
  5. 47 42
      glife.qproj
  6. 92 131
      locations/AppearanceSystem.qsrc
  7. 295 256
      locations/Cheatmenu_din.qsrc
  8. 5 5
      locations/Cum_Manage.qsrc
  9. 3 6
      locations/HotelRoom.qsrc
  10. 4 4
      locations/KGstart.qsrc
  11. 0 91
      locations/Kikatak.qsrc
  12. 39 38
      locations/Komp.qsrc
  13. 4 3
      locations/LariskaHome.qsrc
  14. 214 214
      locations/NikoWhore.qsrc
  15. 9 8
      locations/Nudelake.qsrc
  16. 47 47
      locations/ParkKafe.qsrc
  17. 0 1
      locations/Prostitute.qsrc
  18. 34 34
      locations/RimmaSexQW.qsrc
  19. 10 0
      locations/SMS_schedules.qsrc
  20. 12 12
      locations/TV.qsrc
  21. 61 61
      locations/TerminalOffice.qsrc
  22. 15 15
      locations/UnitAppearance.qsrc
  23. 8 8
      locations/VolleyTrenCentr.qsrc
  24. 101 92
      locations/_attributes_bomba_dress.qsrc
  25. 99 98
      locations/_attributes_bomba_outfits.qsrc
  26. 48 38
      locations/_attributes_bomba_shoes.qsrc
  27. 48 45
      locations/_attributes_cats_shoes.qsrc
  28. 172 150
      locations/_attributes_danilovich_outfits.qsrc
  29. 46 43
      locations/_attributes_danilovich_shoes.qsrc
  30. 123 71
      locations/_attributes_dolls_dress.qsrc
  31. 76 49
      locations/_attributes_dolls_outfits.qsrc
  32. 341 219
      locations/_attributes_dolls_shoes.qsrc
  33. 116 113
      locations/_attributes_eroto_dress.qsrc
  34. 27 23
      locations/_attributes_eroto_shoes.qsrc
  35. 34 31
      locations/_attributes_gm_shoes.qsrc
  36. 199 165
      locations/_attributes_moncheri_shoes.qsrc
  37. 1 0
      locations/_attributes_salacious_dress.qsrc
  38. 46 38
      locations/_attributes_scandalicious_shoes.qsrc
  39. 58 55
      locations/_attributes_school.qsrc
  40. 145 45
      locations/_body_image.qsrc
  41. 1 1
      locations/_menu_setting.qsrc
  42. 0 76
      locations/_pube_image.qsrc
  43. 35 24
      locations/_shoe_description2.qsrc
  44. 17 17
      locations/abduction.qsrc
  45. 28 28
      locations/abductionCustomer.qsrc
  46. 41 41
      locations/agentned.qsrc
  47. 19 5
      locations/alarmclock.qsrc
  48. 483 271
      locations/albina_chat.qsrc
  49. 171 40
      locations/albina_chat2.qsrc
  50. 602 167
      locations/albina_house_events.qsrc
  51. 145 164
      locations/albina_mother_events.qsrc
  52. 626 186
      locations/albina_sex_chat.qsrc
  53. 1724 0
      locations/albina_sex_scenes.qsrc
  54. 15 14
      locations/albina_starlets.qsrc
  55. 71 71
      locations/albina_starlets_sex.qsrc
  56. 32 23
      locations/albina_wine_event.qsrc
  57. 196 655
      locations/albinahome.qsrc
  58. 9 8
      locations/anush_bedroom.qsrc
  59. 1 1
      locations/anush_bedroom_city.qsrc
  60. 242 236
      locations/anushapt.qsrc
  61. 159 140
      locations/anushapt_city.qsrc
  62. 163 160
      locations/anushaptbr.qsrc
  63. 48 36
      locations/anushka.qsrc
  64. 30 18
      locations/anushkachat.qsrc
  65. 19 13
      locations/anushkachat_city.qsrc
  66. 12 12
      locations/anushkaev1.qsrc
  67. 8 8
      locations/anushkaev2.qsrc
  68. 9 8
      locations/anushkamaksim.qsrc
  69. 8 30
      locations/arousal.qsrc
  70. 22 22
      locations/artem_date_events.qsrc
  71. 18 18
      locations/artem_dorm.qsrc
  72. 3 3
      locations/artem_nush_sex.qsrc
  73. 21 24
      locations/artem_sex.qsrc
  74. 49 49
      locations/artemhome.qsrc
  75. 6 6
      locations/arturQW.qsrc
  76. 1 4
      locations/audition_reflections.qsrc
  77. 94 94
      locations/auditions.qsrc
  78. 18 17
      locations/auditions_minor1.qsrc
  79. 55 55
      locations/autosalonF.qsrc
  80. 0 140
      locations/ballet_npc.qsrc
  81. 114 90
      locations/bank.qsrc
  82. 4 4
      locations/bdsm_mansion.qsrc
  83. 0 0
      locations/bdsm_training.qsrc
  84. 3 3
      locations/bed2.qsrc
  85. 18 18
      locations/bed_events.qsrc
  86. 4 4
      locations/bed_get_out_events.qsrc
  87. 4 8
      locations/bedr.qsrc
  88. 2 2
      locations/bedr2x.qsrc
  89. 28 93
      locations/bedrPar.qsrc
  90. 8 16
      locations/bedrPar2.qsrc
  91. 0 49
      locations/beg.qsrc
  92. 9 8
      locations/begin.qsrc
  93. 186 0
      locations/beta_journal_quests.qsrc
  94. 7 7
      locations/billiard.qsrc
  95. 16 16
      locations/billsvid.qsrc
  96. 33 18
      locations/blackmailer.qsrc
  97. 74 105
      locations/body.qsrc
  98. 113 106
      locations/body_desc.qsrc
  99. 369 236
      locations/body_structure.qsrc
  100. 200 216
      locations/booty_call.qsrc

+ 3 - 0
.gitignore

@@ -49,3 +49,6 @@ glife.7z
 missing_media.txt
 plugins.dat
 *.log
+*.stackdump
+
+*glife.html

+ 8 - 8
MakeQSP.bat

@@ -75,16 +75,16 @@ set /p action=Choose an action:
 
 if defined QSPFILE (
 	if %action% == b goto build
-	if %action% == d goto build_debug
-	if %action% == r goto run
-	if %action% == f goto build
-	if %action% == v goto parser
-	if %action% == q goto qgen
 	if %action% == B goto build
+	if %action% == d goto build_debug
 	if %action% == D goto build_debug
+	if %action% == r goto run
 	if %action% == R goto run
+	if %action% == f goto build
 	if %action% == F goto build
+	if %action% == v goto parser
 	if %action% == V goto parser
+	if %action% == q goto qgen
 	if %action% == Q goto qgen
 )
 
@@ -132,7 +132,8 @@ goto menu
 echo.
 echo Running ...
 if defined CP_TO ( start %QGEN% %CP_TO%\%QSPFILE% ) else ( start %QGEN% %QSPFILE% )
-goto exit
+pause
+goto menu
 
 :parser
 echo.
@@ -141,9 +142,8 @@ echo validating...
 @ECHO ON
 "%BATDir%%QSPParser%" --level warn "%BATDir%glife.txt" > "%BATDir%validation.log"
 @ECHO off
-echo Done - Exiting.
 pause
-goto exit
+goto menu
 
 :run
 echo.

+ 21 - 0
buildHTML.bat

@@ -0,0 +1,21 @@
+@ECHO off
+
+SET LOCATIONS=%CD%/locations
+
+PUSHD %1
+cd ./qsrc2tw/tools/QSRC2TW
+node index.js -in "%LOCATIONS%" -out "../../twine-code"
+cd ../..
+call npx tsc
+call npx esbuild "temp/typescript.js" --minify --outfile="twine-code/-generated/typescript-min.js"
+POPD
+
+if %PROCESSOR_ARCHITECTURE% == AMD64 (
+	CALL "%~dp0qsrc2tw\tools\tweeGo\tweego_win64.exe" --head "%~dp0qsrc2tw\twine-code\misc\head.txt" -o "%~dp0glife.html" "%~dp0qsrc2tw\twine-code"
+) else (
+	CALL "%~dp0qsrc2tw\tools\tweeGo\tweego_win86.exe" --head "%~dp0qsrc2tw\twine-code\misc\head.txt" -o "%~dp0glife.html" "%~dp0qsrc2tw\twine-code"
+)
+
+
+
+@ECHO ON

+ 1 - 1
glife

@@ -1 +1 @@
-Subproject commit 9de9b7aaba59068593dde5dcadb2d002e0f8ddba
+Subproject commit 5aee05d9d8873e1b211f1c13dccc48e24f2eccfd

+ 47 - 42
glife.qproj

@@ -37,7 +37,7 @@
 	<Folder name="Stats">
 		<Location name="DNA"/>
 		<Location name="cikl"/>
-		<Location name="daystart"/>
+		<Location name="time"/>
 		<Location name="yearstart"/>
 		<Location name="dina"/>
 		<Location name="MenuMainLoc"/>
@@ -81,6 +81,8 @@
 		<Location name="pcs_has_attr"/>
 		<Location name="grades"/>
 		<Location name="internet_mobile"/>
+		<Location name="library_functions"/>
+		<Location name="clinic_functions"/>
 	</Folder>
 	<Folder name="Sleep">
 		<Location name="pre_sleep"/>
@@ -106,7 +108,6 @@
 		<Location name="piercing_management"/>
 		<Location name="$face_image"/>
 		<Location name="$body_image"/>
-		<Location name="$pube_image"/>
 	</Folder>
 	<Folder name="Stimulus">
 		<Location name="boyStat"/>
@@ -285,6 +286,7 @@
 		<Location name="intro_uni_m"/>
 		<Location name="intro_uni_tg"/>
 		<Location name="intro_initialization"/>
+		<Location name="intro_initialization_sg"/>
 		<Location name="intro_initialization_city"/>
 		<Location name="intro_customization"/>
 		<Location name="intro_sg_select"/>
@@ -319,11 +321,7 @@
 		<Location name="ender"/>
 		<Location name="nill"/>
 		<Location name="test"/>
-		<Location name="kikbox"/>
-		<Location name="initKik"/>
-		<Location name="Kikatak"/>
-		<Location name="enderKik"/>
-		<Location name="razrKik"/>
+		<Location name="kickboxing_funcs"/>
 	</Folder>
 	<Folder name="Furniture">
 		<Location name="bed"/>
@@ -622,6 +620,7 @@
 	<Folder name="Sonia">
 		<Location name="soniadisco"/>
 		<Location name="soniahome"/>
+		<Location name="soniaev1"/>
 	</Folder>
 	<Folder name="Generator">
 		<Location name="placer"/>
@@ -822,6 +821,7 @@
 		<Location name="albina_chat"/>
 		<Location name="albina_chat2"/>
 		<Location name="albina_sex_chat"/>
+		<Location name="albina_sex_scenes"/>
 		<Location name="albina_lazar_sex"/>
 		<Location name="albina_school_sex"/>
 		<Location name="albina_house_events"/>
@@ -867,7 +867,6 @@
 		<Location name="boylove"/>
 	</Folder>
 	<Folder name="Lover">
-		<Location name="boygirl"/>
 		<Location name="girlfriend"/>
 		<Location name="lover"/>
 		<Location name="lover_change"/>
@@ -936,20 +935,15 @@
 		<Location name="city_train"/>
 		<Location name="agentned"/>
 		<Location name="kameraKPZ"/>
-		<Location name="bass"/>
 		<Location name="burger"/>
 		<Location name="burgerWork"/>
 		<Location name="BurgerTip"/>
-		<Location name="moncheri"/>
-		<Location name="lusso"/>
 		<Location name="butoilet"/>
 		<Location name="city_nightclub"/>
 		<Location name="city_nightclubToilet"/>
 		<Location name="Club2"/>
-		<Location name="danceclass"/>
 		<Location name="city_library"/>
 		<Location name="city_hermitage"/>
-		<Location name="fit"/>
 		<Location name="talent_agency"/>
 		<Location name="casting"/>
 		<Location name="tatiana_lab"/>
@@ -958,22 +952,33 @@
 		<Location name="alexandriaChat"/>
 		<Location name="alexandriaEv"/>
 		<Location name="alexandriaSex"/>
-		<Location name="shop_fashionista"/>
 		<Location name="office"/>
 		<Location name="restoran"/>
+		<Location name="city_mall"/>
 		<Location name="hairsalon"/>
 		<Location name="shopdacha"/>
-		<Location name="sportShop"/>
+		<Location name="shop_danilovich"/>
+		<Location name="shop_lusso"/>
 		<Location name="shop_scandalicious"/>
-		<Location name="torgcentr"/>
+		<Location name="shop_fashionista"/>
+		<Location name="shop_moncheri"/>
+		<Location name="shop_gm"/>
+		<Location name="shop_materinstvo"/>
+		<Location name="shop_photography"/>
+		<Location name="photography_work"/>
 		<Location name="yarik"/>
 		<Location name="zoomagazine"/>
-		<Location name="budgetclothes"/>
 		<Location name="city_musicstore"/>
 		<Location name="city_musicstore_stock"/>
-		<Location name="shop_materinstvo"/>
-		<Location name="shop_photography"/>
-		<Location name="photography_work"/>
+	</Folder>
+	<Folder name="Havana Fitness Center">
+		<Location name="havana"/>
+		<Location name="havana_pool"/>
+		<Location name="havana_dance"/>
+		<Location name="havana_crossfit"/>
+		<Location name="havana_crossfit_funcs"/>
+		<Location name="havana_running"/>
+		<Location name="havana_kickboxing"/>
 	</Folder>
 	<Folder name="City Residential">
 		<Location name="city_residential"/>
@@ -1012,7 +1017,7 @@
 		<Location name="TerminalOffice"/>
 		<Location name="ilyroom"/>
 		<Location name="trFatherMisha"/>
-		<Location name="dk"/>
+		<Location name="city_commcenter"/>
 		<Location name="kakuzu"/>
 		<Location name="youry"/>
 		<Location name="alex"/>
@@ -1035,7 +1040,6 @@
 		<Location name="MartinSex2"/>
 		<Location name="MartinSex3"/>
 		<Location name="casino"/>
-		<Location name="mqroom"/>
 		<Location name="city_hotel"/>
 		<Location name="deckShuffle"/>
 	</Folder>
@@ -1043,7 +1047,7 @@
 		<Location name="city_redlight"/>
 		<Location name="bordel"/>
 		<Location name="bordelv"/>
-		<Location name="sexshop"/>
+		<Location name="shop_erotomaniac"/>
 		<Location name="stripclub"/>
 		<Location name="cfnm"/>
 		<Location name="stwork"/>
@@ -1146,8 +1150,11 @@
 	</Folder>
 	<Folder name="Gadyukino">
 		<Location name="gad_gphouse"/>
-		<Location name="grandmahelp"/>
-		<Location name="grandpahelp"/>
+		<Location name="gp_elene"/>
+		<Location name="gp_elene_schedule"/>
+		<Location name="gp_zlatek"/>
+		<Location name="gp_zlatek_schedule"/>
+		<Location name="gad_gpchores"/>
 		<Location name="gad_gpyard"/>
 		<Location name="gad_gpbarn"/>
 		<Location name="gad_gpbath"/>
@@ -1157,7 +1164,7 @@
 		<Location name="gad_beach"/>
 		<Location name="gad_prostitutes"/>
 		<Location name="gad_field"/>
-		<Location name="gad_market"/>
+		<Location name="gad_store"/>
 		<Location name="gad_road"/>
 		<Location name="gad_miroslava_home"/>
 		<Location name="gad_forest"/>
@@ -1165,6 +1172,7 @@
 		<Location name="gad_forest_lost"/>
 		<Location name="gad_meadow"/>
 		<Location name="gad_church"/>
+		<Location name="gad_market"/>
 		<Location name="gad_swamp"/>
 		<Location name="gad_swamp_yard"/>
 		<Location name="gad_swamphouse"/>
@@ -1239,8 +1247,8 @@
 		<Location name="avtonorm"/>
 		<Location name="avt"/>
 		<Location name="avb"/>
-		<Location name="zaprF"/>
-		<Location name="zaprFWash"/>
+		<Location name="fuelstation"/>
+		<Location name="fuelstation_carwash"/>
 		<Location name="abduction"/>
 		<Location name="abductionCustomer"/>
 		<Location name="autosalonF"/>
@@ -1300,8 +1308,6 @@
 		<Location name="hookup_after"/>
 	</Folder>
 	<Folder name="Misc">
-		<Location name="beg"/>
-		<Location name="beg1"/>
 		<Location name="housing"/>
 		<Location name="husb"/>
 		<Location name="husbSex"/>
@@ -1356,7 +1362,7 @@
 		<Location name="rasputin_walkway"/>
 		<Location name="rasputin_show_bur"/>
 		<Location name="rasputin_show_var"/>
-		<Location name="exhibitionistshop"/>
+		<Location name="shop_exhibitionist"/>
 		<Location name="kseniyaQW"/>
 		<Location name="pushkin_parks"/>
 		<Location name="dibodi"/>
@@ -1374,12 +1380,6 @@
 		<Location name="koncepod"/>
 		<Location name="koncepod1"/>
 	</Folder>
-	<Folder name="crossfit_north">
-		<Location name="crossfit_north_box"/>
-		<Location name="crossfit_north_wod"/>
-		<Location name="crossfit_north_record"/>
-		<Location name="crossfit_north_girlmeet"/>
-	</Folder>
 	<Location name="LBZhouse"/>
 	<Location name="BanSexType"/>
 	<Folder name="Magic">
@@ -1396,19 +1396,24 @@
 	<Folder name="Ballet_career">
 		<Location name="pushkin_ballet_init"/>
 		<Location name="core_library"/>
-		<Location name="ballet_npc"/>
-		<Location name="npc_3501_init"/>
-		<Location name="npc_3510_init"/>
+		<Location name="npc_274_init"/>
+		<Location name="npc_283_init"/>
 		<Location name="maya_residence"/>
 		<Location name="pushkin_ballet_center"/>
 		<Location name="pushkin_ballet_res"/>
 		<Location name="pushkin_ballet_class"/>
 		<Location name="pushkin_ballet_evt"/>
 		<Location name="ballet_global_evt"/>
-		<Location name="ballet_secrets"/>
+		<Location name="pushkin_ballet_secrets"/>
 		<Location name="marlilnsky_theatre"/>
 		<Location name="pushkin_theatre"/>
-		<Location name="st_petersburg_canals"/>
+		<Location name="city_canals"/>
+	</Folder>
+	<Folder name="npc_quests">
+		<Location name="quest_data_a274"/>
+	</Folder>
+	<Folder name="beta_code">
+		<Location name="beta_journal_quests"/>
 	</Folder>
 	<Location name="cleanHTML"/>
 	</Structure>

+ 92 - 131
locations/AppearanceSystem.qsrc

@@ -2,11 +2,10 @@
 
 if $ARGS[0] = '':
 	!{
-        PC's appearance is updated regularly in stat.qsrc.
-        Note: A huge part of PC's appearance is from base appearance, which is updated once a day. Because it's
-        a global variable, it does not show in this function in particular, but it's used in 'CalcAppearance'
-    }
-	if pcs_makeup = 6 and bimbolevel >= 2: extra_supnatvnesh = 2*bimbolevel - 2
+		PC's appearance is updated regularly in stat.qsrc.
+		Note: A huge part of PC's appearance is from base appearance, which is updated once a day. Because it's
+		a global variable, it does not show in this function in particular, but it's used in 'CalcAppearance'
+	}
 
 	clothingBonus = func('AppearanceSystem', 'CalcClothingBonus')
 	accessoriesBonus = func('AppearanceSystem', 'CalcAccessoriesBonus', bonusZ, PShoQuality)
@@ -14,8 +13,8 @@ if $ARGS[0] = '':
 	groomingPenalty = func('AppearanceSystem', 'CalcGroomingPenalty')
 	stdPenalty = func('AppearanceSystem', 'CalcSTDPenalty')
 
-	pcs_apprnc = func('AppearanceSystem', 'CalcAppearance', (supnatvnesh + extra_supnatvnesh))
-	Hotcat = func('AppearanceSystem', 'ConvertToHotcat')
+	pcs_apprnc = func('AppearanceSystem', 'CalcAppearance', supnatvnesh)
+	pcs_hotcat = func('AppearanceSystem', 'ConvertToHotcat', pcs_apprnc)
 
 	killvar 'clothingBonus'
 	killvar 'accessoriesBonus'
@@ -46,62 +45,43 @@ if $ARGS[0] = 'CalcFaceBonus':
 		eyelashesBonus = 0
 	elseif pcs_lashes = 1:
 		eyelashesBonus = 1
-	elseif pcs_lashes = 2:
-		eyelashesBonus = 3
-	elseif pcs_lashes = 3:
-		eyelashesBonus = 4
-	elseif pcs_lashes = 4:
-		eyelashesBonus = 5
-	elseif pcs_lashes = 5:
-		eyelashesBonus = 6
-	else
-		eyelashesBonus = 0
+	elseif pcs_lashes >= 2:
+		eyelashesBonus = pcs_lashes + 1
 	end
 	eyelashesBonus = FUNC('AppearanceSystem', 'AdjustFromBMI', eyelashesBonus)
 
 	!!	Setting Eye Size bonus
-	if pcs_eyesize = 1:
-		eyeSizeBonus = 1
+	if pcs_eyesize <= 1:
+		eyeSizeBonus = pcs_eyesize
 	elseif pcs_eyesize = 2:
 		eyeSizeBonus = 3
-	elseif pcs_eyesize = 3:
-		eyeSizeBonus = 2
 	else
-		eyeSizeBonus = 0
+		eyeSizeBonus = 2
 	end
 	eyeSizeBonus = FUNC('AppearanceSystem', 'AdjustFromBMI', eyeSizeBonus)
 
 	!!	Setting the Lip size bonus
-	if pcs_lip = 0:
+	if pcs_lip <= 0:
 		lipBonus = -2
-	elseif pcs_lip = 1:
-		lipBonus = 0
-	elseif pcs_lip = 2:
-		lipBonus = 1
-	elseif pcs_lip = 3:
-		lipBonus = 3
+	elseif pcs_lip <= 2:
+		lipBonus = pcs_lip - 1
 	else
 		lipBonus = 3
 	end
 	lipBonus = FUNC('AppearanceSystem', 'AdjustFromBMI', lipBonus)
 
-	result = eyelashesBonus + eyeSizeBonus + lipBonus + 5
-
+	result = eyelashesBonus + eyeSizeBonus + lipBonus
 end
 
 if $ARGS[0] = 'CalcAttributeBonus':
-	tempAttributeBonus = (pcs_agil / 5) + (pcs_vital / 5)
+	tempAttributeBonus = (pcs_agil + pcs_vital) / 5
 
 	result = func('AppearanceSystem', 'AdjustFromBMI', tempAttributeBonus)
 	killvar 'tempAttributeBonus'
 end
 
 if $ARGS[0] = 'CalcVisibleAgePenalty':
-	if vidage < 20:
-		tempAttributePenalty =   func('shortgs','round_divide', (5*(20 - vidage)), 2)
-	else
-		tempAttributePenalty = 0
-	end
+	if vidage < 20: tempAttributePenalty = (5*(20 - vidage) + 1) / 2
 
 	result = func('AppearanceSystem', 'AdjustFromBMI', tempAttributePenalty)
 	killvar 'tempAttributePenalty'
@@ -159,30 +139,26 @@ end
 
 if $ARGS[0] = 'CalcClothingBonus':
 	if $clothingworntype = 'nude':
-		if pcs_bmi >= 19 and pcs_bmi < 30:
-			! Healthy and not overweight
-			tempRevealing = 405
-			PCloQuality = 3
+		if func('pcs_has_attr', 'OR', 'body_bmi_normal', 'body_bmi_overweight'):
+			! Healthy and overweight
+			result = 15
 		else
-			tempRevealing = 0
-			PCloQuality = 1
+			result = 0
 		end
 	else
-		if pcs_bmi < 19:
+		if func('pcs_has_attr', 'OR', 'body_bmi_starving', 'body_bmi_underweight'):
 			!Skinny and severely skinny
-			tempRevealing = ((400 - PXCloThinness) + (500 - PXCloTopCut) + (400 - PXCloBottomShortness))/2
-		elseif pcs_bmi >= 19 and pcs_bmi < 30:
-			!Healthy and not overweight
+			tempRevealing = ((400 - PXCloThinness) + (500 - PXCloTopCut) + (400 - PXCloBottomShortness)) / 2
+		elseif func('pcs_has_attr', 'OR', 'body_bmi_normal', 'body_bmi_overweight'):
+			!Healthy and overweight
 			tempRevealing = (PXCloThinness + PXCloTopCut + PXCloBottomShortness)/2
-		elseif pcs_bmi >= 30:
+		else
 			!Moderately overweight and above
-			tempRevealing = ((400 - PXCloThinness) + (500 - PXCloTopCut) + (400 - PXCloBottomShortness)) * 3/4
+			tempRevealing = ((400 - PXCloThinness) + (500 - PXCloTopCut) + (400 - PXCloBottomShortness)) * 3 / 4
 		end
+		result = tempRevealing / 76 * PCloQuality
+		killvar 'tempRevealing'
 	end
-
-	result = tempRevealing/ 76 * PCloQuality
-	killvar 'tempRevealing'
-
 end
 
 if $ARGS[0] = 'CalcAccessoriesBonus':
@@ -190,24 +166,20 @@ if $ARGS[0] = 'CalcAccessoriesBonus':
 	shoesQualityBonus = ARGS[2] & !! PShoQuality
 
 	!!bonuses for certain underwear
-	if PanQuality = 6:
-		pantyBonus = 4
-	elseif PanQuality = 5:
-		pantyBonus = 3
-	elseif PanQuality >= 3:
-		pantyBonus = 2
-	else
-		pantyBonus = PanQuality - 1
+	if $pantyworntype ! 'none':
+		if PPanQuality => 4:
+			pantyBonus = PPanQuality - 2
+		else
+			pantyBonus = PPanQuality - 1
+		end
 	end
 
-	if BraQuality = 6:
-		braBonus = 4
-	elseif BraQuality = 5:
-		braBonus = 3
-	elseif BraQuality >= 3:
-		braBonus = 2
-	else
-		braBonus = BraQuality - 1
+	if $braworntype ! 'none':
+		if PBraQuality => 4:
+			braBonus = PBraQuality - 2
+		else
+			braBonus = PBraQuality - 1
+		end
 	end
 
 	result = coatQualityBonus + shoesQualityBonus + pantyBonus + braBonus
@@ -221,34 +193,33 @@ end
 if $ARGS[0] = 'CalcGroomingBonus':
 
 	makeupBonus = pcs_makupskl/5 - 5
-	if pcs_makeup = 0: makeupBonus = -5
-	if pcs_makeup = 1: makeupBonus = 0
-	if pcs_makeup = 5: makeupBonus = 30
-
-	breathBonus = pcs_breath * 5
+	if pcs_makeup = 0:
+		makeupBonus = -5
+	elseif pcs_makeup = 1:
+		makeupBonus = 0
+	elseif pcs_makeup = 5:
+		makeupBonus = 30
+	elseif pcs_makeup = 6 and bimbolevel >= 2:
+		makeupBonus += 2 * (bimbolevel - 1)
+	elseif pcs_makeup = 7:
+		makeupBonus += pcs_makeupskl / 10 - 50
+	end
 
-	tempGroomingBonus = makeupBonus + breathBonus
+	breathBonus = 5 * pcs_breath
 
-	!result = tempGroomingBonus
-	result = func('AppearanceSystem', 'AdjustFromBMI', tempGroomingBonus)
+	result = func('AppearanceSystem', 'AdjustFromBMI', makeupBonus + breathBonus)
 
+	killvar 'breathBonus'
+	killvar 'makeupBonus'
 end
 
 if $ARGS[0] = 'CalcGroomingPenalty':
-	if pcs_lipbalm > 0:
-		lipBalmPenalty = 0
-	else
-		lipBalmPenalty = 5
-	end
+	if pcs_lipbalm <= 0: lipBalmPenalty = 5
 
 	hairPenalty = (1 - pcs_hairbsh) * 10
 
 	!! buzzcut penalty to pcs_apprnc
-	if pcs_hairlng < 10:
-		buzzCutPenalty = 10
-	else
-		buzzCutPenalty = 0
-	end
+	if pcs_hairlng < 10: buzzCutPenalty = 10
 
 	!!Small penalty for not wearing deodorant, if pcs_sweat is low enough
 	if deodorant_on = 0 or pcs_sweat >= 20: deodorantPenalty = 5
@@ -264,11 +235,7 @@ if $ARGS[0] = 'CalcGroomingPenalty':
 	end
 
 	!Glasses Penalty
-	if glass >= 2 or glass = 0:
-		glassesPenalty = 0
-	elseif glass = 1:
-		glassesPenalty = 10
-	end
+	if glass = 1: glassesPenalty = 10
 
 	!hair color fade penalty
 	if pcs_haircol ! nathcol:
@@ -277,15 +244,7 @@ if $ARGS[0] = 'CalcGroomingPenalty':
 	end
 
 	! Leg hair penalty
-	if pcs_leghair <= 0:
-		legPenalty = 0
-	elseif pcs_leghair <= 3:
-		legPenalty = 3
-	elseif pcs_leghair <= 6:
-		legPenalty = 6
-	else
-		legPenalty = 9
-	end
+	legPenalty = max(0, min(3 * (pcs_leghair / 3), 9))
 
 	result = sweatPenalty + glassesPenalty + hairDyePenalty + buzzCutPenalty + legPenalty + lipBalmPenalty + hairPenalty + deodorantPenalty
 
@@ -339,32 +298,31 @@ if $ARGS[0] = 'CalcAppearance':
 
 	temp_apprnc = pcs_apprncbase + clothingBonus + accessoriesBonus + groomingBonus - groomingPenalty - stdPenalty
 
-	if temp_apprnc >= 200: temp_apprnc = 200
-	if temp_apprnc < 0: temp_apprnc = 0
-
 	!Any super natural bonuses are allowed to go above the max scale
-	result = temp_apprnc + superNaturalBonus
+	result = max(0, min(temp_apprnc, 200)) + superNaturalBonus
 
+	killvar 'temp_apprnc'
+	killvar 'superNaturalBonus'
 end
 
 if $ARGS[0] = 'ConvertToHotcat':
-	if pcs_apprnc <= 40:
+	if ARGS[1] <= 40:
 		result = 1
-	elseif pcs_apprnc <= 60:
+	elseif ARGS[1] <= 60:
 		result = 2
-	elseif pcs_apprnc <= 80:
+	elseif ARGS[1] <= 80:
 		result = 3
-	elseif pcs_apprnc <= 100:
+	elseif ARGS[1] <= 100:
 		result = 4
-	elseif pcs_apprnc <= 125:
+	elseif ARGS[1] <= 125:
 		result = 5
-	elseif pcs_apprnc <= 150:
+	elseif ARGS[1] <= 150:
 		result = 6
-	elseif pcs_apprnc <= 165:
+	elseif ARGS[1] <= 165:
 		result = 7
-	elseif pcs_apprnc <= 180:
+	elseif ARGS[1] <= 180:
 		result = 8
-	elseif pcs_apprnc <= 199:
+	elseif ARGS[1] <= 199:
 		result = 9
 	else
 		result = 10
@@ -374,33 +332,36 @@ end
 if $ARGS[0] = 'AdjustFromBMI':
 	tempValue = ARGS[1] & !!value to be adjusted
 
-	if pcs_bmi < 16:
+	temp_bs_class = func('body_structure', 'get_class')
+	if temp_bs_class < 100:
 		!! severely underweight
-		tempValue = tempValue * 50 / 100
-    elseif pcs_bmi < 19:
+		result = tempValue * 50 / 100
+	elseif temp_bs_class < 200:
 		!! underweight
-		tempValue = tempValue * 95 / 100
-    elseif pcs_bmi < 25:
+		result = tempValue * 95 / 100
+	elseif temp_bs_class < 400:
 		!! healthy weight
 		!! normal bonus
-    elseif pcs_bmi < 30:
+		result = tempValue
+	elseif temp_bs_class < 500:
 		!! overweight
-		tempValue = tempValue * 95 / 100
-    elseif pcs_bmi < 35:
+		result = tempValue * 95 / 100
+	elseif temp_bs_class < 600:
 		!! moderately obese
-		tempValue = tempValue * 80 / 100
-    elseif pcs_bmi < 40:
+		result = tempValue * 80 / 100
+	elseif temp_bs_class < 700:
 		!! severely obese
-		tempValue = tempValue * 55 / 100
-    elseif pcs_bmi < 45:
+		result = tempValue * 55 / 100
+	elseif temp_bs_class < 800:
 		!! very severely obese
-		tempValue = tempValue * 50 / 100
-    else
+		result = tempValue * 50 / 100
+	else
 		!!morbidly obese
-		tempValue = tempValue * 40 / 100
-    end
+		result = tempValue * 40 / 100
+	end
 
-	result = tempValue
 	killvar 'tempValue'
+	killvar 'temp_bs_class'
 end
+
 --- AppearanceSystem ---------------------------------

File diff suppressed because it is too large
+ 295 - 256
locations/Cheatmenu_din.qsrc


+ 5 - 5
locations/Cum_Manage.qsrc

@@ -675,7 +675,7 @@ if $ARGS[0] = 'cum_stat_display':
 			$txtloc_adj = 'all over '
 			$icon_txtloc = 'your labia'
 			$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumpussy/cumpus'+rand(1,4)+'.jpg''">labia</a>'
-		elseif i = 2 and PCloPanties > 0:
+		elseif i = 2 and PCloPanties = 1:
 			$txtloc_adj = 'across '
 			$txtloc = 'the front of your panties'
 			$icon_txtloc = $txtloc
@@ -687,7 +687,7 @@ if $ARGS[0] = 'cum_stat_display':
 			$txtloc_adj = 'all over '
 			$icon_txtloc = 'your butt'
 			$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumass/cumass'+rand(1,6)+'.jpg''">butt</a>'
-		elseif i = 5 and PCloPanties > 0:
+		elseif i = 5 and PCloPanties = 1:
 			$txtloc_adj = 'painting '
 			$txtloc = 'the back of your panties'
 			$icon_txtloc = $txtloc
@@ -1118,7 +1118,7 @@ if $ARGS[0] = 'cum_decay':
 								end
 								if cumforced = 0:
 									!! 2 = 'On your panties over your vagina'
-									if $pantyworntype <> 'none' or PCloPanties > 0:
+									if $pantyworntype <> 'none' or PCloPanties = 1:
 										!! isprokp - sanitary pad absorption
 										if isprokp <> 1:
 											spafinloc = 2
@@ -1192,7 +1192,7 @@ if $ARGS[0] = 'cum_decay':
 									end
 								else
 									!! 5 = 'On your panties over your butt'
-									if $pantyworntype <> 'none' or PCloPanties > 0:
+									if $pantyworntype <> 'none' or PCloPanties = 1:
 										!! isprokp - sanitary pad absorption
 										if isprokp <> 1:
 											spafinloc = 5
@@ -1231,7 +1231,7 @@ if $ARGS[0] = 'cum_decay':
 					!! 1 = 'On your labia'  4 = 'On your butt'
 					elseif (i = 1 and sparrvol[idx]*((totminut-cumdectime)/15) > rand(2,5)) _ 
 						or (i = 4 and sparrvol[idx]*((totminut-cumdectime)/15) > rand(4,8)):
-						if $pantyworntype <> 'none' or PCloPanties > 0:
+						if $pantyworntype <> 'none' or PCloPanties = 1:
 							!! 2 = 'On your panties over your vagina'  5 = 'On your panties over your butt'
 							sexvolume = rand(sparrvol[idx]/2, sparrvol[idx]) - iif(i=1,isprokp*rand(15,30),0)
 							if sexvolume > 0:

+ 3 - 6
locations/HotelRoom.qsrc

@@ -1,12 +1,11 @@
 # HotelRoom
 
-if hotelRoomDays[$region] = 0 and hour > 11: hotelRoom[$region] = 0
-if hotelRoomDays[$region] < 0: hotelRoom[$region] = 0
+if hotelRoomDays[$region] - daystart <= 0 and hour > 11: hotelRoom[$region] = 0
+if hotelRoomDays[$region] - daystart < 0: hotelRoom[$region] = 0
 CLOSE ALL
 if $ARGS[0] = 'normal':
 	*clr & cla
 	gs 'shortgs', 'setloc', 'HotelRoom', 'normal'
-	$prevloc = $loc
 	$location_type = 'private'
 	menu_off = 0
 	hotelWiFi = 1
@@ -52,7 +51,6 @@ end
 if $ARGS[0] = 'better':
 	*clr & cla
 	gs 'shortgs', 'setloc', 'HotelRoom', 'better'
-	$prevloc = $loc
 	$location_type = 'private'
 	menu_off = 0
 	hotelWiFi = 1
@@ -98,7 +96,6 @@ end
 if $ARGS[0] = 'best':
 	*clr & cla
 	gs 'shortgs', 'setloc', 'HotelRoom', 'best'
-	$prevloc = $loc
 	$location_type = 'private'
 	menu_off = 0
 	hotelWiFi = 1
@@ -146,7 +143,7 @@ if $ARGS[0] = 'therapist':
 	*clr & cla
 	gs 'schedule', 'A186'
 	gs 'shortgs', 'setloc', 'HotelRoom', 'therapist'
-	if $prevloc ! $loc: $prevloc = $loc & gt 'therapist_home', 'hotel_enter'
+	if $prevloc ! $loc: gt 'therapist_home', 'hotel_enter'
 	$location_type = 'private'
 	menu_off = 0
 	hotelWiFi = 1

+ 4 - 4
locations/KGstart.qsrc

@@ -107,7 +107,7 @@ if KFOnLineReaga > 0:
 		end
 	end
 
-	if karta + bankDebtLimit >= 1000:
+	if karta >= 1000:
 		act 'Payment akkuaunta':
 			karta -= 1000
 			KFOnLineReaga += 30
@@ -115,12 +115,12 @@ if KFOnLineReaga > 0:
 		end
 	end
 
-	if karta + bankDebtLimit > 0:
+	if karta > 0:
 		act 'Buy game coins (1 ₽ = 1 Game Coin)':
 			cla
 			KGOLdonat = input("How many coins do you wish to purchase?")
 
-			if KGOLdonat <= 0 or KGOLdonat > karta:
+			if KGOLdonat <= 0 or karta < KGOLdonat:
 				msg 'Not valid operation'
 			else
 				karta -= KGOLdonat
@@ -135,7 +135,7 @@ else
 	'Welcome to the online game Vertep World'
 	'To play this game you have to pay 1, 000 <b>₽</b> for 30 days via online banking.'
 
-	if karta + bankDebtLimit >= 1000:
+	if karta >= 1000:
 		act 'Payment':
 			karta -= 1000
 			KFOnLineReaga += 30

+ 0 - 91
locations/Kikatak.qsrc

@@ -1,91 +0,0 @@
-# Kikatak
-if $ARGS[0] = 'player':
-	defsumV = agilV + reactV + KikDefV
-	defkofV = defsumV * 20 / 100
-	defV = rand(defsumV - defkofV, defsumV + defkofV)
-
-	if popad >= defV * 2:
-		'<b><font color="green">HIT</font></b>'
-		damageKrit = damage * 20 / 100
-		damage += damageKrit
-		healthV -= damage
-		pointKik += 1
-		'<font color="green">You have dealt <<damage>> points of damage.</font>'
-
-		if damage >= healthV * 20 / 100:
-			pointKik += 1
-			'<font color="green"><<$boydesc>> falls to the ground.</font>'
-
-			if healthV < (vitalV * 10 + strenV * 5) / 4:
-				'<font color="green"><<$boydesc>> is knocked out. You''ve won!</font>'
-				xgt 'enderKik', 'winKO'
-				exit
-			end
-		end
-	elseif popad < defV * 2 and popad >= defV:
-		'<font color="green">Contact</font>'
-		healthV -= damage
-		pointKik += 1
-		'<font color="green">You have dealt <<damage>> points of damage.</font>'
-
-		if damage >= healthV * 20 / 100:
-			pointKik += 1
-			'<font color="green"><<$boydesc>> falls to the ground.</font>'
-
-			if healthV < (vitalV * 10 + strenV * 5) / 4:
-				'<font color="green"><<$boydesc>> is knocked out. You''ve won!</font>'
-				xgt 'enderKik', 'winKO'
-				exit
-			end
-		end
-	elseif popad < defV:
-		'<font color="red">You''ve missed.</font>'
-	end
-end
-
-if $ARGS[0] = 'enemy':
-	defsum = pcs_agil + pcs_react + pcs_def
-	defkof = defsum * 20 / 100
-	def = rand(defsum - defkof, defsum + defkof)
-
-	if popad >= def * 2:
-		'<b><font color="red">You''ve gotten hit.</font></b>'
-		damageKrit = damage * 20 / 100
-		damage += damageKrit
-		pcs_health -= damage
-		pointKikV += 1
-		'<font color="red">You have received <<damage>> points of damage.</font>'
-
-		if damage >= pcs_health * 20 / 100:
-			pointKikV += 1
-			'<font color="red">You have fallen to the ground.</font>'
-
-			if pcs_health < (pcs_vital * 10 + pcs_stren * 5) / 4:
-				'<font color="red">You are knocked out. You''ve lost!</font>'
-				xgt 'enderKik', 'lossKO'
-				exit
-			end
-		end
-	elseif popad < def * 2 and popad >= def:
-		'<font color="red">You''ve gotten hit.</font>'
-		pcs_health -= damage
-		pointKikV += 1
-		'<font color="red">You have received <<damage>> points of damage.</font>'
-
-		if damage >= pcs_health * 20 / 100:
-			pointKikV += 1
-			'<font color="red">You have fallen to the ground.</font>'
-
-			if pcs_health < (pcs_vital * 10 + pcs_stren * 5) / 4:
-				'<font color="red">You are knocked out. You''ve lost!</font>'
-				xgt 'enderKik', 'lossKO'
-				exit
-			end
-		end
-	elseif popad < def:
-		'<font color="green">Missed</font>'
-	end
-end
-
---- Kikatak ---------------------------------
-

+ 39 - 38
locations/Komp.qsrc

@@ -9,13 +9,13 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 	'Your computer boots up and you''re soon looking at your operating system''s main screen.'
 
-	act 'Shut your computer down': 
+	act 'Shut your computer down':
 		killvar '$subs'
 		killvar 'access'
 		gt 'komp', 'fin'
 	end
 	act 'Play Solitaire (0:20)': gt 'komp', 'pasians'
-	
+
 	if AlbinaQW['flashdrive'] = 1:
 		if $loc = 'dachain' or $loc = 'sitr' or $loc = 'bedr' or $loc = 'bedr2x' or ($loc = 'uni_dorm' and $loc_arg = 'dorm_room') or ($loc = 'city_mansion_residence_2' and $loc_arg = 'yoffice') or ($loc = 'pav_shared_apt' and $loc_arg = 'pcsRoom') or ($loc = 'mey_home' and $loc_arg = 'guest_bedroom') or ($loc = 'city_house_res_misc' and $loc_arg = 'livroom') or $loc = 'nichBedroomServant' or (locat['Anya_inroom'] = 0 and $loc = 'bedrPar'):
 			act 'Check Albina''s flash drive': gt 'albina_house_events', 'flash_drive'
@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 	!! arrived here from mobile net.
 	!! Sveta can access the internet if > 0
 	if subscription[$subs] > 0:
-		if access['metered'] = 0: 
+		if access['metered'] = 0:
 			act 'Browse the internet': gt 'komp', 'browse'
 		else
 			act 'Browse the internet - You have <<subscription[$subs]>> minutes of access left': gt 'komp', 'browse'
@@ -54,9 +54,9 @@ if $ARGS[0] = 'browse':
 	*clr & cla
 	gs 'stat'
 	menu_off = 0
-	
+
 	act 'Close the browser': gt 'komp','start'
-	
+
 	!! TODO: Update
 	!! check if the original account still valid?
 	!! if account_used > 0
@@ -119,7 +119,7 @@ end
 if $ARGS[0] = 'sale':
 	*clr & cla
 	!! TODO: Update time and internet
-	
+
 	!! IMPORTANT: What happens if an activity takes more time than the minutes Sveta has? We just say "You tried, but could not finish"?
 	if access['metered'] and subscription[$subs] < 15:
 		'You check the website, but realize that <<subscription[$subs]>> minutes won''t be enough to fill out all the forms.'
@@ -176,13 +176,13 @@ if $ARGS[0] = 'porno':
 	else
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 		'You go to a porn site and browse through videos for a few minutes.'
-		
-		if fame['city_porn'] >= 100: 
+
+		if fame['city_porn'] >= 100:
 			act 'Watch one of your own videos':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/porno.jpg"></center>'
-				'You find a video you like the look of and click on it before getting comfortable. When the video loads up, you''re surprised to find that the girl starring in it is you!' 
+				'You find a video you like the look of and click on it before getting comfortable. When the video loads up, you''re surprised to find that the girl starring in it is you!'
 				act 'Watch it':
 					cla
 					elektro += 3
@@ -203,19 +203,19 @@ if $ARGS[0] = 'porno':
 
 					act 'The video ends': gt 'komp', 'porno'
 				end
-				
+
 				act 'Turn it off':
 					cla
 					minut += 5
 					gs 'stat'
 					'You immediately turn the video off and leave the website. If you found that video yourself, then how many people have seen you?'
-					
+
 					act 'Leave this website': gt 'komp', 'browse'
 				end
 			end
 		end
-		
-		
+
+
 		act 'Watch vanilla porn':
 			*clr & cla
 			elektro += 3
@@ -231,7 +231,7 @@ if $ARGS[0] = 'porno':
 
 			act 'The video ends': gt 'komp', 'porno'
 		end
-		
+
 		act 'Watch anal porn':
 			*clr & cla
 			elektro += 3
@@ -247,7 +247,7 @@ if $ARGS[0] = 'porno':
 
 			act 'The video ends': gt 'komp', 'porno'
 		end
-		
+
 		act 'Watch lesbian porn':
 			*clr & cla
 			elektro += 3
@@ -260,10 +260,10 @@ if $ARGS[0] = 'porno':
 			gs 'arousal', 'porn', 30
 			minut -= 30
 			gs 'stat'
-		
+
 			act 'The video ends': gt 'komp', 'porno'
 		end
-		
+
 		act 'Watch BBC porn':
 			*clr & cla
 			elektro += 3
@@ -315,7 +315,7 @@ if $ARGS[0] = 'masturbate':
 		end
 
 		act 'Stop masturbating': divanmastr = 0 & gt 'komp', 'porno'
-		
+
 		gs 'arousal', 'end'
 		gs 'stat'
 
@@ -365,7 +365,8 @@ if $ARGS[0] = 'znak':
 		if pcs_lover < 3:
 			act 'Look for a kind man':
 				cla
-				gs 'boygirl', 0
+				gs 'npcgeneratec', 0
+				gs 'boyStat', $npclastgenerated
 				gs 'boyfrend', 'start'
 				haraklover[lover_number] = 0
 				'You find a guy named <<$loverdesc[lover_number]>> and send him your number after checking out his profile. You hope he''ll call you!'
@@ -375,7 +376,8 @@ if $ARGS[0] = 'znak':
 
 			act 'Look for a normal guy':
 				cla
-				gs 'boygirl', 0
+				gs 'npcgeneratec', 0
+				gs 'boyStat', $npclastgenerated
 				gs 'boyfrend', 'start'
 				haraklover[lover_number] = 1
 				'You find a guy named <<$loverdesc[lover_number]>> and send him your number after checking out his profile. You hope he''ll call you!'
@@ -385,7 +387,8 @@ if $ARGS[0] = 'znak':
 
 			act 'Look for a strong man':
 				cla
-				gs 'boygirl', 0
+				gs 'npcgeneratec', 0
+				gs 'boyStat', $npclastgenerated
 				gs 'boyfrend', 'start'
 				haraklover[lover_number] = 2
 				'You find a guy named <<$loverdesc[lover_number]>> and send him your number after checking out his profile. You hope he''ll call you!'
@@ -576,10 +579,10 @@ if $ARGS[0] = 'rabota':
 				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore1.jpg"></center>'
 				'You click the button and get taken to the full job description.'
 				'<i>You will be required to expose your body in front of viewers and fulfil their every wish. Payment is based on a tip system: Customers on the website buy tokens which they can use to tip girls they enjoy watching.'
-				'The website will cover all costs during your shows, but how much money you make is up to you: The better you are at attracting viewers, and the more you''re willing to do to please them, the more likely they will be to tip you.' 
+				'The website will cover all costs during your shows, but how much money you make is up to you: The better you are at attracting viewers, and the more you''re willing to do to please them, the more likely they will be to tip you.'
 				'Any tokens you earn will be converted to rubles and paid into your bank account immediately after a session ends. The website also hides your stream for viewers from your region, so the chance of you being recognized by someone you know in real life is very low.'
 				'If you''re interested, please fill in the questionnaire below.</i>'
-				
+
 				if bankAccount = 0:
 					'You need a valid bank account to be able to register for this job.'
 				else
@@ -626,7 +629,7 @@ if $ARGS[0] = 'rabota':
 				'A quick search of the listed address tells you that it''s located somewhere in the red light district of the city.'
 				if pornstudio = 0: 'You''ve heard rumors that an underground porn studio is located somewhere in that area.'
 				if pornstudio = 1: 'The porn studio is located in that area. This job listing suddenly makes more sense to you.'
-				
+
 				if pcs_inhib >= 40:
 					act 'Write down the address':
 						cla
@@ -681,11 +684,11 @@ if $ARGS[0] = 'agent' :
 	*nl
 	'<b>Property listing</b>:'
 	if func('homes_properties', 'is_property_of_status', 'rented', 'city_apartment') :
-		if func('homes_properties', 'get_rent_days', 'city_apartment') > 0: 
+		if func('homes_properties', 'get_rent_days', 'city_apartment') > 0:
 			'You have <B><<func(''homes_properties'', ''get_rent_days'', ''city_apartment'')>> days</B> remaining on the rental of your St. Petersburg apartment.'
 			*nl
 		end
-		if karta + bankDebtLimit >= func('homes_properties', 'get_rent_amount', 'city_apartment'):
+		if karta >= func('homes_properties', 'get_rent_amount', 'city_apartment'):
 			act 'Pay rent on St. Petersburg':
 				cla
 				gs 'homes_properties', 'pay_rent', 'city_apartment', 'card'
@@ -704,14 +707,14 @@ if $ARGS[0] = 'agent' :
 		'Current sale price is listed at: <<func(''homes_properties'', ''get_property_sales_price'', ''village_cottage'')>> <b>₽</b>.'
 		*nl
 	end
-	
+
 	if func('homes_properties', 'is_property_of_status', 'rented', 'old_town_apartment'):
-		if func('homes_properties', 'get_rent_days', 'old_town_apartment') >= 0: 
+		if func('homes_properties', 'get_rent_days', 'old_town_apartment') >= 0:
 			'You have <B><<func(''homes_properties'', ''get_rent_days'', ''old_town_apartment'')>> days</B> remaining on the rental of your Pushkin apartment.'
 			*nl
 		end
-		
-		if karta + bankDebtLimit >= func('homes_properties', 'get_rent_amount', 'old_town_apartment'):
+
+		if karta >= func('homes_properties', 'get_rent_amount', 'old_town_apartment'):
 			act 'Pay rent on Pushkin':
 				cla
 				gs 'homes_properties', 'pay_rent', 'old_town_apartment', 'card'
@@ -736,19 +739,17 @@ end
 
 if $ARGS[0] = 'bank':
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/online_bank.jpg"></center>'
-	if karta + bankDebtLimit >= 10:
+	if karta >= 10:
 		*pl
-
 		'You can buy prepaid internet access online through your bank account. 1 hour of internet only costs 10 <b>₽</b>! *'
-
 		*pl
 
-		if karta >= 0:
-			'You have <<karta>> <b>₽</b> in your account.'
+		if karta >= bankDebtLimit:
+			'You have <<karta - bankDebtLimit>> <b>₽</b> in your account.'
 			'You have an overdraft limit of <font color="blue"><<bankDebtLimit>></font>!'
 		else
-			'You are overdrawn by <font color="red"><<-1 * karta>> <b>₽</b></font>.'
-			'You have a remaining credit limit of <font color="blue"><<bankDebtLimit + karta>></font>!'
+			'You are overdrawn by <font color="red"><<bankDebtLimit - karta>> <b>₽</b></font>.'
+			'You have a remaining credit limit of <font color="blue"><<karta>></font>!'
 		end
 
 		*pl
@@ -758,7 +759,7 @@ if $ARGS[0] = 'bank':
 			cla
 			intinp = input ("How many hours of internet access do you wish to purchase? (1hr = 10 <b>₽</b>)")
 
-			if intinp <= 0 or intinp * 10 > karta + bankDebtLimit:
+			if intinp <= 0 or karta < intinp * 10:
 				'Invalid amount.'
 			else
 				karta -= intinp * 10

+ 4 - 3
locations/LariskaHome.qsrc

@@ -358,7 +358,7 @@ if $ARGS[0] = 'bathroom_join_2':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_shower_2.jpg"></center>'
 	'You quickly strip your clothing off, and gently tap on the shower door. Startled, she turns to see you standing there, before smiling shyly and opening the door for you.'
-	
+
 	act 'Finish the shower':
 		noshampoo = 1
 		dynamic $showerdin
@@ -481,7 +481,8 @@ if $ARGS[0] = 'lariska_bedroom':
 		'Her bed sits directly on the floor, without space underneath.'
 	end
 
-	'<table><tr><td valign="top">Your <a href="exec:gt ''alarmclock'', ''start''">phone alarm</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+	'<table><tr><td valign="top">'
+	func('alarmclock', 'base_alarmclock_text')
 	*nl
 	if locat['Lariska'] = 1:'<a href="exec:gt ''LariskaHome'', ''lariska_asleep_1''">Lariska</a> is sound asleep, curled up and wrapped in blankets.'
 	if locat['Lariska'] = 2:'<a href="exec:gt ''LariskaHome'', ''lariska_dressing_1''">Lariska</a> is getting dressed right now.'
@@ -557,7 +558,7 @@ if $ARGS[0] = 'lariska_bedroom':
 				lariskalove += 1
 				gs 'arousal', 'kiss', 5, 'lesbian'
 				gs 'stat'
-			else 
+			else
 				'No longer shy around you, she wraps her hands around your waist and starts kissing you. You move your left hand down to the top of her butt while putting your right on her stomach and start rubbing in circular motions. You slowly start leaning back, pulling her with you until you are both laying on your sides, and her tongue slips between your lips and starts playing with yours. You feel her left hand slide down from your waist and starts rubbing your butt before working its way down from there to your thigh. Hooking her hand around it, she pulls your leg up and over her own before going back to massaging your butt again. Eventually she pulls back from your tongue fight, face flushed a deep red and panting from lack of breath. She gives you a long, hungry look, telling you without words she wants, no, NEEDS, to keep going.'
 				gs 'npc_relationship', 'modify', 'A13', 'like'
 				lariskalove += 1

File diff suppressed because it is too large
+ 214 - 214
locations/NikoWhore.qsrc


+ 9 - 8
locations/Nudelake.qsrc

@@ -57,14 +57,7 @@ if temper >= 15 and month >= 5 and month <= 9 and hour >= 6 and hour <= 20:
 				cla
 				*clr
 				minut += 5
-				$lastwornclothingtype['swim'] = $clothingworntype
-				lastwornclothingnumber['swim'] = clothingwornnumber
-				$lastwornpantytype['swim'] = $pantyworntype
-				lastwornpantynumber['swim'] = pantywornnumber
-				$lastwornbratype['swim'] = $braworntype
-				lastwornbranumber['swim'] = brawornnumber
-				gs 'clothing', 'strip_all'
-				if pcs_horny >= 80 and exhibitionist_lvl > 1 and PCloPanties > 0:
+				if pcs_horny >= 80 and exhibitionist_lvl > 1 and (PCloPanties = 1 or $pantyworntype ! 'none'):
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
 					'You strip off. A few passing men do a double-take and pause to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
 				elseif pcs_inhib >= 60:
@@ -74,6 +67,14 @@ if temper >= 15 and month >= 5 and month <= 9 and hour >= 6 and hour <= 20:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
 					'You quickly check to see if anyone is watching, and when you''re satisfied no one is paying you undue attention, you take off your clothes. You''re naked now.'
 				end
+				$lastwornclothingtype['swim'] = $clothingworntype
+				lastwornclothingnumber['swim'] = clothingwornnumber
+				$lastwornpantytype['swim'] = $pantyworntype
+				lastwornpantynumber['swim'] = pantywornnumber
+				$lastwornbratype['swim'] = $braworntype
+				lastwornbranumber['swim'] = brawornnumber
+				gs 'clothing', 'strip_all'
+				gs 'stat'
 			else
 				cla
 				*clr

+ 47 - 47
locations/ParkKafe.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'guys':
 	menu_off = 1
 	*clr & cla
 	gs 'stat'
-	if hotcat >= 5: 
+	if pcs_hotcat >= 5:
 		if kloftimes > 0:
 			'You notice Jora and Semyon sitting a bit further away from you. They clearly notice you as one of them nods towards your general direction to the other one. In the end, they ignore you to continue drinking beer and talking to each other.'
 			act 'Leave': gt 'parkKafe', 'end', 'cafe'
@@ -74,7 +74,7 @@ if $ARGS[0] = 'guys':
 				*clr & cla
 				gs 'boyStat', 'A44'
 				gs 'npcgeneratec', 0, 'Sporty Guy', rand(18,35)
-				gs 'boyStat', $npclastgenerated				
+				gs 'boyStat', $npclastgenerated
 				gs 'fame', 'city', 'sex', 3
 				gs 'drugs', 'alcohol', 'beer'
 				'You drink a glass of beer while the guys order another. One of them quietly slips something into your glass. You get drunk very quickly and the guys guide you to the nearest woods.'
@@ -88,7 +88,7 @@ if $ARGS[0] = 'guys':
 					gs 'cum_call', 'mouth', $boy
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act 'Become acquainted':gt 'parkkafe', 'klof 1'
 				else
 					if parkara = 0:parkara = 1
@@ -101,7 +101,7 @@ if $ARGS[0] = 'guys':
 					gs 'cum_call', 'anus', $boy
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act 'Become acquainted':gt 'parkkafe', 'klof 1'
 				end
 			end
@@ -120,13 +120,13 @@ if $ARGS[0] = 'klof 1':
 	clr
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/11 1.jpg"></center>'
-	'You try to rise from the grass in front of the guys, but your legs and hands are shaking from the rough pounding they gave you.' 
+	'You try to rise from the grass in front of the guys, but your legs and hands are shaking from the rough pounding they gave you.'
 	if parkarainmouthnow = 0:
 		'Your vagina feels itchy as warm gooey sperm tickles down your legs. "Did you like it baby?" one of the guys mockingly asks.'
-	else	
+	else
 		'You still have the taste of the guys sperm in your mouth as you hear one of the guys, mockingly ask, "Did you like it baby?"'
 		parkarainmouthnow = 0
-	end	
+	end
 	act 'Yes':gt 'event', 'klof 2'
 	act 'No, walk away': gt 'parkKafe', 'end'
 end
@@ -136,7 +136,7 @@ if $ARGS[0] = 'seniors':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/oldman.jpg"></center>'
-	if hotcat >= 4:
+	if pcs_hotcat >= 4:
 		'A senior citizen, looking a bit scrappy, suddenly stops in his tracks and yells out, "Hey, girl! You don''t want to drink that piss that they serve. Come with me and I''ll get you the real stuff..."'
 		'You look around thinking that the senior is yelling at someone else, but you notice he''s got his eyes locked on you. Pointing at yourself he starts yelling again, "Yes, you!"'
 		gs 'willpower', 'drink', 'resist'
@@ -270,7 +270,7 @@ if $ARGS[0] = 'man':
 	menu_off = 1
 	*clr & cla
 	gs 'stat'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		*clr & cla
 		minut += 15
 		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/drink.jpg"></center>'
@@ -284,7 +284,7 @@ if $ARGS[0] = 'man':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/parkcafe.jpg"></center>'
 			'You look over towards the man, smile, and politely nod your thanks to him.'
-			'The man probably expected a different outcome, but there''s nothing he can do except smile and nod back.'	
+			'The man probably expected a different outcome, but there''s nothing he can do except smile and nod back.'
 			act 'Go back to your own': gt 'parkKafe', 'end', 'cafe'
 		end
 		act 'Walk over to him':
@@ -341,7 +341,7 @@ if $ARGS[0] = 'man':
 								end
 							else
 								act 'Stop! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end	
+							end
 							act 'Give in':
 								*clr & cla
 								gs 'stat'
@@ -392,7 +392,7 @@ if $ARGS[0] = 'man':
 												gs 'arousal', 'end'
 												gs 'stat'
 												act 'Leave':gt 'city_center'
-											end									
+											end
 										end
 										act 'Pull out':
 											*clr & cla
@@ -442,7 +442,7 @@ if $ARGS[0] = 'man':
 							'The man gives you a small breather before he continues fucking you rapidly, and recognizing the usual grunts, you know what is about to happen...'
 							gs 'arousal', 'vaginal', 15
 							$orgasm_or = 'yes'
-							gs 'stat'		
+							gs 'stat'
 							act 'Cum inside me':
 								*clr & cla
 								gs 'cum_call', 'vaginal'
@@ -459,11 +459,11 @@ if $ARGS[0] = 'man':
 									'As you''re finished, he leans in and kisses you one last time. "You were great. Talk about getting lucky with my first try..."'
 									'You can''t help yourself and chuckle as you hear him talk, "Luckily for you, you were also good. So I''m glad I followed you home..."'
 									'The two of you get dressed and chat a little before you decide to leave, "I had a great time" you say as you wink.'
-									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'	
+									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'city_center'
-								end									
+								end
 							end
 							act 'Pull out':
 								*clr & cla
@@ -481,7 +481,7 @@ if $ARGS[0] = 'man':
 									'As you''re finished, he leans in and kisses you one last time. "You were great. Talk about getting lucky with my first try..."'
 									'You can''t help yourself and chuckle as you hear him talk, "Luckily for you, you were also good. So I''m glad I followed you home..."'
 									'The two of you get dressed and chat a little before you decide to leave, "I had a great time" you say as you wink.'
-									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'	
+									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'city_center'
@@ -495,7 +495,7 @@ if $ARGS[0] = 'man':
 							'You lay with your back to him and tuck yourself in as the little spoon while he embraces you. With one of his arms he grabs his hard cock and starts teasing you with it by going up and down your pussy.'
 							'You let out a moan telling him that you''re ready as he slowly leads his cock inside you. He starts slowly thrusting into you as you feel an indescribable feeling hit you. Your moans get louder as he picks up his pace in reaction to you.'
 							'You keep squeaking, "Yes, yes, yes! Fuck me!" as he''s really picked up the pace by now. It doesn''t take long before it darkens in front of your eyes and you orgasm. You forget all about him as your insides enclose themselves and you have an amazing orgasm.'
-							'The man gives you a small breather before he continues fucking you rapidly. You recognize the usual grunts, so you know what is about to happen...'	
+							'The man gives you a small breather before he continues fucking you rapidly. You recognize the usual grunts, so you know what is about to happen...'
 							gs 'arousal', 'vaginal', 15
 							$orgasm_or = 'yes'
 							gs 'stat'
@@ -515,11 +515,11 @@ if $ARGS[0] = 'man':
 									'As you''re finished, he leans in and kisses you one last time. "You were great. Talk about getting lucky with my first try..."'
 									'You can''t help yourself and chuckle as you hear him talk, "Luckily for you, you were also good. So I''m glad I followed you home..."'
 									'The two of you get dressed and chat a little before you decide to leave, "I had a great time" you say as you wink.'
-									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'	
+									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'city_center'
-								end									
+								end
 							end
 							act 'Pull out':
 								*clr & cla
@@ -537,7 +537,7 @@ if $ARGS[0] = 'man':
 									'As you''re finished, he leans in and kisses you one last time. "You were great. Talk about getting lucky with my first try..."'
 									'You can''t help yourself and chuckle as you hear him talk, "Luckily for you, you were also good. So I''m glad I followed you home..."'
 									'The two of you get dressed and chat a little before you decide to leave, "I had a great time" you say as you wink.'
-									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'	
+									'"Me too! They didn''t lie about the girls here" he replies, with a smirk.'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'city_center'
@@ -555,7 +555,7 @@ if $ARGS[0] = 'man':
 							'You take a small breather before continuing to bounce on top of him. It doesn''t take long before you recognize the usual grunt, you know what awaits next...'
 							gs 'arousal', 'vaginal', 15, 'dom'
 							$orgasm_or = 'yes'
-							gs 'stat'	
+							gs 'stat'
 							act 'Cum inside me':
 								*clr & cla
 								gs 'cum_call', ''
@@ -572,11 +572,11 @@ if $ARGS[0] = 'man':
 									'As you''re finished, he leans in and kisses you one last time. "You were great. Talk about getting lucky with my first try..."'
 									'You can''t help yourself and chuckle as you hear him talk, "Luckily for you, you were also good. So I''m glad I followed you home..."'
 									'The two of you get dressed and chat a little before you decide to leave, "I had a great time," you say as you wink.'
-									'"Me too! They didn''t lie about the girls here," he replies, with a smirk.'	
+									'"Me too! They didn''t lie about the girls here," he replies, with a smirk.'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'city_center'
-								end									
+								end
 							end
 							act 'Pull out':
 								*clr & cla
@@ -594,7 +594,7 @@ if $ARGS[0] = 'man':
 									'As you''re finished, he leans in and kisses you one last time. "You were great. Talk about getting lucky with my first try..."'
 									'You can''t help yourself and chuckle as you hear him talk, "Luckily for you, you were also good. So I''m glad I followed you home..."'
 									'The two of you get dressed and chat a little before you decide to leave, "I had a great time," you say as you wink.'
-									'"Me too! They didn''t lie about the girls here," he replies, with a smirk.'	
+									'"Me too! They didn''t lie about the girls here," he replies, with a smirk.'
 									gs 'arousal', 'end'
 									gs 'stat'
 									act 'Leave':gt 'city_center'
@@ -613,7 +613,7 @@ if $ARGS[0] = 'man':
 				'The man, noticing that he messed up, tries to save the situation, "I-It came out wrong. I didn''t mean it like that..."'
 				'However, it''s already too late because you''ve made up your mind. "No thank you! I see that ring on your finger. Go back to your wife instead of chasing girls in a different city... jerk!"'
 				act 'Leave': gt 'parkKafe', 'end', 'cafe'
-			end		
+			end
 		end
 	else
 		'You stealthily glance at the respectable man, but during the time you two sit there he doesn''t give any attention to you.'
@@ -659,12 +659,12 @@ if $ARGS[0] = 'youth':
 	minut += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/drinking.jpg"></center>'
-	if hotcat >= 4:
+	if pcs_hotcat >= 4:
 		'As you take a seat, you notice a loud group of people that are a bit farther away. Judging by the bottles on their table, you can tell that they''ve been drinking for a while. While you''re waiting for a waiter, you notice that some of them look at and then point towards you and whisper something to each other. Before you know it, there''s a younger woman standing in front you. "Me and my friends were wondering if you would like to join us?" She''s clearly tipsy from alcohol.'
 		'She turns around and looks towards her friends. She turns back to you while leaning into your personal space. "Listen, I was dared to come over to talk to you and..." she stops because she is having a hard time remembering what she wanted to say. "So what do you say? I promise it''s nothing dangerous and we''ll remain in the park."'
 		gs 'willpower', 'misc', 'resist'
 		if will_cost <= pcs_willpwr:
-			act 'Decline (<<will_cost>> Willpower)': 
+			act 'Decline (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
@@ -691,7 +691,7 @@ if $ARGS[0] = 'youth':
 			'"Well yeah, the next part is quite simple. We want the two of you to walk around the park and give us a little show." They start to snicker at the thought of the two of you.'
 			'You look at them suspiciously. "What kind of show?"'
 			'They give you a look like you''re an idiot. "To go fuck of course."'
-			act 'Decline': 
+			act 'Decline':
 				*clr & cla
 				pcs_mood -= 20
 				gs 'stat'
@@ -760,7 +760,7 @@ if $ARGS[0] = 'youth':
 									minut += 15
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/join.jpg"></center>'
-									'As you return, the girl has already started asking if the group were pleased with the show and if you''ve managed to complete the dare.' 
+									'As you return, the girl has already started asking if the group were pleased with the show and if you''ve managed to complete the dare.'
 									'The group is still flabbergasted as they didn''t expect it to play out the way it did, but are very pleased with the show.'
 									'The next few minutes are spent on putting your panties back on, and chatting with the rest of the group. At the same time you can hear the girl describe how good you taste.'
 									gs 'arousal', 'end'
@@ -807,8 +807,8 @@ if $ARGS[0] = 'youth':
 								minut += 15
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/join.jpg"></center>'
-								'You let out a moan, but before it escalates farther she stops and smiles. "Can''t have too much fun." You frown a little as though you''ve been robbed of something. However, you accept. The girl has already dressed herself and ran towards the group.' 
-								'As you return, the girl has already started asking if the group were pleased with the show and if you''ve managed to complete the dare.' 
+								'You let out a moan, but before it escalates farther she stops and smiles. "Can''t have too much fun." You frown a little as though you''ve been robbed of something. However, you accept. The girl has already dressed herself and ran towards the group.'
+								'As you return, the girl has already started asking if the group were pleased with the show and if you''ve managed to complete the dare.'
 								'The group is still flabbergasted as they didn''t expect it to play out the way it did, but are very pleased with the show.'
 								'The next few minutes are spent putting your panties back on, and chatting with the rest of the group. At the same time you can hear the girl describe how good you taste.'
 								gs 'arousal', 'end'
@@ -858,7 +858,7 @@ if $ARGS[0] = 'youth':
 								minut += 15
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/join.jpg"></center>'
-								'The two of you start laughing. "What is your problem old man?! Enjoy the show instead" the girl yells out before the two of you dress yourselves and run off giggling. He yells out after you.' 
+								'The two of you start laughing. "What is your problem old man?! Enjoy the show instead" the girl yells out before the two of you dress yourselves and run off giggling. He yells out after you.'
 								'As you return, the girl starts telling the group what happened and that you managed to complete the dare. They sit in awe as the two of you tell them about the old man that interrupted you.'
 								'The next few minutes are spent putting your panties back on, and chatting with the rest of the group as suddenly the old man passes by. "There he is!" she exclaims as she points to him. The group start making a lot of noise, laughing as the man passes by.'
 								gs 'arousal', 'end'
@@ -868,8 +868,8 @@ if $ARGS[0] = 'youth':
 						end
 					end
 				end
-			end	
-		end	
+			end
+		end
 	else
 		'You look at the group of snickering youth, but they don''t seem to pay attention towards you and are mostly ignoring everyone around them.'
 		act 'Leave': gt 'parkKafe', 'end', 'cafe'
@@ -892,7 +892,7 @@ if $ARGS[0] = 'blacks':
 			'You pull away from him. "What are you doing?"'
 			'His friends laugh and he blushes a bit. "Sorry, I just thought after last time... anyways, we should get going." With that he gets up to head for the door and his friends follow him.'
 			act 'Leave': gt 'parkKafe', 'end', 'cafe'
-		end	
+		end
 		act 'Sit in his lap':
 			*clr & cla
 			minut += 5
@@ -900,7 +900,7 @@ if $ARGS[0] = 'blacks':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/africantable2.jpg"></center>'
 			'You take a seat on his lap. One of them asks Djibril "Is this the girl?" He nods and they all smile. Apparently, he has been talking about you. They all start talking to you in an overtly flirty and sexual way before Djibril finally says "We were about to head back to our dorm. We were wondering if you would like to come with us and fuck. I promise that it will be a lot of fun. Are you interested?"'
-			act 'Accept': 
+			act 'Accept':
 				*clr & cla
 				minut += 20
 				DjibrilQW['invite'] = 1
@@ -928,10 +928,10 @@ if $ARGS[0] = 'blacks':
 			'He glances over at them, then looks back to you. "Sorry, I have to go. But it was nice meeting you again. Have a nice day." after saying that, he turns and leaves to join his friends outside. Then he stops at the door. "Hey if you want, why don''t you stop by my dorm some time." Then he tells you which building it is and which room is his. After that he walks outside with his friends and they walk away.'
 			act 'Leave': gt 'parkKafe', 'end', 'cafe'
 		end
-	elseif DjibrilQW['meet'] = 1 and hotcat >= 5:
+	elseif DjibrilQW['meet'] = 1 and pcs_hotcat >= 5:
 		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/africantable1.jpg"></center>'
 		'You notice Djibril sitting with a few other young African men at another table. They see you and start to talk among themselves. From their constant glances, you are sure that they are talking about you. Djibril gives you a huge grin and waves you over. You, not wanting to be rude, get up to walk over to their table. "Hello again, <<$pcs_nickname>>! We are about to head back to our dorm. We were wondering if you would like to come with us and fuck. I promise that it will be a lot of fun. Are you interested?"'
-		act 'Accept': 
+		act 'Accept':
 			*clr & cla
 			minut += 20
 			DjibrilQW['invite'] = 1
@@ -963,8 +963,8 @@ if $ARGS[0] = 'blacks':
 		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/djibril_talk.jpg"></center>'
 		'You notice Djibril sitting with a few other young African men at another table. They see you and start to talk amongst themselves. After a few minutes they get up, and Djibril heads over to your table as his friends head outside. "Hello again <<$pcs_nickname>>, I didn''t expect to see you in the city." You talk to him for a few moments before one of his friends peeks their head back inside to yell, "Djibril, come on, let''s go."'
 		'He glances over at them, then looks back to you. "Sorry, I have to go. But it was nice meeting you again. Have a nice day." after saying that, he turns and leaves to join his friends outside. Then he stops at the door. "Hey if you want, why don''t you stop by my dorm some time." Then he tells you which building it is and which room is his. After that he walks outside with his friends and they walk away.'
-		act 'Leave': gt 'parkKafe', 'end', 'cafe'		
-	elseif hotcat >= 5:
+		act 'Leave': gt 'parkKafe', 'end', 'cafe'
+	elseif pcs_hotcat >= 5:
 		DjibrilQW['meet'] = 1
 		'A few young African men sitting at another table see you and start to talk among themselves. From the constant glances you receive, you are sure they are talking about you. Eventually, they get up and come over to your table. One of them introduces himself. "I am Djibril. What''s your name?"'
 		'You smile to him. "<<$pcs_firstname>> <<$pcs_lastname>>, but most people call me <<$pcs_nickname>>."'
@@ -974,7 +974,7 @@ if $ARGS[0] = 'blacks':
 		'He shakes his head with a slight laugh. "He is my uncle. They have told me about you. Small world, huh?"'
 		'You giggle as well, small world indeed. "Yeah, it really is."'
 		'He says. "We were about to head back to our dorm, so I was wondering if you would like to come with us. I promise it will be a lot of fun. Are you interested?"'
-		act 'Accept': 
+		act 'Accept':
 			*clr & cla
 			minut += 20
 			DjibrilQW['invite'] = 1
@@ -1012,7 +1012,7 @@ if $ARGS[0] = 'the_boy':
 	menu_off = 1
 	*clr & cla
 	gs 'stat'
-	if hotcat >= 5 or gosh >= 1:
+	if pcs_hotcat >= 5 or gosh >= 1:
 		if gosh >= 1:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big127.jpg"></center>'
 			'The two of you exchange glances, you do recognize him from somewhere. Then it hits you... it''s Gosha! Just as you remember, he comes to the same realization. Before you know it, he''s heading over. "Hi, <<$pcs_nickname>>! I''m surprised to see you here."'
@@ -1103,7 +1103,7 @@ if $ARGS[0] = 'the_boy':
 										gs 'stat'
 										act 'Head back to the café': gt 'parkKafe', 'end', 'cafe'
 									end
-									
+
 									gs 'willpower', 'bj', 'self'
 									if will_cost <= pcs_willpwr:
 										act 'Suggest a blowjob (<<will_cost>> Willpower)':
@@ -1125,13 +1125,13 @@ if $ARGS[0] = 'the_boy':
 										end
 									else
 										act 'Suggest a blowjob (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-									end	
+									end
 									gs 'willpower', 'flash', 'resist', 'easy'
 									if will_cost <= pcs_willpwr:
 										act 'What for? (<<will_cost>> Willpower)':
 											*clr & cla
 											gs 'willpower', 'pay', 'resist'
-											minut += 15	
+											minut += 15
 											npc_rel['A127'] -= 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/city/centralpark/parkcafe.jpg"></center>'
@@ -1144,7 +1144,7 @@ if $ARGS[0] = 'the_boy':
 										act 'What for? (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 									end
 								end
-							end	
+							end
 							gs 'willpower', 'misc', 'self', 'easy'
 							if will_cost <= pcs_willpwr:
 								act 'Head back (<<will_cost>> Willpower)':
@@ -1185,7 +1185,7 @@ if $ARGS[0] = 'the_boy':
 			'"Cute name!" he says as the two of you become acquainted with one another. You learn that he is a student and that he lives in the hostel. Gosha invites you visit him. He even gives you directions to the hostel and how to find his dorm. "Well, I won''t disturb you anymore, <<$pcs_nickname>>! Don''t be a stranger and come by!"'
 			act 'Leave': gosh = 1 & gt 'parkKafe', 'end', 'cafe'
 		end
-	elseif hotcat < 5 and gosh = 0:
+	elseif pcs_hotcat < 5 and gosh = 0:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big127.jpg"></center>'
 		'The two of you exchange glances, but you keep yourselves to only that. After a while, he finishes his meal and leaves the café without either of you saying anything to each other.'
 		act 'Leave': gt 'parkKafe', 'end', 'cafe'

+ 0 - 1
locations/Prostitute.qsrc

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

+ 34 - 34
locations/RimmaSexQW.qsrc

@@ -7,7 +7,7 @@ gs 'stat'
 'You go over to Rima who smiles affably as she greets you.'
 '"Hi <<$pcs_nickname>>. My shift is almost over. Do you want to do something?"'
 
-act '"Sorry, I can''t right now"':gt 'moncheri', 'start'
+act '"Sorry, I can''t right now"':gt 'shop_moncheri', 'start'
 
 if money >= 250:
 	act '"Sure. How about we go to my place?"':
@@ -35,7 +35,7 @@ $rimmasexdi = {
 	if RimmaRandEvent = 23:
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma14.jpg"></center>'
 		pcs_throat += 3
-		'Rima pulls a massive strap-on out of her purse and puts it on, and you feel a hint of fear mingled into your excitement, knowing that she''s going to fuck you with it. Wasting no time on ordering you around, she roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.' 
+		'Rima pulls a massive strap-on out of her purse and puts it on, and you feel a hint of fear mingled into your excitement, knowing that she''s going to fuck you with it. Wasting no time on ordering you around, she roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.'
 		'You instinctively start moving your tongue around its thick tip, her hand at the back of your head holding you in place as she guides it into your throat. Given its size, it doesn''t come as a surprise that your gag reflex starts acting up but you endure as best you can, covering it generously in saliva.'
 		gs 'arousal', 'bj', 10, 'sub', 'lesbian'
 		gs 'stat'
@@ -57,7 +57,7 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 22:
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimmabj.jpg"></center>'
 		pcs_throat += 3
-		'Rima pulled the strap-on out of her purse, followed by collar with a chain attached to it. At her order, you put on the collar and hand the chain to Rima who put on the strap-on while you were occupied. She roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.' 
+		'Rima pulled the strap-on out of her purse, followed by collar with a chain attached to it. At her order, you put on the collar and hand the chain to Rima who put on the strap-on while you were occupied. She roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.'
 		'You instinctively start moving your tongue around its thick tip, her hand at the back of your head holding you in place as she guides it into your throat. Given its size, it doesn''t come as a surprise that your gag reflex starts acting up but you endure as best you can, covering it generously in saliva.'
 		gs 'arousal', 'bj', 10, 'sub', 'lesbian'
 		gs 'stat'
@@ -79,13 +79,13 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 21:
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma21.jpg"></center>'
 		gs 'arousal', 'pee', -5, 'sub', 'humiliation', 'lesbian'
-		'Rimma orders you to squat and gets over you, her legs spread wide. Your face an inch from her pussy, you suddenly feel something warm running over it: Without warning, Rima just started peeing on you! Shocked by this, you sit motionless until the jet subsides, the smell intense as the last droplets drip from your chin.' 
+		'Rimma orders you to squat and gets over you, her legs spread wide. Your face an inch from her pussy, you suddenly feel something warm running over it: Without warning, Rima just started peeing on you! Shocked by this, you sit motionless until the jet subsides, the smell intense as the last droplets drip from your chin.'
 		'When she''s done, Rima orders you to lick her clean and you comply without question.'
-		
+
 	elseif RimmaRandEvent = 20:
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma14.jpg"></center>'
 		if pcs_throat < 25: pcs_throat += 3
-		'Rima pulls a massive strap-on out of her purse and puts it on, and you feel a hint of fear mingled into your excitement, knowing that she''s going to fuck you with it. Wasting no time on ordering you around, she roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.' 
+		'Rima pulls a massive strap-on out of her purse and puts it on, and you feel a hint of fear mingled into your excitement, knowing that she''s going to fuck you with it. Wasting no time on ordering you around, she roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.'
 		'You instinctively start moving your tongue around its thick tip, her hand at the back of your head holding you in place as she guides it into your throat. Given its size, it doesn''t come as a surprise that your gag reflex starts acting up but you endure as best you can, covering it generously in saliva.'
 		gs 'arousal', 'bj', 10, 'sub', 'lesbian'
 		gs 'stat'
@@ -94,7 +94,7 @@ $rimmasexdi = {
 			if pcs_ass < 25: pcs_ass += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma20.jpg"></center>'
-			'Rima bends you over and her strap-on enters your ass sans additional lubrication. The friction and fullness are intense but you are also suddenly aware that your bladder is not only full but feels like it''s about to burst.' 
+			'Rima bends you over and her strap-on enters your ass sans additional lubrication. The friction and fullness are intense but you are also suddenly aware that your bladder is not only full but feels like it''s about to burst.'
 			'As Rima fucks you, you tighten the muscles in your lower body to try and keep control of your urethra but all you do is make the stimulation by her that much more intense. When you come, and you come very quickly, the orgasm deprives you of all control and you feel your own piss running down your leg. Rima chuckles but doesn''t stop, driving the strap-on even harder into you, sending you right over the edge again, your shame and sudden relaxation fueling your second climax.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'anal_strap', 20, 'lesbian', 'sub'
@@ -107,7 +107,7 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 19:
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimmabj.jpg"></center>'
 		pcs_throat += 3
-		'Rima pulled the strap-on out of her purse, followed by collar with a chain attached to it. At her order, you put on the collar and hand the chain to Rima who put on the strap-on while you were occupied. She roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.' 
+		'Rima pulled the strap-on out of her purse, followed by collar with a chain attached to it. At her order, you put on the collar and hand the chain to Rima who put on the strap-on while you were occupied. She roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.'
 		'You instinctively start moving your tongue around its thick tip, her hand at the back of your head holding you in place as she guides it into your throat. Given its size, it doesn''t come as a surprise that your gag reflex starts acting up but you endure as best you can, covering it generously in saliva.'
 		gs 'arousal', 'bj', 10, 'sub', 'lesbian'
 		gs 'stat'
@@ -117,7 +117,7 @@ $rimmasexdi = {
 			pcs_vag += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma19.jpg"></center>'
-			'You bend over for Rima when she orders you to, presenting your bare ass to her, feeling the pull on the chain as she enters your wet pussy. As demeaning as this is, it feels right with Rima, experience speaking from each of her actions and her movements inside you so intensely arousing that your moans are no doubt audible to your neighbors.' 
+			'You bend over for Rima when she orders you to, presenting your bare ass to her, feeling the pull on the chain as she enters your wet pussy. As demeaning as this is, it feels right with Rima, experience speaking from each of her actions and her movements inside you so intensely arousing that your moans are no doubt audible to your neighbors.'
 			'At some point, you feel Rima pulling hard on the chain, hard enough to make you rear, and at that exact moment, she pulls the strap-on out and inserts it into your ass, your wetness making it as easy as it''s going to be. A few thrusts later, you are already at your limit and come so hard that all strength leaves your body and Rima has to let go of the chain, lest she choke you.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal_strap', 20, 'lesbian', 'sub'
@@ -130,7 +130,7 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 18:
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma14.jpg"></center>'
 		pcs_throat += 3
-		'Rima pulls a massive strap-on out of her purse and puts it on, and you feel a hint of fear mingled into your excitement, knowing that she''s going to fuck you with it. Wasting no time on ordering you around, she roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.' 
+		'Rima pulls a massive strap-on out of her purse and puts it on, and you feel a hint of fear mingled into your excitement, knowing that she''s going to fuck you with it. Wasting no time on ordering you around, she roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.'
 		'You instinctively start moving your tongue around its thick tip, her hand at the back of your head holding you in place as she guides it into your throat. Given its size, it doesn''t come as a surprise that your gag reflex starts acting up but you endure as best you can, covering it generously in saliva.'
 		gs 'arousal', 'bj', 10, 'sub', 'lesbian'
 		gs 'stat'
@@ -139,7 +139,7 @@ $rimmasexdi = {
 			pcs_ass += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma18.jpg"></center>'
-			'Rima bends you over doggystyle and you feel the tip of her strap-on resting against your anus as she pulls the bottle of lube out of her purse. You groan and try to relax, preparing yourself mentally as she spreads the cool liquid around and inside your puckered hole, but even after all the things you''ve done with Rima, taking this gigantic strap-on up your ass is not an easy feat.' 
+			'Rima bends you over doggystyle and you feel the tip of her strap-on resting against your anus as she pulls the bottle of lube out of her purse. You groan and try to relax, preparing yourself mentally as she spreads the cool liquid around and inside your puckered hole, but even after all the things you''ve done with Rima, taking this gigantic strap-on up your ass is not an easy feat.'
 			'But slowly, ever so slowly, the woman works it into you, inch by inch, and starts moving back and forth, going a little deeper with every thrust, going a little faster every time. Your voice rises with her, the mix of pain and pleasure making it impossible to remain silent, and when you feel her grabbing your hair and pulling your head back, it sends you over the edge, screaming, hurting, but satisfied nonetheless.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'anal_strap', 20, 'lesbian', 'sub'
@@ -152,7 +152,7 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 17:
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma14.jpg"></center>'
 		pcs_throat += 3
-		'Rima pulls a massive strap-on out of her purse and puts it on, and you feel a hint of fear mingled into your excitement, knowing that she''s going to fuck you with it. Wasting no time on ordering you around, she roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.' 
+		'Rima pulls a massive strap-on out of her purse and puts it on, and you feel a hint of fear mingled into your excitement, knowing that she''s going to fuck you with it. Wasting no time on ordering you around, she roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.'
 		'You instinctively start moving your tongue around its thick tip, her hand at the back of your head holding you in place as she guides it into your throat. Given its size, it doesn''t come as a surprise that your gag reflex starts acting up but you endure as best you can, covering it generously in saliva.'
 		gs 'arousal', 'bj', 10, 'sub', 'lesbian'
 		gs 'stat'
@@ -174,7 +174,7 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 16:
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma14.jpg"></center>'
 		pcs_throat += 3
-		'Rima pulls a massive strap-on out of her purse and puts it on, and you feel a hint of fear mingled into your excitement, knowing that she''s going to fuck you with it. Wasting no time on ordering you around, she roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.' 
+		'Rima pulls a massive strap-on out of her purse and puts it on, and you feel a hint of fear mingled into your excitement, knowing that she''s going to fuck you with it. Wasting no time on ordering you around, she roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.'
 		'You instinctively start moving your tongue around its thick tip, her hand at the back of your head holding you in place as she guides it into your throat. Given its size, it doesn''t come as a surprise that your gag reflex starts acting up but you endure as best you can, covering it generously in saliva.'
 		gs 'arousal', 'bj', 10, 'sub', 'lesbian'
 		gs 'stat'
@@ -183,7 +183,7 @@ $rimmasexdi = {
 			pcs_vag += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma16.jpg"></center>'
-			'Rima puts you on your back and spreads your legs, driving the strap-on into your pussy with one slow thrust, stopping just short of your cervix, your moan music to her ears. She doesn''t move fast today, focusing entirely on slowly driving you towards the edge and gauging your reactions as she goes.' 
+			'Rima puts you on your back and spreads your legs, driving the strap-on into your pussy with one slow thrust, stopping just short of your cervix, your moan music to her ears. She doesn''t move fast today, focusing entirely on slowly driving you towards the edge and gauging your reactions as she goes.'
 			'Your eyes never leave hers, not on your slow ascent, not as you fall over the edge, not as you''re coming back down. When the last wave of your orgasm has passed, Rima rips the strap-on off and sits down on your face. Her own climax is only a few licks away.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal_strap', 20, 'lesbian', 'sub'
@@ -196,7 +196,7 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 15:
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma14.jpg"></center>'
 		pcs_throat += 3
-		'Rima pulls a massive strap-on out of her purse and puts it on, and you feel a hint of fear mingled into your excitement, knowing that she''s going to fuck you with it. Wasting no time on ordering you around, she roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.' 
+		'Rima pulls a massive strap-on out of her purse and puts it on, and you feel a hint of fear mingled into your excitement, knowing that she''s going to fuck you with it. Wasting no time on ordering you around, she roughly pushes you down on your knees and slips it past your <<$pc_desc[''lips'']>> lips.'
 		'You instinctively start moving your tongue around its thick tip, her hand at the back of your head holding you in place as she guides it into your throat. Given its size, it doesn''t come as a surprise that your gag reflex starts acting up but you endure as best you can, covering it generously in saliva.'
 		gs 'arousal', 'bj', 10, 'sub', 'lesbian'
 		gs 'stat'
@@ -206,7 +206,7 @@ $rimmasexdi = {
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma15.jpg"></center>'
 			'Rima lies down on the couch with you, spooning you from behind, rubbing the strap-on''s tip against your lower lips, teasing you only for a moment before she pushes it in. Between your spit and lust, the artificial dick goes in without resistance.'
-			'Only when it hits your cervix do you reach back to stop her, the sudden pain shaking you out of your reverie, but Rima whispers encouragingly into your ear as she pulls back. When she starts moving in earnest, she doesn''t hit that threshold again, filling you up as much as she can without actually hurting you, even as she furiously fucks you.' 
+			'Only when it hits your cervix do you reach back to stop her, the sudden pain shaking you out of your reverie, but Rima whispers encouragingly into your ear as she pulls back. When she starts moving in earnest, she doesn''t hit that threshold again, filling you up as much as she can without actually hurting you, even as she furiously fucks you.'
 			'Your folds tighten so much during your orgasm and grip the strap-on so violently that Rima has trouble pulling out afterwards.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal_strap', 20, 'lesbian', 'sub'
@@ -219,9 +219,9 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 14:
 		pcs_ass += 8
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma13.jpg"></center>'
-		'You bend over on the couch for Rima as she lubes up her hands, followed by your anus. She doesn''t have to say a word as she does; you know what''s coming.' 
-		'She places both of her hands at your puckered hole and works her fingers in - left, right, left, right, almost like she''s following an obscure sexual knitting manual - but you don''t care as long as she doesn''t stop, her expert stimulation causing you to moan like a bitch in heat right from the start.' 
-		'Not only does she fit both hands into you but she does so in record time, her soft chuckle speaking of her own surprise at this. Then, she comes to the main course: Without warning or warm-up, she begins pounding you with her hands, your yelp turning into a sustained moan as she hits all the right spots.' 
+		'You bend over on the couch for Rima as she lubes up her hands, followed by your anus. She doesn''t have to say a word as she does; you know what''s coming.'
+		'She places both of her hands at your puckered hole and works her fingers in - left, right, left, right, almost like she''s following an obscure sexual knitting manual - but you don''t care as long as she doesn''t stop, her expert stimulation causing you to moan like a bitch in heat right from the start.'
+		'Not only does she fit both hands into you but she does so in record time, her soft chuckle speaking of her own surprise at this. Then, she comes to the main course: Without warning or warm-up, she begins pounding you with her hands, your yelp turning into a sustained moan as she hits all the right spots.'
 		'When you come down from your climax, Rima sits down in front of you, dripping wet. You are more than happy to return the favor...'
 		$orgasm_or = 'yes'
 		gs 'arousal', 'anal_finger', 20, 'lesbian', 'sub'
@@ -229,8 +229,8 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 13:
 		pcs_ass += 8
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma12.jpg"></center>'
-		'Rima tells you to lie back on your couch and lubricate your anus while she does the same with her hands. You are too excited to question her order, instead taking the bottle of lube she presents to you and making sure your backdoor is ready for anything.' 
-		'Even when you tell her that you are done, Rima lifts your ass to check if your anus is properly lubed up, by pushing several fingers at once it. When her hand is almost all the way in, she seems to be convinced... and adds a finger from her other hand. Then another. And another. What you are feeling is beyond description, beyond comprehension, and it leaves you breathless and almost mute.' 
+		'Rima tells you to lie back on your couch and lubricate your anus while she does the same with her hands. You are too excited to question her order, instead taking the bottle of lube she presents to you and making sure your backdoor is ready for anything.'
+		'Even when you tell her that you are done, Rima lifts your ass to check if your anus is properly lubed up, by pushing several fingers at once it. When her hand is almost all the way in, she seems to be convinced... and adds a finger from her other hand. Then another. And another. What you are feeling is beyond description, beyond comprehension, and it leaves you breathless and almost mute.'
 		'Only when she starts to move, both of her hands all the way inside you, do you make noises again: Soft, understated coos that swell to loud screams when the woman picks up the pace and fucks your ass with both of her hands. The orgasm comes loud and hard and you feel deaf and numb. All you can see is Rima, grinning like a Cheshire cat, and you weakly return that grin.'
 		$orgasm_or = 'yes'
 		gs 'arousal', 'anal_fist', 20, 'lesbian', 'sub'
@@ -239,7 +239,7 @@ $rimmasexdi = {
 		pcs_ass += 6
 		pcs_vag += 5
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma11.jpg"></center>'
-		'Once again, Rima leads you into your bedroom and you lie down on your back for her, curious what she intends to do today. She doesn''t keep you wondering for long: Rima rummages around her purse until she finds a bottle of lube and generously applies it to both of her hands, giving you suggestive smiles as she does.' 
+		'Once again, Rima leads you into your bedroom and you lie down on your back for her, curious what she intends to do today. She doesn''t keep you wondering for long: Rima rummages around her purse until she finds a bottle of lube and generously applies it to both of her hands, giving you suggestive smiles as she does.'
 		'Your previous experiences with her have prepared you well for what she has in mind: With terrifying ease and very little patience, Rima pushes one of her hands into your vagina and works the other into your anus. It''s a testament to the times you have spent with her that you don''t hurt as much as you feel full as, knuckle by knuckle, her fingers sink into you, your groans leaving little doubt as to your pleasure.'
 		'Soon, both of her hands are all the way inside you and Rima starts slowly pulling them out again, then back in, fucking you with her entire limbs, the fullness ebbing away only to return in force. It''s an incredible, maddening feeling and your orgasm hits you with the suddenness and violence of a tsunami.'
 		$orgasm_or = 'yes'
@@ -272,7 +272,7 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 9:
 		pcs_ass += 5
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma8.jpg"></center>'
-		'You find yourself lying on your side, spreading your legs to give Rima easier access to your sex. Indeed, her fingers penetrate your wet pussy and her wonderful touch has you panting in no time at all.' 
+		'You find yourself lying on your side, spreading your legs to give Rima easier access to your sex. Indeed, her fingers penetrate your wet pussy and her wonderful touch has you panting in no time at all.'
 		'Between two strokes, though, she pulls out entirely and instead works the well-lubricated fingers into your ass. You gasp as she gets the speed back to where it was and have your backdoor thoroughly fingerfucked by her. She skillfully teases your clit for additional stimulation but you even without it, you''d have come anyway.'
 		'And come you do, feeling your sphincter twitch around her index and middle finger, beckoning them to stay a little longer as you ride out the waves of your anal climax.'
 		$orgasm_or = 'yes'
@@ -281,7 +281,7 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 8:
 		pcs_ass += 3
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma7.jpg"></center>'
-		'Rima puts you on your back, your soft bed ever-willing to serve, and dives right in, her tongue finding your clit with pin-point precision.' 
+		'Rima puts you on your back, your soft bed ever-willing to serve, and dives right in, her tongue finding your clit with pin-point precision.'
 		'At the same time, her hand explores your nether regions, stroking up and down your legs, outside and inside, caresses your stomach and sides, squeezing your buttcheeks, teasing your wet folds with quick flicks and lingering strokes, but it doesn''t come to rest... until it finds your rosebud.'
 		'She circles around your backdoor as if she had all the time in the world, pretending to push a finger in one moment only to pull it away the next, her constant back and forth driving you crazy and making you hornier the longer she persists.'
 		'At some point, you simply cannot hold out any longer and clamp down hard the instant you feel her pushing in. At the same time, you put one hand at the back of her head and pull her against you. This tiny push is all you need to cum, finally.'
@@ -292,7 +292,7 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 7:
 		pcs_vag += 5
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma6.jpg"></center>'
-		'The couch in the living room is where Rima wants to have you, and you have no reason to deny her. Spreading your legs for her, you watch as she patiently puts one finger after the other into you, teasing you with gusto and nipping at your clit every now and then to put you even more on edge.' 
+		'The couch in the living room is where Rima wants to have you, and you have no reason to deny her. Spreading your legs for her, you watch as she patiently puts one finger after the other into you, teasing you with gusto and nipping at your clit every now and then to put you even more on edge.'
 		'Her second hand squeezes your tits, teases your nipples, strokes your stomach, caresses your cheek - seems to be everywhere at once. Her hand inside your pussy doesn''t go easy on you, not this time: Rima immediately goes from massaging your insides to fist-fucking you and you love every second of it.'
 		'Your climax builds quickly - no surprise after almost half an hour of teasing - when you feel her second hand linger on your throat... and tightening around it. You open your eyes to look at her and while it''s harder to breathe, the passion in Rima''s eyes is infectious.'
 		'The orgasm hits you like a truck, the slight lack of air increasing its intensity by an order of magnitude, and by the looks of it, Rima is just about ready to come herself, getting off immensely on dominating you.'
@@ -302,11 +302,11 @@ $rimmasexdi = {
 	elseif RimmaRandEvent = 6:
 		pcs_vag += 5
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma5.jpg"></center>'
-		'Once again, Rima takes you into your bedroom and has you lie down. Your memories of how she went down on you very present in your mind, you eagerly spread your legs for her and she smiles broadly as lowers her mouth onto you.' 
-		'Two of her fingers are inside your wet pussy in an instant but other than that, she takes her time, teasing and touching you with unfathomable skill, only slowly picking up speed. When you are getting closer to orgasm, she inserts a third finger but slows down at the same time, your groans turning from lust to frustration as she teases you, inches away from release.' 
+		'Once again, Rima takes you into your bedroom and has you lie down. Your memories of how she went down on you very present in your mind, you eagerly spread your legs for her and she smiles broadly as lowers her mouth onto you.'
+		'Two of her fingers are inside your wet pussy in an instant but other than that, she takes her time, teasing and touching you with unfathomable skill, only slowly picking up speed. When you are getting closer to orgasm, she inserts a third finger but slows down at the same time, your groans turning from lust to frustration as she teases you, inches away from release.'
 		'But Rima is merciless: She slowly, ever so slowly works you down from that almost-climax, then back up again, to that same breaking point... then introduces a fourth finger and slows down once again.'
 		nl
-		'You barely even register when she sinks her whole hand into your depths - at that point, you are so desperately horny that you are literally begging her to make you cum, and this time, her fist inside you, she finally relents.' 
+		'You barely even register when she sinks her whole hand into your depths - at that point, you are so desperately horny that you are literally begging her to make you cum, and this time, her fist inside you, she finally relents.'
 		'From one moment to the next, she starts fucking you with her whole hand, pushing you right to the edge and over, then right to the next and over again. You can feel yourself twitching around her hand, gripping her like a vice, but the rest of your body is a shaking, screaming, sweating mess. That doesn''t change the fact, though, that Rima gave you a couple of incredible orgasms, though.'
 		$orgasm_or = 'yes'
 		gs 'arousal', 'vaginal_fist', 20, 'lesbian', 'sub'
@@ -315,7 +315,7 @@ $rimmasexdi = {
 		pcs_vag += 2
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma4.jpg"></center>'
 		'Rima and you go into the bedroom and you lie down on your back, opening yourself to your female company. She doesn''t even try to resist the enticing view and you can feel her tongue on your clit before she''s come to rest on the bed.'
-		'You feel her fingers penetrate you, your folds wet and ready with anticipation, and her touch is heavenly. Rima seems to have an almost supernatural intuition for where she has to touch your insides to elicit the highest moans from you and you are all too willing to let them erupt.' 
+		'You feel her fingers penetrate you, your folds wet and ready with anticipation, and her touch is heavenly. Rima seems to have an almost supernatural intuition for where she has to touch your insides to elicit the highest moans from you and you are all too willing to let them erupt.'
 		'While there is a lot of variation in the way she angles her hand and hooks her fingers, she never gets slower - her index and middle finger went from teasingly slow to a good, hard fingerfuck and she seems certain that she can hold out longer than you.'
 		nl
 		'She''s right, too: When she adds a third finger - without slowing down - an incredible orgasm rips through you and you have to hold on for dear life. All you can manage when Rima kisses you is a weak smile as you taste yourself on her lips.'
@@ -324,23 +324,23 @@ $rimmasexdi = {
 		gs 'stat'
 	elseif RimmaRandEvent = 4:
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma3.jpg"></center>'
-		'Rima leads you into the bedroom and has you lie down. You''ve barely come to rest when she''s already on top of you, her wet pussy mere inches from your mouth, her eyes sparkling as she bends backwards and you feel her fingers caressing your sex.' 
-		'You lose yourself in her expert touch and the arousing taste of her juices, your tongue and lips working tirelessly to pleasure her.' 
+		'Rima leads you into the bedroom and has you lie down. You''ve barely come to rest when she''s already on top of you, her wet pussy mere inches from your mouth, her eyes sparkling as she bends backwards and you feel her fingers caressing your sex.'
+		'You lose yourself in her expert touch and the arousing taste of her juices, your tongue and lips working tirelessly to pleasure her.'
 		'When you feel her crotch pressing more strongly against your face, you know that she won''t take much longer and redouble your efforts, as does she. In seconds, you have her screaming and thrashing, your own orgasm muffled by her nether lips.'
 		$orgasm_or = 'yes'
 		gs 'arousal', 'cuni_give', 20, 'lesbian', 'sub'
 		gs 'stat'
 	elseif RimmaRandEvent = 3:
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma2.jpg"></center>'
-		'You go into the living room where she sits down on the sofa, legs spread. You understand the invitation and drop to your knees, languidly licking her pussy up and down, teasing her greedy hole with one hand while you rub your own clit with the other.' 
-		'Rima moans with joy and you can feel her hands on your head, stroking it, urging you on.' 
+		'You go into the living room where she sits down on the sofa, legs spread. You understand the invitation and drop to your knees, languidly licking her pussy up and down, teasing her greedy hole with one hand while you rub your own clit with the other.'
+		'Rima moans with joy and you can feel her hands on your head, stroking it, urging you on.'
 		'As her passion grows, her movements become rougher and in her bliss, her fingers claw into your hair. She pulls you closer, grinding her hips against your face and is quickly overcome by her orgasm. Thanks to her rough treatment and your "free" hand, you follow her immediately.'
 		$orgasm_or = 'yes'
 		gs 'arousal', 'cuni_give', 20, 'lesbian', 'sub'
 		gs 'stat'
 	elseif RimmaRandEvent = 2:
 		'<center><img <<$set_imgh>> src="mod/bestmod/images/beast/zoo/rimma.jpg"></center>'
-		'You barely make it into the bedroom. As soon as you''re there, Rima pushes you onto the bed and lays on top of you in a 69, offering you her pussy and immediately going down on yours.' 
+		'You barely make it into the bedroom. As soon as you''re there, Rima pushes you onto the bed and lays on top of you in a 69, offering you her pussy and immediately going down on yours.'
 		'The passion she licks you with is infectious and as you desperately try to hold onto her, you do your best to reciprocate, exploring Rima''s delicate folds and hole with your tongue and fingers.'
 		'Your moans, muffled as they are, grow louder, loud enough for the neighbors to hear, you''re sure, but they don''t last for long: Within minutes, the unearthly bliss you''re experiencing culminates in an overwhelming orgasm that leaves you and your partner gasping and shaking.'
 		$orgasm_or = 'yes'

+ 10 - 0
locations/SMS_schedules.qsrc

@@ -1,6 +1,11 @@
 # SMS_schedules
 
 if $ARGS[0] = 'cikl':
+	!! set the time when the SMS will be send
+	gs 'booty_call', 'scheduler'
+	booty_call_time['daystart'] = daystart
+
+
 	if nerd_game['invite_day'] < daystart and week = 1:
 		if nerd_game['first_SMS_received'] = 0: if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'icon_na', 1
 		gs 'telefon', 'SetSMSSchedule', 'A152', "", "0", "gs 'nerd_game_night', 'game_invite_sms_switch'", "totminut > <<totminut + (11 - hour) * 60 + rand(20, 280) - minut>>"
@@ -21,6 +26,11 @@ if $ARGS[0] = 'cikl':
 			gs 'telefon', 'SetSMSSchedule', 'A144', "", "0", "gs 'band_tour_anushka_SMS', 'start'", "totminut > <<totminut + (19 - hour) * 60 + rand(20, 100) - minut>>"
 		end
 	end
+
+	if mainQW >= 1:
+		gs 'tatiana_lab', 'stage_SMS'
+	end
+
 end
 
 

+ 12 - 12
locations/TV.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'kable'
 	end
 
-	if daystart < 10 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart - daystart_start < 9 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
 	act 'Turn off the TV and get off the couch':
 		cla
 		gt $loc, $loc_arg
@@ -34,7 +34,7 @@ if $ARGS[0] = 'nokable':
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 	'You watch the network channel, lying on the couch. It''s all repeats and cheesy infomercials.'
 
-	if daystart < 10 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart - daystart_start < 9 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'nokable'
 	act 'Turn off the TV and get off the couch': gt $loc, $loc_arg
@@ -48,14 +48,14 @@ if $ARGS[0] = 'kable':
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 	'You watch cable television. It''s really good these days.'
 
-	if daystart < 10 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart - daystart_start < 9 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'kable'
 	act 'Turn off the TV and get off the couch': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'pav':
-	if tvtime = 0: 
+	if tvtime = 0:
 		*clr & cla
 		minut += 5
 		tvtime = 1
@@ -70,9 +70,9 @@ if $ARGS[0] = 'pav':
 		'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 		'You are watching one of the half dozen or so television channels that you can get without cable. None of their programs are really worth watching, but the distraction is welcome anyway.'
 		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'pav'
-		act 'Turn off the TV': 
+		act 'Turn off the TV':
 			*clr & cla
-			tvtime = 0 
+			tvtime = 0
 			'<center><video autoplay src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
 			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squawk in protest.'
 			act 'Continue': gt $loc, $loc_arg
@@ -81,7 +81,7 @@ if $ARGS[0] = 'pav':
 end
 
 if $ARGS[0] = 'gad':
-	if tvtime = 0: 
+	if tvtime = 0:
 		*clr & cla
 		minut += 5
 		tvtime = 1
@@ -96,9 +96,9 @@ if $ARGS[0] = 'gad':
 		'<center><video autoplay loop src="images/locations/gadukino/grandparents/tv/tv'+rand(1,5)+'.mp4"></video></center>'
 		'You are watching one of the three television channels that you can get here in the country. None of their programs are really worth watching, but the distraction is welcome anyway.'
 		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'gad'
-		act 'Turn off the TV': 
+		act 'Turn off the TV':
 			*clr & cla
-			tvtime = 0 
+			tvtime = 0
 			'<center><video autoplay src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
 			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squawk in protest.'
 			act 'Continue': gt $loc, $loc_arg
@@ -107,7 +107,7 @@ if $ARGS[0] = 'gad':
 end
 
 if $ARGS[0] = 'meyhome':
-	if tvtime = 0: 
+	if tvtime = 0:
 		*clr & cla
 		minut += 5
 		tvtime = 1
@@ -124,9 +124,9 @@ if $ARGS[0] = 'meyhome':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/tvon.jpg"></center>'
 		'You watch cable television. It''s really good these days.'
 		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'meyhome'
-		act 'Turn off the TV and get off the couch': 
+		act 'Turn off the TV and get off the couch':
 			*clr & cla
-			tvtime = 0 
+			tvtime = 0
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/tvoff.jpg"></center>'
 			'You turn off the TV and the image blinks out of existence, while you stand up and stretch your legs.'
 			act 'Continue': gt $loc, $loc_arg

+ 61 - 61
locations/TerminalOffice.qsrc

@@ -50,12 +50,12 @@ end
 !Office a Manager = 1x
 !==================================================
 if $ARGS[0] = '11':
-	
+
 	!You can buy the item if you know that you can buy
 	!Can try to give the documents from Anatoly Chubais
 	!Can I ask when running accounting
 	!Can I ask when works Director
-	
+
 	cla
 	gs 'TerminalOffice', 'TerminalOfficeScreen', 'Sales', 'terminal2'
 	'"What can I help you with?" the manager asks you.'
@@ -63,25 +63,25 @@ if $ARGS[0] = '11':
 	act 'Leave the office': minut += 1 & gt 'TerminalOffice', '00'
 
 	if verakassir > 0:
-		
+
 		!Buy goods
-		
+
 		!Flag zapolanski storage, reduction
 		!this flag allows you to go shopping
 		DoNotBuy = 2
-		
+
 		!Amount and Quantity that we can buy(store)
 		MaxQuantityA = 0
 		MaxQuantity1 = 0
 		MaxQuantity2 = 0
 		MaxCost = 0
-		
+
 		!Description size of storage
 		TovarLimitRepository1 = 30
 		TovarLimitRepository2 = 100
-		
+
 		'You talk with the Manager about buying small trinkets...'
-		
+
 		!Get current balances
 		TovarRepository1 = mc_inventory['trinkets_home']
 		if TovarRepository1 => TovarLimitRepository1:
@@ -91,7 +91,7 @@ if $ARGS[0] = '11':
 			'You have '+ TovarRepository1 +' trinkets stored in your home. You''re only able to store <<TovarLimitRepository1>> trinkets.'
 			MaxQuantity1 = TovarLimitRepository1 - TovarRepository1
 		end
-		
+
 		if YouCanGar > 0:
 			!Get the current balances in the garage
 			TovarRepository2 = mc_inventory['trinkets_garage']
@@ -103,7 +103,7 @@ if $ARGS[0] = '11':
 				MaxQuantity2 = TovarLimitRepository2 - TovarRepository2
 			end
 		end
-		
+
 		if DoNotBuy = 2:
 			'You think about it for a while, realize that you just have nowhere to store the goods and decide to turn down the purchase.'
 		else
@@ -111,19 +111,19 @@ if $ARGS[0] = '11':
 			act 'The small trinkets cost 100 <b>₽</b>. Please put in how many trinkets you want to purchase.':
 				minut += 13
 				MaxQuantityA = input("How many trinkets do you want to buy for 100 <b>₽</b> apiece?")
-				
+
 				if MaxQuantityA > (MaxQuantity1 + MaxQuantity2):
 					'<b><font color=red>You have nowhere to store the surplus <<MaxQuantityA-(MaxQuantity1 + MaxQuantity2)>> ' + iif(MaxQuantityA - (MaxQuantity1 + MaxQuantity2) = 1, 'trinket', 'trinkets') + '.</front></b>'
 					cla
 					act 'Leave': gt 'TerminalOffice', '11'
 				end
-				
+
 				MaxCost = MaxQuantityA * 100
-				
-				if MaxCost > money:
+
+				if money < MaxCost:
 					!If not enough money
 					'You don''t have enough money on you. You will have to withdraw money before proceeding with the purchase.'
-					if (money + karta >= MaxCost) or (karta >= MaxCost):
+					if money + karta >= MaxCost:
 						!The player can be plastic money
 						'You have enough money on your credit card, and you offer them to pay with that.'
 						'"I''m sorry, we don''t own a card terminal," the Manager replies, "We accept only cash."'
@@ -132,11 +132,11 @@ if $ARGS[0] = '11':
 					act 'Leave': gt 'TerminalOffice', '11'
 				else
 					!If the money is written off money to fill warehouses
-						
+
 					money -= MaxCost
-					
+
 					'You''ve purchased <<MaxQuantityA>> trinkets, worth <<MaxCost>>.'
-					
+
 					!First populate channelise 1
 					if MaxQuantityA => MaxQuantity1:
 						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantity1
@@ -147,48 +147,48 @@ if $ARGS[0] = '11':
 						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantityA
 						MaxQuantityA = 0
 					end
-					
+
 					!Now fill channelise 2
 					if MaxQuantityA > 0:
 						mc_inventory['trinkets_garage'] = TovarRepository2 + MaxQuantityA
 					end
-					
-					if YouCanGar = 0 and money > 100: 
+
+					if YouCanGar = 0 and money > 100:
 						'You''ve purchased plenty of trinkets, but you''ve been thinking about expanding your business. But where could you store them all? Maybe you should ask your stepfather if you could use some free space in his garage...'
 					end
-					
+
 					cla
 					act 'Complete your purchase': gt 'TerminalOffice', '11'
-				end	
+				end
 			end
-			
+
 			act 'Buy small trinkets for 100 <b>₽</b> called "Eyeballs".':
 				!Purchase spend time
 				minut += 13
-				
+
 				MaxQuantityA = MaxQuantity1 + MaxQuantity2
 				MaxCost = MaxQuantityA * 100
-				
+
 				!Hammered warehouses
-				if MaxCost > money:
+				if money < MaxCost:
 					!If not enough money
 					'You don''t have enough money on you. You will have to withdraw money before proceeding with the purchase.'
-					if (money + karta >= MaxCost) or (karta >= MaxCost):
+					if money + karta >= MaxCost:
 						!The player can be plastic money
 						'You have enough money on your credit card, and you offer them to pay with that.'
 						'"I''m sorry, we don''t own a card terminal," the Manager replies, "We accept only cash."'
 					end
-					
+
 					cla
 					act 'Leave': gt 'TerminalOffice', '11'
 				else
-				
+
 					!If the money is written off money to fill warehouses
-						
+
 					money -= MaxCost
-					
+
 					'You''ve purchased <<MaxQuantityA>> trinkets, worth <<MaxCost>>.'
-					
+
 					!First populate channelise 1
 					if MaxQuantityA => MaxQuantity1:
 						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantity1
@@ -199,23 +199,23 @@ if $ARGS[0] = '11':
 						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantityA
 						MaxQuantityA = 0
 					end
-					
+
 					!Now fill channelise 2
 					if MaxQuantityA > 0:
 						mc_inventory['trinkets_garage'] = TovarRepository2 + MaxQuantityA
 					end
-					
-					if YouCanGar = 0 and money > 100: 
+
+					if YouCanGar = 0 and money > 100:
 						'You''ve purchased plenty of trinkets, but you''ve been thinking about expanding your business. But where could you store them all? Maybe you should ask your stepfather if you could use some free space in his garage...'
 					end
-					
+
 					cla
 					act 'Complete your purchase': gt 'TerminalOffice', '11'
-				end	
-			end			
+				end
+			end
 		end
 	end
-	
+
 	if YouNotOpenDoorDir = 1:
 		!Where the Director, the Door was closed dir
 		act 'Ask about the Director':
@@ -225,7 +225,7 @@ if $ARGS[0] = '11':
 			act 'Leave': YouNotOpenDoorDir = 0 & gt 'TerminalOffice', '11'
 		end
 	end
-	
+
 	!Where is the accountant? Buch the door was closed
 	if YouNotOpenDoorBuh = 1:
 		act 'Ask about the accountant':
@@ -235,7 +235,7 @@ if $ARGS[0] = '11':
 			act 'Leave': YouNotOpenDoorBuh = 0 & gt 'TerminalOffice', '11'
 		end
 	end
-	
+
 	!He Has papers, but a Manager should say to go to the accounting Department.
 	if AboutDocsManager=0 and BurgerQW['TerminalTask'] = 1 and BurgerQW['TerminalTaskDay'] = daystart:
 		'"I''m Anatoly Chubais from the company "OOO Bystroushka limited". Do you have the required documents with you?"'
@@ -247,7 +247,7 @@ if $ARGS[0] = '11':
 	end
 
 	!The GG yet topics of conversation.
-	if verakassir = 0 and YouNotOpenDoorDir = 0 and YouNotOpenDoorBuh = 0 and BurgerQW['TerminalTask'] = 0: 
+	if verakassir = 0 and YouNotOpenDoorDir = 0 and YouNotOpenDoorBuh = 0 and BurgerQW['TerminalTask'] = 0:
 		'You have nothing to say or left to do. You can leave the office.'
 	end
 end
@@ -261,14 +261,14 @@ if $ARGS[0] = '21':
 
 	if TerminalOfficeBuhWorkTime = 1:
 		!You can give the documents
-		
+
 		cla
 		gs 'TerminalOffice', 'TerminalOfficeScreen', 'The accountant''s office', 'terminal3'
 		act 'Leave the office': minut += 1 & gt 'TerminalOffice', '00'
-		
+
 		!GG not a complete idiot, so will limit communication with only Buch documents, then that thread again
 		'A cute girl looks up from her monitor, turns to you and asks, "What can I help you with?"'
-		
+
 		if BurgerQW['TerminalTask'] = 1 and BurgerQW['TerminalTaskDay'] = daystart:
 			'"I was talking with Anatoly Chubais from the company ''OOO Bystroushka limited''. I was instructed to deliver these documents."'
 			'"Yes, I''ve been expecting these, may I?" She holds out her hand.'
@@ -280,22 +280,22 @@ if $ARGS[0] = '21':
 				'You hand the girl the folder. She opens it and quickly checks the contents.'
 				'"Tell Anatoly Borisovich that Elizabeth said thank you."'
 				'The girl smiles and then turns her attention to her monitor and starts rapidly typing away on her keyboard.'
-				
+
 				act 'Leave the office': minut += 1 & gt 'TerminalOffice', '00'
 			end
 		else
 			'You have nothing to say or left to do. You can leave the office.'
 		end
-		
+
 	else
 		!Accountant is not in place
 		cla
 		gs 'TerminalOffice', 'TerminalOfficeScreen', 'A door with a sign', 'terminal6'
 		act 'Move away from the door': minut += 1 & gt 'TerminalOffice', '00'
 		'You knock, but there is only silence. You try pushing down the handle, but realize that the door is locked. You''ll have to come back at a different time.'
-		
+
 		YouNotOpenDoorBuh = 1
-		
+
 	end
 end
 
@@ -307,18 +307,18 @@ if $ARGS[0] = '31':
 	if TerminalOfficeDirWorkTime  = 1:
 		!You can try to give the documents
 		!You can try to talk
-		
+
 		cla
 		gs 'TerminalOffice', 'TerminalOfficeScreen', 'The Director''s office', 'terminal1'
 		act 'Leave the office': minut += 1 & gt 'TerminalOffice', '00'
-		
+
 		!Before the development of the plot 'Talk' the Director will constantly be on the phone and send he tries out of the office
 		'You knock and open the door. Behind a massive desk, you see a man. He''s talking on the phone and apparently not in the mood. He''s a bit surprised as you aren''t the person he was expecting, so he dismissively waves his hand, clearly indicating that you need to leave the office.'
-		
-		if AboutBussines = 0: 
+
+		if AboutBussines = 0:
 			act 'Talk':
 				gs 'TerminalOffice', 'TerminalOfficeScreen', 'The Director''s office', 'terminal1'
-				
+
 				'"I was told to come and see you about a business proposal..." you start.'
 				'"I heard there was a possibility of a good, legitimate and profitable trade business going on..." you continue.'
 				'The man puts the phone to his side and irritably answers, "Can''t you see I''m in middle of a phone call? Leave!"'
@@ -326,11 +326,11 @@ if $ARGS[0] = '31':
 				delact 'Talk'
 			end
 		end
-	
+
 		if AboutDocs = 0 and BurgerQW['TerminalTask'] = 1 and BurgerQW['TerminalTaskDay'] = daystart:
 			act 'Give him the documents':
 				gs 'TerminalOffice', 'TerminalOfficeScreen', 'The Director''s office', 'terminal1'
-				
+
 				'You walk up to the desk. You''re ignored by the man, but you refuse to turn back, you have an important assignment from the boss.'
 				'"I was told by Anatoly Chubais from the company "OOO Bystroushka limited" to hand over these documents to you."'
 				'The man stops talking on the phone, frowns, and, pointing towards the door, asserts, "You need to head over to the accountant''s office."'
@@ -338,18 +338,18 @@ if $ARGS[0] = '31':
 				delact 'Give him the documents'
 			end
 		end
-		
+
 		if AboutBussines = 1 or AboutDocs = 1: 'You have nothing to say or left to do. You can leave the office.'
-		
+
 	else
 		!The Director is not in place
 		cla
 		gs 'TerminalOffice', 'TerminalOfficeScreen', 'A door with a sign', 'terminal5'
 		act 'Move away from the door': minut += 1 & gt 'TerminalOffice', '00'
 		'You knock, but there is only silence. You try pushing down the handle, but realize that the door is locked. You''ll have to come back at a different time.'
-		
+
 		YouNotOpenDoorDir = 1
-		
+
 	end
 end
 --- TerminalOffice ---------------------------------

+ 15 - 15
locations/UnitAppearance.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'GenRow':
     else
 	    '<<$ARGS[1]>>,<<unitHotcat>>,<<unitpcs_apprnc>>,<<unitbmi_calc>>,<<unitbodykoef>>,<<unitHeadBonus>>,<<unitAttributeBonus>>,<<unitclothingbonus>>,<<unitAccessoriesBonus>>,<<unitGroomingBonus>>,<<unitGroomingPenalty>>,<<unitpcs_apprncbase>>'
     end
-end 
+end
 
 if $ARGS[0] = 'GenRowBreak':
     if unitDisplayType = 0:
@@ -32,9 +32,9 @@ if $ARGS[0] = 'GenRowBreak':
             '<tr><th align="left"><<$ARGS[1]>></th><th align="right">clothingbonus Q1</th></th><th align="right">clothingbonus Q2</th></th><th align="right">clothingbonus Q3</th></th><th align="right">clothingbonus Q4</th></th><th align="right">clothingbonus Q5</th></th><th align="right">clothingbonus Q6</th></th><th align="right">clothingbonus Q7</th><th align="right">clothingbonus Nude</th></tr>'
         end
     else
-        '<<$ARGS[1]>>,hotcat,pcs_apprnc,bmi,bodykoef,HeadBonus,AttributeBonus,clothingbonus,AccessoriesBonus,GroomingBonus,GroomingPenalty,pcs_apprncbase'
+        '<<$ARGS[1]>>,pcs_hotcat,pcs_apprnc,bmi,bodykoef,HeadBonus,AttributeBonus,clothingbonus,AccessoriesBonus,GroomingBonus,GroomingPenalty,pcs_apprncbase'
     end
-end 
+end
 
 if $ARGS[0] = 'calcHotcat':
 	unitbmi_calc = FUNC('body', 'bmicalc', unitsalo, unitpcs_hgt)
@@ -233,7 +233,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-   
+
     $svetadesc = 'Computer Geek Start'
     unitsalo = 132
     unitpcs_hgt = 170
@@ -271,7 +271,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-   
+
     $svetadesc = 'Chess Player Start'
     unitsalo = 40
     unitpcs_hgt = 170
@@ -309,7 +309,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-	
+
     $svetadesc = 'Volleyball Start'
     unitsalo = 75
     unitpcs_hgt = 170
@@ -347,7 +347,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-	
+
     $svetadesc = 'Dancer Start'
     unitsalo = 55
     unitpcs_hgt = 170
@@ -385,7 +385,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-	
+
     $svetadesc = 'Runner Start'
     unitsalo = 51
     unitpcs_hgt = 170
@@ -423,7 +423,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-	
+
     $svetadesc = 'Football Start'
     unitsalo = 80
     unitpcs_hgt = 170
@@ -461,7 +461,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-	
+
     $svetadesc = 'Popular Friends Start'
     unitsalo = 80
     unitpcs_hgt = 170
@@ -879,7 +879,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitpcs_apprncbase = 0
     unitResetBase = 1
     gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
-	
+
    gs 'UnitAppearance', 'GenRowBreak', 'BMI Maximums'
 
     unitstrenbuf = 100
@@ -1129,7 +1129,7 @@ if $ARGS[0] = 'GenerateSvetaOptions':
     unitbmi_calc = FUNC('body', 'bmicalc', unitsalo, unitpcs_hgt)
 
     $svetadesc = 'Current Clothes'
-    
+
     gs 'UnitAppearance', 'calcHotcat', $svetadesc
 
     $svetadesc = 'Naked'
@@ -1204,7 +1204,7 @@ if $ARGS[0] = 'GenerateSvetaOptions':
     unitlegkoef = 0
     gs 'UnitAppearance', 'calcHotcat', $svetadesc
 
-end 
+end
 
 if $ARGS[0] = 'GetClothThick':
 	if ARGS[1] < 16:
@@ -1380,7 +1380,7 @@ end
 
 if $args[0] = 'SaloGenerateRows':
 
-    $unitclothingworntype = ''    
+    $unitclothingworntype = ''
     unitPCloQuality = 1
     $svetadesc = '<<$ARGS[2]>> Q1'
     gs 'UnitAppearance', 'calcHotcat', '<<$ARGS[1]>> <<$svetadesc>>'
@@ -1416,7 +1416,7 @@ if $args[0] = 'SaloGenerateRows':
     gs 'UnitAppearance', 'calcHotcat', '<<$ARGS[1]>> <<$svetadesc>>'
     unitclothingbonus7 = unitclothingbonus
 
-    $unitclothingworntype = 'nude'    
+    $unitclothingworntype = 'nude'
     $svetadesc = '<<$ARGS[2]>> Nude'
     gs 'UnitAppearance', 'calcHotcat', '<<$ARGS[1]>> <<$svetadesc>>'
     unitclothingbonusnude = unitclothingbonus

+ 8 - 8
locations/VolleyTrenCentr.qsrc

@@ -23,9 +23,9 @@ if ShowerIvan = 4 and centr = 1:
 		'"I am sorry, <<$pcs_nickname>> and Guang, but my wife is expecting me and I must be going," the coach says, looking at his watch. He then departs, leaving you in the company of the Chinese trainer.'
 		act 'Ask about the coach':
 			cla & *clr
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak12.jpg"></center>'
-			'As soon as Mikhail left, you bombard the other trainer with questions about the coach, wanting to know about his life, his girlfriend, competitions and, of course, the European championship. Dumbfounded, Guang stares at you, unable to get a word in edgewise for the next few minutes as you jump from subject to subject without pause.' 
+			'As soon as Mikhail left, you bombard the other trainer with questions about the coach, wanting to know about his life, his girlfriend, competitions and, of course, the European championship. Dumbfounded, Guang stares at you, unable to get a word in edgewise for the next few minutes as you jump from subject to subject without pause.'
 			'Guang finally manages to force himself into the conversation as you pause momentarily to draw in a breath.'
 			'"If you don''t know these things, it means that Misha didn''t tell you, so why should I tell you and betray my friend''s trust?" he asks you.'
 			'You are at a loss, not knowing how to proceed. Fearing that he is going to continue to scold you, you prepare to leave.'
@@ -38,7 +38,7 @@ if ShowerIvan = 4 and centr = 1:
 			'The older man just smiles at you and shrugs.'
 			'You think about it and remember there were a couple of Chinese merchants at the market back home. Maybe one of them will have the rice wine.'
 			ShowerIvan = 5
-			act 'Move away':gt 'fit', 'start'
+			act 'Move away': gt 'havana', 'start'
 		end
 	end
 elseif ShowerIvan = 5 and centr = 2:
@@ -46,7 +46,7 @@ elseif ShowerIvan = 5 and centr = 2:
 	act 'Greet Guang':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak13.jpg"></center>'
-		'You go up to Guang and say hello.' 
+		'You go up to Guang and say hello.'
 		'"Have you brought it?" he asks.'
 		if ricewine = 1:
 			act 'Give him the wine':
@@ -59,8 +59,8 @@ elseif ShowerIvan = 5 and centr = 2:
 				act 'Ask question':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak15.jpg"></center>'
-					'About the European championship, tell me why the coach doesn''t want to talk about it," you ask after taking a deep breath.' 
-					'Guang bites his lip thoughtfully, then begins the story.' 
+					'About the European championship, tell me why the coach doesn''t want to talk about it," you ask after taking a deep breath.'
+					'Guang bites his lip thoughtfully, then begins the story.'
 					'"The stories are true, your coach really was on the national team. And they did make it to the European championships."'
 					'With bated breath, you listen to the story.'
 					act 'Play on':
@@ -76,7 +76,7 @@ elseif ShowerIvan = 5 and centr = 2:
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak17.jpg"></center>'
 								'"He almost ended up in jail, but the officials decided to avoid a scandal and just kicked Mikhail off of the team," Guang concluded his story.'
 								$OpenInnerThought+'"Now I understand why coach shies away from me whenever we start to get close,"'+$CloseInnerThought+'you think to yourself.'
-								act 'Move away':gt 'fit', 'start'
+								act 'Move away': gt 'havana', 'start'
 							end
 						end
 					end
@@ -84,7 +84,7 @@ elseif ShowerIvan = 5 and centr = 2:
 			end
 		else
 			'"Why are you here then?" he asks as he walks away from you.'
-			act 'Move away':gt 'fit', 'start'
+			act 'Move away': gt 'havana', 'start'
 		end
 	end
 end

+ 101 - 92
locations/_attributes_bomba_dress.qsrc

@@ -9,7 +9,7 @@ if ARGS[1] = 1:
 	CloSkirtShortness = 2
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 2:
 	CloQuality = 3
 	CloThinness = 1
@@ -17,7 +17,7 @@ elseif ARGS[1] = 2:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 1
@@ -25,7 +25,7 @@ elseif ARGS[1] = 3:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 4:
 	CloQuality = 4
 	CloThinness = 1
@@ -33,14 +33,14 @@ elseif ARGS[1] = 4:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 5:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 6:
 	CloQuality = 4
 	CloThinness = 1
@@ -48,7 +48,7 @@ elseif ARGS[1] = 6:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 7:
 	CloQuality = 4
 	CloThinness = 1
@@ -56,7 +56,7 @@ elseif ARGS[1] = 7:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 8:
 	CloQuality = 4
 	CloThinness = 3
@@ -64,7 +64,7 @@ elseif ARGS[1] = 8:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 9:
 	CloQuality = 3
 	CloThinness = 2
@@ -72,7 +72,7 @@ elseif ARGS[1] = 9:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 3
@@ -80,7 +80,7 @@ elseif ARGS[1] = 10:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 11:
 	CloQuality = 4
 	CloThinness = 3
@@ -89,21 +89,21 @@ elseif ARGS[1] = 11:
 	CloDress = 1
 	CloStyle = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 12:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 1
@@ -111,14 +111,14 @@ elseif ARGS[1] = 14:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 15:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloDress = 1
-	
+
 elseif ARGS[1] = 16:
 	CloQuality = 5
 	CloThinness = 4
@@ -126,7 +126,7 @@ elseif ARGS[1] = 16:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 17:
 	CloQuality = 3
 	CloThinness = 4
@@ -134,28 +134,28 @@ elseif ARGS[1] = 17:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloDress = 1
-	
+
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 21:
 	CloQuality = 3
 	CloThinness = 4
@@ -168,77 +168,77 @@ elseif ARGS[1] = 22:
 	CloTopCut = 3
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 23:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 25:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 28:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 29:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 30:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 31:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 33:
 	CloQuality = 3
 	CloThinness = 1
@@ -246,7 +246,7 @@ elseif ARGS[1] = 33:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 5
-	
+
 elseif ARGS[1] = 34:
 	CloQuality = 3
 	CloThinness = 3
@@ -254,49 +254,51 @@ elseif ARGS[1] = 34:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 36:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 40:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 41:
 	CloQuality = 3
 	CloThinness = 4
@@ -304,28 +306,28 @@ elseif ARGS[1] = 41:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 42:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 44:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 45:
 	CloQuality = 3
 	CloThinness = 4
@@ -341,7 +343,7 @@ elseif ARGS[1] = 46:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 47:
 	CloQuality = 3
 	CloThinness = 5
@@ -349,14 +351,14 @@ elseif ARGS[1] = 47:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 4
@@ -364,7 +366,8 @@ elseif ARGS[1] = 49:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 50:
 	CloQuality = 4
 	CloThinness = 4
@@ -372,14 +375,14 @@ elseif ARGS[1] = 50:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 51:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 52:
 	CloQuality = 4
 	CloThinness = 4
@@ -387,26 +390,26 @@ elseif ARGS[1] = 52:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 53:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	
+
 elseif ARGS[1] = 54:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	
+
 elseif ARGS[1] = 55:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 56:
 	CloQuality = 3
 	CloThinness = 4
@@ -419,14 +422,14 @@ elseif ARGS[1] = 57:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 58:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 59:
 	CloQuality = 3
 	CloThinness = 4
@@ -434,7 +437,7 @@ elseif ARGS[1] = 59:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 60:
 	CloQuality = 3
 	CloThinness = 4
@@ -442,7 +445,7 @@ elseif ARGS[1] = 60:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 61:
 	CloQuality = 4
 	CloThinness = 5
@@ -450,7 +453,7 @@ elseif ARGS[1] = 61:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 62:
 	CloQuality = 4
 	CloThinness = 5
@@ -458,7 +461,7 @@ elseif ARGS[1] = 62:
 	CloSkirtShortness = 5
 	CloDress = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 63:
 	CloQuality = 4
 	CloThinness = 4
@@ -466,7 +469,7 @@ elseif ARGS[1] = 63:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 64:
 	CloQuality = 4
 	CloThinness = 5
@@ -475,7 +478,7 @@ elseif ARGS[1] = 64:
 	CloDress = 1
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 65:
 	CloQuality = 4
 	CloThinness = 5
@@ -484,33 +487,35 @@ elseif ARGS[1] = 65:
 	CloDress = 1
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 66:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+	CloGoth = 1
+	CloPunk = 1
+
 elseif ARGS[1] = 67:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
-	
+
 elseif ARGS[1] = 68:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 69:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
-	
+
 elseif ARGS[1] = 70:
 	CloQuality = 3
 	CloThinness = 4
@@ -518,21 +523,21 @@ elseif ARGS[1] = 70:
 	CloSkirtShortness = 4
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 71:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 72:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 73:
 	CloQuality = 3
 	CloThinness = 5
@@ -540,7 +545,7 @@ elseif ARGS[1] = 73:
 	CloSkirtShortness = 4
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 74:
 	CloQuality = 3
 	CloThinness = 1
@@ -582,14 +587,14 @@ elseif ARGS[1] = 79:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 80:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloDress = 1
-	
+
 elseif ARGS[1] = 81:
 	CloQuality = 3
 	CloThinness = 5
@@ -597,13 +602,13 @@ elseif ARGS[1] = 81:
 	CloSkirtShortness = 5
 	CloStyle = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 82:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
-	
+
 elseif ARGS[1] = 83:
 	CloQuality = 3
 	CloThinness = 5
@@ -611,7 +616,7 @@ elseif ARGS[1] = 83:
 	CloSkirtShortness = 5
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 84:
 	CloQuality = 3
 	CloThinness = 4
@@ -619,7 +624,7 @@ elseif ARGS[1] = 84:
 	CloSkirtShortness = 5
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 85:
 	CloQuality = 4
 	CloThinness = 4
@@ -627,14 +632,14 @@ elseif ARGS[1] = 85:
 	CloSkirtShortness = 5
 	CloDress = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 86:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 87:
 	CloQuality = 3
 	CloThinness = 4
@@ -642,27 +647,28 @@ elseif ARGS[1] = 87:
 	CloSkirtShortness = 5
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 88:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	
+
 elseif ARGS[1] = 89:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 90:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 91:
 	CloQuality = 4
 	CloThinness = 6
@@ -670,7 +676,8 @@ elseif ARGS[1] = 91:
 	CloSkirtShortness = 5
 	CloStyle = 4
 	CloBimbo = 1
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 92:
 	CloQuality = 4
 	CloThinness = 6
@@ -678,49 +685,51 @@ elseif ARGS[1] = 92:
 	CloSkirtShortness = 5
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 93:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloStyle = 4
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 94:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 6
 	CloDress = 1
-	
+
 elseif ARGS[1] = 95:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 6
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 96:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 6
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 97:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloSkirtShortness = 6
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 98:
 	CloQuality = 4
 	CloThinness = 5
 	CloBra = 1
 	CloSkirtShortness = 6
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 99:
 	CloQuality = 4
 	CloThinness = 4
@@ -728,14 +737,14 @@ elseif ARGS[1] = 99:
 	CloSkirtShortness = 6
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 100:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloStyle = 4
-					
+
 end
 
 --- $attributes_bomba_dress ---------------------------------

+ 99 - 98
locations/_attributes_bomba_outfits.qsrc

@@ -8,117 +8,117 @@ if ARGS[1] = 1:
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 2:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 4:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 5:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 6:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 7:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 8:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 9:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 11:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 12:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 15:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 16:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 17:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 2
@@ -130,74 +130,74 @@ elseif ARGS[1] = 19:
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 22:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 24:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 25:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 28:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 29:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 30:
 	CloQuality = 4
 	CloThinness = 6
@@ -205,49 +205,50 @@ elseif ARGS[1] = 30:
 	CloPantsShortness = 1
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 31:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 32:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 33:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 34:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 35:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 4
@@ -255,14 +256,14 @@ elseif ARGS[1] = 37:
 	CloPantsShortness = 1
 	CloStyle = 2
 	CloOnePiece = 1
-	
+
 elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 39:
 	CloQuality = 5
 	CloThinness = 2
@@ -270,94 +271,94 @@ elseif ARGS[1] = 39:
 	CloPantsShortness = 1
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 40:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 41:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 42:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 44:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 45:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 46:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 47:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 48:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 50:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 51:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 52:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 53:
 	CloQuality = 4
 	CloThinness = 4
@@ -365,117 +366,117 @@ elseif ARGS[1] = 53:
 	CloPantsShortness = 6
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 54:
 	CloQuality = 3
 	CloThinness = 6
 	CloBra = 1
 	CloPantsShortness = 6
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 55:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 56:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 57:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 58:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 59:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 60:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 61:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 62:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 63:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 64:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 3
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 65:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 66:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 5
 	CloOnePiece = 1
-	
+
 elseif ARGS[1] = 67:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 68:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 69:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 70:
 	CloQuality = 3
 	CloThinness = 4
@@ -483,28 +484,28 @@ elseif ARGS[1] = 70:
 	CloPantsShortness = 5
 	CloStyle = 2
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 71:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 72:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 73:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 74:
 	CloQuality = 4
 	CloThinness = 4
@@ -512,7 +513,7 @@ elseif ARGS[1] = 74:
 	CloPantsShortness = 5
 	CloStyle = 2
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 75:
 	CloQuality = 4
 	CloThinness = 4
@@ -520,14 +521,14 @@ elseif ARGS[1] = 75:
 	CloPantsShortness = 5
 	CloStyle = 2
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 76:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 77:
 	CloQuality = 4
 	CloThinness = 3
@@ -542,14 +543,14 @@ elseif ARGS[1] = 78:
 	CloPantsShortness = 6
 	CloStyle = 2
 	CloOnePiece = 1
-	
+
 elseif ARGS[1] = 79:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 6
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 80:
 	CloQuality = 5
 	CloThinness = 4
@@ -557,7 +558,7 @@ elseif ARGS[1] = 80:
 	CloPantsShortness = 6
 	CloStyle = 2
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 81:
 	CloQuality = 4
 	CloThinness = 5
@@ -565,20 +566,20 @@ elseif ARGS[1] = 81:
 	CloPanties = 1
 	CloStyle = 2
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 82:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 6
-	
+
 elseif ARGS[1] = 83:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 6
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 84:
 	CloQuality = 4
 	CloThinness = 6
@@ -586,66 +587,66 @@ elseif ARGS[1] = 84:
 	CloPantsShortness = 6
 	CloStyle = 2
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 85:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 2
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 86:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 6
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 87:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 6
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 88:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 6
-	
+
 elseif ARGS[1] = 89:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 6
-	
+
 elseif ARGS[1] = 90:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 6
-	
+
 elseif ARGS[1] = 91:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 6
-	
+
 elseif ARGS[1] = 92:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 93:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
 	CloStyle = 4
-		
+
 elseif ARGS[1] = 94:
 	CloQuality = 4
 	CloThinness = 4
@@ -653,42 +654,42 @@ elseif ARGS[1] = 94:
 	CloPanties = 1
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 95:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 96:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 97:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 98:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 2
 	CloPantsShortness = 6
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 99:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 100:
 	CloQuality = 4
 	CloThinness = 4
@@ -696,7 +697,7 @@ elseif ARGS[1] = 100:
 	CloPantsShortness = 6
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 end
 
 --- $attributes_bomba_outfits ---------------------------------

+ 48 - 38
locations/_attributes_bomba_shoes.qsrc

@@ -7,175 +7,182 @@ if ARGS[1] = 1:
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 2:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 4:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 5:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 6:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 7:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 9:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 13:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 17:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+	ShoGoth = 1
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 20:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 21:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 22:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 23:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 24:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 25:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 26:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 27:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 28:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 29:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 30:
 	ShoStyle = 0
 	ShoQuality = 4
@@ -183,10 +190,11 @@ elseif ARGS[1] = 30:
 	ShoHeels = 4
 
 elseif ARGS[1] = 31:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
+	ShoBimbo = 1
 
 elseif ARGS[1] = 32:
 	ShoStyle = 0
@@ -231,17 +239,19 @@ elseif ARGS[1] = 38:
 	ShoHeels = 3
 
 elseif ARGS[1] = 39:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 3
 	ShoHeels = 3
+	ShoBimbo = 1
 
 elseif ARGS[1] = 40:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 3
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 end
 
 --- $attributes_bomba_shoes ---------------------------------

+ 48 - 45
locations/_attributes_cats_shoes.qsrc

@@ -7,175 +7,177 @@ if ARGS[1] = 1:
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 2:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 4:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 5:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 6:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 9:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 14:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 16:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 17:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 20:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 21:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 22:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 23:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 24:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 25:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 26:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 27:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 28:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 29:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 30:
 	ShoStyle = 0
 	ShoQuality = 5
@@ -187,60 +189,61 @@ elseif ARGS[1] = 31:
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 32:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 33:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 34:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 35:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 36:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 37:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 2
-	
+	ShoHeels = 1
+
 elseif ARGS[1] = 38:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 2
-	
+	ShoHeels = 1
+
 elseif ARGS[1] = 39:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 2
-	
+	ShoHeels = 1
+
 elseif ARGS[1] = 40:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 2
+	ShoHeels = 1
 
 end
 

File diff suppressed because it is too large
+ 172 - 150
locations/_attributes_danilovich_outfits.qsrc


+ 46 - 43
locations/_attributes_danilovich_shoes.qsrc

@@ -7,241 +7,244 @@ if ARGS[1] = 1:
 	ShoQuality = 7
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 2:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 4:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 5:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 6:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 9:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 12:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 17:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 20:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 21:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 22:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 23:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 24:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 25:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 26:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 27:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 28:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 29:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 30:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 31:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 32:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 33:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 34:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 35:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 36:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 37:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 38:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 39:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 40:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 end
 
 --- $attributes_danilovich_shoes ---------------------------------

+ 123 - 71
locations/_attributes_dolls_dress.qsrc

@@ -9,7 +9,8 @@ if ARGS[1] = 1:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 2:
 	CloQuality = 5
 	CloThinness = 2
@@ -17,7 +18,8 @@ elseif ARGS[1] = 2:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 3:
 	CloQuality = 5
 	CloThinness = 2
@@ -25,7 +27,8 @@ elseif ARGS[1] = 3:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 4:
 	CloQuality = 5
 	CloThinness = 2
@@ -33,7 +36,8 @@ elseif ARGS[1] = 4:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 5:
 	CloQuality = 5
 	CloThinness = 2
@@ -41,7 +45,8 @@ elseif ARGS[1] = 5:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 6:
 	CloQuality = 5
 	CloThinness = 2
@@ -49,7 +54,8 @@ elseif ARGS[1] = 6:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 7:
 	CloQuality = 5
 	CloThinness = 2
@@ -57,7 +63,8 @@ elseif ARGS[1] = 7:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 8:
 	CloQuality = 5
 	CloThinness = 2
@@ -65,7 +72,8 @@ elseif ARGS[1] = 8:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 9:
 	CloQuality = 5
 	CloThinness = 2
@@ -73,7 +81,8 @@ elseif ARGS[1] = 9:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 10:
 	CloQuality = 5
 	CloThinness = 2
@@ -81,7 +90,8 @@ elseif ARGS[1] = 10:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 11:
 	CloQuality = 5
 	CloThinness = 2
@@ -89,7 +99,8 @@ elseif ARGS[1] = 11:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 12:
 	CloQuality = 5
 	CloThinness = 2
@@ -97,7 +108,8 @@ elseif ARGS[1] = 12:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 13:
 	CloQuality = 5
 	CloThinness = 2
@@ -105,7 +117,8 @@ elseif ARGS[1] = 13:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 14:
 	CloQuality = 5
 	CloThinness = 2
@@ -113,7 +126,8 @@ elseif ARGS[1] = 14:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 15:
 	CloQuality = 5
 	CloThinness = 2
@@ -121,7 +135,8 @@ elseif ARGS[1] = 15:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 16:
 	CloQuality = 4
 	CloThinness = 2
@@ -129,7 +144,8 @@ elseif ARGS[1] = 16:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 2
@@ -137,7 +153,8 @@ elseif ARGS[1] = 17:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 2
@@ -145,7 +162,7 @@ elseif ARGS[1] = 18:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 19:
 	CloQuality = 5
 	CloThinness = 5
@@ -153,7 +170,8 @@ elseif ARGS[1] = 19:
 	CloSkirtShortness = 2
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 4
@@ -161,7 +179,7 @@ elseif ARGS[1] = 20:
 	CloSkirtShortness = 2
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 2
@@ -169,14 +187,14 @@ elseif ARGS[1] = 21:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 22:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 2
@@ -184,7 +202,7 @@ elseif ARGS[1] = 23:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 4
@@ -192,7 +210,8 @@ elseif ARGS[1] = 24:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 25:
 	CloQuality = 4
 	CloThinness = 3
@@ -200,7 +219,8 @@ elseif ARGS[1] = 25:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 3
@@ -208,35 +228,36 @@ elseif ARGS[1] = 26:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 28:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 29:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 31:
 	CloQuality = 4
 	CloThinness = 2
@@ -244,7 +265,8 @@ elseif ARGS[1] = 31:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 2
@@ -252,21 +274,21 @@ elseif ARGS[1] = 32:
 	CloSkirtShortness = 3
 	CloStyle = 2
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 33:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 34:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 2
@@ -274,7 +296,7 @@ elseif ARGS[1] = 35:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 2
@@ -282,7 +304,7 @@ elseif ARGS[1] = 36:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 37:
 	CloQuality = 3
 	CloThinness = 2
@@ -290,7 +312,7 @@ elseif ARGS[1] = 37:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 38:
 	CloQuality = 3
 	CloThinness = 2
@@ -298,7 +320,7 @@ elseif ARGS[1] = 38:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 39:
 	CloQuality = 5
 	CloThinness = 2
@@ -306,7 +328,8 @@ elseif ARGS[1] = 39:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 40:
 	CloQuality = 4
 	CloThinness = 4
@@ -314,7 +337,7 @@ elseif ARGS[1] = 40:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 41:
 	CloQuality = 4
 	CloThinness = 4
@@ -322,7 +345,7 @@ elseif ARGS[1] = 41:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 42:
 	CloQuality = 4
 	CloThinness = 4
@@ -330,7 +353,7 @@ elseif ARGS[1] = 42:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 4
@@ -338,7 +361,8 @@ elseif ARGS[1] = 43:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 44:
 	CloQuality = 4
 	CloThinness = 4
@@ -346,7 +370,8 @@ elseif ARGS[1] = 44:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 45:
 	CloQuality = 4
 	CloThinness = 4
@@ -354,7 +379,7 @@ elseif ARGS[1] = 45:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 46:
 	CloQuality = 4
 	CloThinness = 4
@@ -362,7 +387,7 @@ elseif ARGS[1] = 46:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 47:
 	CloQuality = 4
 	CloThinness = 4
@@ -370,7 +395,7 @@ elseif ARGS[1] = 47:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 48:
 	CloQuality = 4
 	CloThinness = 4
@@ -378,14 +403,14 @@ elseif ARGS[1] = 48:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 49:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 50:
 	CloQuality = 4
 	CloThinness = 4
@@ -393,7 +418,7 @@ elseif ARGS[1] = 50:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 51:
 	CloQuality = 4
 	CloThinness = 4
@@ -401,7 +426,7 @@ elseif ARGS[1] = 51:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 52:
 	CloQuality = 4
 	CloThinness = 4
@@ -409,14 +434,15 @@ elseif ARGS[1] = 52:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 53:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 54:
 	CloQuality = 3
 	CloThinness = 4
@@ -424,7 +450,7 @@ elseif ARGS[1] = 54:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 55:
 	CloQuality = 4
 	CloThinness = 4
@@ -432,21 +458,26 @@ elseif ARGS[1] = 55:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 56:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+	CloStyle2 = 4
+	CloGoth = 1
+
 elseif ARGS[1] = 57:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+	CloStyle2 = 4
+	CloPunk = 1
+
 elseif ARGS[1] = 58:
 	CloQuality = 4
 	CloThinness = 3
@@ -454,7 +485,7 @@ elseif ARGS[1] = 58:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 59:
 	CloQuality = 4
 	CloThinness = 4
@@ -462,35 +493,39 @@ elseif ARGS[1] = 59:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 61:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 62:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 63:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+	CloStyle2 = 4
+	CloGoth = 1
+
+
 elseif ARGS[1] = 64:
 	CloQuality = 4
 	CloThinness = 3
@@ -498,28 +533,28 @@ elseif ARGS[1] = 64:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 65:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 66:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 67:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 68:
 	CloQuality = 5
 	CloThinness = 4
@@ -527,14 +562,14 @@ elseif ARGS[1] = 68:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 69:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 70:
 	CloQuality = 4
 	CloThinness = 4
@@ -565,6 +600,7 @@ elseif ARGS[1] = 73:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 74:
 	CloQuality = 3
@@ -572,6 +608,7 @@ elseif ARGS[1] = 74:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 75:
 	CloQuality = 3
@@ -594,6 +631,7 @@ elseif ARGS[1] = 77:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 78:
 	CloQuality = 3
@@ -632,6 +670,7 @@ elseif ARGS[1] = 82:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 83:
 	CloQuality = 5
@@ -671,6 +710,7 @@ elseif ARGS[1] = 87:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 88:
 	CloQuality = 4
@@ -685,7 +725,7 @@ elseif ARGS[1] = 89:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 90:
 	CloQuality = 3
 	CloThinness = 4
@@ -700,6 +740,7 @@ elseif ARGS[1] = 91:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 92:
 	CloQuality = 5
@@ -724,6 +765,7 @@ elseif ARGS[1] = 94:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 95:
 	CloQuality = 4
@@ -799,6 +841,7 @@ elseif ARGS[1] = 104:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 105:
 	CloQuality = 4
@@ -806,6 +849,7 @@ elseif ARGS[1] = 105:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 106:
 	CloQuality = 4
@@ -834,6 +878,7 @@ elseif ARGS[1] = 109:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 110:
 	CloQuality = 5
@@ -856,6 +901,7 @@ elseif ARGS[1] = 112:
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 113:
 	CloQuality = 3
@@ -893,6 +939,8 @@ elseif ARGS[1] = 117:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
+	CloGoth = 1
+	CloPunk = 1
 
 elseif ARGS[1] = 118:
 	CloQuality = 5
@@ -908,6 +956,7 @@ elseif ARGS[1] = 119:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 120:
 	CloQuality = 4
@@ -929,6 +978,7 @@ elseif ARGS[1] = 122:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 123:
 	CloQuality = 5
@@ -949,6 +999,7 @@ elseif ARGS[1] = 125:
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 126:
 	CloQuality = 4
@@ -986,6 +1037,7 @@ elseif ARGS[1] = 130:
 	CloDress = 1
 	CloStyle = 2
 	CloCoverTop = 3
+	CloGoth = 1
 
 elseif ARGS[1] = 131:
 	CloQuality = 4
@@ -1058,7 +1110,7 @@ elseif ARGS[1] = 140:
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloStyle = 4
-	
+
 end
 
 --- $attributes_dolls_dress ---------------------------------

+ 76 - 49
locations/_attributes_dolls_outfits.qsrc

@@ -8,224 +8,242 @@ if ARGS[1] = 1:
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 2:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 3:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 4:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 5:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 6:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 7:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 8:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 9:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 10:
 	CloQuality = 6
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 11:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 12:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 13:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 14:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 15:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 16:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 20:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 21:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 22:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 24:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 25:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 26:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 27:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 28:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 29:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 30:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 31:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 33:
 	CloQuality = 4
 	CloThinness = 5
@@ -233,7 +251,7 @@ elseif ARGS[1] = 33:
 	CloPantsShortness = 1
 	CloStyle = 2
 	CloCoverTop = 2
-	
+
 elseif ARGS[1] = 34:
 	CloQuality = 5
 	CloThinness = 6
@@ -241,91 +259,95 @@ elseif ARGS[1] = 34:
 	CloPantsShortness = 1
 	CloStyle = 2
 	CloCoverTop = 3
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 35:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 38:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 39:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 40:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 41:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 42:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 44:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 45:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 46:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 47:
 	CloQuality = 4
 	CloThinness = 5
@@ -333,21 +355,22 @@ elseif ARGS[1] = 47:
 	CloPantsShortness = 1
 	CloStyle = 2
 	CloCoverTop = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 48:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 50:
 	CloQuality = 5
 	CloThinness = 4
@@ -396,6 +419,7 @@ elseif ARGS[1] = 56:
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 57:
 	CloQuality = 5
@@ -403,6 +427,7 @@ elseif ARGS[1] = 57:
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 58:
 	CloQuality = 4
@@ -480,6 +505,7 @@ elseif ARGS[1] = 68:
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 69:
 	CloQuality = 4
@@ -543,6 +569,7 @@ elseif ARGS[1] = 77:
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 78:
 	CloQuality = 5

+ 341 - 219
locations/_attributes_dolls_shoes.qsrc

@@ -6,242 +6,267 @@ if ARGS[1] = 1:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 2
-	
+	ShoHeels = 1
+
 elseif ARGS[1] = 2:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 4:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 2
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 5:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 6:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 2
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
-	ShoHeels = 3
-	
+	ShoHeels = 1
+
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
-	ShoHeels = 3
-	
+	ShoHeels = 1
+
 elseif ARGS[1] = 9:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
-	ShoHeels = 3
-	
+	ShoHeels = 1
+	ShoBimbo = 1
+
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
-	ShoHeels = 3
-	
+	ShoHeels = 1
+
 elseif ARGS[1] = 11:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
-	ShoHeels = 3
-	
+	ShoHeels = 1
+	ShoBimbo = 1
+
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
-	
+	ShoHeels = 3
+
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
-	
+	ShoHeels = 2
+
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
-	
+	ShoHeels = 3
+
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 5
-	
+	ShoHeels = 3
+
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 17:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 5
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 19:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 5
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 20:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 5
-	
+	ShoHeels = 3
+	ShoPunk = 1
+
 elseif ARGS[1] = 21:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 5
-	
+	ShoHeels = 3
+
 elseif ARGS[1] = 22:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 5
-	
+	ShoHeels = 3
+	ShoBimbo = 1
+
 elseif ARGS[1] = 23:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 6
-	
+	ShoHeels = 3
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 24:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 6
-	
+	ShoHeels = 3
+	ShoGoth = 1
+
 elseif ARGS[1] = 25:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 6
-	
+	ShoHeels = 3
+	ShoBimbo = 1
+	ShoGoth = 1
+
 elseif ARGS[1] = 26:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 6
-	
+	ShoHeels = 3
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 27:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 6
-	
+	ShoHeels = 3
+	ShoGoth = 1
+
 elseif ARGS[1] = 28:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 29:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 30:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 31:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 32:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 33:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 34:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 35:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 36:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 37:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 38:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 39:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 40:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 41:
 	ShoStyle = 0
 	ShoQuality = 4
@@ -252,146 +277,174 @@ elseif ARGS[1] = 42:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 1	
-	
+	ShoHeels = 1
+
 elseif ARGS[1] = 43:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 1	
-	
+	ShoHeels = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 44:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
 
 elseif ARGS[1] = 45:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 46:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 47:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 48:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 2
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 49:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 50:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 51:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 52:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
+	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 53:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
-	
+	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 54:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
+	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 55:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
-	
+	ShoHeels = 4
+	ShoBimbo = 1
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 56:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 5	
+	ShoHeels = 5
+	ShoGoth = 1
 
 elseif ARGS[1] = 57:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 5
-	
+	ShoHeels = 2
+	ShoPunk = 1
+	ShoBimbo = 1
+
 elseif ARGS[1] = 58:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 3
+	ShoHeels = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 59:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 3
-	
+	ShoHeels = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 60:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
-	ShoHeels = 3
+	ShoHeels = 1
 
 elseif ARGS[1] = 61:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 3
-	
+	ShoHeels = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 62:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 3
+	ShoHeels = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 63:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 3
-	
+	ShoHeels = 1
+
 elseif ARGS[1] = 64:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
+	ShoHeels = 3
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 65:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
-	
+	ShoHeels = 3
+
 elseif ARGS[1] = 66:
 	ShoStyle = 0
 	ShoQuality = 4
@@ -403,325 +456,394 @@ elseif ARGS[1] = 67:
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 68:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
+	ShoPunk = 1
 
 elseif ARGS[1] = 69:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
-	
+	ShoHeels = 1
+
 elseif ARGS[1] = 70:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4
+	ShoHeels = 1
 
 elseif ARGS[1] = 71:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 4
-	
+	ShoHeels = 1
+
 elseif ARGS[1] = 72:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
+	ShoHeels = 2
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 73:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
-	
+	ShoHeels = 4
+	ShoPunk = 1
+
 elseif ARGS[1] = 74:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4	
+	ShoHeels = 3
+	ShoGoth = 1
 
 elseif ARGS[1] = 75:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4	
-	
+	ShoHeels = 3
+	ShoBimbo = 1
+
 elseif ARGS[1] = 76:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4	
+	ShoHeels = 2
 
 elseif ARGS[1] = 77:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4	
-	
+	ShoHeels = 2
+
 elseif ARGS[1] = 78:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4	
+	ShoHeels = 4
 
 elseif ARGS[1] = 79:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4	
-	
+	ShoHeels = 4
+
 elseif ARGS[1] = 80:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 5	
+	ShoHeels = 5
+	ShoPunk = 1
 
 elseif ARGS[1] = 81:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 4	
-	
+	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 82:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 4	
+	ShoHeels = 3
+	ShoPunk = 1
 
 elseif ARGS[1] = 83:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
-	
+	ShoHeels = 1
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 84:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4
+	ShoHeels = 1
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 85:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 86:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4
+	ShoHeels = 3
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 87:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 6
-	
+	ShoHeels = 3
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 88:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 4
+	ShoGoth = 1
 
 elseif ARGS[1] = 89:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 4
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 90:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 91:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 4
-	
+	ShoHeels = 1
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 92:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 4	
+	ShoHeels = 1
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 93:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 4
-	
+	ShoHeels = 1
+	ShoGoth = 1
+
 elseif ARGS[1] = 94:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 4
+	ShoHeels = 2
+	ShoGoth = 1
 
 elseif ARGS[1] = 95:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 96:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
+	ShoGoth = 1
 
 elseif ARGS[1] = 97:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
-	
+	ShoPunk = 1
+	ShoGoth = 1
+
 elseif ARGS[1] = 98:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
+	ShoGoth = 1
 
 elseif ARGS[1] = 99:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 100:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
-	ShoHeels = 4
+	ShoHeels = 1
+	ShoGoth = 1
 
 elseif ARGS[1] = 101:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
-	ShoHeels = 4
-	
+	ShoHeels = 1
+	ShoGoth = 1
+
 elseif ARGS[1] = 102:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
-	ShoHeels = 4
+	ShoHeels = 1
+	ShoGoth = 1
 
 elseif ARGS[1] = 103:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
-	ShoHeels = 5
-	
+	ShoHeels = 2
+	ShoGoth = 1
+
 elseif ARGS[1] = 104:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 5
+	ShoHeels = 2
+	ShoGoth = 1
 
 elseif ARGS[1] = 105:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 5
-	
+	ShoHeels = 2
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 106:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 5
+	ShoHeels = 2
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 107:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 5
-	
+	ShoHeels = 2
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 108:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 5
+	ShoHeels = 2
+	ShoGoth = 1
 
 elseif ARGS[1] = 109:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 5
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 110:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 111:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 112:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 4
+	ShoHeels = 2
+	ShoGoth = 1
 
 elseif ARGS[1] = 113:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 3
-	ShoHeels = 5
-	
+	ShoHeels = 2
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 114:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
-	ShoHeels = 5
+	ShoHeels = 2
+	ShoGoth = 1
 
 elseif ARGS[1] = 115:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 116:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
+	ShoPunk = 1
 
 elseif ARGS[1] = 117:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 118:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 119:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 4
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 120:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 4
 	ShoHeels = 4
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 end
 
 --- $attributes_dolls_shoes ---------------------------------

File diff suppressed because it is too large
+ 116 - 113
locations/_attributes_eroto_dress.qsrc


+ 27 - 23
locations/_attributes_eroto_shoes.qsrc

@@ -7,115 +7,117 @@ if ARGS[1] = 1:
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 2:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 4:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 5:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 6:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 9:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 17:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 20:
 	ShoStyle = 0
 	ShoQuality = 6
@@ -177,10 +179,11 @@ elseif ARGS[1] = 29:
 	ShoHeels = 6
 
 elseif ARGS[1] = 30:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 5
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 31:
 	ShoStyle = 0
@@ -231,10 +234,11 @@ elseif ARGS[1] = 38:
 	ShoHeels = 6
 
 elseif ARGS[1] = 39:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 5
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 40:
 	ShoStyle = 0

+ 34 - 31
locations/_attributes_gm_shoes.qsrc

@@ -6,149 +6,152 @@ if ARGS[1] = 1:
 	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 2:
 	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 3:
 	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 4:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 5:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 6:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 7:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 8:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 9:
+	ShoStyle = 0
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	ShoStyle = 2
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 10:
+	ShoStyle = 0
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	ShoStyle = 2
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 11:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 12:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 13:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 14:
 	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 15:
 	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 16:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 17:
 	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 3
-	
+
 elseif ARGS[1] = 18:
 	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 3
-	
+
 elseif ARGS[1] = 19:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 20:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 21:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 22:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 23:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 24:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 3
-	
+
 elseif ARGS[1] = 25:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 4
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 26:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 4
-	
+
 elseif ARGS[1] = 27:
 	ShoQuality = 2
 	ShoHeels = 4
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 28:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 29:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 30:
 	ShoQuality = 2
 	ShoHeels = 4

+ 199 - 165
locations/_attributes_moncheri_shoes.qsrc

@@ -3,791 +3,823 @@
 !!price range from 6 to 7 but please avoid adding too many 7s
 
 if ARGS[1] = 1:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 2:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 4:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 5:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 6:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 8:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 9:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 10:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 15:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 17:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 20:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 21:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 22:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 23:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 24:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 3
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 25:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 26:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 27:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 28:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 29:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 30:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 31:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 32:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 33:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 34:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 35:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 36:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 37:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 38:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 39:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 40:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 41:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 42:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 43:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 44:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 45:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 46:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 47:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 48:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 49:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 50:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 51:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 52:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 53:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 54:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 55:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 56:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 57:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 58:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 59:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 60:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 61:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 62:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 63:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 64:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 65:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 66:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 67:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 68:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 69:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 70:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 71:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 72:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 73:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 74:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 4
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 75:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 4
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 76:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 2
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 77:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 2
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 78:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 2
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 79:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 2
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 80:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 81:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 82:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 83:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 84:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 85:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 86:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 87:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 88:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 89:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 90:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 91:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 92:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 93:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 94:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 95:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 96:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 97:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 98:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 99:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 100:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 101:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 102:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 103:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 104:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 105:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 106:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 107:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 108:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 109:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 110:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 111:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 112:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 113:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 114:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 115:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 116:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 117:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 118:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 119:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 120:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 121:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 122:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 123:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 124:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 125:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 126:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 127:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 128:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 129:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 130:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 131:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 132:
 	ShoStyle = 0
 	ShoQuality = 7
@@ -807,16 +839,18 @@ elseif ARGS[1] = 134:
 	ShoHeels = 4
 
 elseif ARGS[1] = 135:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
+	ShoBimbo = 1
 
 elseif ARGS[1] = 136:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
+	ShoBimbo = 1
 
 elseif ARGS[1] = 137:
 	ShoStyle = 0

+ 1 - 0
locations/_attributes_salacious_dress.qsrc

@@ -256,6 +256,7 @@ elseif ARGS[1] = 26:
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloDress = 1
+	CloBimbo = 1
 	CloCoverTop = 3
 	CloCoverfront = 3
 	CloCoverBack = 3

+ 46 - 38
locations/_attributes_scandalicious_shoes.qsrc

@@ -7,175 +7,177 @@ if ARGS[1] = 1:
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 2:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 3:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 4:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 5:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 6:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 9:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 17:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 20:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 21:
 	ShoStyle = 1
 	ShoQuality = 3
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 22:
 	ShoStyle = 1
 	ShoQuality = 3
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 23:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 24:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 25:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 26:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 27:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 28:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 29:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 30:
 	ShoStyle = 1
 	ShoQuality = 4
@@ -267,16 +269,18 @@ elseif ARGS[1] = 44:
 	ShoHeels = 6
 
 elseif ARGS[1] = 45:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 46:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 47:
 	ShoStyle = 0
@@ -333,10 +337,11 @@ elseif ARGS[1] = 55:
 	ShoHeels = 6
 
 elseif ARGS[1] = 56:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 57:
 	ShoStyle = 1
@@ -375,10 +380,11 @@ elseif ARGS[1] = 62:
 	ShoHeels = 6
 
 elseif ARGS[1] = 63:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 64:
 	ShoStyle = 1
@@ -399,10 +405,11 @@ elseif ARGS[1] = 66:
 	ShoHeels = 6
 
 elseif ARGS[1] = 67:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 68:
 	ShoStyle = 1
@@ -465,10 +472,11 @@ elseif ARGS[1] = 77:
 	ShoHeels = 6
 
 elseif ARGS[1] = 78:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 79:
 	ShoStyle = 0
@@ -481,7 +489,7 @@ elseif ARGS[1] = 80:
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 6
-	
+
 end
 
 --- $attributes_scandalicious_shoes ---------------------------------

+ 58 - 55
locations/_attributes_school.qsrc

@@ -8,98 +8,98 @@ if ARGS[1] = 1:
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 2:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 3:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 4:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 5:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 6:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 7:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 8:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 9:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 10:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 11:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 12:
 	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 15:
 	CloQuality = 3
 	CloThinness = 3
@@ -107,140 +107,140 @@ elseif ARGS[1] = 15:
 	CloSkirtShortness = 4
 	CloBimbo = 1
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 16:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 19:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 20:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 22:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 23:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 1
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 25:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 1
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 26:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 27:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 28:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 29:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 31:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 32:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 33:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 34:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 35:
 	CloQuality = 3
 	CloThinness = 4
@@ -248,14 +248,14 @@ elseif ARGS[1] = 35:
 	CloSkirtShortness = 5
 	CloStyle2 = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 3
@@ -269,7 +269,7 @@ elseif ARGS[1] = 38:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 39:
 	CloQuality = 3
 	CloThinness = 4
@@ -277,7 +277,7 @@ elseif ARGS[1] = 39:
 	CloSkirtShortness = 5
 	CloStyle2 = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 40:
 	CloQuality = 3
 	CloThinness = 3
@@ -306,7 +306,7 @@ elseif ARGS[1] = 43:
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 44:
 	CloQuality = 5
 	CloThinness = 2
@@ -320,7 +320,7 @@ elseif ARGS[1] = 45:
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 46:
 	CloQuality = 3
 	CloThinness = 4
@@ -334,35 +334,36 @@ elseif ARGS[1] = 47:
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 49:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 50:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 51:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 52:
 	CloQuality = 3
 	CloThinness = 2
@@ -370,28 +371,30 @@ elseif ARGS[1] = 52:
 	CloSkirtShortness = 4
 	CloStyle2 = 4
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 53:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 54:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 55:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 56:
 	CloQuality = 3
 	CloThinness = 4
@@ -400,42 +403,42 @@ elseif ARGS[1] = 56:
 	CloStyle2 = 4
 	CloBimbo = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 57:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 58:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 59:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 61:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 62:
 	CloQuality = 4
 	CloThinness = 6

+ 145 - 45
locations/_body_image.qsrc

@@ -1,24 +1,134 @@
 # $body_image
 !This function will return url of image, and set additional texts to $body_image_msg
-!for example, you can   VIEW FUNC('$body_image', 'body')   to view body image in popup window, and
+!for example, you can   VIEW func('$body_image', 'body')   to view body image in popup window, and
 !pl $body_image_msg     to display extra texts
 
 
 $body_image_msg = ''
+
 if $ARGS[0] = 'body':
-	$bodyVars['img'] = func('body_structure', 'body_img')
+	$body_image_msg += 'You are <<pcs_hgt>>cm tall and <<$bodyVars[''desc'']>>.'
 	$result = $bodyVars['img']
-	$body_image_msg += 'You are <<pcs_hgt>>cm tall and <<$bodyVars[''desc'']>>'
 end
 
+if $ARGS[0] = 'tits':
+	$body_image_msg += 'Your breasts would be considered an EU <<$titsize>>.'
+	$result = 'images/pc/body/tits/t<<tits>>.jpg'
+end
+
+if $ARGS[0] = 'pubes' or $ARGS[0] = 'pussy':
+	$result = 'images/pc/body/pussy/'
+
+	if ARGS[1] ! 0: temp_pubes = ARGS[1]		else temp_pubes = pcs_pubes
+	if ARGS[2] ! 0: temp_pubecol = ARGS[2]		else temp_pubecol = pcs_pubecol[2]
+	if ARGS[3] ! 0: temp_pubestyle = ARGS[3]	else temp_pubestyle = pubestyle
+
+	if temp_pubecol = 0:
+		$temp_pubecol = 'black'
+	elseif temp_pubecol = 1:
+		$temp_pubecol = 'brunette'
+	elseif temp_pubecol = 2:
+		$temp_pubecol = 'ginger'
+	elseif temp_pubecol = 3:
+		$temp_pubecol = 'blonde'
+	elseif temp_pubecol = 4:
+		$temp_pubecol = 'red'
+	elseif temp_pubecol = 5:
+		$temp_pubecol = 'blue'
+	elseif temp_pubecol = 6:
+		$temp_pubecol = 'green'
+	elseif temp_pubecol = 7:
+		$temp_pubecol = 'pink'
+	elseif temp_pubecol = 8:
+		$temp_pubecol = 'purple'
+	end
+
+	if temp_pubes ! 0:
+		if temp_pubes <= 3:
+			$result += 'hair/pussy'
+		elseif temp_pubes <= 10:
+			$result += 'hair/stubble'
+		elseif temp_pubes <= 15:
+			$result += 'hair/very_short'
+		elseif temp_pubes <= 25:
+			if temp_pubestyle = 2:
+				$result += 'shave/<<$temp_pubecol>>_v'
+			elseif temp_pubestyle = 3:
+				$result += 'shave/<<$temp_pubecol>>_triangle'
+			elseif temp_pubestyle = 4:
+				$result += 'shave/<<$temp_pubecol>>_landing'
+			elseif temp_pubestyle = 5:
+				$result += 'shave/<<$temp_pubecol>>_heart'
+			elseif temp_pubestyle = 6:
+				$result += 'shave/<<$temp_pubecol>>_flame'
+			elseif temp_pubestyle = 7:
+				$result += 'shave/<<$temp_pubecol>>_cross'
+			elseif temp_pubestyle = 8:
+				$result += 'shave/<<$temp_pubecol>>_trimmed'
+			elseif temp_pubestyle = 12:
+				$result += 'shave/<<$temp_pubecol>>_mini'
+			else
+				$result += 'hair/<<$temp_pubecol>>_small'
+			end
+		elseif temp_pubes <= 35:
+			$result += 'hair/<<$temp_pubecol>>_mid'
+		else
+			$result += 'hair/<<$temp_pubecol>>_full'
+		end
+	else
+		$result += 'hair/pussy'
+	end
+
+	killvar 'temp_pubes' & killvar 'temp_pubecol' & killvar 'temp_pubestyle'
+
+	$result += '.jpg'
+end
+
+if $ARGS[0] = 'ass' or $ARGS[0] = 'butt':
+	$result = 'images/pc/body/ass/'
+
+	if bodyVars['butt_silicone'] > 0:
+		$result += '9s.jpg'
+		!$body_image_msg += 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''<<$result>>''">butt</a>.'
+
+	!natural butt
+	elseif pcs_buttsize <= 7:
+		$result += '1.jpg'
+		!$body_image_msg = 'Your <a href="exec:view''<<$result>>''">ass</a> is square and as flat as a plank.'
+	elseif pcs_buttsize <= 14:
+		$result += '2.jpg'
+		!$body_image_msg = 'Your <a href="exec:view''<<$result>>''">ass</a> is square but not completely flat.'
+	elseif pcs_buttsize <= 21:
+		$result += '3.jpg'
+		!$body_image_msg = 'You have an average, feminine looking <a href="exec:view''<<$result>>''">ass</a>.'
+	elseif pcs_buttsize <= 29:
+		$result += '4.jpg'
+		!$body_image_msg = 'You have an above-average, feminine looking <a href="exec:view''<<$result>>''">ass</a>.'
+	elseif pcs_buttsize <= 36:
+		$result += '5.jpg'
+		!$body_image_msg = 'Your <a href="exec:view''<<$result>>''">ass</a> is bigger, rounder and firmer than average.'
+	elseif pcs_buttsize <= 44:
+		$result += '6.jpg'
+		!$body_image_msg = 'Your ample <a href="exec:view''<<$result>>''">ass</a> is bigger, rounder and firmer than most.'
+	elseif pcs_buttsize <= 51:
+		$result += '7.jpg'
+		!$body_image_msg = 'You have a heart-shaped <a href="exec:view''<<$result>>''">butt</a> that jiggles as you walk.'
+	elseif pcs_buttsize <= 59:
+		$result += '8.jpg'
+		!$body_image_msg = 'You have a large heart-shaped <a href="exec:view''<<$result>>''">butt</a> that jiggles and sways as you walk.'
+	else
+		$result += '9.jpg'
+		!$body_image_msg = 'You have a large bubble <a href="exec:view''<<$result>>''">butt</a> that jiggles and sways as you walk.'
+	end
+end
+
+
 if $ARGS[0] = 'coat':
 	if $coatworntype = 'none':
-		$RESULT = ''
 		$body_image_msg += 'You will not wear a coat outside.'
-
 		$body_image_msg += '<br>Your health will suffer if you don''t wear a coat in the winter.'
+		$result = ''
 	else
-		$RESULT = 'images/pc/items/<<$coatworntype>>/coats/<<coatwornnumber>>.jpg'
 		$body_image_msg += 'Your current coat is <<$coatworntype>> no.<<coatwornnumber>>.<br>'
 		!make sure to sync these with [outdoors]~364
 		if PCoatWarm = 1:
@@ -28,28 +138,29 @@ if $ARGS[0] = 'coat':
 		elseif PCoatWarm = 3:
 			$body_image_msg += 'You will be nice and warm even in the depths of winter.'
 		end
+		$result = 'images/pc/items/<<$coatworntype>>/coats/<<coatwornnumber>>.jpg'
 	end
 end
 
 if $ARGS[0] = 'clothes':
 	if $clothingworntype = 'nude' and towel = 1 and $pantyworntype = 'none':
-		$RESULT = 'images/pc/body/towel.jpg'
+		$result = 'images/pc/body/towel.jpg'
 		$body_image_msg += 'You are only wearing a towel'
 	elseif $clothingworntype = 'nude' and robe = 1:
-		$RESULT = 'images/pc/body/robe.jpg'
+		$result = 'images/pc/body/robe.jpg'
 		$body_image_msg += 'You are only wearing a robe'
 	elseif $clothingworntype = 'nude' and $pantyworntype ! 'none':
-		$RESULT = 'images/pc/body/nude.jpg'
+		$result = 'images/pc/body/nude.jpg'
 		$body_image_msg += 'You are only wearing panties'
 	elseif $clothingworntype = 'nude' and $pantyworntype = 'none':
-		$RESULT = 'images/pc/body/nude1.jpg'
+		$result = 'images/pc/body/nude1.jpg'
 		$body_image_msg += 'You are completely naked.'
 	elseif $clothingworntype = 'misc_outfits' and clothingwornnumber = 1:
-		$RESULT = FUNC('$clothing_image', $clothingworntype, clothingwornnumber)
+		$result = func('$clothing_image', $clothingworntype, clothingwornnumber)
 		$body_image_msg += 'You are wearing a hessian sack the hunters gave you.'
 	else
-		$RESULT = FUNC('$clothing_image', $clothingworntype, clothingwornnumber)
-		$body_image_msg += 'You are wearing ' + FUNC('$short_description', $clothingworntype) + '<<clothingwornnumber>>.'
+		$result = func('$clothing_image', $clothingworntype, clothingwornnumber)
+		$body_image_msg += 'You are wearing ' + func('$short_description', $clothingworntype) + '<<clothingwornnumber>>.'
 		if PClobimbo = 1:$body_image_msg += '<br>You are dressed like a bimbo.'
 		if $clothingworntype ! 'coat' and PCloswimwear = 0:
 			gs 'clothing_attributes', $clothingworntype, clothingwornnumber
@@ -57,27 +168,21 @@ if $ARGS[0] = 'clothes':
 			$body_image_msg += '<br><<$description>>'
 		else
 			if $clothingworntype = 'danilovich_swimsuit':
-				FUNC('$attributes_danilovich_swim_one', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_danilovich_swim_one', $clothingworntype, clothingwornnumber
 			elseif $clothingworntype = 'scandalicious_swimsuit':
-				FUNC('$attributes_scandalicious_swim_one', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_scandalicious_swim_one', $clothingworntype, clothingwornnumber
 			elseif $clothingworntype = 'scandalicious_bikinis':
-				FUNC('$attributes_scandalicious_swim_two', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_scandalicious_swim_two', $clothingworntype, clothingwornnumber
 			elseif $clothingworntype = 'allure_swimsuit':
-				FUNC('$attributes_allure_swim_one', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_allure_swim_one', $clothingworntype, clothingwornnumber
 			elseif $clothingworntype = 'allure_bikinis':
-				FUNC('$attributes_allure_swim_two', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_allure_swim_two', $clothingworntype, clothingwornnumber
 			elseif $clothingworntype = 'nerdvana_swimsuit':
-				FUNC('$attributes_nerdvana_swim_one', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_nerdvana_swim_one', $clothingworntype, clothingwornnumber
 			elseif $clothingworntype = 'nerdvana_bikinis':
-				FUNC('$attributes_nerdvana_swim_two', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_nerdvana_swim_two', $clothingworntype, clothingwornnumber
 			end
+			$body_image_msg += $swimwear_description
 		end
 
 		if $clothingworntype = 'gm_maid' or PCloStyle2 = 1:
@@ -92,45 +197,40 @@ end
 
 if $ARGS[0] = 'panties':
 	if $pantyworntype = 'none':
-		$RESULT = FUNC('$pube_image')
 		$body_image_msg += 'You are not wearing any panties.'
+		$result = func('$body_image', 'pussy')
 	else
-		$RESULT = FUNC('$panty_image', $pantyworntype, pantywornnumber)
-		!Kevin, please edit this line. I can not find panties description
-		!$body_image_msg += 'You are wearing ' + FUNC('$shoe_description', $shoeworntype) + '<<shoewornnumber>>.'
-		$body_image_msg += 'You are wearing <<$pantyworntype>> panty <<pantywornnumber>>'
+		$result = func('$panty_image', $pantyworntype, pantywornnumber)
+		$body_image_msg += 'You are wearing <<$pantyworntype>> panty no. <<pantywornnumber>>'
 	end
 end
 
 if $ARGS[0] = 'bra':
 	if $braworntype = 'none':
-		$RESULT = 'images/pc/body/tits/t<<tits>>.jpg'
-		$body_image_msg += 'You are not wearing a bra. Your breasts would be considered an EU <<$titsize>>'
+		$body_image_msg += 'You are not wearing a bra. '
+		$result = func('$body_image', 'tits')
 	else
-		$RESULT = FUNC('$bra_image', $braworntype, brawornnumber)
-		!Kevin, please edit this line. I can not find bra description
-		!$body_image_msg += 'You are wearing ' + FUNC('$shoe_description', $shoeworntype) + '<<shoewornnumber>>.'
-		$body_image_msg += 'You are wearing <<$braworntype>> bra <<brawornnumber>>. Your breasts would be considered an EU <<$titsize>>'
+		$body_image_msg += 'You are wearing <<$braworntype>> bra no. <<brawornnumber>>. Your breasts would be considered an EU <<$titsize>>'
+		$result = func('$bra_image', $braworntype, brawornnumber)
 	end
 end
 
 if $ARGS[0] = 'bodysuit':
 	if $braworntype = 'none':
-		$RESULT = 'images/pc/body/tits/t<<tits>>.jpg'
-		$body_image_msg += 'You are not wearing a bodysuit. Your breasts would be considered an EU <<$titsize>>'
+		$body_image_msg += 'You are not wearing a bodysuit. '
+		$result = func('$body_image', 'tits')
 	else
-		$RESULT = FUNC('$pcs_outfit_image', $bodysuitworntype+'_bodysuits', bodysuitwornnumber)
 		$body_image_msg += 'You are wearing <<$bodysuitworntype>> bodysuit <<bodysuitwornnumber>>. Your breasts would be considered an EU <<$titsize>>'
+		$result = func('$pcs_outfit_image', $bodysuitworntype+'_bodysuits', bodysuitwornnumber)
 	end
 end
 
 if $ARGS[0] = 'shoes':
 	if $clothingworntype = 'nude' or $shoeworntype = 'none':
-		$RESULT = 'images/pc/body/feet.jpg'
+		$result = 'images/pc/body/feet.jpg'
 	else
-		$RESULT = FUNC('$shoe_image', $shoeworntype, shoewornnumber)
-
-		$body_image_msg += 'You are wearing ' + FUNC('$shoe_description', $shoeworntype) + '<<shoewornnumber>>.'
+		$body_image_msg += 'You are wearing ' + func('$shoe_description', $shoeworntype) + '<<shoewornnumber>>.'
+		$result = func('$shoe_image', $shoeworntype, shoewornnumber)
 	end
 end
 

+ 1 - 1
locations/_menu_setting.qsrc

@@ -1,7 +1,7 @@
 # $menu_setting
 
 gs 'Cheatmenu_din'
-dynamic $cheatmenu['setting']
+gs 'Cheatmenu_din', 'setting'
 
 --- $menu_setting ---------------------------------
 

+ 0 - 76
locations/_pube_image.qsrc

@@ -1,76 +0,0 @@
-# $pube_image
-
-!!use with - <img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>">
-!! Expanded use that can call specific lengths, colours and styles (for shave menu):
-!! func('$pube_image', [pube length], [pube colour num], [pube style])
-
-
-$RESULT = 'images/pc/body/pussy/'
-
-if ARGS[0] ! 0: temp_pubes = ARGS[0] else temp_pubes = pcs_pubes
-if ARGS[1] ! 0: temp_pubecol = ARGS[1] else temp_pubecol = pcs_pubecol[2]
-if ARGS[2] ! 0: temp_pubestyle = ARGS[2] else temp_pubestyle = pubestyle
-
-if temp_pubecol = 0:
-	$temp_pubecol = 'black'
-elseif temp_pubecol = 1:
-	$temp_pubecol = 'brunette'
-elseif temp_pubecol = 2:
-	$temp_pubecol = 'ginger'
-elseif temp_pubecol = 3:
-	$temp_pubecol = 'blonde'
-elseif temp_pubecol = 4:
-	$temp_pubecol = 'red'
-elseif temp_pubecol = 5:
-	$temp_pubecol = 'blue'
-elseif temp_pubecol = 6:
-	$temp_pubecol = 'green'
-elseif temp_pubecol = 7:
-	$temp_pubecol = 'pink'
-elseif temp_pubecol = 8:
-	$temp_pubecol = 'purple'
-end
-
-if temp_pubes ! 0:
-	if temp_pubes <= 3:
-		$RESULT += 'hair/pussy'
-	elseif temp_pubes <= 10:
-		$RESULT += 'hair/stubble'
-	elseif temp_pubes <= 15:
-		$RESULT += 'hair/very_short'
-	elseif temp_pubes <= 25:
-		if temp_pubestyle = 2:
-			$RESULT += 'shave/<<$temp_pubecol>>_v'
-		elseif temp_pubestyle = 3:
-			$RESULT += 'shave/<<$temp_pubecol>>_triangle'
-		elseif temp_pubestyle = 4:
-			$RESULT += 'shave/<<$temp_pubecol>>_landing'
-		elseif temp_pubestyle = 5:
-			$RESULT += 'shave/<<$temp_pubecol>>_heart'
-		elseif temp_pubestyle = 6:
-			$RESULT += 'shave/<<$temp_pubecol>>_flame'
-		elseif temp_pubestyle = 7:
-			$RESULT += 'shave/<<$temp_pubecol>>_cross'
-		elseif temp_pubestyle = 8:
-			$RESULT += 'shave/<<$temp_pubecol>>_trimmed'
-		elseif temp_pubestyle = 12:
-			$RESULT += 'shave/<<$temp_pubecol>>_mini'
-		else
-			$RESULT += 'hair/<<$temp_pubecol>>_small'
-		end
-	elseif temp_pubes <= 35:
-		$RESULT += 'hair/<<$temp_pubecol>>_mid'
-	else
-		$RESULT += 'hair/<<$temp_pubecol>>_full'
-	end
-else
-	$RESULT += 'hair/pussy'
-end
-
-killvar 'temp_pubes' & killvar 'temp_pubecol' & killvar 'temp_pubestyle'
-
-$RESULT += '.jpg'
-
-
---- $pube_image ---------------------------------
-

+ 35 - 24
locations/_shoe_description2.qsrc

@@ -2,60 +2,71 @@
 
 
 if ShoQuality = 1:
-   $RESULT = 'This is a crappy cheap '
+	$result = 'This is a crappy cheap '
 elseif ShoQuality = 2:
-   $RESULT = 'This is a low quality '
+	$result = 'This is a low quality '
 elseif ShoQuality = 3:
-   $RESULT = 'This is an average quality '
+	$result = 'This is an average quality '
 elseif ShoQuality = 4:
-   $RESULT = 'This is a reasonable quality '
+	$result = 'This is a reasonable quality '
 elseif ShoQuality = 5:
-   $RESULT = 'This is a high quality '
+	$result = 'This is a high quality '
 elseif ShoQuality = 6:
-   $RESULT = 'This is a very well made '
+	$result = 'This is a very well made '
 elseif ShoQuality = 7:
-   $RESULT = 'This is a beautifully made '
+	$result = 'This is a beautifully made '
 end
 
 if $ARGS[0] = 'danilovich':
-	$RESULT += 'training shoe.'
+	$result += 'training shoe.'
 else
 	if ShoHeels = 1:
-	   $RESULT += 'flat '
+		$result += 'flat '
 	elseif ShoHeels = 2:
-	   $RESULT += 'low heel '
+		$result += 'low heel '
 	elseif ShoHeels = 3:
-	   $RESULT += 'mid heel '
+		$result += 'mid heel '
 	elseif ShoHeels = 4:
-	   $RESULT += 'high heel '
+		$result += 'high heel '
 	elseif ShoHeels = 5:
-	   $RESULT += 'ultra high heel '
+		$result += 'ultra high heel '
 	elseif ShoHeels = 6:
-	   $RESULT += 'fetish heel '
+		$result += 'fetish heel '
 	end
 
 	if ShoCut = 1:
-	   $RESULT += 'shoe.'
+		$result += 'shoe.'
 	elseif ShoCut = 2:
-	   $RESULT += 'ankle boot.'
+		$result += 'ankle boot.'
 	elseif ShoCut = 3:
-	   $RESULT += 'calf high boot.'
+		$result += 'calf high boot.'
 	elseif ShoCut = 4:
-	   $RESULT += 'knee high boot.'
+		$result += 'knee high boot.'
 	elseif ShoCut = 5:
-	   $RESULT += 'thigh high boot.'
+		$result += 'thigh high boot.'
 	elseif ShoCut = 6:
-	   $RESULT += 'groin high boot.'
+		$result += 'groin high boot.'
 	end
 end
 
 if ShoStyle = 1:
-	$RESULT += ' These shoes are considered stripper shoes.'
+	$result += ' These shoes are considered stripper shoes.'
 elseif ShoStyle = 2:
-	$RESULT += ' These shoes are considered bimbo shoes.'
-elseif ShoStyle = 3:
-	$RESULT += ' These shoes are considered alternative shoes.'
+	$result += ' These shoes are considered alternative shoes.'
 end
 
+killvar '$temp_shoe_desc'
+if ShoBimbo = 1:	$temp_shoe_desc[] = 'bimbo'
+if ShoGoth = 1:		$temp_shoe_desc[] = 'goth'
+if ShoPunk = 1:		$temp_shoe_desc[] = 'punk'
+
+if arrsize('$temp_shoe_desc') > 0:
+	$result += ' These shoes are considered '
+	$result += func('shortgs', 'enumerate_list', '$temp_shoe_desc')
+	$result += ' shoes.'
+end
+killvar '$temp_shoe_desc'
+
+
 --- $shoe_description2 ---------------------------------
 

+ 17 - 17
locations/abduction.qsrc

@@ -128,10 +128,10 @@ if $ARGS[0] = 'abdSomeoneComing':
 		if broken = 0:
 			'You fearfully back away from the man and curl up against the wall, your body trembling in fear of what''s going to happen next.'
 			act 'Cower in fear':gt 'abduction', 'abdRape'
-			
+
 			if rapeCount >= 5: act 'Plead that you can''t take any more':gt 'abduction', 'abdBreak1'
 		else
-		
+
 		end
 
 		buyoutChance = (broken + tortureCount + rapeCount + abdCustomerCount) - 20
@@ -176,7 +176,7 @@ if $ARGS[0] = 'abdExamStart':
 	'Your blindfold is removed and you find yourself in a small room that''s painted white. The light is very bright and blinds you to the point that you can barely see.'
 	'As your eyes adjust, you see that it''s some kind of examination room. It distinctly reminds you of a gynecologist''s office.'
 	'"Sit." the man sternly orders.'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Resist (<<will_cost>> Willpower)':
@@ -338,7 +338,7 @@ if $ARGS[0] = 'abdBrokenGivePainkiller':
 		end
 	else
 		act 'Refuse and keep your mouth shut (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end		
+	end
 end
 
 if $ARGS[0] = 'abdBrokenGivePainkillerYes':
@@ -378,13 +378,13 @@ end
 if $ARGS[0] = 'abdBrokenAsk':
 	menu_off = 1
 	gs 'stat'
-	
+
 	'Your master responds. "Very good. What do you want me to do to you, slave?"'
-	
+
 	act 'Please fuck my mouth Master':gt 'abduction', 'abdBreak2FuckB1'
-	
+
 	if pcs_vag > 0: act 'Please fuck my pussy Master':gt 'abduction', 'abdBreak2FuckA1'
-	
+
 	if broken >= 5: act 'Please rape me Master':gt 'abduction', 'abdRape'
 
 	if broken >= 10: act 'Please punish me Master':gt 'abduction', 'abdTorture'
@@ -395,7 +395,7 @@ if $ARGS[0] = 'abdBreak2FuckA1':
 	menu_off = 1
 	broken += 1
 	cumnostd = 1
-	gs 'cum_call', '', 'Master', 0,'', spot, svol
+	gs 'cum_call', '', 'Master', 0, 0, spot, svol
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/brokena1.jpg"></center>'
 	'Your tormentor unchains you and throws you onto your dirty bed.'
 	'Spreading your legs wide apart, you spit on your hand and smear it on your pussy. "Come and take me, Master."'
@@ -411,7 +411,7 @@ if $ARGS[0] = 'abdBreak2FuckA2':
 	*clr & cla
 	menu_off = 1
 	cumnostd = 1
-	gs 'cum_call', 'mouth', 'Master', 0,'', spot, svol
+	gs 'cum_call', 'mouth', 'Master', 0, 0, spot, svol
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/brokena2.jpg"></center>'
 	'Fucking you wildly for some time, your master stops right before he orgasms.'
 	'He unties your hands and legs, then ties your hands behind your back.'
@@ -671,7 +671,7 @@ if $ARGS[0] = 'abdFood':
 		menu_off = 1
 		minut += 15
 		pcs_horny += 1
-		noshampoo = 1 
+		noshampoo = 1
 		dynamic $showerdin
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/shower1.jpg"></center>'
@@ -686,7 +686,7 @@ if $ARGS[0] = 'abdexercise':
 	*clr & cla
 	menu_off = 1
 	gs 'exercise', 'tier2', 30, 'stren'
-	
+
 	'<center><video autoplay loop src="images/pc/activities/exercises/push_nude.mp4"></video></center>'
 	*nl
 	'You do push-ups for <<$timestring>> minutes, improving your strength.'
@@ -702,18 +702,18 @@ if $ARGS[0] = 'abdexercise':
 
 	if pushrecord < pushnum:pushrecord = pushnum & 'This is a new record!'
 	gs 'stat'
-	
+
 	act 'Continue':
 		*clr & cla
 		menu_off = 1
 		gs 'exercise', 'tier2', 30, 'vital'
-		
+
 		'<center><video autoplay loop src="images/pc/activities/exercises/abdominal_nude.mp4"></video></center>'
 		*nl
 		'You do a series of abdominal exercises for <<$timestring>> minutes, improving your endurance.'
-		
+
 		gs 'stat'
-	
+
 		act 'Finish': gt 'abduction', 'abdFood'
 	end
 end
@@ -745,7 +745,7 @@ if $ARGS[0] = 'abdRape':
 	elseif rapeType = 2 and pcs_vag > 0:
 		pain['vaginal'] += 10
 		cumnostd = 1
-		gs 'cum_call', '', 'Master', 0
+		gs 'cum_call', '', 'Master'
 		i = rand(1,5)
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/fucktiedpussy<<i>>.jpg"></center>'
 		'Your hands are tied, and you''re bent over the bed.'

+ 28 - 28
locations/abductionCustomer.qsrc

@@ -219,12 +219,12 @@ if $ARGS[0] = 'abdCustomer-buyout1':
 	'"You do realize that the police have already given up searching for you. As if they made any effort though..."'
 	'"I-I don''t even know how long I''ve been here. The only thing I remember is being a plaything for these perverts..."'
 	'There is a short period of silence, but despite the unexpected situation, you keep kneeling with your back straight and breasts jutting forward, as you have been trained to do.'
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/slavewhorekneel2.jpg"></center>'
 	'The look on <<$bName>>''s face then changes from surprised to something else.'
 	'He approaches you and gently caresses your face. "Plaything, you say? And do you like it?"'
 	'Surprised by such a question, you consider how to reply:'
-	
+
 	gs 'willpower', 'misc', 'self', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Admit you like to be dominated, but this is too much (<<will_cost>> Willpower)':
@@ -267,7 +267,7 @@ if $ARGS[0] = 'abdCustomer-buyout3':
 			gs 'willpower', 'bj', 'resist'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			gt 'abductionCustomer', 'abdCustomer-fuckAnalRough'
 		end
 	else
@@ -438,7 +438,7 @@ if $ARGS[0] = 'abdCustomer-unzip':
 	end
 
 	if pcs_throat < dick:
-		'It''s obvious that his <<$dick_girth>> dick is above your skill level and you know you can''t safely swallow it whole.'	
+		'It''s obvious that his <<$dick_girth>> dick is above your skill level and you know you can''t safely swallow it whole.'
 		act 'Suck the tip':gt 'abductionCustomer', 'abdCustomer-suckTip'
 		gs 'willpower', 'bj', 'self'
 		if will_cost <= pcs_willpwr:
@@ -446,7 +446,7 @@ if $ARGS[0] = 'abdCustomer-unzip':
 				gs 'willpower', 'bj', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
-				
+
 				gt 'abductionCustomer', 'abdCustomer-suckForceself'
 			end
 		else
@@ -461,7 +461,7 @@ if $ARGS[0] = 'abdCustomer-unzip':
 				gs 'willpower', 'bj', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
-				
+
 				gt 'abductionCustomer', 'abdCustomer-suckDeep'
 			end
 		else
@@ -482,11 +482,11 @@ end
 if $ARGS[0] = 'abdCustomer-suckTip':
 	gs 'arousal', 'bj', 15, 'sub'
 	gs 'stat'
-	i = rand(1,5)	
+	i = rand(1,5)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoreblowjobtip<<i>>.mp4"></video></center>'
 	'You try your best to suck the head of his <<dick>> cm sized <<$dick_girth>> dick.'
 	if pcs_throat < dick:
-		'It''s obvious that his <<$dick_girth>> dick is above your skill level and you know you can''t safely swallow it whole.'	
+		'It''s obvious that his <<$dick_girth>> dick is above your skill level and you know you can''t safely swallow it whole.'
 	else
 		'Even though his dick is <<$dick_girth>>, you know you could take it all the way to the base.'
 	end
@@ -517,7 +517,7 @@ if $ARGS[0] = 'abdCustomer-suckTip':
 					gs 'willpower', 'bj', 'self'
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					
+
 					gt 'abductionCustomer', 'abdCustomer-suckForceself'
 				end
 			else
@@ -530,7 +530,7 @@ if $ARGS[0] = 'abdCustomer-suckTip':
 					gs 'willpower', 'bj', 'self'
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					
+
 					gt 'abductionCustomer', 'abdCustomer-suckDeep'
 				end
 			else
@@ -627,7 +627,7 @@ if $ARGS[0] = 'abdCustomer-fuck':
 				gs 'willpower', 'sex', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
-				
+
 				gt 'abductionCustomer', 'abdCustomer-beg'
 			end
 		else
@@ -656,7 +656,7 @@ if $ARGS[0] = 'abdCustomer-decide':
 		else
 			'"I want to see how tight your ass is."'
 			act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckAnal'
-		end		
+		end
 	end
 end
 
@@ -683,17 +683,17 @@ if $ARGS[0] = 'abdCustomer-beg':
 		hardChance = rand(1, 100)
 		'"I''ll fuck you however I want, so shut up bitch!"'
 		if hardChance <= 50:
-			if vagOrAss = 0:	
+			if vagOrAss = 0:
 				act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckRough'
 			else
 				act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckAnalRough'
 			end
 		else
-			if vagOrAss = 0:	
+			if vagOrAss = 0:
 				act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckNormal'
 			else
 				act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckAnal'
-			end	
+			end
 		end
 	end
 end
@@ -758,7 +758,7 @@ if $ARGS[0] = 'abdCustomer-fuckAnalRough':
 		pain['tummy'] += assDMG
 		gs 'stat'
 		act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckAnalDeep'
-	end	
+	end
 end
 
 if $ARGS[0] = 'abdCustomer-fuckAnalDeep':
@@ -827,7 +827,7 @@ if $ARGS[0] = 'abdCustomer-fuckRough':
 	i = rand(1,5)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhorefuckrough<<i>>.mp4"></video></center>'
 	'The man takes you by your leash and positions your body as if it''s just meat to be used.'
-	'What comes next is an excruciatingly rough fuck that clearly shows he has no regard for all the pain you have to endure.'	
+	'What comes next is an excruciatingly rough fuck that clearly shows he has no regard for all the pain you have to endure.'
 	if vagDMG <= 0:
 		'Fortunately, his <<$dick_girth>> dick is not enough to cause you much pain. No more than usual, anyway.'
 		gs 'arousal', 'vaginal', 30, 'sub', 'bound'
@@ -870,7 +870,7 @@ if $ARGS[0] = 'abdCustomer-fuckDeep':
 	end
 	'With every thrust of his dick deep inside your vagina, you feel as if it''s your very cervix being penetrated.'
 	'After about half an hour of deep vaginal banging, the man is about to cum.'
-	
+
 	if endPunishment = 1 or $charType = 'sadistic':
 		'"I''m going to feed you my cum now, you unruly fuck slave!"'
 		act 'Be silent':gt 'abductionCustomer', 'abdCustomer-cum'
@@ -885,45 +885,45 @@ if $ARGS[0] = 'abdCustomer-cumGate':
 		act 'Be silent':gt 'abductionCustomer', 'abdCustomer-cum'
 	elseif buyout = 1:
 		'"You''re going to be filled with my seed for the first time, so be sure to cherish the memory of this moment!"'
-		act 'Be silent':gt 'abductionCustomer', 'abdCustomer-cumAss'		
+		act 'Be silent':gt 'abductionCustomer', 'abdCustomer-cumAss'
 	else
 		'"So where do you want it, bitch?"'
 		act 'Be silent':gt 'abductionCustomer', 'abdCustomer-cum'
 		act 'On your face':gt 'abductionCustomer', 'abdCustomer-cumFace'
-		
+
 		gs 'willpower', 'cum_inside', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Inside your pussy (<<will_cost>> Willpower)':
 				gs 'willpower', 'cum_inside', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
-				
+
 				gt 'abductionCustomer', 'abdCustomer-cumPussy'
 			end
 		else
 			act 'Inside your pussy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		
+
 		gs 'willpower', 'cum_inside_anal', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Inside your ass (<<will_cost>> Willpower)':
 				gs 'willpower', 'cum_inside_anal', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
-				
+
 				gt 'abductionCustomer', 'abdCustomer-cumAss'
 			end
 		else
 			act 'Inside your ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		
+
 		gs 'willpower', 'swallow', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'In your mouth (<<will_cost>> Willpower)':
 				gs 'willpower', 'swallow', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
-				
+
 				gt 'abductionCustomer', 'abdCustomer-cumMouth'
 			end
 		else
@@ -978,7 +978,7 @@ if $ARGS[0] = 'abdCustomer-cumPussy':
 	pcs_vag += 1
 	stat['vaginal'] += 1
 	cumnostd = 1
-	gs 'cum_call', 'pussy', 'customer', svol,'', spot
+	gs 'cum_call', 'pussy', 'customer', 0, 0, spot, svol
 	gs 'stat'
 
 	act 'Continue':gt 'abductionCustomer', 'abdCustomer-end'
@@ -1038,7 +1038,7 @@ if $ARGS[0] = 'abdCustomer-cumAss':
 	end
 	pcs_ass += 1
 	cumnostd = 1
-	gs 'cum_call', 'anus', $boy
+	gs 'cum_call', 'anus', $boy, 0
 	stat['anal'] += 1
 	gs 'stat'
 	if buyout = 1:
@@ -1057,7 +1057,7 @@ if $ARGS[0] = 'abdCustomer-cumMouth':
 		pain['throat'] += throatDMG
 		gs 'stat'
 	end
-	
+
 	if cumVol = 3:
 		'His cum fills your throat.'
 	elseif cumVol = 4:

+ 41 - 41
locations/agentned.qsrc

@@ -3,7 +3,7 @@
 
 if $ARGS[0] = 'start':
 	CLOSE ALL
-	
+
 	*clr & cla
 	$loc = 'agentned'
 	$loc_arg = $ARGS[0]
@@ -11,11 +11,11 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'agentned'
 	$menu_arg = 'start'
 	menu_off = 0
-	
+
 	gs'stat'
 	gs'dina'
 !!	gs 'housing', 'rent'
-	
+
 	'<center><b><font color = maroon>Kirsanova Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
 	*nl
@@ -58,7 +58,7 @@ if $ARGS[0] = 'start':
 		if i < count: jump 'listing_rented_properties_loop'
 	end
 	killvar 'count' & killvar 'i'
-	
+
 	!! Get a list of the properties and their attributes that the player rented:
 	!! $property_code[], $property_name[], $property_display[], $property_status_display[], $property_type[]
 	!! property_construction_status, property_is_renovated[], property_sales_price[], property_renovation_value[]
@@ -97,11 +97,11 @@ if $ARGS[0] = 'buy':
 	*nl
 	minut += 5
 	gs 'stat'
-	
+
 	act 'Return':gt'agentned', 'start'
-	
-	!! "Returns": 
-	!! $property_code[], $property_name[], $property_display[], $property_agency_name[], 
+
+	!! "Returns":
+	!! $property_code[], $property_name[], $property_display[], $property_agency_name[],
 	!! property_construction_status,property_is_renovated[], property_sales_price[],
 	!! property_type[]
 	gs 'homes_properties', 'get_properties_for_sale'
@@ -109,13 +109,13 @@ if $ARGS[0] = 'buy':
 	if count > 0:
 		i = 0
 		'<h4>We have the following properties for sales</h4>'
-		:listing_properties_for_sale_loop	
+		:listing_properties_for_sale_loop
 			if property_is_rented[i] ! 0:
 				'You could buy the <<$property_display[i]>> you''re currently renting, for <<func(''agentned'', ''format_price_string'', property_sales_price[i])>> <b>₽</b>.'
-			else	
+			else
 				'A(n) <<$property_display[i]>> is available for sale for <<func(''agentned'', ''format_price_string'', property_sales_price[i])>> <b>₽</b>.'
 			end
-			if karta + bankDebtLimit >= property_sales_price[i]: 
+			if karta >= property_sales_price[i]:
 				if $property_code[i] = 'city_apartment': act 'Buy the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'city_apartment'
 				if $property_code[i] = 'village_cottage': act 'Buy the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'village_cottage'
 				if $property_code[i] = 'matryona_mansion': act 'Buy the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'matryona_mansion'
@@ -133,11 +133,11 @@ end
 if $ARGS[0] = 'buy_property':
 	*clr & cla
 	menu_off = 1
-	
+
 	gs 'homes_properties', 'get_property_sales_info', $ARGS[1]
 	minut += 30
 	karta -= property_sales_price
-	
+
 	gs 'homes_properties', 'buy_property', $ARGS[1], property_sales_price
 	$set_homeyn = input("Would you like to set this as your new home? (yes/no)")
 	if $set_homeyn = 'yes': gs 'homes_properties', 'set_home', $ARGS[1]
@@ -156,7 +156,7 @@ if $ARGS[0] = 'buy_property':
 	act 'Return':gt'agentned', 'start'
 end
 
-!! NOTE: When a property is sold, it can be bought back. To avoid a guaranteed income from the 
+!! NOTE: When a property is sold, it can be bought back. To avoid a guaranteed income from the
 !!       "I buy property for X, renovate it, sell it for X+Y, then buy it for X, then repeat" loop,
 !!       the sales price of the property is updated with the price that it was sold for.
 if $ARGS[0] = 'sell':
@@ -168,20 +168,20 @@ if $ARGS[0] = 'sell':
 	$menu_arg = 'sell'
 	menu_off = 0
 	gs 'homes_properties', 'clean_up_property_data'
-	
+
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
 	*nl
 	'<h4>Any purchase or sale of a property requires a bank account. The Agency is not conducting business in cash in compliance with the Anti-Money Laundering Regulations</h4>'
 	*nl
 	act 'Return': gs 'homes_properties', 'clean_up_property_data' & gt'agentned', 'start'
-	
+
 	if bankAccount = 1:
 		!! Get a list of the properties and their attributes that the player rented:
 		!! $property_code[], $property_name[], $property_display[], $property_status_display[], $property_type[]
 		!! property_construction_status, property_is_renovated[], property_sales_price[], property_renovation_value[]
 		gs 'homes_properties', 'get_owned_properties', 'home'
-		
+
 		count = ARRSIZE('$property_name')
 		if count > 0:
 			'<h4>Available offers for your properties</h4>'
@@ -191,33 +191,33 @@ if $ARGS[0] = 'sell':
 					!! NOTE: Offer: (last sales price + rand(-10%, +10%)) + (renovation value + rand(0%,+10%)
 					!! 		 No need to check what has been renovated, the only thing that matters is the total value of the renovation
 					!! 		 If Sveta sells, this will be stored as the new sales price of the property
-					
+
 					offer = property_sales_price + property_renovation_value + (property_sales_price*rand(-10,10))/100 + (property_renovation_value*rand(0,10))/100
 					'We have found a buyer for your <<$property_display[i]>>. They will offer <<func(''agentned'', ''format_price_string'', offer)>><b>₽</b>, minus 5% for fees and taxes to the value of <<func(''agentned'', ''format_price_string'', ( (offer*5)/100) )>>, bringing the total to <<func(''agentned'', ''format_price_string'', ( (offer*95)/100 ) )>>'
-					if $property_code[i] = 'city_apartment': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'finalise_sale', 'city_apartment'
-					if $property_code[i] = 'village_cottage': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'finalise_sale', 'village_cottage'
-					if $property_code[i] = 'matryona_mansion': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'finalise_sale', 'matryona_mansion'
-					if $property_code[i] = 'city_house': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'finalise_sale', 'city_house'
+					if $property_code[i] = 'city_apartment': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'finalise_sale', 'city_apartment', i
+					if $property_code[i] = 'village_cottage': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'finalise_sale', 'village_cottage', i
+					if $property_code[i] = 'matryona_mansion': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'finalise_sale', 'matryona_mansion', i
+					if $property_code[i] = 'city_house': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'finalise_sale', 'city_house', i
 				end
 				i += 1
 			if i < count: jump 'listing_offers_on_owned_properties_loop'
-			
+
 		end
 		gs 'homes_properties', 'clean_up_property_data'
 		killvar 'count' & killvar 'i' & killvar 'j'
 		act 'Leave': minut += 5 & gt 'city_center'
 
 !! NOTE: Keeping this here for future renovation related reference.
-!!{ 
+!!{
 	if bankAccount = 1:
 			if rembedr = 1 and remsitr = 1 and remkorr = 1 and remvanr = 1 and remkuhr = 1:
 				!Renovated city residential apartment
-				offer1 = ((800000 + 250000) + rand(-100000, 100000)) 
+				offer1 = ((800000 + 250000) + rand(-100000, 100000))
 			else
 				offer1 = (800000 + rand(-100000, 100000))
 			end
-		
-			if func('homes_properties', 'property_renovated', 'village_cottage') = 1: 
+
+			if func('homes_properties', 'property_renovated', 'village_cottage') = 1:
 				!Renovated communal cottage
 				offer2 = ((prop_price['village_cottage'] + 200000) + rand(-10000, 10000))
 			else
@@ -237,10 +237,10 @@ if $ARGS[0] = 'finalise_sale':
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
 	minut += 30
-	'You spend thirty minutes filling out the paperwork for the sale of your <<$property_display>>. <<func(''agentned'', ''format_price_string'', ( (offer*95)/100) )>><b>₽</b> has been paid into your bank account.'
+	'You spend thirty minutes filling out the paperwork for the sale of your <<$property_display[ARGS[2]]>>. <<func(''agentned'', ''format_price_string'', ( (offer*95)/100) )>><b>₽</b> has been paid into your bank account.'
 	gs 'homes_properties', 'sell_property', $ARGS[1], offer
-	karta += (offer*95)/100
-	delact 'Sell the <<$property_display>>'
+	karta += (offer * 95) / 100
+	delact 'Sell the <<$property_display[ARGS[2]]>>'
 	gs 'stat'
 	killvar 'property_display' & killvar 'property_sales_price'
 end
@@ -259,9 +259,9 @@ if $ARGS[0] = 'rent':
 	*nl
 	minut += 5
 	gs 'stat'
-	
+
 	act 'Return': killvar 'rent_code' & killvar 'monthly_rent' & gt'agentned', 'start'
-	
+
 	gs 'homes_properties', 'get_properties_for_rent', 'home'
 	count = ARRSIZE('property_name')
 
@@ -289,11 +289,11 @@ if $ARGS[0] = 'view_property_details':
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
 	*nl
-	'<<func(''agentned'', ''get_rent_detail_dialogue'', $ARGS[1] )>> The receptionist says as he starts pulling out the paperwork, "Rent is <<func(''agentned'', ''format_price_string'', ARGS[2] )>><b>₽</b> and leases have to be renewed every 30 days. Payment will be automatically deducted from your account or you can come into the office to pay. Last, but not least, you must make pay the first month when you sign for the lease."'
+	'<<func(''agentned'', ''get_rent_detail_dialogue'', $ARGS[1])>> The receptionist says as he starts pulling out the paperwork, "Rent is <<func(''agentned'', ''format_price_string'', ARGS[2] )>><b>₽</b> and leases have to be renewed every 30 days. Payment will be automatically deducted from your account or you can come into the office to pay. Last, but not least, you must make pay the first month when you sign for the lease."'
 	'<br>He pulls out a pen and slides the paperwork onto the counter. "Interested? You can move in right away," he says calmly.'
-	
-	if money >= ARGS[2] or karta+bankDebtLimit >= ARGS[2]:
-		act 'Agree and pay': 
+
+	if money >= ARGS[2] or karta >= ARGS[2]:
+		act 'Agree and pay':
 			*clr & cla
 			cls
 			minut += 30
@@ -312,7 +312,7 @@ if $ARGS[0] = 'view_property_details':
 				if $set_homeyn = 'yes': gs 'homes_properties', 'set_home', $ARGS[1]
 				killvar '$set_homeyn'
 			end
-			
+
 			gs'stat'
 			'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
@@ -322,7 +322,7 @@ if $ARGS[0] = 'view_property_details':
 		end
 	else
 		'You do not have enough money with you or in your bank account to pay the rent.'
-	end	
+	end
 
 	act 'Decline':
 		*clr & cla
@@ -340,15 +340,15 @@ end
 
 !! $ARGS[1] - the code of the property.
 if $ARGS[0] = 'get_rent_detail_dialogue':
-	if $ARGS[1] = 'old_town_apartment': 
+	if $ARGS[1] = 'old_town_apartment':
 		$result = '"We have a small apartment available right now that is in Pushkin’s city center. It’s a little bit pricey, but it’s been recently renovated to be more modern. It looks quite nice, so you won’t find a place like that outside of Pushkin."'
-	elseif $ARGS[1] = 'city_apartment': 
+	elseif $ARGS[1] = 'city_apartment':
 		$result = '"We have a flat available right now in the St. Petersburg residential area."'
 	else
 		gs 'agentned', 'get_rent_detail_dialogue_hook', $ARGS[1]
 		$result = $agency_rental_dialogue
 		killvar '$agency_rental_dialogue'
-	end 
+	end
 end
 
 !! $ARGS[1] - the code of the property.

+ 19 - 5
locations/alarmclock.qsrc

@@ -28,9 +28,23 @@ end
 
 if $ARGS[0] = 'alarm_display':
 	!! func('alarmclock', 'alarm_display', hour, minutes)
-	$result = '<b><<$mid(100 + ARGS[1], 2, 2)>>:<<$mid(100 + ARGS[2], 2, 2)>></b>'
+	$result = '<b><<func(''time'', ''get_time_string'', ARGS[1], ARGS[2])>></b>'
 end
 
+if $ARGS[0] = 'get_week_display':
+	$result = '<b><<func(''time'', ''get_time_string'', alarmVars[''timerH''], alarmVars[''timerM''])>></b>'
+end
+
+if $ARGS[0] = 'get_weekend_display':
+	$result = '<b><<func(''time'', ''get_time_string'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>></b>'
+end
+
+if $ARGS[0] = 'base_alarmclock_text':
+	$result = 'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''get_week_display'')>> during the week and <<func(''alarmclock'', ''get_weekend_display'')>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+end
+
+
+
 if $ARGS[0] = 'clear':
 	cla
 	bud1 = 0
@@ -208,11 +222,11 @@ if $ARGS[0] = 'build_table':
 	$alarmVars_table='<center><table border=0 cellpadding=0 cellspacing=5><font size="+1"<b>'
 	$alarmVars_table+='<tr><td><b><a href="exec: bud_weekend = 0 & gt ''alarmclock'', ''Reset''">Reset weekday alarm</a></b></td>'
 	$alarmVars_table+='<td><b><a href="exec: bud_weekend = 0 & gt ''alarmclock'', ''Time''">Set weekday alarm</a></b></td>'
-	$alarmVars_table+='<td><b>Currently set for <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>></b></td></tr>'
-	
+	$alarmVars_table+='<td><b>Currently set for <<func(''time'', ''get_time_string'', alarmVars[''timerH''], alarmVars[''timerM''])>></b></td></tr>'
+
 	$alarmVars_table+='<tr><td><b><a href="exec: bud_weekend = 1 & gt ''alarmclock'', ''Reset''">Reset weekend alarm</a></b></td>'
 	$alarmVars_table+='<td><b><a href="exec: bud_weekend = 1 & gt ''alarmclock'', ''Time''">Set weekend alarm</a></b></td>'
-	$alarmVars_table+='<td><b>Currently set for <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>></b></td></tr>'
+	$alarmVars_table+='<td><b>Currently set for <<func(''time'', ''get_time_string'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>></b></td></tr>'
 
 	if mid($start_type,1,2) = 'sg':
 		$alarmVars_table+='<tr><td colspan="3"><b>Use weekend alarm for holidays - ' + iif(alarmVars['alarm_holiday'] = 0, '<a href="exec: alarmVars[''alarm_holiday''] = 1 & gt ''alarmclock'', ''start''">OFF</a>', '<a href="exec:  alarmVars[''alarm_holiday''] = 0 & gt ''alarmclock'', ''start''">ON</a>') + '</b></td></tr>'
@@ -221,7 +235,7 @@ if $ARGS[0] = 'build_table':
 	$alarmVars_table+='<tr><td colspan="3"><b>Your alarm is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt ''alarmclock'', ''start''">OFF</a>', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt ''alarmclock'', ''start''">ON</a>') + '.</b></td></tr>'
 
 	if alarmVars['alarmOn'] = 1:
-		$alarmVars_table+='</table></center><center><table border=0 cellpadding=0 cellspacing=10><tr><td><b>Your Alarm is ' + iif(alarmVars['timerH'] <= 0 and alarmVars['timerM'] <= 0, 'not set', 'set to ' + func('alarmclock', 'alarm_display', alarmVars['timerH'], alarmVars['timerM'])) + ' for the weekdays ' + iif(alarmVars['timerEndH'] <= 0 and alarmVars['timerEndM'] <= 0, 'and not set', 'and set to ' + func('alarmclock', 'alarm_display', alarmVars['timerEndH'], alarmVars['timerEndM'])) + ' for the weekend' + iif(alarmVars['alarm_holiday'] = 1, ' and holidays', '') + '.</b></td></tr>'
+		$alarmVars_table+='</table></center><center><table border=0 cellpadding=0 cellspacing=10><tr><td><b>Your Alarm is ' + iif(alarmVars['timerH'] <= 0 and alarmVars['timerM'] <= 0, 'not set', 'set to ' + func('time', 'get_time_string', alarmVars['timerH'], alarmVars['timerM'])) + ' for the weekdays ' + iif(alarmVars['timerEndH'] <= 0 and alarmVars['timerEndM'] <= 0, 'and not set', 'and set to ' + func('time', 'get_time_string', alarmVars['timerEndH'], alarmVars['timerEndM'])) + ' for the weekend' + iif(alarmVars['alarm_holiday'] = 1, ' and holidays', '') + '.</b></td></tr>'
 	end
 	$alarmVars_table+='</b></font></table></center>'
 

File diff suppressed because it is too large
+ 483 - 271
locations/albina_chat.qsrc


+ 171 - 40
locations/albina_chat2.qsrc

@@ -7,8 +7,8 @@ if $ARGS[0] = 'first_model_talk1':
 			AlbinaQW['know_model'] = daystart
 			cla & *nl
 			if fame['pav_modelling'] >= 400 and stat['school_knows_model'] = 0:
-				'"I... Do some modelling in the city..." you admit slowly. Albina''s eyes go wide.'
-				'"Holy shit! The rumors are true!" she shouts gleefully, suddenly punching you in the arm.'
+				'"I... Do some modelling in the city..." you admit slowly.'
+				'Her eyes go wide. "Holy shit! The rumors are true!" she shouts gleefully, suddenly punching you in the arm.'
 				'"Ow! What rumors?" you ask in sudden bewilderment.'
 				'"The ones about a model that looks like you!" she grins. "I figured they had to be bullshit, but this means it really is you! Why would you hide that from me?"'
 			else
@@ -17,7 +17,7 @@ if $ARGS[0] = 'first_model_talk1':
 			end
 			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 asks suspiciously.'
+				'Her eyes narrow. "Why? What kind of modelling are you doing?" she asks suspiciously.'
 				gs 'albina_chat2','first_model_talk_shy1'
 				gs 'albina_chat2','first_model_talk2'
 				gs 'albina_chat2','first_model_talk_proud2'
@@ -36,7 +36,7 @@ end
 
 if $ARGS[0] = 'first_model_talk_proud2':
 	act 'Tell her (proud)':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		if $model['type'] = 'catalog':
 			'"Catalogue modelling!" you say with bubbly excitement. "The kind that you see on websites to show what''s for sale or in magazines with a company''s stock. It''s not much right now, but it''s a foot in the door!"'
@@ -94,7 +94,7 @@ end
 
 if $ARGS[0] = 'first_model_talk2':
 	act 'Tell her (nonchalant)':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		if $model['type'] = 'catalog':
 			'"Just some catalogue modelling," you say nonchalantly. "You know, the kind that you see on websites to show what''s for sale. No big deal."'
@@ -176,12 +176,12 @@ end
 !!not done
 if $ARGS[0] = 'first_model_talk4':
 	if modelfoto['nude'] > 0:
-		'"You''re naked in these?" Albina''s eyes go wide and she scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
+		'"You''re naked in these?!" Her eyes go wide and she scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
 	elseif modelfoto['topless'] > 0:
-		'"You''re topless in these?" Albina''s eyes go wide and she scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
+		'"You''re topless in these?!" Her eyes go wide and she scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
 	end
 	act 'Stop her':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"No!" you squeal, grabbing her by the arm to stop her. Albina back looks at you, bewildered.'
 		AlbinaQW['model_no_look'] = 1
@@ -197,11 +197,11 @@ if $ARGS[0] = 'first_model_talk4':
 	if $model['nickname'] = $pcs_firstname or $model['nickname'] = $pcs_nickname or $model['firstname'] = $pcs_nickname or $model['firstname'] = $pcs_nickname:
 		act 'It''s not my name (lie)':
 			AlbinaQW['model_no_look'] = 2
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"You''re not gonna find anything just Yandexing my name," you tell her, dramatically rolling your eyes. "Do you really think I''m stupid enough to start nude modelling and use my real name?"'
 			*nl
-			'She stops and turns to look at you with a frown. You snicker internally but manage to maintain a straight face, hoping she won''t see through your bluff.'
+			'She stops and turns to look at you with a frown. You snicker internally, but manage to maintain a straight face, hoping she won''t see through your bluff.'
 			*nl
 			'"Fuck!" she pouts. "Tell me what to search!"'
 			'"Nope! You''re never finding those pics," you reply smugly, enjoying the feeling of pulling one over on her.'
@@ -209,7 +209,7 @@ if $ARGS[0] = 'first_model_talk4':
 		end
 		
 		act 'Let her search':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina searches and quickly finds your profile. "You didn''t even change your name?" she snickers.'
 			act 'It seemed wrong':
@@ -236,7 +236,7 @@ if $ARGS[0] = 'first_model_talk4':
 	else
 		act 'It''s not my name':
 			AlbinaQW['model_no_look'] = 2
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"You''re not gonna find anything just Yandexing my name," you tell her, dramatically rolling your eyes. "Do you really think I''m stupid enough to start nude modelling and use my real name?"'
 			*nl
@@ -247,7 +247,7 @@ if $ARGS[0] = 'first_model_talk4':
 		end
 			
 		act 'Let her search':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina searches for you using your real name, but can''t find it because you used a pseudonym.'
 			'"Why can''t I find you?!" she grumbles in frustration.'
@@ -275,9 +275,9 @@ if $ARGS[0] = 'first_model_talk_tell':
 end
 
 if $ARGS[0] = 'first_model_talk_nude1':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/1.jpg"> <img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/2.jpg"> <img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/3.jpg"></center>'
-	'Albina''s eyes go wide as a gallery fills the screen. "Woah! You''re so fucking hot!" she says, openly gaping at the full frontal nude pictures of you.'
+	'Her eyes go wide as a gallery fills the screen. "Woah! You''re so fucking hot!" she says, openly gaping at the full frontal nude pictures of you.'
 	act 'Embarrassed':
 		cla & *nl
 		'You thought you weren''t embarrassed by this line of talk, but it''s hard not to be when the actual pictures are right in front of you, especially when Albina expands them to full screen and takes advantage of the high definition to zoom <i>very</i> far in. A warm blush spreads through your cheeks.'
@@ -352,8 +352,8 @@ if $ARGS[0] = 'first_model_talk_nude2':
 	if pcs_pubes > 10 and AlbinaQW['model_shave'] = 0:
 		gs 'albina_chat2','first_model_talk_nude_pubes_shaved'
 	else
-		act'Continue':
-			cla & *clr
+		act 'Continue':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina starts saving the images to her hard drive and rapidly clicking through other websites, bookmarking them.'
 			'"What are you doing?" you ask, confused.'
@@ -426,16 +426,16 @@ if $ARGS[0] = 'first_model_talk_nude3':
 			'You sit in silence for a few moments before Albina turns back towards you tentatively.'
 			'"Do you regret it?"'
 			act 'No':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-				'"No." You give Albina a smile. "Whatever the underhanded reason they got me to do it, once it was done, I didn''t regret it."'
+				'"No." You give her a smile. "Whatever the underhanded reason they got me to do it, once it was done, I didn''t regret it."'
 				'"Well... you <i>are</i> pretty hot in them aren''t you?" she says, encouraged by your response.'
 				'"Only ''pretty hot''?" you tease back and she laughs aloud.'
 				gs 'albina_chat','small_talk'
 			end
 			
 			act 'Not anymore':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 				'"Not anymore," you shake your head. "I <i>did</i> regret it for a while, but after some time, I got used to the idea. I''m happy I did it."'
 				'"Well... you <i>are</i> pretty hot in them aren''t you?" she says, encouraged by your response.'
@@ -445,7 +445,7 @@ if $ARGS[0] = 'first_model_talk_nude3':
 			
 			
 			act 'Yes (thought I wanted it)':
-				cla & *clr
+				*clr & cla
 				'<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 as the two of you sit in silence for a few minutes.'
@@ -453,7 +453,7 @@ if $ARGS[0] = 'first_model_talk_nude3':
 			end
 			
 			act 'Yes (felt pressured)':
-				cla & *clr
+				*clr & cla
 				'<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 as the two of you sit in silence for a few minutes.'
@@ -513,7 +513,7 @@ end
 
 if $ARGS[0] = 'first_model_talk_shy1':
 	act 'Tell her (embarrassed)':
-		cla & *clr
+		*clr & cla
 		'<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."'
@@ -653,7 +653,7 @@ if $ARGS[0] = 'first_model_talk_shy3':
 			'You sit in silence for a few seconds before Albina turns back towards you tentatively.'
 			'"Do you regret it?"'
 			act 'No':
-				cla & *clr
+				*clr & cla
 				'<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," she says, her eyes lighting up with your good humor. "You''re hot as fuck naked!"'
@@ -662,7 +662,7 @@ if $ARGS[0] = 'first_model_talk_shy3':
 			end
 			
 			act 'Yes (thought I wanted it)':
-				cla & *clr
+				*clr & cla
 				'<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 as the two of you sit in silence for a few more minutes.'
@@ -670,7 +670,7 @@ if $ARGS[0] = 'first_model_talk_shy3':
 			end
 			
 			act 'Yes (felt pressured)':
-				cla & *clr
+				*clr & cla
 				'<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 as the two of you sit in silence for a few more minutes.'
@@ -682,14 +682,14 @@ end
 
 if $ARGS[0] = 'first_model_talk_shy4':
 	if $model['type'] = 'glamour':
-		'"You''re naked in these?" Albina''s eyes go wide.'
+		'Her eyes go wide. "You''re naked in these?!"'
 		'"I didn''t say I was naked!" you protest.'
 		'"Yeah yeah, who cares," she says, completely ignoring you while 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 she scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
+		'"You''re naked in these?!" Her eyes go wide and she scrambles for her laptop. "Oh, I <i>gotta</i> see these pics!"'
 	end
 	act 'Stop her':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'"No!" you squeal, grabbing her by the arm to stop her. Albina looks at you, bewildered.'
 		act 'Beg her':
@@ -706,7 +706,7 @@ if $ARGS[0] = 'first_model_talk_shy4':
 	if $model['nickname'] = $pcs_firstname or $model['nickname'] = $pcs_nickname or $model['firstname'] = $pcs_nickname or $model['firstname'] = $pcs_nickname:
 		act'It''s not my name (lie)':
 			AlbinaQW['model_no_look'] = 2
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"You''re not gonna find anything just Yandexing my name," you tell her, dramatically rolling your eyes. "Do you really think I''m stupid enough to start nude modelling and use my real name?"'
 			*nl
@@ -718,7 +718,7 @@ if $ARGS[0] = 'first_model_talk_shy4':
 		end
 		
 		act 'Let her search':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina searches and quickly finds your profile. "You didn''t even change your name?" she snickers.'
 			act 'Blush':
@@ -750,7 +750,7 @@ if $ARGS[0] = 'first_model_talk_shy4':
 	else
 		act 'It''s not my name':
 			AlbinaQW['model_no_look'] = 2
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"You''re not gonna find anything just Yandexing my name," you tell her, dramatically rolling your eyes. "Do you really think I''m stupid enough to start nude modelling and use my real name?"'
 			*nl
@@ -762,7 +762,7 @@ if $ARGS[0] = 'first_model_talk_shy4':
 		end
 	
 		act 'Let her search':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina searches for you using your real name, but can''t find it because you used a pseudonym.'
 			'"Why can''t I find it?!" she grumbles in frustration.'
@@ -785,9 +785,9 @@ if $ARGS[0] = 'first_model_talk_shy4':
 end
 
 if $ARGS[0] = 'first_model_talk_nude_shy1':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/1.jpg"> <img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/2.jpg"> <img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/3.jpg"></center>'
-	'Albina''s eyes go wide as a gallery fills the screen. "Woah! You''re so fucking hot!" she says, openly gaping at the full frontal nude pictures of you.'
+	'Her eyes go wide as a gallery fills the screen. "Woah! You''re so fucking hot!" she says, openly gaping at the full frontal nude pictures of you.'
 	act 'Embarrassed':
 		cla & *nl
 		'You blush furiously as she furiously clicks through them, expanding them to full screen and even zooming in at times, especially on your "womanly features."'
@@ -827,7 +827,7 @@ if $ARGS[0] = 'first_model_talk_nude_shy2':
 		gs 'albina_chat2','first_model_talk_nude_shy_pubes_shaved'
 	else
 		act 'Continue':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina starts saving the images to her hard drive and rapidly clicking through other websites, bookmarking them.'
 			'"What are you doing?" you ask, bewildered.'
@@ -860,7 +860,7 @@ if $ARGS[0] = 'first_model_talk_nude_shy_pubes_shaved':
 			AlbinaQW['model_shave'] = 2
 			cla & *nl
 			'"They made me do it," you mumble shyly. "This is my nude debut and the studio''s policy is that models have to go cleanshaven for their first nude set. I didn''t want to do it, but they refused to do the shoot unless I did."'
-			'Albina''s grin fades and takes on a more somber expression as she scrolls through the pictures of you with new eyes.'
+			'Her grin fades and takes on a more somber expression as she scrolls through the pictures of you with new eyes.'
 			if AlbinaQW['shave_story'] = 1:
 				'"I told you about why I started shaving, didn''t I?" she asks referring to that story she told you while you were both drunk after the pool. "What you said reminds me of that."'
 				'She shuts the lid on her laptop and pushes it away. "I''m sorry <<$pcs_nickname>>," she says tenderly. "Maybe we should talk about something else?"'
@@ -874,7 +874,7 @@ if $ARGS[0] = 'first_model_talk_nude_shy_pubes_shaved':
 end
 
 if $ARGS[0] = 'recurrent_model_talk1':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'"What''s it like working as a model?" Albina asks, looking curious.'
 	act 'It''s whatever':
@@ -885,11 +885,30 @@ if $ARGS[0] = 'recurrent_model_talk1':
 	end
 end
 
+if $ARGS[0] = 'recurrent_model_talk2':
+	!! what have you shot lately?
+end
+
 if $ARGS[0] = 'recurrent_porn_talk1':
-	cla & *clr
+	!! Albina tries to be conversational and friendly about your job as a porn star, which she disagrees with.
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'"So..." Albina starts hesitantly, nervously drumming her fingers. "How''s... the uhh... <i>porn stuff</i> going...?"'
-	act 'We don''t have to talk about this':
+	act 'Answer uncomfortably':
+		cla & *nl
+		'"It''s, uhh, fine..." you reply awkwardly, unable to meet Albina''s gaze. Not that she''s doing a good job of maintaining eye contact herself.'
+		'"What have you, uhm, filmed lately...?" she asks.'
+		gs 'albina_chat2','recurrent_porn_talk_uncomfortable'
+	end
+	
+	act 'Answer casually':
+		cla & *nl
+		'"It''s going fine," you shrug casually. Albina nods, but it''s obvious that she can''t even look at you while talking about this subject.'
+		'"What have you, uhm, filmed lately...?" she asks.'
+		gs 'albina_chat2','recurrent_porn_talk_casual'
+	end
+	
+	act '"We don''t have to talk about this"':
 		albinaQW['no_porn_talk'] = 1
 		cla & *nl
 		'"Albina," you say gently. "If you''re uncomfortable with what I do for money, then we don''t have to talk about it."'
@@ -898,4 +917,116 @@ if $ARGS[0] = 'recurrent_porn_talk1':
 	end
 end
 
+if $ARGS[0] = 'porn_history_check':
+	
+end
+
+if $ARGS[0] = 'recurrent_porn_talk_uncomfortable':
+	act 'Nothing':
+		cla & *nl
+		'"Nothing really..." You give her an embarrassed smile. "I haven''t really shot anything, er, new, recently..."'
+		'"Oh. That''s uh... good?" She visibly cringes at her own remark and the two of you clumsily move on towards other subjects.'
+		gs 'albina_chat','small_talk'
+	end
+	
+	act 'Don''t go into detail':
+		cla & *nl
+		'"Oh, you know, just a film here or there," you say casually.'
+	end
+	
+	if albinaQW['porn_gb_films'] < stat['gangbang_films']:
+		act 'Gangbang scene':
+			cla & *nl
+			'"I... uhh... I got gangbanged a little while ago? They, er... double penetrated me..." You give her an embarrassed smile and you feel your face turn bright red as hers visibly pales.'
+			'"Oh. That''s uh... good?" She visibly cringes at her own remark and the two of you clumsily move on towards other subjects.'
+			gs 'albina_chat','small_talk'
+		end
+	end
+	
+	if albinaQW['porn_gb_films'] < stat['gangbang_films']:
+		act 'Gangbang scene':
+			cla & *nl
+			'"I... uhh... I got gangbanged a little while ago? They, er... double penetrated me..." You give her an embarrassed smile and you feel your face turn bright red as hers visibly pales.'
+			'"Oh. That''s uh... good?" She visibly cringes at her own remark and the two of you clumsily move on towards other subjects.'
+			gs 'albina_chat','small_talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'recurrent_porn_talk_casual':
+	act 'Nothing':
+		cla & *nl
+		'"Nothing really." You shrug again. "I haven''t gotten to work for the studios very much recently."'
+		'"Oh. That''s uh... good?" She visibly cringes at her own remark. Seeing you''re not going to get anywhere on this line of conversation, you take the initiative and change the subject.'
+		gs 'albina_chat','small_talk'
+	end
+	
+	act 'Don''t go into detail':
+		cla & *nl
+		'"Oh, you know, just a film here or there," you say casually. "The usual sucking and fucking on camera. Nothing special."'
+		'"'
+	end
+	
+	if albinaQW['porn_gb_films'] < stat['gangbang_films']:
+		act 'Gangbang scene':
+			cla & *nl
+			'"I got gangbanged a little while ago," you say as casually as if you were saying you had a banana with your lunch. "Fucked me in all three holes simultaneously."'
+			'Your friend visibly pales, but soldiers on through the conversation nonetheless.'
+			'"That''s uh... good?" She visibly cringes at her own remark. Seeing you''re not going to get anywhere on this topic, you take the initiative and change the subject.'
+			gs 'albina_chat','small_talk'
+		end
+	end
+end
+
+
+if $ARGS[0] = 'recurrent_porn_talk2':
+	!! Route 2: Albina asks Sveta if she really thinks the money is worth shooting porn
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	'"<<$pcs_nickname>>..." Albina says slowly. "I need to ask you... Do you really think shooting porn is worth the money?"'
+	
+	!! separated with a gosub so the player can click back if they misclick
+	gs 'albina_chat2','recurrent_porn_talk2_menu'
+	
+end
+
+if $ARGS[0] = 'recurrent_porn_talk2_menu':
+	act '"It''s soul destroying"':
+		cla & *nl
+		'You turn away from your friend, unable to look her in the eyes.'
+		'"I don''t know," you mumble in shame. "Every time I finish a shoot I want to throw up. Every time a guy cums on my face, I feel filthy and no amount of washing up makes me feel clean. When the producers tell me my videos are going live, I''m terrified that someone I know will see it. It''s tearing me apart from the inside out..."'
+		'"Then quit."'
+		'Turning back to face Albina, you see she''s practically begging you with just those two words.'
+		gs 'albina_chat2','recurrent_porn_talk2_need_money'
+	end
+	
+	act 'Conflicted':
+		cla & *nl
+		'"It''s not a perfect job," you admit uncomfortably. "But it''s not that bad either. All things considered, it''s worth what it pays. I <i>need</i> the money right now."'
+		'"But you could do something else for money too," she replies, practically pleading with you. "It doesn''t have to be something that exposes your most intimate things all over the internet forever."'
+		'"And what would I do?" you ask. "Be a secretary? Or a nurse? Or a reporter? That''s all future. I need a uni degree for that. Or should I break my back working shit jobs around Pav, cleaning toilets and sweeping hallways, and changing cum-stained sheets in the hotel? I''m not doing that. Those are worse than getting paid to fuck on camera."'
+		gs 'albina_chat2','recurrent_porn_talk2_end'
+	end
+end
+
+if $ARGS[0] = 'recurrent_porn_talk2_need_money':
+	act '"I need the money"':
+		cla & *nl
+		'"I <i>need</i> the money, Albina," you reply uncomfortably. "I don''t have a choice."'
+		'"Yes you do," she says softly. "There are other things you can do for money, <<$pcs_nickname>>..."'
+		'"Not without a diploma," you say with a shake of your head. "Or a degree. Or a certification. Or working for 40 hours a week and shit pay. I don''t have that time or experience. For porn, all I have to do is get fucked and look pretty while I do. That second part is even optional sometimes. This is the best job I can get with what I have."'
+		*nl
+		'Albina''s eyes mist up with tears and she looks away, rubbing her eyes with the palm of her hand.'
+		'You let the conversation die off and change subjects.'
+		gs 'albina_chat2','recurrent_porn_talk2_end'		
+	end
+end
+
+if $ARGS[0] = 'recurrent_porn_talk2_end':
+	*nl
+	'Albina''s eyes mist up with tears and she looks away, rubbing her eyes with the palm of her hand.'
+	'You let the conversation die off and change subjects.'
+	gs 'albina_chat','small_talk'
+end
+
 --- albina_chat2 ---------------------------------

File diff suppressed because it is too large
+ 602 - 167
locations/albina_house_events.qsrc


+ 145 - 164
locations/albina_mother_events.qsrc

@@ -2,31 +2,69 @@
 !2022/03/16
 menu_off = 1
 
+if $ARGS[0] = 'zoya_chat_menu':
+	
+	act'Make small talk': gs 'albina_mother_events', 'zoya_small_talk'
+end
+
+if $ARGS[0] = 'zoya_small_talk':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
+	if rand(1,5) = 1:
+		'"Thank you for coming over by the way," Zoya smiles at you warmly. "I''m not just being polite. After everything Albina''s been through, I''m glad she has a friend like you to rely on. She needs it."'
+		gs 'albina_mother_events', 'zoya_chat_menu'
+	end
+	
+end
+
+if $ARGS[0] = 'zoya_meet':
+	!!First time visiting on your own after she shows you where she lives
+	AlbinaQW['visiting'] = 1
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
+	'As you walk up the long driveway to the front door, you notice a sleek and expensive looking car you''ve never seen before parked in front of the house. When you knock, the door opens to reveal a beautiful, well-dressed woman you estimate to be in her late 30s. She wears high heels, a pencil skirt, and a partially unbuttoned blouse that gives you a view of her substantial cleavage that bulges against the fabric.'
+	*nl
+	'"You must be <<$pcs_firstname>>!" she smiles. "Albina has told me quite a bit about you. All good things, I assure you," she adds with a laugh.'
+	'The woman holds her hand for you to shake, and you do so tentatively. "I''m sorry, and you are...?"'
+	'"Oh! Forgive my rudeness. I''m Albina''s mother, Zoya Petrenkoa." <i>Albina''s mother??</i> You think, shocked by the introduction.'
+	'"It''s a pleasure to meet you!" you blurt out. "Mrs... Ms... Uhh..." you flounder, realizing she didn''t use Albina''s surname, and you''re unsure what to do.'
+	'"Doctor, actually," she says, smirking wryly. "But you can just call me Zoya."'
+	'"Oh no! I could-"'
+	'"I insist," she smiles warmly. "Would you like to come inside?"'
+	act 'Continue':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
+		'"Albina is in her room right now. I expect the maid has told her of your arrival already." She grabs her coat and clatters her way to the front door. "I wish I could be a more entertaining host, but I have to get to the hospital, so I''ll just have to leave that to my daughter. If you''re a frequent visitor, you might not see me often, but do come and say hello if I''m ever home when you visit. It was nice meeting you, <<$pcs_firstname>>."'
+		'She gives a parting smile and closes the door behind her. You hear the car starting up outside before it roars away.'
+		act 'Continue': gt 'albinahome', 'bedroom'
+	end
+end
+
 if $ARGS[0] = 'zoya_sunbathing_solo': 
 !! (if summer)
 	minut += 2
-	gs'stat'
-	'You walk up the long driveway to Albina''s house, reaching it a couple of minutes later. Upon knocking on the door, it''s opened by the maid. "Hello. Ms. Zoya said to tell you she is out back by the pool if you need anything."'
+	gs 'stat'
+	'You walk up the long driveway to Albina''s house, reaching it a few minutes later. Upon knocking on the door, it''s opened by the maid.'
+	'"Hello. Ms. Zoya said to tell you she''s out back by the pool if you need anything."'
 
 	if AlbinaQW['pool'] = 0:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapool.jpg"></center>'
-		'Heading out the back door, you find Zoya in the middle of the pool, laying back with her eyes closed on a floatie. She''s topless and looks very relaxed, moving only for a moment to adjust her bikini bottom and you catch the briefest glimpse of her pussy lips as she does. Perhaps hearing you close the door, she cracks open an eye to look at you as you approach.'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapool.jpg"></center>'
+		'Heading out the back door, you find Zoya in the middle of the pool, laying back with her eyes closed on a floatie. She''s topless and looks very relaxed, moving only for a moment to adjust her bikini bottom, allowing you to catch the briefest glimpse of her pussy lips as she does. Perhaps hearing you close the door, she cracks open an eye to look at you as you approach.'
 		'"Ahh, <<$pcs_firstname>>. Milena told me you arrived," she says, carefully sitting up on her elbows, the floatie wobbling beneath her.'
-		'"Hi!" you reply politely. "I hope I''m not intruding."'
+		'"I hope I''m not intruding?" you reply politely.'
 		'"No no, not at all. Were you looking for Albina? I think she''s out right now, but you''re welcome to make yourself at home until she comes back."'
 		AlbinaQW['pool'] = 1
 		minut += 6
 		gs 'stat'
 
 		act 'Check her out':
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapool.jpg"></center>'
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapool.jpg"></center>'
 			AlbinaQW['check_out_zoya'] = 1
-			'"Okay, thanks Zoya."'
+			'"Okay. Thanks, Zoya."'
 			'Your gaze wanders up and down her body. Zoya looks incredible for her age, especially given that she wasn''t a teen parent like your own mother. Her skin is wonderfully tanned, unmarred by any white lines, clearly due to her topless sunbathing habits. Her breasts are exceptionally full, large and with a beautiful symmetrical roundness to them. Not to mention her flat, toned stomach and long shapely legs. Though mostly obscured by the floatie, her thick thighs give you a pretty good idea of where Albina got her ass from.'
 			*nl
-			'"Ahem."'
-			'You blink and realize that Zoya is looking sternly at you, seemingly annoyed. "It''s rude to stare at someone''s body like that <<$pcs_firstname>>."'
+			'"<i>Ahem</i>."'
+			'You blink and realize that Zoya is looking sternly at you, seemingly annoyed. "It''s rude to stare at someone''s body like that, <<$pcs_firstname>>."'
 			'"Oh, sorry..." you gulp.'
 			'"Perhaps you should wait for Albina inside?"'
 			'"Yeahhhh... I''ll go do that..." Awkwardly walking away, you head back inside, taking one last glance back at Zoya to see her lay her head back on the floatie and close her eyes again.'
@@ -36,32 +74,32 @@ if $ARGS[0] = 'zoya_sunbathing_solo':
 			act 'Continue': gt 'albinahome', 'hallway'
 		end
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapool.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapool.jpg"></center>'
 		'Heading out the back door, you find Zoya sunbathing in the pool again. Reacting to some kind of sound you made, she opens her eyes and sits up to look at you.'
-		'"Hello again <<$pcs_firstname>>. Waiting for Albina again?"'
+		'"Hello again, <<$pcs_firstname>>. Waiting for Albina again?"'
 		'"Mhmm," you respond with a nod.'
 		'"Well, as always, make yourself at home until she comes back."'
 		minut += 6
 		gs 'stat'
 
 		act 'Check her out':
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapool.jpg"></center>'
-			'"Okay, thanks Zoya."'
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapool.jpg"></center>'
+			'"Okay. Thanks, Zoya."'
 			if AlbinaQW['check_out_zoya'] > 0:
 				'You can''t help but ogle her body again. Those big tanned tits, those long toned legs... You vaguely imagine what it would be like to bury your head into her breasts or feel her thighs squeeze your head during climax. A tingling sensation runs through your crotch at the thought.'
 				*nl
 				'"Ahem."'
-				'You blink and realize that Zoya is glaring at you. "I believe we talked about this before <<$pcs_firstname>>...'
+				'You blink and realize that Zoya is glaring at you. "I believe we talked about this before, <<$pcs_firstname>>...'
 				'"Oh, uhh..." you gulp.'
 				'"You should go and wait for Albina inside."'
 				'"Umm, yeah.. I''ll go do that..." Awkwardly walking away, you head back inside, taking one last glance back at Zoya before you go.'
-				'<i>That body... Damn!</i>'
+				'<i>That body... Damn</i>!'
 			else
 				'Your gaze wanders up and down her body. Zoya looks incredible for her age, especially given that she wasn''t a teen parent like your own mother. Her skin is wonderfully tanned, unmarred by any white lines, clearly due to her topless sunbathing habits. Her breasts are exceptionally full, large and with a beautiful symmetrical roundness to them. Not to mention her flat, toned stomach and long shapely legs. Though mostly obscured by the floatie, her thick thighs give you a pretty good idea of where Albina got her ass from.'
 				*nl
 				'"Ahem."'
-				'You blink and realize that Zoya is looking sternly at you, seemingly a bit annoyed. "It''s rude to stare at someone''s body like that <<$pcs_firstname>>."'
+				'You blink and realize that Zoya is looking sternly at you, seemingly a bit annoyed. "It''s rude to stare at someone''s body like that, <<$pcs_firstname>>."'
 				'"Oh, sorry..." you gulp.'
 				'"Perhaps you should wait for Albina inside?"'
 				'"Yeahhhh... I''ll go do that..." Awkwardly walking away, you head back inside, taking one last glance back at Zoya to see her lay her head back on the floatie and close her eyes again.'
@@ -74,8 +112,8 @@ if $ARGS[0] = 'zoya_sunbathing_solo':
 	end
 
 	act 'Make small talk until Albina returns':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
 		'"So," you begin, sitting down next to the pool to be closer to eye level. "How have you been?"'
 		'The two of you chat about various things like school and her work until Milena interrupts to tell you Albina has just come home. Ending on that note, you wave goodbye and head back in to see Albina.'
 		minut +=6
@@ -85,9 +123,9 @@ if $ARGS[0] = 'zoya_sunbathing_solo':
 	end
 
 	act 'Go inside':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
-		'"Okay, thanks Zoya. I''ll let you get back to your sunbathing."'
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
+		'"Okay. Thanks, Zoya. I''ll let you get back to your sunbathing."'
 		'You wave goodbye and head back into the house, thinking about how to pass the time until Albina returns.'
 		minut += 6
 		gs 'stat'
@@ -98,135 +136,78 @@ end
 
 
 if $ARGS[0] = 'zoya_sunbathing_albina':
+	AlbinaQW['mother_daughter_sunbathe'] = daystart
 	minut += 2
-	gs'stat'
-	'You walk up the long driveway to Albina''s house, reaching it a few minutes later. Upon knocking on the door, it''s opened by the maid. "Hello. Miss Albina and Ms. Zoya are sunbathing by the pool. If you''d like to come this way..." She leads you through the house and out through the back door.'
-	minut += 6
 	gs 'stat'
-
-	act 'Follow':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/sunbathing.jpg"></center>'
-		'Stepping out onto the deck of the pool, you find Albina and her mother just as the maid told you. Zoya is drifting around the pool on a floatie while Albina is laying on her stomach on one of the lounge chairs with some earbuds in, listening to some music. They are both topless, their bodies glistening in the sun from what you assume is tanning lotion.'
-		'"Miss Albina, you have a guest," the maid says, performing a small curtsy before leaving to head back inside. Albina pulls out her earbuds while looking over her shoulder.'
-		'"<<$pcs_nickname>>!"'
-		'"It''s about time to get out of the sun anyways Albina," Zoya calls over from the pool. "Tans, not skin cancer."'
-		'"Yes Mama," she says, getting up from her chair. "Come on <<$pcs_nickname>>, let''s go."'
-		minut += 6
-		gs 'stat'
-
-		act 'Go with her':
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-			'You follow Albina to her room, where she pulls the strings on her bikini thong and lets it fall around her ankles before kicking it aside.'
-			'"I need to take a shower and wash all this lotion and sweat off. Care to join me?" She smiles playfully at you.'
-			minut += 6
-			gs 'stat'
-
-			act 'Join her': gt 'albina_mother_events', 'albina_shower'
-
-			act 'Just talk':
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/showering.jpg"></center>'
-				cla & *nl
-				'"No thanks. But I wouldn''t mind talking while you do."'
-				'"Suit yourself," she shrugs. Albina heads into her personal bathroom, leaving the door open for you to follow her in. You sit down on the edge of her bath while she steps into the shower.'
-				'"So you and your mother sunbathe together?"'
-				'"When we can," her voice echos back off the glass and tile. "Sometimes I''m busy, sometimes she''s busy. I wish she''d let me go full nude to avoid pantylines, but topless is the most she lets me get away with. Says I shouldn''t be worrying about those kinds of tanlines anyways. I sneak in a few nude sessions when she''s not home though," she adds with a small laugh.'
-				if motherKnowWhore > 0:
-					'"Pff. Better than my mother. Ever since she found out I''ve been having sex, she doesn''t even call me by my name anymore. Usually just ''whore'' or ''slut''. It fucking blows."'
-					'The tap squeaks off and Albina steps out of the shower, grabbing a towel to dry herself off.'
-					'"Well... Still better than being called that because it''s true." Her expression goes blank and your conversation lulls into a melancholy silence for a moment, both of you thinking about her father. "At least that''s not the case anymore," she continues, heading into her room. You follow behind her, sitting on her bed and chatting about lighter topics while she gets dressed.'
-				elseif motherKnowSpravka > 0:
-					'"Pff. Still better than my mother. She keeps lecturing me about sex. It''s better than it was before, but it''s still so annoying."'
-					'"Mama always leaves condoms out for me even though I''m on the pill," Albina says, stepping out of the shower and grabbing a towel. "I always thought it was a little overbearing, but I guess your mother''s probably a lot worse huh?" You follow her into her room to continue chatting while she gets dressed.'
-				elseif motherKnowDildo > 0:
-					'"Pff. Still better than my mother. She keeps scolding me about leaving my dildos lying around the house. A girl has needs, you know?"'
-					'"Ugh, I know exactly what you mean," Albina says, stepping out of the shower and grabbing a towel. "I love Mama, but I wish she wasn''t so uptight about where I leave my toys. Always saying, ''What if a guest comes over and sees that laying around?'' or ''What if they catch you in your underwear?'' As if we have any guests these days other than my friends. Besides, isn''t this what we have a maid for? Cleaning stuff up?" She heads into her room and you follow behind, sitting on her bed and continuing to chat while she gets dressed.'
-				else
-					if stat['think_virgin'] = 0:
-						'"Pff. Still better than my mother. She still makes me see the gyno every month just to confirm I''m still a virgin."'
-						'"What??? There''s no way you''re still a virgin!"'
-						'"I... have ways of getting around it."'
-						'"Ways of ''getting around'' you mean!" Albina laughs, stepping out of the shower and grabbing her towel.'
-						'"Bitch!" you laugh back, following her into her room to keep chatting while she gets dressed.'
-					else
-						'"Pff. Still better than my mom. She still makes me see the gyno every month just to confirm I''m still a virgin."'
-						'"What?! That''s totally fucked up!"'
-						'"I know right?!"'
-						'"Maybe you should lose it," Albina says, stepping out of the shower and grabbing her towel. "Just to stick it to her, you know?"'
-						'"I don''t know... Maybe..."'
-						'You follow her into her room and sit on her bed, continuing to chat while she gets dressed.'
-					end
-				end
-
-				minut += 6
-				gs 'stat'
-
-				act 'Continue': gt 'albinahome', 'bedroom'
-			end
-
-			act 'I''ll just wait':
-				cla & *nl
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-				'"No thanks. I''ll just wait until you''re done."'
-				'"Suit yourself I guess," Albina shrugs and heads into the bathroom, closing the door behind her. You twiddle your thumbs for a few minutes until she comes back out, towel wrapped around her hair and with nothing around her body. She heads straight to her dresser to start picking out clothes.'
-				minut += 6
-				gs 'stat'
-
-				act 'Continue': gt 'albinahome', 'bedroom'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool/alb_zoya1.jpg"></center>'
+	'Stepping out through the back doors of the house, you find Albina and Zoya both lying topless upon the poolside deck chairs, cocktail glasses filled with fruity looking liquids at elbowside tables beside them next to various oils and lotions. Zoya notices you first, casually rolling away from you and onto her belly, her dark hair shifting to let you see her marvelously toned back.'
+	act 'Approach them':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool/alb_zoya2.jpg"></center>'
+		'Only once you get closer does Albina notice you, making no move to cover herself as her lips give way to a sly smile.'
+		'"Hey <<$pcs_nickname>>," she says. "Did Milena let you in?"'
+		'"Yeah," you nod.'
+		'"Mama and I were just tanning ourselves," she smirks, casually picking up one of the bottles on the tables and drizzling a line of oil across her stomach. It sparkles in the sunlight as she rubs it in with her hands, clearly defining the muscles of her core. Her hands move up to her breasts, rubbing it in there as well. She massages and knead with almost groping motions. Her fingers squeeze from the base of her mounds all the way up to her nipples, rolling them between them and forefinger, only releasing after gentle tugs.'
+		*nl
+		'You can''t help but stare as she does this until your eyes flicker to her face and only then do you realize:'
+		'She''s doing this on purpose!'
+		act 'Interrupted':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool/alb_zoya2.jpg"></center>'
+			'"Why must you act like that, Albina?" Zoya sighs, rolling her eyes from the other chair.'
+			'Albina snorts. "Why not? It''s nothing <<$pcs_nickname>> hasn''t seen before. We shower together all the time at school. Besides, you''re topless too, Mama."'
+			'"It''s called <i>modesty</i>, young lady!" Zoya snorts in return. "You could stand to have some. It was time for my back anyway. And it''s time you went inside. You''ve been out here long enough. Go rinse off before you get skin cancer."'
+			'Albina sighs and gets up. "Yes, Mama..."'
+			act 'Continue':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool/bottoms_off.jpg"></center>'
+				'Albina drains her cocktail glass in one gulp and then shamelessly pulls down her bikini bottom to stand completely nude on the deck. Her mother gives her an eyeful, but you see her physically bite her tongue as Albina pads her way back through the house, you following along behind her.'
+				*nl
+				'"I need to take a shower," she says, casually twirling her bottoms around one finger before carelessly letting them fall to the floor. She stops in the hall outside her room and gives you a playful smile. "Care to join me?"'
+				gs 'albina_house_events', 'albina_shower_talk_start'
 			end
 		end
 	end
-	act 'Tell her you''ll wait':
-		cla & *nl
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
-		'"That''s okay, I''ll just wait down here until you''re done."'
-		'"Whatever. Suit yourself I guess." She swaggers up the stairs while you sit on her couch and pull out your phone to pass the time. About ten minutes later, Albina comes back down with damp hair and a new outfit.'
-		minut += 10
-		gs 'stat'
-
-		act 'Continue': gt 'albinahome', 'bedroom'
-	end
 end
 
-
 if $ARGS[0] = 'Doing yoga with Albina':
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/yoga.jpg"></center>'
-	'You enter the house and hear Albina calling you from a nearby room. You enter the home gym and find Albina and Zoya doing some yoga. You get a great view of their round asses and toned legs stretching their skintight yoga pants. You''re not sure where to look as they finish their routine. "I''d love to stay and chat <<$pcs_nickname>>, but I need to shower and get some paperwork done for work." She excuses herself and leaves the room, leaving you with Albina.'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/yoga.jpg"></center>'
+	'You enter the house and hear Albina calling you from a nearby room. You enter the home gym and find Albina and Zoya doing some yoga. You get a great view of their round asses and toned legs stretching their skintight yoga pants and aren''t sure where to look as they finish their routine.'
+	'"I''d love to stay and chat, but I need to shower and get some paperwork done for work," Zoya says and excuses herself from the room, leaving you with Albina.'
 	'"Come on <<$pcs_nickname>>, I gotta get changed."'
 	minut += 6
 	gs 'stat'
 
 	act 'Go with her':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-		'You follow Albina to her room where she strips from her clothes and tosses them aside without a care.'
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinaroom.jpg"></center>'
+		'You follow Albina to her room, where she strips from her clothes and tosses them aside without a care.'
 		'"I need to take a shower and wash all this sweat off. Care to join me?" she asks with a playful smile.'
 		minut += 6
 		gs 'stat'
 
-		act 'Join her': gt 'albina_mother_events', 'albina_shower'
+		act 'Join her': gt 'albina_sex_scenes', 'albina_shower'
 	end
 
 	act 'Just talk':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/showering.jpg"></center>'
-		'"No thanks. But I wouldn''t mind talking while you do."'
-		'"Suit yourself," she shrugs. Albina heads into her personal bathroom, leaving the door open for you to follow her in. You sit down on the edge of her bath while she steps into the shower.'
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/showering.jpg"></center>'
+		'"No thanks, but I wouldn''t mind talking while you do."'
+		'"Suit yourself," she shrugs and heads into her personal bathroom, leaving the door open for you to follow her in. You sit down on the edge of her bath while she steps into the shower.'
 		'"So you and your mother work out together?"'
-		'"When we can," her voice echos back off the glass and tile. "Sometimes I''m busy, sometimes she''s busy. She says I should always try and keep myself in shape and use yoga to calm myself and my mind. Says it''ll ''do me a world of good'', whatever the hell that means." The tap squeaks off and Albina steps out of the shower, grabbing a towel to dry herself off.'
+		'"When we can," her voice echoing back off the glass and tile. "Sometimes I''m busy, sometimes she''s busy. She says I should always try and keep myself in shape and use yoga to calm myself and my mind. Says it''ll ''do me a world of good'', whatever the hell that means." The tap squeaks off and Albina steps out of the shower, grabbing a towel to dry herself off.'
 		'You follow her into her room and sit down on her bed, continuing to chat while she gets dressed.'
-
 		minut += 6
 		gs 'stat'
 
 		act 'Continue': gt 'albinahome', 'bedroom'
 	end
 	act 'I''ll just wait':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinaroom.jpg"></center>'
 		'"No thanks. I''ll just wait until you''re done."'
-		'"Suit yourself I guess," Albina shrugs and heads into the bathroom, closing the door behind her. You twiddle your thumbs for a few minutes until she comes back out, towel wrapped around her hair and with nothing around her body. She heads straight to her dresser to start picking out clothes.'
+		'"Suit yourself I guess," she shrugs and heads into the bathroom, closing the door behind her. You twiddle your thumbs for a few minutes until she comes back out, towel wrapped around her hair and with nothing around her body. She heads straight to her dresser to start picking out clothes.'
 		minut += 6
 		gs 'stat'
 
@@ -234,10 +215,10 @@ if $ARGS[0] = 'Doing yoga with Albina':
 	end
 
 	act 'Tell her you''ll wait':
-		cla & *clr
+		*clr & cla
 		minut += 10
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
 		'"That''s okay, I''ll just wait down here until you''re done."'
 		'"Whatever. Suit yourself I guess." She swaggers up the stairs while you sit down on her couch and pull out your phone to pass the time. About ten minutes later, Albina comes back down with damp hair and a new outfit.'
 		minut += 6
@@ -247,7 +228,6 @@ if $ARGS[0] = 'Doing yoga with Albina':
 	end
 end
 
-
 if $ARGS[0] = 'albina_shower':
 	CLOSE ALL & PLAY 'sound/dush.mp3',30
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/4.jpg"></center>'
@@ -257,7 +237,7 @@ if $ARGS[0] = 'albina_shower':
 	gs 'stat'
 
 	act 'Continue':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/5.jpg"></center>'
 		'You squeeze more of the scented gel into your hands and start ''cleaning'' her ass, rubbing, squeezing and smacking her cheeks as you kiss her neck. She reaches back and starts passionately kissing you as you continue.'
 		gs 'arousal', 'foreplay_give', 3, 'lesbian'
@@ -265,51 +245,51 @@ if $ARGS[0] = 'albina_shower':
 
 		act 'Finish':
 			CLOSE ALL
-			gs 'arousal', 'end'
+			gs'arousal','end'
 			gs 'stat'
 			gt 'albinahome', 'bedroom'
 		end
 
 		act 'Continue':
-			cla & *clr
+			*clr & cla
 			'<center><video autoplay loop src="images/shared/sex/lesbian/shower_kiss1.mp4"></video></center>'
-			'Your hand finds its way between her legs but before you can go any further, she suddenly turns and pushes you up against the shower wall before moving in and locking lips with you. You passionately make out under the steamy water, fondling each other''s wet bodies for a few seconds before she breaks the kiss and moves away from you. "I need a release <<$pcs_nickname>>. Maybe you can help me with that?"'
+			'Your hand finds its way between her legs, but before you can go any further, she suddenly turns and pushes you up against the shower wall before moving in and locking lips with you. You passionately make out under the steamy water, fondling each other''s wet bodies for a few seconds before she breaks the kiss and moves away from you. "I need a release <<$pcs_nickname>>. Maybe you can help me with that?"'
 			gs 'arousal', 'kiss', 3, 'lesbian'
 			gs 'stat'
 
 			act 'Finger her pussy':
-				cla & *clr
+				*clr & cla
 				'<center><video autoplay loop src="images/shared/sex/lesbian/shower_finger1.mp4"></video></center>'
 				'You smile and move your hand back down between her legs. Being rather flexible, Albina lifts her leg straight up and places her foot against the shower wall, giving you better access to her pussy, which is dripping wet in anticipation. You slide two fingers inside her and start finger fucking her pussy as your thumb massages her clit. She moans loudly in pleasure as she leans against you to steady herself. A few minutes of this is enough to bring her to the edge and she starts moaning even louder. "Don''t you dare stop <<$pcs_nickname>>, I''m about to cum!" You finger her even faster and she lets out a pleasured shriek as her pussy starts squirting her juices over your arm. She steadies herself against you as she rides through the pleasure of her orgasm. You pull your fingers out of her and shove them in her mouth. She sucks on them before smiling at you.' 
-				'"Ohhh <<$pcs_nickname>>, that... that was amazing! Just let me finish up in here and I''ll be out." You nod and step out of the shower, grabbing one of the nearby towels and wrapping yourself in it before walking back into her bedroom.'
+				'"Ohhh <<$pcs_nickname>>, that... That was amazing! Just let me finish up in here and I''ll be out." You nod and step out of the shower, grabbing one of the nearby towels and wrapping yourself in it before walking back into her bedroom.'
 				'As you dry off, you hear the water turn off and a naked Albina casually strolls into the room.'
-				'"You were amazing in there and I want to return the favor." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"' 
+				'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"' 
 				gs 'arousal', 'vaginal_finger_give', 5, 'lesbian'
 				gs 'stat'
 
 				act 'Eat her ass':
-					cla & *clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/6.jpg"></center>'
 					'You firmly squeeze her ass in your hand before pushing her down onto all fours. She looks back and gives you a knowing smile as you kneel down next to her and spread her ass. She moans and giggles as you start rimming her asshole before grabbing you by the hair and holding you tightly against her, forcing your face between her ass cheeks as you continue pleasuring her backdoor. She soon relaxes enough for you to start pushing the tip of your tongue against her hole and it eventually penetrates. You start tongue fucking her ass in addition to rimming it, all to Albina''s immense pleasure. She reaches back and starts fondling her clit, her grip on your hair tightening as she approaches orgasm. Hearing her moans getting louder and her breathing more ragged, you start going even faster, pushing your tongue as deep as you can into her ass before Albina suddenly lets out a pleasured shriek as her pussy starts squirting juices. She lets go of your hair and you continue eating her ass as she rides through her orgasm. Once she recovers, she pulls herself up and the two of you sit in the shower making out for a few minutes before Albina breaks the kiss and smiles at you.' 
 					'"Ohhh <<$pcs_nickname>>, that... that was amazing! Just let me finish up in here and I''ll be out." You nod and step out of the shower, grabbing one of the nearby towels and wrapping yourself in it before walking back into her bedroom.'
 					'As you dry off, you hear the water turn off and a naked Albina casually strolls into the room.'
-					'"You were amazing in there and I want to return the favor." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"' 
-
+					'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"' 
 					gs 'arousal', 'rimming_give', 5, 'lesbian'
 					gs 'stat'
+					
 					act 'Get your ass eaten':
-						cla & *clr
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/7.jpg"></center>'
 						'You get on all fours as Albina climbs in behind you and spreads your ass, giving her access to your awaiting asshole. You gasp when she eagerly plunges her face between your cheeks and starts greedily licking and rimming your backdoor before pushing her tongue inside and tongue fucking your ass while expertly teasing your clit with her fingers.' 
 						'You moan loudly in pleasure as you feel your orgasm building within you and Albina, apparently sensing this, grabs your hips and starts eating your ass with even more lustful desire.'
 						'"Don''t stop, I''m gonna cum!" you cry out as Albina goes even faster, rimming your asshole with reckless abandon before suddenly pinching your engorged clit, causing a powerful orgasm to wash over you. Once it passes, you flop out on the bed as Albina smiles at you in satisfaction. Once you recover, you both get dressed.'
-						
 						gs 'arousal', 'rimming', 5, 'lesbian'
 						gs 'arousal', 'vaginal_finger', -5, 'lesbian'
 						gs 'stat'
+						
 						act 'Finish':
 							CLOSE ALL
-							gs 'arousal', 'end'
+							gs'arousal','end'
 							gs 'stat'
 							gt 'albinahome', 'bedroom'
 						end
@@ -322,10 +302,9 @@ end
 
 
 if $ARGS[0] = 'workout_solo':
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyaworkout.jpg"></center>'
-	'Approaching the gym, you hear someone inside. You peer in and find Zoya doing squats. Her technique looks flawless and you get a great view of her voluptuous ass and her heavily toned legs visibly flexing beneath the skintight yoga pants covering them. Noticing your reflection in the mirror, she turns her head over her shoulder to smile at you while continuing to squat. "Hello <<$pcs_firstname>>, it''s nice to see you. What can I do for you?"
-	You enter the room and chat with Zoya for a few minutes as she finishes her work out. "I''d love to stay and chat, but I need to shower and get some paperwork done for work." She excuses herself and leaves the room, leaving you alone to decide what to do.'
-
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyaworkout.jpg"></center>'
+	'Approaching the gym, you hear someone inside and peer in to find Zoya doing squats. Her technique looks flawless and you get a great view of her voluptuous ass and her heavily toned legs visibly flexing beneath the skintight yoga pants covering them. Noticing your reflection in the mirror, she turns her head over her shoulder to smile at you while continuing to squat. "Hello <<$pcs_firstname>>, it''s nice to see you. What can I do for you?"
+	You enter the room and chat with Zoya for a few minutes as she finishes her workout. "I''d love to stay and chat, but I need to shower and get some paperwork done for work." She excuses herself and leaves the room, leaving you alone to decide what to do.'
 	minut += 6
 	gs 'stat'
 
@@ -351,7 +330,7 @@ if $ARGS[0] = 'peep1':
 
 	act 'Enter':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyaroom.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyaroom.jpg"></center>'
 		'You quietly open the door and step into the room before closing the door behind you. Zoya doesn''t hear you and continues showering. You take a minute to appreciate the nicely decorated room before turning your attention to the connecting ensuite bathroom.'
 		minut += 6
 		gs 'stat'
@@ -364,8 +343,9 @@ if $ARGS[0] = 'peep1':
 		
 		act 'Take a peek':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyashower.jpg"></center>'
-			'Your curiousity gets the better of you and you crack open the door to the ensuite and peek inside. Zoya is unaware of your presence and continues showering. Being a former model, she has a great body that she keeps in shape. You can see where Albina gets some of her curvy nature from, especially her ass. You continue watching for a few seconds before deciding you shouldn''t push your luck and get caught. You quietly slip back out into the hallway just as you hear the water stop running.'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyashower.jpg"></center>'
+			'Your curiousity gets the better of you and you crack open the door to the ensuite and peek inside. Zoya is unaware of your presence and continues showering. Being a former model, she has a great body that she keeps in shape. You can see where Albina gets some of her curvy nature from, especially her ass.'
+			'You continue watching for a few seconds before deciding you shouldn''t push your luck and get caught. You quietly slip back out into the hallway just as you hear the water stop running.'
 			act 'Continue' : gt 'albinahome', 'hallway'
 		end
 	end
@@ -383,8 +363,9 @@ if $ARGS[0] = 'peep2':
 
 	act 'Peek':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapeeping.jpg"></center>'
-		'Your curiousity gets the better of you and you peek through the gap in the door. Peering into the room, you can see a naked Zoya, her back turned to you as she prepares to get dressed. Being a former model, she has a great body that she keeps in shape. You can see where Albina gets some of her curvy nature from, especially her ass. She turns around and you duck out of view, but she doesn''t react and you peer back in. This time, you get a good view of her large breasts and the neatly trimmed tuft of pubic hair sitting atop her pussy, the only hair on her otherwise silky smooth body.'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapeeping.jpg"></center>'
+		'Your curiousity gets the better of you and you peek through the gap in the door. Peering into the room, you can see a naked Zoya, her back turned to you as she prepares to get dressed. Being a former model, she has a great body that she keeps in shape. You can see where Albina gets some of her curvy nature from, especially her ass.'
+		'She suddenly turns around and you duck out of view, but she doesn''t react and you peer back in. This time, you get a good view of her large breasts and the neatly trimmed tuft of pubic hair sitting atop her pussy, the only hair on her otherwise silky smooth body.'
 		minut += 6
 		gs 'stat'
 
@@ -396,26 +377,26 @@ if $ARGS[0] = 'peep2':
 
 		act 'Keep watching':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapeeping.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapeeping.jpg"></center>'
 			'You keep watching her as she starts putting on her underwear, her bosom bouncing slightly as she adjusts her bra. She then disappears out of your view and you hear her rummaging through her closet before returning with the rest of her clothes.'
 
 			if week = 3 or week = 6:
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapeeping1.jpg"></center>'
-				'Before you can watch any further, you hear someone coming and run over to the bathroom, pretending to leave just as the maid walks up the stairs doing her rounds. She seems a little surprised to see you.
-				"Are you okay, Miss <<$pcs_firstname>>?" she asks, noticing the flushed appearance on your face.
-				"Oh, uuhh... I was... just leaving the bathroom." you reply, awkwardly trying to hide the fact that you were peeping on her employer.
-				You awkwardly laugh and she seems even more confused. "I''m just... I''m fine. I promise."
-				The maid gives you an awkward stare, but Zoya walks out into the hallway before she can push you further.' 
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapeeping1.jpg"></center>'
+				'Before you can watch any further, you hear someone coming and run over to the bathroom, pretending to leave just as the maid walks up the stairs doing her rounds. She seems a little surprised to see you.'
+				'"Are you okay, Miss <<$pcs_firstname>>?" she asks, noticing the flushed appearance on your face.'
+				'"Oh, uuhh... I was... just leaving the bathroom." you reply, awkwardly trying to hide the fact that you were peeping on her employer.'
+				'You awkwardly laugh and she seems even more confused. "I''m just... I''m fine. I promise."'
+				'She gives you an awkward stare, but Zoya walks out into the hallway before she can push you further.' 
 				'"Is everything okay out here, Milena?" The maid silently nods and continues on her duties, giving you a disapproving glare as she enters Zoya''s bedroom. You avoid eye contact with Zoya as you hastily walk past her and return to Albina.'
 			else
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapeeping1.jpg"></center>'
-				'Before you can watch any further, you hear someone coming and run over to the bathroom, pretending to leave just as Albina arrives. She has an inquisitive look on her face.
-				"<<$pcs_nickname>>, what are you doing?" she asks, noticing the flushed appearance on your face.
-				"Oh, uuhh... I was... just leaving the bathroom." you reply, awkwardly trying to hide the fact that you were peeping on her mother.
-				Albina raises a brow. "You didn''t clog the toilet did you?"
-				You awkwardly laugh and she seems even more confused. "No! I''m just... I''m fine. I promise."
-				Albina gives you an awkward glare, but her mother walks out into the hallway before she can push you further.
-				"Is everything okay out here girls?" Albina silently nods and motions for you to follow her. You avoid eye contact with Zoya as you walk past her.'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapeeping1.jpg"></center>'
+				'Before you can watch any further, you hear someone coming and run over to the bathroom, pretending to leave just as Albina arrives. She has an inquisitive look on her face.'
+				'"<<$pcs_nickname>>, what are you doing?" she asks, noticing the flushed appearance on your face.'
+				'"Oh, uuhh... I was... just leaving the bathroom." you reply, awkwardly trying to hide the fact that you were peeping on her mother.'
+				'Albina raises a brow. "You didn''t clog the toilet, did you?"'
+				'You awkwardly laugh and she seems even more confused. "No! I''m just... I''m fine. I promise."'
+				'She gives you an awkward glare, but her mother walks out into the hallway before she can push you further.'
+				'"Is everything okay out here, girls?" Albina silently nods and motions for you to follow her. You avoid eye contact with Zoya as you walk past her.'
 			end
 			
 			gs 'stat'

File diff suppressed because it is too large
+ 626 - 186
locations/albina_sex_chat.qsrc


+ 1724 - 0
locations/albina_sex_scenes.qsrc

@@ -0,0 +1,1724 @@
+# albina_sex_scenes
+
+if $ARGS[0] = 'kissing1':
+	*clr & cla
+	gs 'arousal', 'kiss', 3, 'no_orgasm_msg', 'lesbian'
+	gs 'arousal', 'kiss', -5, 'no_orgasm_msg', 'lesbian'
+	gs 'arousal', 'foreplay', -5, 'no_orgasm_msg', 'lesbian'
+	'<center><video autoplay loop src="images/shared/sex/lesbian/kiss2.mp4"></video></center>'
+	'You kiss Albina deeply, pulling her face into yours and drinking in the taste of her tongue as your breasts smoosh against hers. Her hands wander, snaking down your back to grab at your ass.'
+	if func('pcs_has_attr', 'body_ass_flat'):
+		'"You need to do some squats," she giggles. "I want more to play with back here."'
+	elseif func('pcs_has_attr', 'body_ass_average'):
+		'"Mmmm..." she moans. "You have a nice ass..."'
+	elseif func('pcs_has_attr', 'body_ass_big'):
+		'"Mmmm- fuck~!" she moans. "Is this what it feels like for guys when they grab my ass?"'
+	else
+		'"Mmmm- fuck~!" she moans. "I think your ass is even bigger than mine!"'
+	end
+!!	act '69 her':
+
+!!	act 'Fuck her with a strapon':
+
+	if stat['think_virgin'] = 1:
+		act 'Ask her to take your virginity': gs 'albina_sex_scenes', 'virgin_take1'
+	else
+		act 'Ask her to fuck you with a strapon': gs 'albina_sex_scenes', 'virgin_take1'
+	end
+end
+
+if $ARGS[0] = '69ing_1':
+	*clr & cla
+	gs 'arousal', 'kiss', 3, 'no_orgasm_msg', 'lesbian'
+	gs 'arousal', 'kiss', -5, 'no_orgasm_msg', 'lesbian'
+	gs 'arousal', 'foreplay', -5, 'no_orgasm_msg', 'lesbian'
+	'<center><video autoplay loop src="images/shared/sex/lesbian/69_1.mp4"></video></center>'
+	'Your kisses leave Albina''s mouth and start roaming around her body. Your limbs become tangled and you somehow end up with your face between her legs and her face between yours. She dives right in, making filthy slurping sounds as she licks your pussy and sucks on your clit. As she comes up for air, you feel her breath on your pussy.'
+	'"<i>Fuck!</i>, you taste <i>so good</i>, <<$pcs_nickname>>!" she moans before diving back in.'
+	'For your part, her pussy is slippery beneath your tongue. Not just soaking wet, but smooth as silk too, without a single hair to brush against your tongue.'
+end
+
+
+!! --------------- Losing Your Virginity To Albina ----------------------------------------
+
+if $ARGS[0] = 'virgin_take1':
+	$orgasm_or = 'no'
+	*clr & cla
+	!! IMAGE HERE
+	'"Albina," you murmur.'
+	'"What is it?" she smiles up at you.'
+	act'Ask shyly':
+		cla & *nl
+		'"W-will... Will you take my virginity?" you stammer shyly.'
+		'Her eyes go wide. "What?! You-" She chokes on her words. "You want me to-? Are you... sure?"'
+		'Biting your lip, you nod once as your face flushes with heat.'
+		gs 'albina_sex_scenes', 'virgin_take2'
+	end
+
+	act 'Ask openly':
+		cla & *nl
+		'"I want you to take my virginity," you say, staring straight into her eyes.'
+		'Her eyes go wide in shock. "What?! You-" She chokes on her words. "You want me to-? Are you... sure?"'
+		'"I''m sure," you nod without hesitation. "And I want it to be you."'
+		gs 'albina_sex_scenes', 'virgin_take2'
+	end
+
+end
+
+if $ARGS[0] = 'virgin_take2':
+	'"Okay," she nods back. Her eyes seem to shimmer.'
+	'You climb off of her and she gets up from the bed, moving over to one of her dressers.'
+	'"Just lay on the bed for now," she says. "Spread your legs and touch yourself a little. Try to get wet."'
+	act 'Wait for her':
+		*clr & cla
+		!! IMAGE HERE
+		'You watch as Albina reaches into a drawer and pulls out a harness and pulls it up her legs, cinching it tight to her thighs. She then reaches back to pull out a dildo about <<dick>>cm long.'
+		gs 'albina_sex_scenes', 'virgin_take2.1'
+	end
+
+	act 'Do as she says':
+		*clr & cla
+		!! IMAGE HERE
+		gs 'arousal', 'clit_finger', 3, 'no_orgasm_msg', 'masturbation'
+		'You take her advice, closing your eyes and snaking your hand between your legs. You touch yourself, taking deep breaths as you let the anticipation build. Heat spreads through your hips and your fingers begin to feel much wetter.'
+		*nl
+		'A sound causes your eyes to open and you see Albina with a harness strapped around her legs as she pulls out a decently sized <<dick>>cm dildo.'
+		gs 'albina_sex_scenes', 'virgin_take2.1'
+	end
+end
+
+if $ARGS[0] = 'virgin_take2.1':
+	dick = 13
+	$dick_girth = 'well proportioned'
+	'"Just a little bit bigger than an average dick," she smiles softly at you. "But not too big. We don''t want to go overboard for your first time."'
+	act 'Nod':
+		*clr & cla
+		!! IMAGE HERE
+		'You nod nervously as she screws it onto a plate at the front of her harness.'
+		gs 'albina_sex_scenes', 'virgin_take3'
+	end
+	act 'Tell her you want a big one':
+		*clr & cla
+		!! IMAGE HERE
+		'"I want a bigger one," you say and her smile fades.'
+		'"No you don''t," she says sternly before her expression softens again. "Trust me..."'
+		act 'Insist':
+			dick = 18
+			$dick_girth = 'thick'
+			cla & *nl
+			'"I only get to pop my cherry once, right?" you say. "So if I''m gonna do this, I want to go big."'
+			'Albina hesitates, caught between doing what you want and her desire to protect you, but eventually relents.'
+			'"Okay," she says quietly. "If that''s what you really want..."'
+			'She reaches back into the drawer and pulls out a <i>very</i> big pitch black dildo -about a third longer in size and significantly thicker- with large veins running up and down its shaft. She screws it onto a plate at the front of her harness.'
+			gs 'albina_sex_scenes', 'virgin_take3'
+		end
+	end
+end
+
+if $ARGS[0] = 'virgin_take3':
+	ar_vag_lube = 1
+	*clr & cla
+	!! IMAGE HERE
+	'Albina rejoins you on the bed and spreads your legs. You let out a soft groan as she pushes a single finger into your virgin pussy, stealing your juices to wipe on the tip of the strapon. She then pumps several spurts of lube from a bedside bottle all over it before finally lining it up with your pussy.'
+	'"Okay, ready?" she asks and you nod. "Deep breath."'
+	act 'Put it in':
+		*clr & cla
+		!! IMAGE HERE
+		if $dick_girth = 'thick':
+			'Albina moves her hips and the thick rubber cock pushes through your folds and squeezes its head inside. You gasp as it stretches your pussy to the point of pain.'
+			'"Are you okay?" Albina asks worriedly. "Do you want to pause for a second?"'
+			act 'It hurts':
+				albinaQW['big_dildo_hurt'] = 1
+				cla & *nl
+				'"It hurts," you whimper.'
+				'"This is why I warned you against a big one for your first time," she says sadly, not attempting to gloat at all about her ignored advice. "Let''s just wait here for a minute okay?"'
+				'You nod back and Albina stays where she is, still as a statue as your pussy starts to adjust.'
+				act 'Lose your virginity':
+					minut += rand(2,4)
+					gs 'stat'
+					*clr & cla
+					!! IMAGE HERE
+					'After a few minutes, Albina speaks up.'
+					'"I''m going to move again. Here comes the hard part. This is going to hurt the most. Just tell me when you''re ready."'
+					'You nod once and brace yourself as Albina puts her hands on either side of your head and does the same. And then she thrusts.'
+					gs 'albina_sex_scenes', 'virgin_take4'
+				end
+			end
+
+			act 'It feels good':
+				albinaQW['big_dildo_enjoy'] = 1
+				cla & *nl
+				'"It... It feels... <i>So good</i>," you say in awe. It''s just the head, but you can feel your pussy stretching to accommodate. The good stretch of a sore, overworked muscle, but even better.'
+				'Albina seems even more surprised than you are. "Well, if you''re okay then... This is going to be the hard part. It''s going to hurt. Are you ready?"'
+				'You nod once and Albina puts her hands on either side of your head.'
+				*nl
+				'And then she thrusts.'
+				gs 'albina_sex_scenes', 'virgin_take4'
+			end
+		else
+			'Albina moves her hips and the thick rubber cock pushes through your folds and squeezes its head inside. You gasp as it starts to stretch your pussy.'
+			'"Pretty different from just a finger, huh?" she says with a smirk. You nod back, speechless and her expression turns more somber. "Now comes the hard part. This is going to hurt. Are you ready?"'
+			'You nod once and Albina puts her hands on either side of your head.'
+			*nl
+			'And then she thrusts.'
+			gs 'albina_sex_scenes', 'virgin_take4'
+		end
+	end
+end
+
+if $ARGS[0] = 'virgin_take4':
+	act 'Grunt':
+		*clr & cla
+		!! IMAGE HERE
+		'Albina thrusts her hips and you feel something <i>rip</i> inside you.'
+		*nl
+		if albinaQW['big_dildo_hurt'] = 1:
+			'Albina thrusts her hips and you feel something <i>rip</i> inside you. You clench your teeth, grunting as you try to hold back the pain of the big rubber cock sliding all the way to its base, filling you to the brim and sending that stretching and tearing sensation throughout your entire pussy. Something hot drips from your pussy around the dildo.'
+		elseif albinaQW['big_dildo_enjoy'] = 1:
+			'Albina thrusts her hips and you feel something <i>rip</i> inside you. You clench your teeth, grunting as the big rubber cock slides all the way to its base, filling you to the brim and sending that stretching sensation throughout your entire pussy. Something hot drips from your pussy around the dildo.'
+		else
+			'Albina thrusts her hips and you feel something <i>rip</i> inside you. You clench your teeth, grunting as the rubber cock slides all the way to its base, filling you to the brim. Your walls squeeze against it tightly, ever so slightly stretched by its girth. Something hot drips from your pussy around the dildo.'
+		end
+		*nl
+		'"That''s the whole thing," she says. "You okay?"'
+
+		act 'Nod':
+			cla & *nl
+			'"Yeah," you nod, concentrating hard just to get that one syllable out.'
+			'I''m going to start moving. Slowly."'
+			'You nod again and Albina begins to move her hips.'
+			gs 'albina_sex_scenes', 'virgin_take5'
+		end
+
+		if $dick_girth = 'thick':
+			act 'It''s big':
+				cla & *nl
+				if albinaQW['big_dildo_hurt'] = 1:
+					'"<i>Fuck</i>, that''s big!" you groan. "I can feel it in my stomach. Oh fuck, I feel like I''m gonna throw up!"'
+					'"Your pussy will adjust," Albina reassures you tenderly. "I''m going to start moving. Slowly."'
+					'You nod back, unable to say anything else and Albina begins to move her hips.'
+				elseif albinaQW['big_dildo_enjoy'] = 1:
+					'"<i>Fuck</i>, that''s big!" you pant, an involuntary smile creeping onto your face. "I feel so... <i>full</i>..."'
+					'The smile becomes a full blown grin as you look at Albina in astonishment and she smiles back.'
+					'"Yeah. Big dicks are like that. They fill you up and stretch you out. You ready for me to move?"'
+					'You nod back excitedly and Albina begins to move her hips.'
+				end
+				gs 'albina_sex_scenes', 'virgin_take5'
+			end
+		end
+	end
+
+	act 'Gasp':
+		*clr & cla
+		!! IMAGE HERE
+		'Albina thrusts her hips and you feel something <i>rip</i> inside you.'
+		*nl
+		if albinaQW['big_dildo_hurt'] = 1:
+			'Albina thrusts her hips and you feel something <i>rip</i> inside you. You gasp loudly, trying to hold back the pain of the big rubber cock sliding all the way to its base, filling you to the brim and sending that stretching and tearing sensation throughout your entire pussy. Something hot drips from your pussy around the dildo.'
+		elseif albinaQW['big_dildo_enjoy'] = 1:
+			'Albina thrusts her hips and you feel something <i>rip</i> inside you. You gasp loudly as the big rubber cock slides all the way to its base, filling you to the brim and sending that stretching sensation throughout your entire pussy. Something hot drips from your pussy around the dildo.'
+		else
+			'Albina thrusts her hips and you feel something <i>rip</i> inside you. You gasp in surprise as the rubber cock slides all the way to its base, filling you to the brim. Your walls squeeze against it tightly, ever so slightly stretched by its girth. Something hot drips from your pussy around the dildo.'
+		end
+		*nl
+		'"That''s the whole thing," she says. "You okay?"'
+
+		act 'Nod':
+			cla & *nl
+			'"Yeah," you gasp again, concentrating hard just to get that one syllable out as you pant for breath.'
+			'I''m going to start moving. Slowly."'
+			'You nod again and Albina begins to move her hips.'
+			gs 'albina_sex_scenes', 'virgin_take5'
+		end
+
+		if $dick_girth = 'thick':
+			act 'It''s big':
+				cla & *nl
+				if albinaQW['big_dildo_hurt'] = 1:
+					'"<i>Fuck</i>, that''s big!" you gasp again. "I can feel it in my stomach. Oh fuck, I feel like I''m gonna throw up."'
+					'"Your pussy will adjust," Albina reassures you tenderly. "I''m going to start moving. Slowly."'
+					'You nod back, unable to say anything else and Albina begins to move her hips.'
+				elseif albinaQW['big_dildo_enjoy'] = 1:
+					'"<i>Fuck</i>, that''s big!" you gasp again, an involuntary smile creeping onto your face. "I feel so... <i>full</i>..."'
+					'The smile becomes a full blown grin as you look at Albina in astonishment and she smiles back.'
+					'"Yeah. Big dicks are like that. They fill you up and stretch you out. You ready for me to move?"'
+					'You nod back excitedly and Albina begins to move her hips.'
+				end
+				gs 'albina_sex_scenes', 'virgin_take5'
+			end
+		end
+	end
+
+	if $dick_girth = 'thick':
+		act 'Shriek':
+			*clr & cla
+			!! IMAGE HERE
+			'Albina thrusts her hips and you feel something <i>rip</i> inside you.'
+			*nl
+			if albinaQW['big_dildo_hurt'] = 1:
+				'Albina thrusts her hips and you feel something <i>rip</i> inside you. You shriek in pain as the big rubber cock slides all the way to its base, filling you to the brim and sending that stretching and tearing sensation throughout your entire pussy. Something hot drips from your pussy around the dildo.'
+			elseif albinaQW['big_dildo_enjoy'] = 1:
+				'Albina thrusts her hips and you feel something <i>rip</i> inside you. You shriek in pain as the big rubber cock slides all the way to its base, filling you to the brim and sending that stretching sensation throughout your entire pussy. Something hot drips from your pussy around the dildo.'
+			else
+				'Albina thrusts her hips and you feel something <i>rip</i> inside you. You shriek in pain as the rubber cock slides all the way to its base, filling you to the brim. Your walls squeeze against it tightly, ever so slightly stretched by its girth. Something hot drips from your pussy around the dildo.'
+			end
+			*nl
+			'"I''m so sorry <<$pcs_nickname>>," she says morosely. "I know it hurts, just bear with it."'
+
+			act 'Nod':
+				cla & *nl
+				'You nod, unable to speak lest you scream again as your pussy adjusts to having something inside it.'
+				'I''m going to start moving. Slowly."'
+				'You nod again and Albina begins to move her hips.'
+				gs 'albina_sex_scenes', 'virgin_take5'
+			end
+
+			if $dick_girth = 'thick':
+				act 'It''s big':
+					cla & *nl
+					if albinaQW['big_dildo_hurt'] = 1:
+						'"<i>Fuck</i>, that''s big!" you whimper, eyes welling up with tears. "It feels like I''m getting torn in half!"'
+						'"Your pussy will adjust," Albina reassures you tenderly. "I''m going to start moving. Slowly."'
+						'You nod back, unable to say anything else and Albina begins to move her hips.'
+					elseif albinaQW['big_dildo_enjoy'] = 1:
+						'"<i>Fuck</i>, that''s big!" you whimper, eyes welling up with tears. "It''s different when the whole thing is inside you..."'
+						'"That was just your hymen tearing," Albina reassures you. "Your pussy will adjust soon. I''m going to start moving. Slowly."'
+						'You nod back and she begins to move her hips.'
+					end
+					gs 'albina_sex_scenes', 'virgin_take5'
+				end
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'virgin_take5':
+	act 'Let Albina fuck you':
+		*clr & cla
+		!! IMAGE HERE
+		gs 'arousal', 'vaginal_strap', 5, 'no_orgasm_msg', 'lesbian'
+		gs 'arousal', 'vaginal_strap', -5, 'no_orgasm_msg', 'lesbian'
+		'The rubber cock inside you moves. Slowly.'
+		*nl
+		if albinaQW['big_dildo_hurt'] = 1:
+			'Albina is careful to keep the pace almost torturously slow, pulling back until only the dildo''s head is still in your pussy before slowly pushing back in until her hips are flush with yours. Each thrust leaves you wincing in pain.'
+			*nl
+			'In... Out... In... Out... In... Out... I-<i>ohhhhh...</i>'
+			*nl
+			'The point at which everything changes is hard to pinpoint. It comes as a genuine shock for you when you realize pain has turned to pleasure. Warmth blossoms between your hips as Albina plunges the strapon''s length into your pussy and a moan escapes your lips.'
+			*nl
+			'"Starting to feel good, right?" Albina smiles. You nod back, starting to go lightheaded with pleasure as she begins to roll her hips during her thrusts.'
+		elseif albinaQW['big_dildo_enjoy'] = 1:
+			'The pain of losing your virginity only lasted a few moments and quickly faded. Albina keeps the pace almost tantalizingly slow, pulling back until only the dildo''s head is still in your pussy before slowly pushing back in until her hips are flush with yours.'
+			*nl
+			'Each thrust leaves you feeling stretched out in the best way and each withdrawal leaves you feeling empty. Heat is radiating through your hips and you''re on the verge of literally begging for more when your hips start unconsciously thrusting back towards Albina''s as she moves.'
+			*nl
+			'"You seem like you''re ready for more," Albina smiles. You moan loudly, unable to form a coherent response, as she begins to roll her hips during her thrusts.'
+		else
+			'Albina is careful to keep the pace almost torturously slow, pulling back until only the dildo''s head is still in your pussy before slowly pushing back in until her hips are flush with yours. Each thrust leaves you in a state of anxious anticipation.'
+			*nl
+			'In... Out... In... Out... In... Out... I-<i>ohhhhh...</i>'
+			*nl
+			'The tip of the dildo rubs against something inside you and warmth immediately blossoms between your hips. It feels so good you''re genuinely shocked as a half gasp, half moan escapes your lips.'
+			*nl
+			'"Starting to feel good, right?" Albina smiles. You nod back, starting to go lightheaded with pleasure as she begins to roll her hips during her thrusts.'
+		end
+
+		act 'Continue': gs 'albina_sex_scenes', 'virgin_take6'
+	end
+end
+
+if $ARGS[0] = 'virgin_take6':
+	gs 'arousal', 'vaginal_strap', 5, 'no_orgasm_msg', 'lesbian'
+	gs 'arousal', 'vaginal_strap', -5, 'no_orgasm_msg', 'lesbian'
+	gs 'stat'
+	*clr & cla
+	'<center><video autoplay loop src="images/shared/sex/lesbian/strapon/miss/med1.mp4"></video></center>'
+	'Albina starts to fuck you for real, putting real effort as her hips slam down between yours. It''s the perfect amount of force with absolutely no pain, but your insides are still getting pounded in all the right ways; building, <i>building</i>, <i><b>building</b></i> pressure inside you.'
+	*nl
+	'With her technique, it''s only a few minutes before-'
+	*nl
+	'"Albina!" you gasp. "I''m-! I''m gonna-!"'
+	act 'Come!':
+		$orgasm_or = 'yes'
+		gs'arousal', 'vaginal_strap', 1, 'no_orgasm_msg', 'lesbian'
+		gs 'stat'
+		*clr & cla
+		'<center><video autoplay loop src="images/shared/sex/lesbian/strapon/miss/orgasm1.mp4"></video></center>'
+		'"<i>Ahhhhhh~!</i>"'
+		*nl
+		'A wordless cry sounds from your lips as pleasure explodes from within, releasing all the pent up pressure inside you. Albina thrusts the whole strapon inside you, keeping you filled to the brim as your pussy clenches down on it and you helplessly spasm around its length.'
+		gs 'albina_sex_scenes', 'virgin_take6'
+	end
+end
+
+if $ARGS[0] = 'virgin_take_after1':
+	act 'Continue':
+		gs 'arousal', 'kiss', 1, 'no_orgasm_msg', 'lesbian'
+		gs 'stat'
+		*clr & cla
+		'<center><video autoplay loop src="images/shared/sex/lesbian/strapon/miss/kiss1.mp4"></video></center>'
+		'Just as your climax begins to wind down, Albina leans forward and presses her lips against yours. Your body reacts on its own and you kiss her back instinctively, still quivering as post-orgasm tremors quake inside you.'
+		act 'Speechless':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/strapon/miss/after1.jpg"></center>'
+			'"Albina..." you pant breathlessly. You take a ragged gulp of air, unable to say anything else.'
+			'"Was it... Was it good?" she asks, suddenly strangely shy.'
+			gs 'albina_sex_scenes', 'virgin_take_after2'
+		end
+
+		act '"That was incredible"':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/strapon/miss/after1.jpg"></center>'
+			'"That was... incredible..." you pant breathlessly. You take a ragged gulp of air, unable to say anything else.'
+			'"Was it... Was it good?" she asks, suddenly strangely shy.'
+			gs 'albina_sex_scenes', 'virgin_take_after2'
+		end
+	end
+end
+
+if $ARGS[0] = 'virgin_take_after2':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/strapon/miss/after1.jpg"></center>'
+	'"''Was it good?''" you ask, incredulous as you look into her eyes from beneath her. "You just gave me a mind-blowing orgasm. Of course it was good!"'
+	'"That''s... That''s good," she repeats, smiling back at you as tears well up in her eyes. "It was really important that I managed to make your first time good. I couldn''t live with myself if it turned out... otherwise."'
+	*nl
+	'She suddenly looks away and you get the feeling she''s hiding something.'
+	act 'Hug her':
+		gs 'arousal', 'end'
+		*clr & cla
+		!! IMAGE HERE
+		'You pull her into a hug, startling yourself as you forget it also moves the dildo inside you, but you don''t let it stop you from pulling her tight.'
+		*nl
+		'"You don''t have to tell me anything," you whisper in her ear. "But thank you. This was an amazing way to lose my virginity. I couldn''t have asked for a better first time."'
+		'When you finally release her, Albina looks like she''s about to burst into tears, but gives you a full smile.'
+		'"Good," she says, wiping her eyes. "I''m glad I was able to give you a happy memory."'
+		*nl
+		'"We should probably do something else now..." she says with surprising shyness as you smile back at her.'
+		act 'Finish': gt 'albinahome', 'bedroom'
+	end
+
+	act 'Kiss her':
+		gs 'arousal', 'kiss', 1, 'no_orgasm_msg', 'lesbian'
+		gs 'stat'
+		*clr & cla
+		'<center><video autoplay loop src="images/shared/sex/lesbian/strapon/miss/kiss1.mp4"></video></center>'
+		'You pull her back into another kiss and for a few seconds you both lose yourself in each other''s lips and bodies.'
+		*nl
+		'"It was amazing," you say when the kiss is finally broken. "I couldn''t have asked for a better first time."'
+		'Albina smiles back at you, even though it also seems like she''s about to burst into tears.'
+		'"Good," she says, wiping her eyes. "I''m glad I was able to give you a happy memory."'
+		act 'Continue': gs 'albina_sex_scenes', 'virgin_take_after3'
+	end
+end
+
+if $ARGS[0] = 'virgin_take_after3':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/strapon/miss/after1.jpg"></center>'
+	'As you both share the moment, you become aware of a sudden heat growing between you. You can see it in Albina''s eyes that she feels it too.'
+	*nl
+	'"<<$pcs_nickname>>," she says in a husky voice. "Do you think you could...?"'
+	'You nod and without another word, both of you scramble to change places. Albina tears off the strapon and lays down, furiously rubbing her clit as you hurry to buckle it on to yourself. Finally, you manage to get it secured and without any additional foreplay, fill Albina''s soaking wet pussy with a single thrust of the rubber cock, which is still slick with the juices of your first time.'
+	act 'Fuck Albina': gs 'albina_sex_scenes', 'virgin_albina_turn1'
+end
+
+if $ARGS[0] = 'virgin_albina_turn1':
+	gs 'arousal', 'vaginal_strap_give', 5, 'no_orgasm_msg', 'lesbian'
+	gs 'stat'
+	*clr & cla
+	'<center><video autoplay loop src="images/shared/sex/lesbian/strapon/miss/med1.mp4"></video></center>'
+	'"Harder!" Albina screams at the top of her lungs and you obey, slamming your hips and the strapon into her pussy all the way to the hilt. "Yes! Just like that! Fuck my dirty little hole! Pound my pussy!"'
+	*nl
+	'You fuck her with an unexpected desperation and it''s only minutes before she reaches her climax.'
+	act'Continue':
+		gs 'arousal', 'end'
+		*clr & cla
+		'<center><video autoplay loop src="images/shared/sex/lesbian/strapon/miss/orgasm1.mp4"></video></center>'
+		'"<i>Fffuuuuuuuuuckkkk~!</i> she cries as you ram the strapon into her one final time, filling her with its girth. Her voice gives out and her entire body goes taught for several seconds before falling limp.'
+		*nl
+		'"I really needed that..." she pants with ragged breaths.'
+		act 'Finish': gt 'albinahome', 'bedroom'
+	end
+end
+
+if $ARGS[0] = 'virgin_albina_pillow_talk_start':
+	*clr & cla
+	!! IMAGE HERE
+	if albinaQW['virgin_fuck_albina'] = 1:
+		'You draw your hips back, watching Albina''s pussy convulsing as the dildo slips out.'
+		'"Just throw that on the floor," she says tiredly. "I''ll clean it up later."'
+		'You nod and do as she says, haphazardly tossing the harness aside before you lay down and cuddle up with your friend.'
+	else
+		'Albina draws her hips back and you let out a small moan as you feel the strapon slip out from your pussy. She pulls the harness down her legs and haphazardly kicks it off, landing in the middle of her bedroom floor before cuddling up next to you.'
+	end
+	'Her naked skin is hot against yours and her body is soft and squishy.'
+	gs 'albina_sex_scenes', 'virgin_albina_pillow_talk_menu'
+end
+
+if $ARGS[0] = 'virgin_albina_pillow_talk_menu':
+	act 'You popped my cherry':
+		*clr & cla
+		!! IMAGE HERE
+		if albinaQW['virgin_fuck_albina'] = 1:
+			'"So you''re officially the one who popped my cherry," you murmur as you nuzzle into her neck. "When boys ask me if I''m a virgin, should I tell them you''re the one who took it?"'
+		else
+			'"So you''re officially the one who popped my cherry," you murmur as you nuzzle into her neck. Your eyes flick to the strapon that still has the blood of your virginity running down its shaft. "When boys ask me if I''m a virgin, should I tell them you''re the one who took it?"'
+		end
+	end
+
+	act 'You''re really good at fucking':
+		*clr & cla
+		!! IMAGE HERE
+		if albinaQW['virgin_fuck_albina'] = 1:
+			'"You''re really good at using that strapon," you murmur as you nuzzle into her neck. "You practice that with other girls a lot or something?"'
+		else
+			'"You''re really good at using that strapon," you murmur as you nuzzle into her neck. Your eyes flick to the rubber cock on the floor that still has the blood of your virginity running down its shaft. "You practice that with other girls a lot or something?"'
+		end
+		'"What? No!" Albina turns away, blushing fiercely. "Besides, how would you know if I''m good or not? You were a virgin up until ten minutes ago."'
+		'"You made a virgin cum," you reply. "Isn''t that supposed to be kind of hard?"'
+		if albinaQW['virgin_fuck_albina'] = 1:
+			'"You made me cum even though you''ve never fucked <i>anybody</i> before," she counters. "That sounds much more impressive."'
+		else
+			'She bites her lip and remains silent, unable to come up with a suitable counterargument.'
+		end
+	end
+
+	act 'Do real cocks feel different?':
+		*clr & cla
+		!! IMAGE HERE
+		if albinaQW['virgin_fuck_albina'] = 1:
+			'"So... Does it feel different to get fucked by a real cock?" you ask, eyeing the strapon on the floor that has both of your juices running down its shaft.'
+		else
+			'"So... Does it feel different to get fucked by a real cock?" you ask, eyeing the strapon on the floor that still has the blood of your virginity running down its shaft.'
+		end
+		'"Yeah. Big difference," she smiles back. "It''s <i>hot</i>. Like physically hot inside you."'
+		'"Really? You can feel that?"'
+		'She nods. "I would have warmed the dildo up for you, but it takes a while and water is a pretty shitty lubricant. The other thing is that it''s actually harder."'
+		'"The dildo is harder?"'
+		'"No. I mean cock," she grins. "You''d think that a rubber toy would be harder than flesh and blood, but cock is actually way more rigid. When Lazar fucks me and he changes angles, I feel his <i>whole length</i> turn, but the dildo kind of bends and curves."'
+		act 'Continue':
+			*clr & cla
+			!! IMAGE HERE
+			'Her smile suddenly falters. "I''m sorry that I took your fi-"'
+			'"Stop," you cut her off. "I''m glad you took my virginity. And now you''ll always have it."'
+			'You wink at her and she can''t help but give a shy laugh.'
+		end
+	end
+
+	act '"Why are you crying?"':
+		*clr & cla
+		!! IMAGE HERE
+		'"Albina... Why are you crying?" you ask in a whisper as a tear rolls down the side of her cheek.'
+		'"It''s nothing," she says flatly, wiping it away with the heel of her hand but you don''t let it go.'
+		'"Albina... You can tell me."'
+		'She takes a deep breath and lets it out slowly. When she finally speaks, she barely manages to get the words out in a choked voice.'
+		'"Doing this with you brings back... memories. My first time was... let''s just say it wasn''t good. I won''t say more than that, but I want you to know that it makes me really happy I could make your''s special."'
+	end
+end
+
+!! --------------- end of Virgin Event ----------------------------------------
+
+!! --------------- strapon sex events ----------------------------------------
+
+if $ARGS[0] = 'sex_event1':
+	*clr & cla
+	'<center><video autoplay loop src="images/shared/sex/lesbian/kiss2.mp4"></video></center>'
+	'You find yourself on top of Albina, your hips between her legs and your breasts smooshed against hers as her hands hungrily grope your ass and your tongues tango with one another, swapping saliva.'
+end
+
+if $ARGS[0] = 'wear_strapon':
+	*clr & cla
+	menu_off = 1
+	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/albina/sex/game/spank.mp4"></video></center>'
+	'Before you can begin, Albina smirks at you while wiggling her ass. "I need to be punished for losing first. Spank me, <<$pcs_nickname>>, and don''t stop until my pussy is wet and my ass is red and stinging!"'
+	'She pushes you down onto the bed and lays across your lap before looking up at you. "Don''t make me beg, <<$pcs_nickname>>."'
+	'You smile at her before raising your hand and giving her a firm smack on the ass. "Harder!" she blurts out, and you respond by delivering a hard smack that leaves both her ass and your hand red and stinging. "Oh FUCK, <i>yeeesss</i>! Do that again!" she moans in an almost orgasmic tone.'
+	'You continue spanking her as hard as you can until the stinging in your hand becomes too much, and you have to stop. "That was fucking amazing, <<$pcs_nickname>>! I''m so fucking wet after that!" True to her word, you can feel her juices trickling down your leg. "I need you to fuck me just as hard now. Pound me until I cum!" She climbs off of you, and you stand to adjust the harness around your hips.'
+	gs 'arousal', 'BDSM_give', 8, 'dom', 'lesbian'
+	gs 'stat'
+
+	if spellKnown['penisenvy'] = 1 and (mc_inventory['strapon'] = 1 and (strapnumber > 0 and strapnumber < 5)):
+		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/albina/sex/game/spank.mp4"></video></center>'
+		'Just as you''re about to slide the harness on, the thought of using Penis Envy occurs to you, but it would be too suspicious to use Albina''s dildo.'
+		'"Do you mind if we use my dildo instead?" you ask, and seeing the curious look in her eye, you continue. "My dildo has fake cum and I think it would be fun to use it."'
+		'"Fake cum?" she replies curiously. "Okay, that does sound fun. Just don''t cum in my pussy. I don''t like that."'
+		'You nod as you grab your own strapon out of your purse, pleased that she bought it.'
+		*nl
+		'You slide the harness on and tighten it in place, but before you can begin, Albina smirks at you while wiggling her ass. "I need to be punished for losing first. Spank me, <<$pcs_nickname>>, and don''t stop until my pussy is wet and my ass is red and stinging!"'
+		'She pushes you down onto the bed and lays across your lap before looking up at you. "Don''t make me beg, <<$pcs_nickname>>."'
+		'You smile at her before raising your hand and giving her a firm smack on the ass. "Harder!" she blurts out, and you respond by delivering a hard smack that leaves both her ass and your hand red and stinging. "Oh FUCK, <i>yeeesss</i>! Do that again!" she moans in an almost orgasmic tone.'
+		'You continue spanking her as hard as you can until the stinging in your hand becomes too much and you have to stop. She smiles up at you in satisfaction and you feel her juices trickling down your leg as she climbs off you. You stand to adjust the harness around your hips.'
+		gs 'arousal', 'BDSM_give', 8, 'dom', 'lesbian'
+		gs 'stat'
+		if penisEnvyVariable = 0:
+			act 'Cast Penis Envy':
+				*clr & cla
+				gs 'castSpell', 'penisenvy'
+				if spellSuccess > 0:
+					act 'Get your dick sucked': gt 'albina_sex_scenes', 'fuck_albina_magic'
+				else
+					'You cast the spell, but it fails to take effect.'
+					'"You okay, <<$pcs_nickname>>?" Albina asks with a curious gaze.'
+					'"Yeah, I just realized that this is the wrong dildo," you reply.'
+					'"That''s okay. I just want you to fuck me silly, with or without cum."'
+					'You nod, but can''t help but feel disappointed.'
+					act 'Just use the strapon': gt 'albina_sex_scenes', 'fuck_albina'
+				end
+			end
+		else
+			act 'Get your dick sucked': gt 'albina_sex_scenes', 'fuck_albina_magic'
+		end
+	else
+		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/albina/sex/game/spank.mp4"></video></center>'
+		'You slide the harness on and tighten it in place, but before you can begin, Albina smirks at you while wiggling her ass. "I need to be punished for losing first. Spank me, <<$pcs_nickname>>, and don''t stop until my pussy is wet and my ass is red and stinging!"'
+		'She pushes you down onto the bed and lays across your lap before looking up at you. "Don''t make me beg, <<$pcs_nickname>>."'
+		'You smile at her before raising your hand and giving her a firm smack on the ass. "Harder!" she blurts out, and you respond by delivering a hard smack that leaves both her ass and your hand red and stinging. "Oh FUCK, <i>yeeesss</i>! Do that again!" she moans in an almost orgasmic tone.'
+		'You continue spanking her as hard as you can until the stinging in your hand becomes too much and you have to stop. She smiles up at you in satisfaction and you feel her juices trickling down your leg as she climbs off you. You stand to adjust the harness around your hips.'
+		gs 'arousal', 'BDSM_give', 8, 'dom', 'lesbian'
+		gs 'stat'
+		act 'Fuck her with the strapon': gt 'albina_sex_scenes', 'fuck_albina'
+	end
+end
+
+if $ARGS[0] = 'fuck_albina':
+	*clr & cla
+	menu_off = 1
+	npc_sex['A23'] += 1
+	lesbian += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
+	'With the strapon firmly in place, you stand next to the bed and pull her head down to the dildo. "Suck my dick, loser!" you giggle.'
+	'She laughs before she takes the dildo in her mouth and starts sucking while stroking the shaft with one hand. You spend several minutes making her suck on the dildo, getting it wet with her drool.'
+	gs 'arousal', 'foreplay', 5, 'lesbian'
+	gs 'stat'
+
+	act 'Fuck her pussy':
+		*clr & cla
+		gs 'boyStat', 'D3'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
+		'You pull away until the dildo slides out of her mouth, climb onto the bed next to her and lie on your back. "Come and ride it, cowgirl!" you laugh.'
+		'She straddles you and lowers herself down until the dildo easily slides inside her wet pussy, causing her to moan in pleasure. She starts riding you slowly but gradually picks up speed, moaning louder as she does.'
+		gs 'arousal', 'vaginal_strap_give', 8, 'lesbian'
+		gs 'stat'
+
+		act 'Fuck her faster':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
+			'You slap her on the ass. "Come on, Albina! Ride it like you mean it!"'
+			'With your encouragement, she starts really riding you hard and fast, her ass slapping against your thighs as she takes the whole length inside her. She rides you for several minutes before she slides off the dildo, which glistens with her juices, and collapses on the bed next to you. She looks at you with an appreciative smile before she leans over and whispers in your ear.'
+			'"I want you to fuck my ass now..."'
+			'You grin as she giggles and gets on all fours to wiggle her bubble butt at you.'
+			gs 'arousal', 'vaginal_strap_give', 7, 'lesbian'
+			gs 'stat'
+			act 'Fuck her ass': gt 'albina_sex_scenes', 'fuck_albina_ass'
+		end
+	end
+	act 'Fuck her ass': gt 'albina_sex_scenes', 'fuck_albina_ass'
+end
+
+if $ARGS[0] = 'fuck_albina_magic':
+	*clr & cla
+	menu_off = 1
+	npc_sex['A23'] += 1
+	lesbian += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
+	'With the strapon firmly in place, you give it a few strokes and smile as you feel your hand wrapping around the dildo. You then stand next to the bed and pull Albina''s head down. "Suck my dick, loser!" you giggle.'
+	'You gasp when you feel her soft lips wrap around your dick and she starts sucking. She has some serious skill and you find yourself moaning softly, especially when she swirls her tongue around the head of your dick.'
+	gs 'arousal', 'magicd_bj', 5
+	gs 'stat'
+
+	act 'Fuck her pussy':
+		*clr & cla
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
+		'You pull away until your dick slides out of her mouth, climb onto the bed next to her and lie on your back. "Come and ride it, cowgirl!" you laugh.'
+		'She straddles you and lowers herself down until your dick slides inside her wet pussy, causing you both to moan in pleasure as you feel the head parting her lips and pushing its way inside her. She looks down at you suspiciously and you hold in another moan as you feel her pussy clenching around your shaft, so you quickly smack her on the ass. "I said ride it, cowgirl!"'
+		'She starts riding you slowly, but gradually picks up speed, moaning louder as she does. Soft moans escape your lips when the sensation overwhelms you, but Albina is too busy riding you to notice. Her pussy is <i>tight</i>, likely from all the working out she does, and fucking her is one of the best feelings you''ve ever experienced.'
+		gs 'arousal', 'magicd_vaginal', 8, 'dom'
+		gs 'stat'
+
+		act 'Fuck her faster':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
+			'You slap her on the ass. "Come on, Albina! Ride it like you mean it!"'
+			'With your encouragement, she starts really riding you hard and fast, her ass slapping against your thighs as she takes the whole length inside her. She rides you for several minutes before you feel a tingling sensation in your stomach and feel a pressure building within your dick. You''re about to cum!'
+			gs 'arousal', 'magicd_vaginal', 8, 'dom'
+			gs 'stat'
+
+			act 'Pull out':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_red1.jpg"></center>'
+				'You grab onto Albina''s hips and gradually slow her down before she stops. "Okay, that''s enough, cowgirl. I going to cum on your face now."'
+				'"But I haven''t cum yet!" she pouts as you feel her clenching around you again, pushing you further to orgasm.'
+				'"I don''t care," you reply as you push her off you, releasing your dick from the vice-like grip of her pussy. "You can cum when I''m done like a good little slut."'
+				'"I love it when you talk dirty like that, <<$pcs_nickname>>," she smiles before she kneels on the bed. "Hurry up and cum on my face then!"'
+				*nl
+				$orgasm_or = 'yes'
+				$orgasm_txt = 'You stand up over her and start jerking your dick before you feel the sudden release. You moan loudly as you shoot several loads of cum all over her face, stroking your dick as you milk every last drop out of it. You find yourself panting as the feeling of release makes for an amazing afterglow.'
+				*nl
+				'Albina smiles up at you. "I''ve never had a girl cum on me quite like that before! Speaking of which..."'
+				'She lies back on the bed before spreading her legs and rubbing her dripping wet pussy. It only takes a few seconds of her teasing her clit for her to bring herself to an explosive orgasm; she cries out as a stream of her juices squirt from her pussy and splash all over her before she grows weak and just lies on the bed panting loudly in satisfaction.'
+				'She eventually gathers enough strength to drag herself into her en-suite bathroom to clean herself up and you slide the harness off and clean the dildo before putting it away and getting dressed. Albina soon returns and dresses in fresh clothes.'
+				'That was fun," she smiles. "We should do it again sometime."'
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Finish': gt 'albinahome', 'bedroom'
+			end
+
+			act 'Cum inside her':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/after2.jpg"></center>'
+				'You grab onto Albina''s hips and start thrusting up into her. You said you wouldn''t cum inside her, but the pleasure is too inviting and you don''t want to pull out of her tight, warm pussy.'
+				'Albina realizes what you''re about to do and tries to pull herself off you, but you hold tightly onto her before you feel the sudden release.'
+				$orgasm_or = 'yes'
+				$orgasm_txt = 'You grunt loudly as you start pumping shot after shot of cum into Albina. It''s a strange, but very pleasurable experience. You don''t know how much you cum, but you eventually feel yourself squirting the last few drops into her pussy. You find yourself panting as the feeling of release makes for an amazing afterglow.'
+				*nl
+				'Albina immediately climbs off you and smacks one of your breasts, causing a small sting to pulse through your nipple.'
+				'"What the fuck, <<$pcs_nickname>>?! Were you listening when I said NOT TO CUM INSIDE ME?!" she screams as she sits back on the bed and your cum starts dribbling out of her pussy.'
+				'"Calm down, Albina! It''s just fake cum. You can''t get pregnant from it," you lie.'
+				'"Preg-?" she sputters. "That''s not the fucking point! I told you not to do it because I didn''t like it, but you went ahead and done it anyway! Just... Just get out and leave me alone!"'
+				'She curls up on the bed and you feel a tinge of guilt. "I''m sorry..." you mumble, but she doesn''t reply as you take the harness off and get dressed. She starts sobbing as you leave her room and close the door.'
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Leave': gt 'pav_residential'
+			end
+		end
+		act 'Fuck her ass': gt 'albina_sex_scenes', 'fuck_albina_ass_magic'
+	end
+end
+
+if $ARGS[0] = 'fuck_albina_ass':
+	*clr & cla
+	menu_off = 1
+	npc_sex['A23'] += 1
+	lesbian += 1
+	gs 'boyStat', 'D3'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
+	'You grab the bottle of lube and squirt some onto the dildo. You rub it up and down the shaft until it is very slick before spreading her ass cheeks and applying a generous amount onto her asshole. You grab her ass in your hand and appreciate how firm it feels in your grip.'
+	'"Like what you see?" she giggles. You kneel down behind her, line the head of the dildo up with her asshole and slowly push forward. There is little resistance, and the large dildo slides into her ass easily, causing her to moan as you go deeper and faster. You look down and admit that her ass is fantastic, the dildo enveloping her huge, firm cheeks as you thrust in and out of her back door.'
+	'You wonder what the guys in your class would do to be in your position as you continue fucking her ass. Finally, after a few minutes, you pull out of her, and she looks back over her shoulder at you.'
+	gs 'arousal', 'anal_strap_give', 5, 'lesbian'
+	gs 'stat'
+
+	act 'Keep fucking her ass':
+		*clr & cla
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
+		'"Come on, <<$pcs_nickname>>. Put it back in and fuck me... hard," she says while wiggling her hips. You smile at her and slide the dildo back into her hole with ease, making her moan in pleasure. Next, you grab onto her hips and start fucking her balls deep, filling her ass with the dildo as she reaches back and starts rubbing her clit. After several minutes, you feel her ass tighten around your fake cock. Finally, she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy, soaking the sheets beneath her. You keep fucking her throughout her orgasm, only pulling out once her shudders have passed.'
+		'After you''ve pulled out, she thrusts her fingers into her gaping hole as juices leak from her pussy. "That was fucking amazing!" she says as she pulls her fingers out of her ass and sucks on them.'
+		'"Fucking such a nice-looking ass was amazing!" you reply, and you both laugh.'
+		gs 'arousal', 'anal_strap_give', 5, 'lesbian'
+		gs 'stat'
+		act 'Finish': gt 'albina_sex_scenes', 'strapon_finish'
+	end
+end
+
+if $ARGS[0] = 'fuck_albina_ass_magic':
+	*clr & cla
+	menu_off = 1
+	lesbian += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
+	'You grab the bottle of lube and can feel the cold liquid squirting onto your dick before you rub it in, making it very slick. You then spread Albina''s ass cheeks and apply a generous amount to her asshole. You grab her ass in your hand appreciate how firm it feels in your grip.'
+	'"Like what you see?" she giggles as you line the tip of your dick up with her asshole and slowly push forward. There''s little resistance and you feel your dick easily slide up her ass, causing you both to moan softly as you feel her clenching tightly around the shaft.'
+	'You wonder what the guys in your class would do to be in your position as you start fucking her ass, feeling her asshole gradually loosening up as you fuck her faster and deeper. The sensation is extremely pleasurable and you force yourself to pull out of her before you blow your load.'
+	gs 'arousal', 'magicd_anal', 8
+	gs 'stat'
+
+	act 'Keep fucking her ass':
+		*clr & cla
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
+		'"Come on, <<$pcs_nickname>>. Put it back in and fuck me," she says while wiggling her hips.'
+		'You smile at her and slide your dick back into her asshole, making her moan in pleasure as the sensation of penetrating her tight ass once again washes over you. You then grab onto her hips and start fucking her balls deep, filling her ass with your dick as she reaches back and starts rubbing her clit.'
+		'After several minutes, you feel her ass tighten around your dick and she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy, soaking the sheets beneath her. You keep fucking her throughout her orgasm, the added tightness of her asshole pushing you to your own orgasm.'
+		'"Fuck, I''m gonna cum!" you cry out as you feel the need to release building within you.'
+		'"Do it!" she cries out. "Cum in my tight little ass!"'
+		gs 'arousal', 'magicd_anal', 8, 'dom'
+		gs 'stat'
+
+		act 'Cum in her ass':
+			*clr & cla
+			'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/doggy_drip1.mp4"></video></center>'
+			'You pick up the pace as you continue fucking Albina, pounding her ass as she rides out her orgasm beneath you.'
+			$orgasm_or = 'yes'
+			$orgasm_txt = 'You soon reach climax and thrust yourself as deep as you can before you blow your load. You moan softly as you feel yourself pumping shot after shot of cum into Albina''s ass. It''s a strange, but very pleasurable experience. You don''t know how much you cum, but you eventually feel yourself squirting the last few drops into her ass. You find yourself panting as the feeling of release makes for an amazing afterglow.'
+			*nl
+			'Once you''re done, you pull out of her and watch as your cum starts leaking out of her asshole and dribbling down her pussy.'
+			'"How much cum did you dump inside me? I don''t think I''ve ever had so much inside me!" she asks in bewilderment as she sticks some of her fingers inside her gaping asshole. She pulls them out and you see your cum sticking to them. "I need to clean up. Back soon!"'
+			'She rolls off the bed and disappears into her en-suite bathroom as you slide the harness off and clean the dildo before putting it away and getting dressed. Albina soon returns and dresses in fresh clothes.'
+			'That was fun," she smiles. "We should do it again sometime."'
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Finish': gt 'albinahome', 'bedroom'
+		end
+	end
+end
+
+if $ARGS[0] = 'receive_strapon':
+	*clr & cla
+	menu_off = 1
+	lesbian += 1
+	gs 'stat'
+	if stat['bj'] = 0:
+		stat['bj'] += 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
+		'Albina notices you staring at the dildo as she tightens the straps firmly around her hips. "You okay, <<$pcs_nickname>>?"'
+		'"Yeah, it''s just..." you start to answer.'
+		'"You''ve never sucked dick before, have you?" she interrupts with a smile. "It''s okay. I can show you what to do so you''re ready for the real thing." She sits back on the bed and spreads her legs, motioning for you to crawl between them.'
+		'"Okay, first thing''s first. You''ll want to start off with a handjob. It gets them in the mood and wanting more," she explains as she takes your hand and places it on the dildo. "Take a firm grip of the shaft, but not too tight, and start moving your hand up and down."'
+		*nl
+		'You follow her instructions and slowly run your hand up and down the dildo. "That''s it, <<$pcs_nickname>>. Just keep doing that. If you feel like it, you can also lick the shaft or suck on their balls while jerking them off. They like it when you tease them like that."'
+		'After a few minutes, Albina moves on with her lesson. "Okay <<$pcs_nickname>>, you ready?" she asks and you nod your head. "Okay. Start off with a little teasing. Run your tongue around the tip while jerking them off."'
+		'You do as she says and she makes you look up at her. "Eye contact, <<$pcs_nickname>>. They like that." You nod at her and look her in the eye as you continue jerking off her fake cock. "Good. Now some guys like taking control, but only let them do that if it''s what you want. That''s enough teasing anyway. Now I want you take as much of the shaft into your mouth as you can."'
+		*nl
+		'You obdiently take as much of the dildo into your mouth as you can without choking. "Good," Albina says. "Now start bobbing your head up and down; imagine that you''re sucking on a popsicle while swirling your tongue around the head. And keep using your hand."'
+		'You spend the next few minutes practicing on the dildo until your arm and jaw start to ache and you stop. You pop the dildo out of your mouth and look up at Albina, who smiles. "You''re a natural, <<$pcs_nickname>>! If I had a dick, then my cum would be all over your face by now."'
+		'You smile at the compliment. "Time for me to fuck you now," Albina says with a grin.'
+		gs 'arousal', 'foreplay', 5, 'lesbian'
+		gs 'stat'
+		act 'Continue': gt 'albina_sex_scenes', 'albina_fucks_you'
+	else
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
+		'You slide your panties off as she tightens the strapon firmly while standing next to the bed. You lie next to her, and she pulls your head down to the dildo. "Suck my dick, loser!" she says with a giggle.'
+		'You take the dildo into your mouth and start sucking on it while stroking the shaft with one hand. "Yeah, just like that, <<$pcs_nickname>>..." she moans as she reaches between the straps and gently rubs her pussy. You spend several minutes sucking on the dildo, getting it wet with your drool before she pulls it out of your mouth. "I''m so going to enjoy fucking you!"'
+		gs 'arousal', 'foreplay', 5, 'lesbian'
+		gs 'stat'
+		act 'Continue': gt 'albina_sex_scenes', 'albina_fucks_you'
+	end
+end
+
+if $ARGS[0] = 'albina_fucks_you':
+	*clr & cla
+	menu_off = 1
+	gs 'stat'
+	if stat['think_virgin'] = 1:
+		act 'You''re a virgin':
+			*clr & cla
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
+			'You blush deeply, and she looks at you. "Oh, right. You haven''t done this before," she says, remembering that you''re still pure.'
+			'You blush even more. "Yes, I''m... still a virgin..." you reply.'
+			'"Well, I can just fuck your ass if you want?" She then gives you a small smile. "Unless you want me to pop your cherry?"'
+			act 'Just fuck my ass': gt 'albina_sex_scenes', 'albina_ass_fucks_you'
+			act 'Get your cherry popped':
+				*clr & cla
+				npc_sex['A23'] += 1
+				lesbian += 1
+				gs 'boyStat', 'D3'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
+				'You give her an awkward smile in return. "I... I want you to... take me. My... virginity that is..." you tell her as your cheeks burn bright red.'
+				'She smiles back. "Okay, don''t worry. I''ll be gentle since it''s your first time. Just lie on your back and spread your legs." You do as she commands, and she climbs onto the bed and scoots between your legs. She rubs your pussy with her fingers to make sure it''s wet enough but adds some lube to the dildo anyway. You feel it rubbing against your slit before she slowly slides it into your virgin pussy.'
+				'It''s both painful and pleasurable, and you moan softly as she starts to fuck you. After a few minutes, it starts to hurt less, and you find yourself moaning louder.'
+				*nl
+				'After a few more minutes, Albina starts growing tired and pulls out, leaving you empty. "So how was that for your first time?" she asks with a smile.'
+				'"It was amazing! I''m glad it was you I shared it with. You were so gentle and considerate," you reply, and Albina smiles even wider.'
+				'"I couldn''t have your first time being a shitty experience like mine...." she replies, but gasps and looks away when she realises what she said.'
+				*nl
+				'You quickly sit up next to her and give her a hug. "Hey, it''s okay. This was the best thing I could hope for when losing my virginity."'
+				'She looks at you as tears well up in her eyes, the memories of a traumatic event flooding her. "Really? I wanted it to be good for you because-"'
+				'You can see this is a painful memory for her, and pull her into another hug. "I know..." you gently reassure her, and you both sit silently for a few minutes. Finally, she gets up, takes the harness off, cleans the dildo and tosses it back in the drawer.'
+				'"This is supposed to be your happy memory, and I don''t want to ruin it for you. So let''s do something fun!" She clearly needs a distraction, so you nod in agreement.'
+				gs 'arousal', 'vaginal_strap', 5, 'lesbian'
+				gs 'stat'
+				act 'Continue': gt 'albinahome', 'bedroom'
+			end
+		end
+	else
+		act 'Get your pussy fucked':
+			*clr & cla
+			npc_sex['A23'] += 1
+			lesbian += 1
+			gs 'boyStat', 'D3'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
+			'"Lie on your back and spread your legs." You do as she commands, and she climbs onto the bed and scoots between your legs. She rubs the head of the dildo against your pussy before she pushes it inside you. You moan as she slowly starts fucking your pussy, going a little faster the louder you moan.'
+			gs 'arousal', 'vaginal_strap', 8, 'lesbian'
+			gs 'stat'
+			act 'Keep getting your pussy fucked':
+				*clr & cla
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag2.jpg"></center>'
+				'She proceeds to fuck you hard, but not too hard, settling into a near-perfect thrusting rhythm that you enjoy, feeling yourself slowly getting wetter. She seems to enjoy it as much as you, moaning softly as she fucks you. Finally, she leans in and kisses you before suddenly stopping and pulling out. "Okay, that''s enough, but I''m not finished with you just yet. Roll over so I can fuck that tight little ass of yours."'
+				gs 'arousal', 'vaginal_strap', 7, 'lesbian'
+				gs 'stat'
+				act 'Take it up the ass': gt 'albina_sex_scenes', 'albina_ass_fucks_you'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'albina_ass_fucks_you':
+	if stat['anal'] = 0 and stat['anal_strap'] = 0:
+		if stat['anal_dildo'] = 0 and stat['anal_fist'] = 0 and stat['self_fisting_anal'] = 0:
+			!!The player character has never had anything larger than a finger in her ass
+			act 'Anal virgin':
+				*clr & cla
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
+				'Thoughts race through your head as you look at the massive dildo, and Albina notices your hesitation.'
+				'"<<$pcs_nickname>>, have you ever been fucked in the ass before?"'
+				'You shake your head as you feel your cheeks burning bright red. "Uhh... No, I haven''t..."'
+				'She places a hand on your shoulder. "Hey, it''s nothing to be embarrassed about. Plenty of girls don''t do anal."'
+				'You stare at the dildo again before Albina snaps your attention back to her. "<<$pcs_nickname>>, be honest with me. Do you want me to fuck your ass? I''ll be as gentle as you want."'
+				act 'Yes': gt 'albina_sex_scenes', 'first_anal'
+				act 'No': gt 'albina_sex_scenes', 'anal_refuse'
+			end
+		end
+		if stat['anal_fist'] = 1 or stat['self_fisting_anal'] = 1:
+			!!The player character has had a fist (her own or another persons) in her ass
+			act 'Only a fist':
+				*clr & cla
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
+				'Thoughts race through your head as you look at the huge dildo, and Albina notices your hesitation.'
+				'"<<$pcs_nickname>>, have you ever been fucked in the ass before?"'
+				'You feel your cheeks burning bright red. "Well, I''ve managed to take a fist..."'
+				*nl
+				'Albina looks at you in what you can only describe as awe. "God damn, <<$pcs_nickname>>, even I''ve never taken a fist up my ass, and I''m the queen of butt stuff!"'
+				'"Is it weird to do that?" you ask with concern.'
+				'"No, not at all! I''ve always wanted to try it myself. Maybe I will now that I need to up my game."'
+				'She looks you over with lustful desire before continuing. "Practicing with a dildo makes your first butt fuck easier, but a whole fucking hand?! A cock or dildo would be a breeze for you!"'
+				'She then places a hand on your shoulder. "<<$pcs_nickname>>, be honest with me. Do you want me to fuck your ass? I''ll be as gentle as you want."'
+				act 'Yes': gt 'albina_sex_scenes', 'first_anal1'
+				act 'No': gt 'albina_sex_scenes', 'anal_refuse'
+			end
+		end
+		if stat['anal_dildo'] = 1:
+			!!The player character has used a dildo on her ass
+			act 'Only a dildo':
+				*clr & cla
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
+				'Thoughts race through your head as you look at the massive dildo, and Albina notices your hesitation.'
+				'"<<$pcs_nickname>>, have you ever been fucked in the ass before?"'
+				'You feel your cheeks burning bright red. "Well, I''ve used a dildo..."'
+				*nl
+				'"Oh, a buttslut in training!" she teases. "No, it''s good that you''re experimenting back there. It''ll make your first proper butt fuck easier if you''ve had some experience shoving something up there first."'
+				'She then places a hand on your shoulder. "<<$pcs_nickname>>, be honest with me. Do you want me to try the real thing? I''ll be as gentle as you want."'
+				act 'Yes': gt 'albina_sex_scenes', 'first_anal1'
+				act 'No': gt 'albina_sex_scenes', 'anal_refuse'
+			end
+		end
+	else
+		act 'Get your ass fucked':
+			*clr & cla
+			menu_off = 1
+			npc_sex['A23'] += 1
+			lesbian += 1
+			gs 'boyStat', 'D3'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
+			'As you get on all fours, you glance back and see her applying lube to the dildo. She squirts some on the dildo and strokes the shaft with it before she massages a generous amount into your asshole with her fingers. You and the dildo now lubed up, she moves behind you, and you feel the dildo pressing against your asshole, the pressure building until the tip pops into your ass, causing you to groan slightly in pain. Next, she slowly slips the dildo up your ass, steadily working it deeper.'
+			gs 'arousal', 'anal_strap', 5, 'lesbian'
+			gs 'stat'
+
+			act 'Get your ass hammered':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
+				'Once you''re comfortable with her in your ass, she stands up over you. "Get ready because now I''m really going to fuck your ass!" she laughs before slamming the dildo in and out of your ass, causing you to grip the sheets tightly. Despite this, she isn''t too rough, and you start enjoying the pleasurable sensation. Albina seemingly grows more aroused the more she fucks you.'
+				'Just as it''s starting to hurt, she lets out a loud, pleasured scream as you feel her juices spraying across your legs. You then feel the dildo slide out of you and turn to see Albina sprawled out on the bed in orgasmic bliss, her juices slowly trickling out of her soaking wet pussy as a huge wet patch soaks into the sheets. "You were such a good little buttslut, <<$pcs_nickname>>..." she says softly.'
+				'After riding through her orgasm, she pulls the harness off and tosses it aside.'
+				gs 'arousal', 'anal_strap', 10, 'lesbian'
+				gs 'stat'
+				act 'Finish': gt 'albina_sex_scenes', 'strapon_finish'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'first_anal':
+	*clr & cla
+	menu_off = 1
+	npc_sex['A23'] += 1
+	lesbian += 1
+	gs 'boyStat', 'D3'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
+	'"Y-yes, I would. Just promise you''ll be gentle," you reply, and Albina smiles.'
+	'"I will. Get on all fours and bring your ass up as high as possible."'
+	'As you get on all fours, you glance back and see her squirting lube onto her fingers. You shiver when you feel the cold liquid being applied to your asshole. Albina starts massaging it before you feel her slowly pushing a finger inside you. You moan softly at the sensation as you feel her finger curling up inside you.'
+	'After spending a few minutes fingering you, she pulls her finger out. "Okay, that should be enough. Are you sure you want to do this, <<$pcs_nickname>>? Just because I''m a buttslut doesn''t mean you have to be one too."'
+	'You stare at the dildo hanging between her legs but steel yourself and nod. "Yes, I want to do this. Just go slow, please?"'
+	gs 'arousal', 'anal_finger', 5, 'lesbian'
+	gs 'stat'
+
+	act 'Get your ass fucked':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
+		'Your heart races as you feel Albina moving in behind you. You instinctively tense up when you feel the head of the dildo pressing against your asshole. "Okay, <<$pcs_nickname>>, this is going to feel strange and definitely hurt a little, but you''re going to have to try and relax as best as you can for me," Albina tells you. You grip the sheets tightly as you do what she says.'
+		'You feel her start slowly pushing, and the pressure builds until the tip of the dildo suddenly pops into your ass, causing you to groan and grit your teeth while gripping the sheets even tighter. It''s a painful sensation, and you instinctively feel the urge to free yourself. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks as you feel a stinging pain shooting through you.'
+		'Remembering what she said, you fight the urge to pull away and try to relax. "No, I just need a second," you reply as you look back at her, and she nods.'
+		*nl
+		'After taking a few seconds to adjust to the sensation, you nod at Albina, who squirts more lube onto the slick dildo before placing her hands on your hips. "Okay, just keep your ass relaxed and tell me if it gets too painful. I don''t want you hurting yourself trying to impress me. Got it?"'
+		'You nod and prepare yourself as you feel Albina slowly push the dildo deeper into your ass. You feel stretched out as she reaches a depth she feels you''ll be comfortable with and starts gently thrusting.'
+		'Despite the shallow depth and Albina being gentle, the pain becomes too much after a few minutes, and you ask her to pull out. You sit on your knees and clutch your ass cheeks in your hands as pain pulses through your stretched asshole.'
+		'"You lasted longer than I thought you would. Not bad for your first go, <<$pcs_nickname>>," Albina says as she hands you some wipes to clean yourself up. "Next time you lose, maybe we can go deeper and... harder," she adds with a teasing grin as she cleans the dildo and puts it away.'
+		*nl
+		'As the stinging pain continues to pulse through your ass, you slowly get dressed. Albina watches with an amused grin. "Don''t worry. It gets less painful the more you do it."'
+		'"You would know," you reply with a smirk, and she laughs.'
+		gs 'arousal', 'anal_strap', 10, 'lesbian'
+		gs 'arousal', 'end'
+		gs 'stat'
+		act 'Do something else': gt 'albinahome', 'bedroom'
+	end
+end
+
+if $ARGS[0] = 'first_anal1':
+	*clr & cla
+	menu_off = 1
+	npc_sex['A23'] += 1
+	lesbian += 1
+	gs 'boyStat', 'D3'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
+	'"Yes, I would," you reply, and Albina smiles.'
+	'"Okay, get on all fours and bring your ass up as high as possible."'
+	'As you get on all fours, you glance back and see her squirting lube onto her fingers. You shiver when you feel the cold liquid being applied to your asshole. Albina starts massaging it before you feel her slowly pushing a finger inside you. You moan softly at the sensation as you feel her finger curling up inside you.'
+	'After spending a few minutes fingering you, she pulls her finger out. "Okay, that should be enough. Are you sure you want to do this, <<$pcs_nickname>>? Just because I''m a buttslut doesn''t mean you have to be one too."'
+	'You stare at the dildo hanging between her legs but steel yourself and nod. "Yes, I want to do this."'
+	gs 'arousal', 'anal_finger', 5, 'lesbian'
+	gs 'stat'
+
+	act 'Get your ass fucked':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
+		'Your heart is racing even though you know what to expect. Albina presses the tip of the dildo against your asshole, and you feel the familiar sensation of the pressure building as she pushes forward until the dildo suddenly pops into your ass, causing you to groan. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks.'
+		*nl
+		'After a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the slick dildo before placing her hands on your hips. "Okay, just tell me if it gets too painful for you."'
+		'You nod and prepare yourself as you feel Albina slowly push the dildo deeper into your ass and start thrusting.'
+		'Having had your ass penetrated before, Albina goes faster and deeper than you think she usually would have. However, the sensation of being buttfucked is still new to you, and you soon ask her to stop when it becomes too much.'
+		*nl
+		'"Not bad for your first go, <<$pcs_nickname>>. I bet the prior ''practice'' helped," Albina says as she hands you some wipes to clean yourself up. "Next time you lose, maybe we can go deeper and... harder," she adds with a teasing grin as she cleans the dildo and puts it away.'
+		'You slowly get dressed as Albina watches with an amused grin. "It feels great, doesn''t it? It gets better the more you do it."'
+		'"You would know," you reply with a smirk and she laughs.'
+		gs 'arousal', 'anal_strap', 10, 'lesbian'
+		gs 'arousal', 'end'
+		gs 'stat'
+		act 'Do something else': gt 'albinahome', 'bedroom'
+	end
+end
+
+if $ARGS[0] = 'anal_refuse':
+	*clr & cla
+	menu_off = 1
+	gs 'arousal', 'end'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
+	'You shake your head. "No, I don''t think I''m ready for that yet."'
+	'Albina smiles. "That''s okay, but if you want to do it with me or want some advice, then just ask. It''s best to get help from someone with... experience on the matter," she says with a grin.'
+	'You grin back. "I''ll be sure to ask the master buttslut for any of her wisdom."'
+	'She punches you in the arm. "Damn right you will."'
+	act 'Do something else': gt 'albinahome', 'bedroom'
+end
+
+if $ARGS[0] = 'strapon_finish':
+	*clr & cla
+	menu_off = 1
+	npc_sex['A23'] += 1
+	lesbian += 1
+	gs 'stat'
+	if rand(0,3) = 0:
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
+		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she gives you a sly smile and moves into position to start scissoring you. Before she can, her phone buzzes, and she looks at it before frowning in disappointment. "Sorry, but I need to go, <<$pcs_nickname>>. I''ll see you later?"'
+		'You nod in understanding. "Sure, not a problem. I had fun."'
+		'You finally kiss each other before you both quickly get dressed. She wipes the dildo clean and shoves it back in the drawer before ushering you out of her room. She walks with you into town before leaving you to attend to her business.'
+		gs 'arousal', 'foreplay', 5, 'lesbian'
+		gs 'arousal', 'end'
+		gs 'stat'
+		act 'Finish': gt 'pav_residential'
+	else
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
+		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she collapses next to you, and you both just lie naked on her bed in silence. She eventually gets up and cleans the dildo before shoving it back in the drawer and getting dressed.'
+		'You get dressed, and when you finish, she smiles at you. "Okay, what do you want to do now?" she asks.'
+		gs 'arousal', 'foreplay', 5, 'lesbian'
+		gs 'arousal', 'end'
+		gs 'stat'
+		act 'Finish': gt 'albinahome', 'bedroom'
+	end
+end
+
+if $ARGS[0] = 'Use butt plug':
+    '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/buttplug.jpg"></center>'
+	'You dig out the butt plug in her nightstand and hold it up. "I want to use this bad boy..." you say with a smile and she gives you an intrigued, almost aroused look. "And how do you plan on doing that?" she replies.'
+	minut +=6
+	gs 'stat'
+
+	act 'I''ll use it on you':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/buttplug1.jpg"></center>'
+		'"I''ll use it on you. Get that tight ass over here and bend over!" you demand. She giggles and does as you say, wiggling her ass at you. You grab the bottle of lube from her nightstand and squirt some onto her asshole, working it around until it is nice and lubed up, then squirt some onto the butt plug and coat it nicely until it is nice and slick. You kneel next to her and spread her ass. "That''s right I''m going to shove this thing right up your ass and work it until you''re nice and loose like the butt slut you are!" you tell her and she bites her lip.'
+		gs 'arousal', 'foreplay', 3, 'lesbian'
+		gs 'stat'
+
+		act 'Stick the butt plug inside':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/buttplug2.jpg"></center>'
+			'There''s a little resistance as you push the butt plug against her asshole. The tip goes in easily enough, but as you push it in deeper and the plug widens out, it starts taking a bit more force. At it''s widest point, she relaxes her ass and the plug suddenly and loudly pops firmly into her hole, causing her to moan a little in pleasure. With the plug firmly in her ass, you start spanking her cheeks hard, causing her to moan loudly and wiggle her ass at you.'
+			gs 'arousal', 'anal_dildo_give', 3, 'lesbian', 'dom'
+			gs 'stat'
+
+			act 'Fuck her ass with the plug':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/buttplug3.jpg"></center>'
+				'Her cheeks now red from your thorough spanking, you grab hold of the plug and start pulling on it. You pull it until it''s widest point is stretching her and then let go, watching it disappear back up her asshole. Each time you do it, she moans a little louder and it gets easier to pull it out as her asshole loosens up. She moans loudly in pleasure as you pull the plug out past the widest point, leaving only the tip inside before you shove it all the way back in. You keep repeating this, fucking her ass with the butt plug until she finally cries out in orgasm and her whole body shakes. Once it passes, you pull the plug completely out of her with a loud pop, her asshole gaping widely.'
+				gs 'arousal', 'foreplay', 3, 'lesbian'
+				gs 'stat'
+
+				act 'Finish':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
+					'"That was fun. I enjoyed that and I know you did too," you tell her teasingly and she laughs.'
+					'"Yeah, I did. I <i>really</i> enjoyed that."'
+					'She cleans the butt plug before placing it back in her nightstand along with the lube. She then uses some wipes to clean her ass.'
+					gs 'arousal', 'foreplay', 2, 'lesbian'
+					minut += 8
+					gs 'arousal', 'end'
+					gs 'stat'
+
+					act 'Get dressed': gt 'albinahome', 'bedroom'
+				end
+			end
+		end
+	end
+
+	act 'Use it on me':
+		*clr & cla
+		menu_off = 1
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/buttplug1.jpg"></center>'
+		'"I want you to use it on me..." you say with a smile and she giggles before crawling over to you. "Turn around and bend over. I want to see that tight little asshole of yours." she replies as she grabs the bottle of lube from her nightstand. You do as you''re told and gasp as she starts rubbing a plentiful amount of lube onto your asshole, working it around until you''re nice and lubed up. She then squirts some onto the butt plug and coats it nicely until it is nice and slick. She kneels next to you and spreads your ass.'
+		'"That''s right I''m going to shove this thing right up your ass and work it until you''re nice and loose like the butt slut you are!" You can''t help but bite your lip.'
+
+		act 'Take it inside you':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/buttplug2.jpg"></center>'
+			'There''s a little resistance as she pushes the butt plug against your asshole. The tip goes in easily enough, but as she tries pushing it deeper and the plug widens out, it starts taking a bit more force. At it''s widest point, you relax your ass and the plug suddenly and loudly pops firmly into your hole, causing you to gasp and moan a little in pleasure. With the plug firmly in your ass, she starts spanking your cheeks hard.'
+			gs 'arousal', 'anal_dildo', 3, 'lesbian', 'sub'
+			gs 'stat'
+
+			act 'Get fucked':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/buttplug3.jpg"></center>'
+				'Your cheeks stinging from her thorough spanking, she grabs hold of the plug and starts pulling on it. She pulls it until it''s widest point is stretching your hole and then lets go, making you gasp and moan as it disappears back inside your asshole. Each time she does it, you moan a little louder and it gets easier to pull it out as your asshole loosens up. You moan loudly in pleasure as she pulls the plug out past the widest point, leaving only the tip inside you before shoving it all the way back in. She keeps repeating this, fucking your ass with the butt plug until you finally cry out in orgasm and your whole body shakes. Once it passes, she pulls the plug completely out of you with a loud pop and you feel your asshole gaping widely.'
+				gs 'arousal', 'foreplay', 3, 'lesbian'
+				gs 'stat'
+
+				act 'Finish':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
+                    '"That was fun. I enjoyed that and I know you did." she tells you teasingly and you laugh.'
+					'"Yeah, I did." you reply before she cleans the butt plug and places it back in her nightstand along with the lube. She then offers you some wipes for you to clean your ass.'
+					gs 'arousal', 'foreplay', 2, 'lesbian'
+					minut += 8
+					gs 'arousal', 'end'
+					gs 'stat'
+
+					act 'Get dressed': gt 'albinahome', 'bedroom'
+				end
+			end
+		end
+	end
+end
+
+!! --------------- end strapon sex events ----------------------------------------
+
+!! --------------- Other Sveta-Albina sex events ----------------------------------------
+
+if $ARGS[0] = 'albina_shower':
+	CLOSE ALL & PLAY 'sound/dush.mp3',30
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/4.jpg"></center>'
+	'You smile and nod before stripping down and following her into the bathroom. She turns the water in the shower on and drags you inside. The warm water splashing down on you feels magical as Albina smiles at you.'
+	'I need a <i>good</i>, <i>hard</i> clean. Maybe you could help me?" she says seductively with a wink. You grin and turn her around before giving her ass a good smack, the wet sound echoing off the walls of the shower as she giggles.'
+	'You then grab one of the many bottles she has sitting in the shower and squeeze the contents into your hand before you reach round and start lathering up her breasts, giving them a soft squeeze and lightly pinching her nipples as you grind against her, your own breasts rubbing against her back.'
+	'A soft moan escapes her lips and your hands then run down her back to her ass.'
+	gs 'arousal', 'foreplay_give', 3, 'lesbian'
+	gs 'stat'
+
+	act 'Continue':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/5.jpg"></center>'
+		'You squeeze more of the scented gel into your hands and start ''cleaning'' her ass, rubbing, squeezing and smacking her cheeks as you kiss her neck. She reaches back and starts passionately kissing you as you continue.'
+		gs 'arousal', 'foreplay_give', 3, 'lesbian'
+		gs 'stat'
+
+		act 'Finish':
+			CLOSE ALL
+			gs'arousal','end'
+			gs 'stat'
+			gt 'albinahome', 'bedroom'
+		end
+
+		act 'Continue':
+			*clr & cla
+			'<center><video autoplay loop src="images/shared/sex/lesbian/shower_kiss1.mp4"></video></center>'
+			'Your hand finds its way between her legs but before you can go any further, she suddenly turns and pushes you up against the shower wall before moving in and locking lips with you. You passionately make out under the steamy water, fondling each other''s wet bodies for a few seconds before she breaks the kiss and moves away from you.'
+			'"I need a release <<$pcs_nickname>>. Maybe you can help me with that?"'
+			gs 'arousal', 'kiss', 3, 'lesbian'
+			gs 'stat'
+
+			act 'Finger her pussy':
+				*clr & cla
+				'<center><video autoplay loop src="images/shared/sex/lesbian/shower_finger1.mp4"></video></center>'
+				'You smile and move your hand back down between her legs. Being rather flexible, Albina lifts her leg straight up and places her foot against the shower wall, giving you better access to her pussy, which is dripping wet in anticipation. You slide two fingers inside her and start finger fucking her pussy as your thumb massages her clit. She moans loudly in pleasure as she leans against you to steady herself.'
+				'A few minutes of this is enough to bring her to the edge and she starts moaning even louder. "Don''t you dare stop <<$pcs_nickname>>, I''m about to cum!" You finger her even faster and she lets out a pleasured shriek as her pussy starts squirting her juices over your arm. She steadies herself against you as she rides through the pleasure of her orgasm. You pull your fingers out of her and shove them in her mouth. She sucks on them before smiling at you.'
+				'"Ohhh <<$pcs_nickname>>, that... That was amazing! Just let me finish up in here and I''ll be out."'
+				'You nod and step out of the shower, grabbing one of the nearby towels and wrapping yourself in it before walking back into her bedroom.'
+				*nl
+				'As you dry off, you hear the water turn off and a naked Albina casually strolls into the room.'
+				'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"'
+				gs 'arousal', 'vaginal_finger_give', 5, 'lesbian'
+				gs 'stat'
+
+				act 'Eat her ass':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/6.jpg"></center>'
+					'You firmly squeeze her ass in your hand before pushing her down onto all fours. She looks back and gives you a knowing smile as you kneel down next to her and spread her ass. She moans and giggles as you start rimming her asshole before grabbing you by the hair and holding you tightly against her, forcing your face between her ass cheeks as you continue pleasuring her backdoor. She soon relaxes enough for you to start pushing the tip of your tongue against her hole and it eventually penetrates. You start tongue fucking her ass in addition to rimming it, all to Albina''s immense pleasure.'
+					'She reaches back and starts fondling her clit, her grip on your hair tightening as she approaches orgasm. Hearing her moans getting louder and her breathing more ragged, you start going even faster, pushing your tongue as deep as you can into her ass before Albina suddenly lets out a pleasured shriek as her pussy starts squirting juices. She lets go of your hair and you continue eating her ass as she rides through her orgasm.'
+					'Once she recovers, she pulls herself up and the two of you sit in the shower making out for a few minutes before Albina breaks the kiss and smiles at you. "Ohhh <<$pcs_nickname>>, that... That was amazing! Just let me finish up in here and I''ll be out."'
+					'You nod and step out of the shower, grabbing one of the nearby towels and wrapping yourself in it before walking back into her bedroom.'
+					*nl
+					'As you dry off, you hear the water turn off and a naked Albina casually strolls into the room.'
+					'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"'
+					gs 'arousal', 'rimming_give', 5, 'lesbian'
+					gs 'stat'
+
+					act 'Get your ass eaten':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/7.jpg"></center>'
+						'You get on all fours as Albina climbs in behind you and spreads your ass, giving her access to your awaiting asshole. You gasp when she eagerly plunges her face between your cheeks and starts greedily licking and rimming your backdoor before pushing her tongue inside and tongue fucking your ass while expertly teasing your clit with her fingers.'
+						'You moan loudly in pleasure as you feel your orgasm building within you and Albina, apparently sensing this, grabs your hips and starts eating your ass with even more lustful desire.'
+						'"Don''t stop, I''m gonna cum!" you cry out as Albina goes even faster, rimming your asshole with reckless abandon before suddenly pinching your engorged clit, causing a powerful orgasm to wash over you. Once it passes, you flop out on the bed as Albina smiles at you in satisfaction. Once you recover, you both get dressed.'
+						gs 'arousal', 'rimming', 5, 'lesbian'
+						gs 'arousal', 'vaginal_finger', -5, 'lesbian'
+						gs 'stat'
+
+						act 'Finish':
+							CLOSE ALL
+							gs 'arousal','end'
+							gs 'stat'
+							gt 'albinahome', 'bedroom'
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+
+!! --------------- end of other Sveta-Albina sex events ----------------------------------------
+
+
+!! --------------- Tekken Bet Event ----------------------------------------
+
+!! tease her by edging her with alternating hard and slow movements
+
+!! --------------- end of Tekken Bet Event ----------------------------------------
+
+
+
+!! --------------- Lazar Stuff ----------------------------------------
+
+
+if $ARGS[0] = 'lazar_start':
+	if rand(1,2) = 1:
+		$albinaQW['lazar_cum'] = 'anal_creampie'
+	else
+		$albinaQW['lazar_cum'] = 'facial'
+	end
+	menu_off = 1
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/maid.jpg"></center>'
+	'You enter Albina''s house and the maid politely greets you.'
+	if AlbinaQW['Lazar_Sex'] = 0:
+		'"Miss <<$pcs_firstname>>, how nice to see you. Miss Albina already has a guest, shall I tell them of your arrival?"'
+		'You shake your head, knowing what Albina and her "guest" are doing upstairs. "No, it''s fine. She should be expecting me, so I''ll head up to her room if that''s okay?"'
+		'The maid just nods and continues with her duties, leaving you to head up the stairs, curious to know what "other friend" this could be as you reach the door...'
+		act 'Open the door': gt 'albina_sex_scenes', 'lazar_door_first'
+	else
+		'"Miss <<$pcs_firstname>>, how nice to see you. Miss Albina already has a guest, shall I tell them of your arrival?"'
+		'From her smile, you can guess that this "guest" is Lazar again and the maid knows exactly what they''re doing.'
+		'"No, it''s fine. She should be expecting me, so I''ll head up to her room if that''s okay?"'
+		'The maid just nods and continues with her duties, leaving you to head up the stairs if you so choose.'
+		gs 'albina_sex_scenes', 'lazar_wait'
+		gs 'albina_sex_scenes', 'lazar_peek1'
+	end
+end
+
+if $ARGS[0] = 'lazar_door_first':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/doors.jpg"></center>'
+	if AlbinaQW['Lazar_Sex'] = 0:
+		AlbinaQW['Lazar_Sex'] = 1
+		*nl
+		'<b><i>"OH FUCK! JUST LIKE THAT! POUND MY FUCKING PUSSY!"</i></b>'
+		*nl
+		'You jump in surprise as Albina''s screaming voice blasts right through the closed door, clear into the hallway.'
+	else
+		*nl
+		if rand(1,3) = 1:
+			'<b><i>"OH FUCK! JUST LIKE THAT! POUND MY FUCKING PUSSY!"</i></b>'
+		elseif rand(1,2) = 1:
+			'<b><i>"YES! YES! FUCK ME WITH YOUR BIG FAT COCK!"</i></b>'
+		else
+			'<b><i>"I''M YOUR DIRTY WHORE! I''M YOUR DIRTY DANCING SLUT!"</i></b>'
+		end
+		*nl
+		'Predictably, the sound of Albina''s voice echoes down the hallway as you approach her room.'
+	end
+	gs 'albina_sex_scenes', 'lazar_wait'
+	gs 'albina_sex_scenes', 'lazar_peek1'
+end
+
+if $ARGS[0] = 'lazar_wait':
+	act 'Give them some privacy':
+		menu_off = 1
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/phone.jpg"></center>'
+		'You decide to wait them out, and so walk down the hall to the bathroom. You walk in, lock the door and sit on the toilet. You pull out your phone and start amusing yourself.'
+		act 'Keep using phone': gt 'albina_sex_scenes', 'keep_using_phone'
+		act 'Watch porn': gt 'albina_sex_scenes', 'watch_porn'
+	end
+end
+
+if $ARGS[0] = 'lazar_peek1':
+	act 'Peep on her':
+		*clr & cla
+		'<center><video autoplay loop src="images/shared/sex/vag/miss/rough1.mp4"></video></center>'
+		'Unable to help yourself, you move in close to Albina''s door and silently ease it open just a <i>tiny</i> crack to see what''s inside.'
+		*nl
+		'Albina is on her back, her hair wrapped in Lazar''s fist and being savagely pulled onto his cock even as he hammers it between her legs. The sound of flesh slapping against flesh fills the room.'
+		gs 'albina_sex_scenes', 'lazar_wait'
+		gs 'albina_sex_scenes', 'lazar_peek2'
+	end
+end
+
+if $ARGS[0] = 'lazar_peek2':
+	act 'Keep watching':
+		*clr & cla
+		'<center><video autoplay loop src="images/shared/sex/vag/doggy/spit1.mp4"></video></center>'
+		'Lazar pulls out of her and forcibly flips her up onto her knees. From this angle, you can see Albina is soaking wet, but that doesn''t stop him spreading her lips and spitting directly into her pussy. Her whole body twitches in one violent flinch and you hear a muffled moan as he fingers her.'
+		'"You like it dirty, don''t you, you little whore?"'
+		'"Put it back in!" she begs. "Shove your cock in my pussy! Fuck me with your huge dick!"'
+
+		act 'Continue':
+			*clr & cla
+			'<center><video autoplay loop src="images/shared/sex/vag/doggy/kotovsex10.mp4"></video></center>'
+			'Lazar slams his cock into her pussy with enough force to rattle the bed. She screams in what sounds like a little bit of pain and a whole lot of pleasure and he doesn''t pause for even a second before he starts pounding her from behind.'
+			gs 'albina_sex_scenes', 'lazar_peek3'
+		end
+	end
+end
+
+if $ARGS[0] = 'lazar_peek3':
+	act 'Keep watching':
+		*clr & cla
+		'<center><video autoplay loop src="images/shared/sex/anal/doggy/rough1.mp4"></video></center>'
+		'In what can only be a practiced move or the result of a lot of experience, he pulls out of her pussy and rams his cock straight up her ass in one thrust. A choked cry sounds from her open mouth as he starts ravaging her asshole.'
+		'"Why didn''t you use the lube?" she whines softly.'
+		'"Your slutty pussy juices weren''t enough?" he grunts back. He smacks her ass hard enough that it goes red immediately and she emits a high pitched squeak.'
+		*nl
+		'"Who''s ass is this?" he growls.'
+		'"Yours~!" she whimpers, squealing as he slaps her ass again.'
+		'"That''s right, you dirty little buttslut!"'
+		'"I''m your dirty little buttslut!" Albina gasps as he ramps up. "I''m your dirty buttslut whore!"'
+		gs 'albina_sex_scenes', 'lazar_peek_cum'
+	end
+end
+
+if $ARGS[0] = 'lazar_peek_cum':
+	act 'Keep watching':
+		*clr & cla
+		if $albinaQW['lazar_cum'] = 'anal_creampie':
+			!! IMAGE HERE
+			'With one final thrust, Lazar rams his cock balls deep into her ass and her head is thrown back, choked sounds coming from her throat. You can see her pussy spasming as it squirts her juices from here, her legs trembling and her body caught in the throes of orgasm as she screams a wordless cry. Then all at once, she collapses face-down onto the bed.'
+			'Lazar withdraws his cock from her limp body and slaps it against her ass a few times before he wipes it with her hair as a thick white fluid leaks from her asshole and runs down the valley of her thighs. Albina doesn''t move or protest at all. From your point of view, she seems to have passed out.'
+			gs 'albina_sex_scenes', 'lazar_peek_end'
+		elseif $albinaQW['lazar_cum'] = 'facial':
+			'<center><video autoplay loop src="images/shared/sex/cum/facial/facial41.mp4"></video></center>'
+			'Lazar suddenly pulls his cock from between Albina''s ass cheeks. Without instruction, she flips around and kneels beneath his cock just in time for him to blast a load into her already open mouth. A few more shots land on her tongue, but the rest is sprayed all over her face, with some even going into her hair.'
+			act 'Keep watching':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/sleep1.jpg"></center>'
+				'Once he''s finished, Albina swallows it all in one gulp and immediately collapses onto the bed, seemingly passed out as Lazar wipes his cock with her hair.'
+				gs 'albina_sex_scenes', 'lazar_peek_end'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'lazar_peek_end':
+	*nl
+	'You stare at Albina''s cum-stained form for a few seconds before suddenly realizing that Lazar has almost finished dressing and is heading towards the door.'
+
+	act 'Wait outside the door':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
+		'You step back just as the door opens, Lazar pulling on his shirt as he steps through the threshold.'
+		'"Oh shit! What are you doing here, <<$pcs_nickname>>?" he asks, seemingly startled.'
+		'"Here to see Albina," you smirk. "Seems like you were here for a similar reason."'
+		'"If you''re here to assfuck her brains out, then sure," he grins back. "But I gotta get going. Gotta hit the gym." He flexes his arm with a confident smirk as he passes you and heads downstairs. "See you around."'
+		gs 'albina_sex_scenes', 'lazar_after'
+	end
+
+!!	act 'Panic!':
+		!!*clr & cla
+		!!'<center><img <<$set_imgh>> src="images/.jpg"></center>'
+
+!!	end
+
+	act 'Run back down the stairs!':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hallway.jpg"></center>'
+		'With urgent speed, you rush down the stairs, going as fast as you can without stomping and giving yourself away. Upon reaching the bottom, you inhale deeply, trying to calm your breathing when Lazar appears at the top.'
+		*nl
+		'"Oh. Hey <<$pcs_nickname>>," he says.'
+		'"Hey Lazar," you reply as casually as you can.'
+		'"I didn''t know Albina invited you over."'
+		'"Oh, you know, just popped in to say hi."'
+		'"Well, she''s in her room, but I gotta get going. Gotta hit the gym." He flexes his arm with a confident smirk as he passes you. "See you around."'
+		gs 'albina_sex_scenes', 'lazar_after'
+	end
+end
+
+if $ARGS[0] = 'lazar_after':
+	menu_off = 1
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/doors.jpg"></center>'
+	'You walk down the hall and knock on Albina''s door. A muffled groan sounds inside.'
+	*nl
+	'"<i>Nnngh. Who is it...?</i>"'
+	'"It''s me, <<$pcs_nickname>>."'
+	'"<i>Oh... Come in...</i>"'
+	act 'Open the door':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/nudealbina.jpg"></center>'
+		if $albinaQW['lazar_cum'] = 'anal_creampie':
+			'You open the door to see a completely nude Albina sitting up on her rumpled bed, hair ruffled and wild, her thighs wet with pussy juice and cum that you can see is still dripping from her asshole.'
+		elseif $albinaQW['lazar_cum'] = 'facial':
+			'You open the door to see a completely nude Albina sitting up on her rumpled bed, her thighs wet with pussy juice and her wild cum-smeared hair plastered across her face.'
+		end
+		*nl
+		'"Hey <<$pcs_nickname>>," she smiles tiredly at you. "Sorry about the mess. Lazar just finished fucking my brains out."'
+		'If she''s even at all embarrassed by her appearance, then she doesn''t show it, sighing in what seems like deep satisfaction before unsteadily climbing to her feet and stumbling towards her en-suite bathroom.'
+		'"Give me a sec to clean up?" she asks and disappears inside without waiting for a response. You hear the sounds of the shower splashing and a few minutes later a sparkling wet and clean but equally nude Albina reappears toweling her hair.'
+		'She grins at you, snaps a flimsy-looking thong around her hips, and throws on a tank top without a bra before sitting down next to you. "What''s up?"'
+		act 'Continue':
+			gs 'arousal', 'end'
+			gs 'stat'
+			gt 'albinahome', 'bedroom'
+		end
+	end
+end
+
+!! -------------------- legacy content to be re-implemented better later --------------------------------
+
+if $ARGS[0] = 'lazar_peek':
+	menu_off = 1
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz1.jpg"></center>'
+	'You glance around to make sure nobody is nearby, then crack the door open slightly to peek in. You can see Albina in her underwear, squatting in front of Lazar. She pulls his jeans down and his impressively sized and rock hard dick springs free.'
+	'She starts licking and jerking it before she takes it into her mouth and starts bobbing her head up and down his shaft as she sucks his dick. After a few seconds of this, she gags as she takes it further into her mouth and down her throat, deepthroating him as far as she can before pulling her head back up and coughing. Lazar barely lets her breath before he shoves his dick back into her mouth, moaning in pleasure as he holds her down as long as possible.'
+	gs 'arousal', 'voyeur', 5
+	gs 'stat'
+	act 'Keep watching':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz2.jpg"></center>'
+		'You keep watching as she pulls his dick out of her mouth with a loud slurp, ropes of her saliva covering his shaft as she gasps for air.'
+		'She grins up at him before standing and wiggling out of her thong. She then climbs onto the bed and gets on her back before leaning her head over the edge. You push the door open just a little more so you can see all the action.'
+		'Albina smiles and beckons Lazar over before opening her mouth wide. Lazar steps in and shoves his cock down her throat, causing her to gag before he starts face fucking her. He''s somewhat rough, yet Albina seems to be enjoying it. Despite gagging and choking, she vigorously rubs her clit and fingers herself as he slams his cock in and out of her throat.'
+		*nl
+		'Drool dribbles out of her mouth and runs down her face, getting in her hair as he continues face fucking her. He only stops when it looks like Albina is about to pass out. He pulls out and she splutters a large amount of drool down her face as she gasps for air before sucking on her soaked fingers.'
+		gs 'arousal', 'voyeur', 5
+		gs 'stat'
+		act 'Keep watching':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz3.jpg"></center>'
+			'You catch a glimpse of an aroused grin on Albina''s face as she wipes her face and slowly jerks his drool coated cock in her hands. "Enough foreplay. I want you to fuck the shit out of me."'
+			'He climbs on the bed and gets on his back as Albina crawls over to him. She straddles him and guides his cock into her slit before sliding down onto it, moaning as it stretches her pussy.'
+			'"Fuck, I love it when you rearrange my guts like this!" she grunts and starts riding him hard, her bubble butt loudly slapping against his thighs as she lets his hands roam all over her curvy body.'
+			gs 'arousal', 'voyeur_sex', 5
+			gs 'stat'
+			act 'Keep watching':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz4.jpg"></center>'
+				'After a few minutes Lazar grabs her by the hips and lifts her off his cock before dropping her on the bed. She spreads her legs and he climbs on top of her and starts fucking her missionary style, causing her to moan loudly as she wraps her legs tightly around his back. He starts fucking her harder as a result and she wraps her arms around his neck, pulling him down and making out with him as he keeps thrusting in and out of her ever wetter hole.'
+				'After a few minutes, he climbs off her and flops down on his back as Albina brushes her hair back and sucks his dick for a few seconds before popping it out of her mouth. "Mmhhm, I love tasting my pussy on your dick, but it''s time to give my other hole a turn now..." Lazar grins as she leans over and opens her nightstand, pulling out a bottle of lube and popping the cap on it.'
+				gs 'arousal', 'voyeur_sex', 5
+				gs 'stat'
+				act 'Keep watching':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz5.jpg"></center>'
+					'You keep watching as she sits up on her knees and squirts a plentiful amount of its contents onto her fingers and starts rubbing it into her asshole. When she feels she''s ready, she throws the bottle aside and Lazar squeezes her ass as she climbs back on top of him.'
+					'She moans softly in pleasure as his dick slowly penetrates her ass. Once it''s inside, she slowly starts riding him, gradually taking him deeper with each thrust as they both grunt and moan in pleasure. This continues for a few minutes until his dick suddenly slides out of her ass.'
+					gs 'arousal', 'voyeur_sex', 5
+					gs 'stat'
+					act 'Keep watching':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz6.jpg"></center>'
+						'Albina crawls onto all fours and wiggles her ass at Lazar, who gets on his knees behind her and slides his dick back into her ass.'
+						'He''s rather slow with his thrusts, which annoys Albina. "Harder! I want you to pound my tight little ass and make me fucking cum!" He spanks her ass several times as he starts fucking her harder. She squeals in delight and tightly grips the sheets between her fingers before burying her head in them to muffle her loud cries of pleasure.'
+						gs 'arousal', 'voyeur_sex', 5
+						gs 'stat'
+						if rand(0,4) = 0:
+							act 'Keep watching':
+								*clr & cla
+								'<center><video autoplay loop src="images/shared/sex/cum/cum5.mp4"></center>'
+								'Another few hard smacks on her now bright red ass is enough to send her over the edge and a powerful orgasm overwhelms her entirely. Lazar''s dick slides out of her ass as she falls forwards and shudders and pants on the bed, the sheets soaked with her juices.'
+								'Once she recovers, Albina sits up on the bed. "You must be close by now?"'
+								'Lazar grins. "Another round with that sweet pussy should do it."'
+								'Albina gets back on all fours. "Just don''t cum inside me, okay?"'
+								'Lazar pushes her down on her stomach and mounts her before he shoves his cock in her pussy and starts pounding her.'
+								'After a few seconds, Albina looks back at him when he starts panting. "Pull out! PULL OUT!"'
+								'He keeps thrusting until the last second when he pulls out and starts cumming over her lower back, collapsing on the bed when he''s finished.'
+								gs 'arousal', 'voyeur_sex', 5
+								gs 'stat'
+								act 'Finished':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/shared/sex/after/cuddle1.jpg"></center>'
+									'Albina climbs on top of him and smacks him on the chest. "What have I told you about waiting until the last second to pull out?" she asks with a hint of annoyance before grabbing a pillow and hitting him with it. "You know I don''t like getting cum in my pussy!"'
+									'She continues berating him as you quickly hurry away before you''re spotted. You hide in the bathroom until you hear Lazar leaving the room and heading down the stairs. You then walk up to Albina''s door, deciding not to say anything about what you just saw.'
+									act 'Go to her room': gt 'albina_sex_scenes', 'go_to_bedroom1'
+								end
+						    end
+						elseif rand(0,4) = 1:
+							act 'Keep watching':
+								*clr & cla
+								'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></center>'
+								'Another few hard smacks on her now bright red ass is enough to send her over the edge and a powerful orgasm overwhelms her entirely. Lazar''s dick slides out of her ass as she falls forwards and shudders and pants on the bed, the sheets soaked with her juices.'
+								'Lazar continues jerking off as Albina recovers on the bed before saying he''s close. Albina quickly slides off the bed and onto her knees in front of him and his cum starts splattering across her face.'
+								'He groans loudly in pleasure as he squeezes the last of his cum out onto her forehead before she takes his cock into her mouth and sucks it clean. "Damn, your pretty little face looks even better with my cum all over it!" he pants with a smile as she pops his cock out of her mouth and looks up at him with a satisfied grin as his cum trickles down her face and drips from her chin.'
+								gs 'arousal', 'voyeur_sex', 5
+								gs 'stat'
+								act 'Finished':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/shared/sex/after/cuddle1.jpg"></center>'
+									'Albina cleans herself up before crawling up to Lazar and snuggling into him. They sit quietly in each other''s embrace before Lazar gently kisses her forehead, gets up off the bed and gathers his clothes up. He starts getting dressed and you quickly close the door and hurry away before you''re spotted.'
+									'You wait on the top stairs until you hear the door open and walk up like you were just heading to the room. He looks a little surprised to see you, but smiles.'
+									'"Oh hey <<$pcs_nickname>>, Albina''s in her room if you''re looking for her. I need to get going, got to hit the gym today," he explains as he flexes and walks past you. "See you around."'
+									'With that, he walks down the stairs and you hear him bidding farewell to Zoya. You walk up to Albina''s door, deciding not to say anything about what you just saw.'
+									act 'Go to her room': gt 'albina_sex_scenes', 'go_to_bedroom'
+								end
+						    end
+						else
+							act 'Keep watching':
+								*clr & cla
+								'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumanal1.mp4"></center>'
+								'Another few hard smacks on her now bright red ass is enough to send her over the edge and a powerful orgasm overwhelms her entirely. Lazar''s dick slides out of her ass as she falls forwards and shudders and pants on the bed, the sheets soaked with her juices.'
+								'Once she recovers, Albina sits up on the bed. "You must be close by now?"'
+								'"If I keep fucking that ass, then I''ll be done in no time," he replies before pulling her up next to him.'
+								'Albina giggles before Lazar shoves his cock back in her ass, causing her to moan loudly. "Yes, fuck my slutty asshole!"'
+								*nl
+								'He starts fucking her sideways for a few minutes before he starts panting. "Yes, cum in my tight little ass! Fill me with your cum!" Albina says as she looks back at him.'
+								'In response, he shoves his dick as far as he can up her ass before he starts pumping his cum into her, causing her to moan softly at the sensation.'
+								'Once he''s finished, he pulls out and his cum soon follows, flowing down Albina''s ass cheek and pooling on the bed beneath her as the two of them make out. "I love farting your cum out of my ass," she giggles between kisses before shoving her fingers up her ass. She fingers herself deep before pulling them out and sucking on them as Lazar grins.'
+								gs 'arousal', 'voyeur_sex', 5
+								gs 'stat'
+								act 'Finished':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/shared/sex/after/cuddle1.jpg"></center>'
+									'Albina cleans herself up before crawling up to Lazar and snuggling into him. They sit quietly in each other''s embrace before Lazar gently kisses her forehead, gets up off the bed and gathers his clothes up. He starts getting dressed and you quickly close the door and hurry away before you''re spotted.'
+									'You wait on the top stairs until you hear the door open and walk up like you were just heading to the room. He looks a little surprised to see you, but smiles.'
+									'"Oh hey <<$pcs_nickname>>, Albina''s in her room if you''re looking for her. I need to get going, got to hit the gym today," he explains as he flexes and walks past you. "See you around."'
+									'With that, he walks down the stairs and you hear him bidding farewell to Zoya. You walk up to Albina''s door, deciding not to say anything about what you just saw.'
+									act 'Go to her room': gt 'albina_sex_scenes', 'go_to_bedroom'
+								end
+						    end
+						end
+					end
+					act 'Go and masturbate': gt 'albina_sex_scenes', 'masturbate'
+					act 'Join them': gt 'albina_sex_scenes', 'join'
+				end
+				act 'Go and masturbate': gt 'albina_sex_scenes', 'masturbate'
+			end
+			act 'Go and masturbate': gt 'albina_sex_scenes', 'masturbate'
+		end
+		act 'Go and masturbate': gt 'albina_sex_scenes', 'masturbate'
+	end
+	act 'Wait them out': gt 'albina_sex_scenes', 'lazar_wait'
+end
+
+if $ARGS[0] = 'join':
+	menu_off = 1
+	gs 'boyStat', 'A149'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/walkin3.jpg"></center>'
+	'It''s too much for you. You have to be part of this, so you walk in and close the door, startling the two of them before a puzzled Albina glares at you. "What the fuck, <<$pcs_nickname>>?! Can''t you knock?" she asks in a somewhat confused tone.'
+	if AlbinaQW['Lazar_Threesome'] = 1:
+		'"You guys sounded like you were having fun, so I thought I could join in as well?"'
+		'Lazar just grins widely. "Having another threesome with you babes? Fuck yeah, I''m down with that!"'
+		'Albina just shakes her head and grins at you.'
+	else
+		'"You guys sounded like you were having fun, so I thought I could join in as well?"'
+		'Lazar just grins widely. "Getting to fuck you two babes at the same time? Fuck yeah, I''m down for that. How about you?" he asks as he looks at Albina, who just shrugs with indifference.'
+	end
+	act 'Suck his cock':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some1.jpg"></center>'
+		'You strip naked as Albina sucks Lazar''s dick. Once you come over to join them, she pops his dick out of her mouth and offers it to you. You take it into your mouth and start sucking it while she licks and sucks his balls.'
+		'You swap his cock back and forth between each other before she stops and pushes you onto the bed. She bends over and buries her head into your crotch as Lazar moves in behind her and slides his dick back into her pussy. He starts fucking her as she licks and sucks on your clit, her moans and tongue piercing adding to your pleasure.'
+		gs 'arousal', 'bj', 5, 'group'
+		gs 'stat'
+		act 'Get eaten out':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some2.jpg"></center>'
+			'She licks and sucks on your clit for a while before you reach down, grab the back of her head and pull her face tighter against you. You''re soaking wet, and her tongue easily slides inside your pussy. You start to rock and ride against her face, smearing it with your wetness, but just as you''re about to cum, she is pulled away by Lazar, who moves in between your legs and grinds the tip of his dick between your labia.'
+			gs 'arousal', 'cuni', 5, 'group'
+			gs 'stat'
+			act 'Lie on your back':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some3.jpg"></center>'
+				vaginal_slip = 8
+				'Albina climbs onto the bed as you spread your legs and Lazar slowly penetrates your pussy and starts fucking you. Albina watches him fuck you for a few minutes before she straddles you and sits on your face, her soaking wet pussy dripping into your mouth. You start licking and sucking her pussy and clit and occassionaly tongue fuck her while she plays with your breasts, kneading them in her hands and squeezing your nipples. She soon starts rocking her hips over your face, smearing you with her sticky wetness as Lazar starts fucking you even harder, his balls deep thrusts bottoming out inside you.'
+				gs 'arousal', 'vaginal', 5, 'group'
+				gs 'stat'
+				act 'Join in sucking his dick':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some1.jpg"></center>'
+					'You don''t know how long he fucks you, but it feels amazing none the less. He eventually pulls out and Albina climbs off of you. You crawl over to the edge of the bed with her and take turns sucking his dick before Albina stops and motions for Lazar to lie back on the bed.'
+					'As he does, she runs her hand over her asshole and finds that the lube has somewhat dried up, so she grabs the bottle, squirts a plentiful amount onto her fingers and rubs it into her asshole before fingering herself. She then squirts some lube onto Lazar''s dick and strokes it up and down his shaft which, combined with your pussy juices, gets him nice and slick.'
+					gs 'arousal', 'bj', 5, 'group'
+					gs 'stat'
+					act 'Watch Albina get fucked':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some4.jpg"></center>'
+						'All lubed up, she squats above him reverse cowgirl style and guides the tip of his dick to her asshole. She relaxes and slowly slides down, moaning softly as his dick easily penetrates her backdoor. Once he''s inside her, she starts riding him, her ass slapping off his hips as she picks up speed. Lazar then grabs her knees and pulls her legs back before he really starts hammering her ass, causing her eyes to roll back in her head in pleasure.'
+						'After a few minutes of this, he pulls out of her, leaving her looking a little disappointed. "Okay, your turn <<$pcs_nickname>>," he says as he reaches over and gives your ass a firm squeeze.'
+						gs 'arousal', 'voyeur_sex', 5, 'group'
+						gs 'stat'
+						act 'No anal':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz6.jpg"></center>'
+							'You shake your head. "Sorry, but I don''t want to do anal."'
+							'He just shrugs at you and then smiles at Albina. "Your ass ready for round two then?" She bites her lip and giggles at him as she bends over on all fours and wiggles her ass at him.'
+							'He moves up behind her and slides his dick back into her awaiting hole, causing her to moan loudly in pleasure. He starts really hammering her ass and she begs him to go harder as she grips the sheets tightly and moans loudly in pleasure. It doesn''t take long until she has an intense orgasm, her pussy juices squirting out everywhere as her legs buckle and she covers her mouth to muffle her screams of pleasure. "Fuck, I''m about to cum!" he cries out.'
+							gs 'arousal', 'voyeur_sex', 5, 'group'
+							gs 'stat'
+							act 'Climax':
+								*clr & cla
+								'<center><video autoplay loop  src="images/locations/city/redlight/studio_porn/sex/mff4.mp4"></center>'
+								'He grabs hold of her hips and a few seconds later, groans loudly in pleasure as he cums deep in her ass. She moans and giggles at the sensation as he unloads inside her. When he finally finishes, he motions for you to slide underneath him as he spreads Albina''s cheeks with his hands. You do as you''re told and when he pulls out, a steady stream of thick cum flows out of Albina''s anus and down her pussy, where it drips onto your face and into your open mouth.
+								When it finally stops, Albina turns around, takes his dick deep into her mouth and sucks it clean before she smiles down at you. She then leans down and starts licking up the cum on your face, not stopping until every last drop is in her mouth. She then pulls you up onto your knees and the two of you swallow Lazar''s cum in front of him, a wide grin appearing on his face when you stick out your clean tongues. He collapses back on the bed, satisfied, and you and Albina crawl over and join him. You all bask in the afterglow of your threesome.'
+								gs 'arousal', 'bj', 5, 'group'
+								gs 'cum_call', 'mouth_swallow', $boy, 1
+								gs 'stat'
+								act 'Get dressed':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some5.jpg"></center>'
+									'After a few minutes, Lazar gets up. "I need to get going girls," he says and starts getting dressed. Once he finishes, he leans over and gives Albina a kiss on the forehead. "See you around. This was a blast, we should do again sometime," he says and points at both of you with a smirk. Albina teases him by licking your pussy as he leaves, causing him to grin. Once he leaves, you both clean up and get dressed.'
+									cumspclnt = 12
+									AlbinaQW['Lazar_Threesome'] += 1
+									gs 'cum_cleanup'
+									gs 'arousal', 'end'
+									gs 'stat'
+									act 'Relax': gt 'albinahome', 'bedroom'
+								end
+							end
+						end
+						act 'Get your ass fucked':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz6.jpg"></center>'
+							'You stare at the size of Lazar''s dick and bite your lip. "Yeah, I want you in my ass <i>now</i>," you say teasingly and bend over on all fours, giving him a good wiggle of your ass. You look back and see Albina squirting a good amount of lube onto her fingers and gasp when you feel the cold liquid touch your asshole as she starts rubbing it in. You moan softly when two of her fingers slide into you and she slowly fingers you, stretching you out for Lazar''s dick.'
+							anal_slip = 8
+							'Once she thinks you''re ready, she pulls her fingers out and you feel the tip of Lazar''s dick pressing against your hole.'
+							'You relax, and thanks to the lube, his dick easily pushes into your ass, causing you to groan a little as it does. He goes slow at first to let you adjust, but as you moan louder in pleasure, he starts picking up the pace and is soon pounding your backdoor, his hips slapping off your ass with every thrust.'
+							'Albina isn''t willing to be left out, however, and gets on all fours in front of your face, presenting her wet holes to you. She wiggles her hips, expecting you to get to work.'
+							gs 'arousal', 'anal_finger', -5, 'group'
+							gs 'arousal', 'anal', 5, 'group'
+							gs 'stat'
+							act 'Eat her pussy':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some2.jpg"></center>'
+								'You have Albina get on her back and spread her legs in front of you. When she does, you go to work on her pussy, licking her wet folds and sucking on her engorged clit while fingering her, her pussy tightly clamping around your digits as you pleasure her. She eventually reaches her orgasm and muffles her moans as her pussy sprays her juices over your face. His ragged thrusts and heavy breathing tell you that Lazar is close as well, so you beg him to go faster while tightly squeezing your asshole around his dick. He soon cries out that he''s going to cum.'
+								gs 'arousal', 'cuni_give', -5, 'group'
+								gs 'arousal', 'anal', 5, 'group'
+								gs 'stat'
+								act 'Climax':
+									*clr & cla
+									'<center><video autoplay loop  src="images/locations/city/redlight/studio_porn/sex/mff4.mp4"></center>'
+									'He starts really going at it before he grunts and moans in pleasure as you feel his warm cum coating your insides. You moan at the sensation as he continues pumping into your back door. When he finishes, he spreads your ass and pulls out. You squeeze and feel a stream of thick cum pour out of your ass and start running down the inside of your leg. Albina, having recovered from her orgasm, suddenly crawls in behind you and runs her tongue up the length of your thigh, licking up the sticky liquid on your leg before she stops underneath your ass and lets the rest of the cum flow into her mouth.'
+									'When the stream finally stops, you turn around and watch Albina grimace as she swallows before sticking her tongue out and showing you both that she''s gulped down all of the load. Lazar then collapses back on the bed, satisfied, and you and Albina crawl over and join him. You all bask in the afterglow of your threesome.'
+									gs 'arousal', 'anal', 5, 'group'
+									gs 'cum_call', 'anus', $boy, 1
+									gs 'stat'
+									act 'Get dressed':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some5.jpg"></center>'
+										'After a few minutes, Lazar gets up. "I need to get going girls," he says and starts getting dressed. Once he finishes, he leans over and gives Albina a kiss on the forehead. "See you around. This was a blast, we should do again sometime," he says and points at both of you with a smirk. Albina teases him by licking your pussy as he leaves, causing him to grin. Once he leaves, you both clean up and get dressed.'
+										cumspclnt = 3
+										AlbinaQW['Lazar_Threesome'] += 1
+										gs 'cum_cleanup'
+										gs 'arousal', 'end'
+										gs 'stat'
+										act 'Relax': gt 'albinahome', 'bedroom'
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'keep_using_phone':
+	menu_off = 1
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/phone.jpg"></center>'
+	'You keep using your phone and end up texting people, scrolling through social media and playing a few games to pass the time. When you finally get bored, you hear what sounds like muffled moaning and a few minutes later hear someone exiting Albina''s bedroom and walking away down the hall. When you''re sure they''re gone, you stand up and leave the bathroom.'
+	act 'Go to her room': gt 'albina_sex_scenes', 'lazar_after'
+end
+
+if $ARGS[0] = 'watch_porn':
+	menu_off = 1
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/phone.jpg"></center>'
+	'The thought of Albina and Lazar having sex down the hall turns you on, so you search for a good porn video to pass the time. You find one you like the look of and start watching it, finding yourself getting wetter and wetter...'
+	gs 'arousal', 'porn', 5
+	gs 'stat'
+	act 'Just keep watching':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/phone.jpg"></center>'
+		'The idea of rubbing one out crosses your mind, but the risk of being caught is enough to discourage the thought. You keep watching the video and when it ends, you hear the sound of Albina''s door closing and someone walking away down the hall. When you''re sure they''re gone, you stand up and leave the bathroom.'
+		gs 'arousal', 'porn', 5
+		gs 'stat'
+		act 'Go to her room': gt 'albina_sex_scenes', 'lazar_after'
+	end
+	act 'Rub one out':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/masturbate.jpg"></center>'
+		if $pantyworntype = 'none':
+			'You''re now feeling extremely horny, and the thought of someone catching you turns you on even more. You put your phone to the side and pull your soaked panties down, exposing your eager pussy. You start fondling away at your engorged clit with one hand while using the other to slide some fingers into your wet hole and start finger banging yourself.'
+		else
+			'You''re now feeling extremely horny, and the thought of someone catching you turns you on even more. You put your phone to the side and start fondling away at your engorged clit with one hand while using the other to slide some fingers into your wet hole and start finger banging yourself.'
+		end
+		$orgasm_txt = 'A few minutes of this is enough to bring you to climax and you pull your fingers out and clamp your hand against your mouth as you keeping vigorously rubbing your clit and bring yourself to orgasm, hoping your muffled cries of pleasure don''t draw any attention.'
+		$orgasm_or = 'custom'
+		gs 'arousal', 'clit_finger', 5, 'masturbate'
+		gs 'stat'
+		'When your orgasm ends, you hear the sound of Albina''s door closing and someone walking away down the hall. When you''re sure they''re gone, you pull your clothes back on and leave the bathroom.'
+		act 'Go to her room': gt 'albina_sex_scenes', 'lazar_after'
+	end
+end
+
+if $ARGS[0] = 'masturbate':
+	menu_off = 1
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/masturbate.jpg"></center>'
+	'Having become aroused by what you saw, you quietly close the door and quickly make your way to the bathroom, where you lock the door and sit on the toilet.'
+	'The thought of Albina and Lazar having sex down the hall turns you on, so you pull your panties down and start pleasuring yourself, not caring if anyone catches you. You start fondling away at your clit with one hand while using the other to finger bang yourself.'
+	$orgasm_txt = 'A few minutes of this is enough to bring you to climax and you pull your fingers out and clamp your hand against your mouth as you keeping vigorously rubbing your clit and bring yourself to orgasm, hoping your muffled cries of pleasure don''t draw any attention.'
+	$orgasm_or = 'custom'
+	gs 'arousal', 'clit_finger', 5, 'masturbate'
+	gs 'stat'
+	'When your orgasm ends, you hear the sound of Albina''s door closing and someone walking away down the hall. When you''re sure they''re gone, you pull your clothes back on and leave the bathroom.'
+	act 'Go to her room': gt 'albina_sex_scenes', 'lazar_after'
+end
+
+
+--- albina_sex_scenes ---------------------------------

+ 15 - 14
locations/albina_starlets.qsrc

@@ -43,20 +43,20 @@ if $ARGS[0] = 'albina1':
 			'She looks at you in disbelief, seemingly offended by your remark. "You think you can dance better than <i>me</i>? <i>YOU</i>? You can just sit your amateur ass down and watch how a professional does it. Then we''ll see if you still think you can dance!" she says scornfully before forcing you to sit on the bench.'
 			'Turning to the other girls, she motions for one of them to turn the music on.'
 
-			act 'Watch': 
+			act 'Watch':
 			   *clr & cla
 			   gs 'stat'
 			   '<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 			   'The music starts playing and you instantly realize your mistake in trying to compare yourself to Albina. She flawlessly performs a number of dance moves you could never even hope to do, all with a smug smile on her face directed at you.'
 			   'She finishes her performance as the music ends and you sheepishly avoid eye contact with her as she walks up to you, breathless.'
-			   '"Not so loud-mouthed now are you?" she gleefully remarks with a laugh. "Now why don''t you fuck off and take your humble ass back to the amateur corner where you belong?"' 
+			   '"Not so loud-mouthed now are you?" she gleefully remarks with a laugh. "Now why don''t you fuck off and take your humble ass back to the amateur corner where you belong?"'
 			   if grupTipe = 4:
 					'"A junkie like you will never dance with <i>us</i>!"'
 				else
 					'"If I liked you better, then I <i>might</i> have taken an interest in improving your horrible dancing."'
 				end
 			   'The other girls laugh at you as you retreat from the mocking insults being directed at you.'
-			   
+
 			   act 'Leave': gt 'gdksport', 'start'
 			end
 		end
@@ -104,15 +104,15 @@ if $ARGS[0] = 'albina2':
 			'Her arrogance annoys you. "I can dance just as well as you or any of these girls!" you scornfully reply.'
 			'She looks at you in disbelief, seemingly offended by your remark. "You think you can dance better than <i>me</i>? <i>YOU</i>?! You can just sit your amateur ass down and watch how a professional does it. Then we''ll see if you still think you can dance!" she says scornfully before forcing you to sit on the bench.'
 			'Turning to the other girls, she motions for one of them to turn the music on.'
-            
-			act 'Watch': 
+
+			act 'Watch':
 			   *clr & cla
 			   gs 'stat'
 			   '<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 			   'The music starts playing and you instantly realize your mistake in trying to compare yourself to Albina. She flawlessly performs a number of dance moves that you could never even hope to do, all with a smug smile on her face directed at you.'
 			   'She finishes her performance as the music ends and you sheepishly avoid eye contact with her as she walks up to you, breathless.'
 			   '"Not so loud mouthed now are you?" she gleefully remarks with a laugh. "I''m in a good mood today. I want to see you dance. Get your ass up and prove you''re as good as you claim."'
-			   
+
 			   act 'Continue': gt 'albina_starlets', 'albina4'
 			end
 		end
@@ -178,11 +178,11 @@ if $ARGS[0] = 'albina4':
 				*clr & cla
 				minut += 5
 				gs 'stat'
-				if hotcat < 6:
+				if pcs_hotcat < 6:
 					'"Well? Am I good enough to join?" you ask.'
-					'She just laughs at you dismissively. "While I <i>could</i> train you properly so you''re not a floundering embarrassment, appearance is everything to the Starlets, so try improving your looks first and then get back to us."' 
+					'She just laughs at you dismissively. "While I <i>could</i> train you properly so you''re not a floundering embarrassment, appearance is everything to the Starlets, so try improving your looks first and then get back to us."'
 					'She turns and leaves with the rest of the troupe, her comments leaving you feeling slightly insulted.'
-				elseif hotcat >= 6 and stat['think_virgin'] = 1 and stat['vaginal'] = 0:
+				elseif pcs_hotcat >= 6 and stat['think_virgin'] = 1 and stat['vaginal'] = 0:
 					'"Well? Am I good enough to join?" you ask.'
 					'She thinks about it and looks at the other girls; some nod, others shrug.'
 					'Finally, she answers. "Okay, we''ll take a shot. Maybe you''ll learn something by training with <i>actual</i> dancers. We practice every day except Tuesday and Thursday, so don''t be late."'
@@ -259,6 +259,7 @@ if $ARGS[0] = 'starlets':
 	AlbinaQW['startletsday'] = daystart
 	starlets_practice = 0
 	gs 'exercise', 'tier2', 120, 'agil', 'dancero'
+	gs 'exp_gain', 'dancero', 2
 	pcs_mood -= 5
 	inhib_exp += rand(2,4)
 	if perform_lvl < 35: gs 'exp_gain', 'perform', 1
@@ -277,7 +278,7 @@ if $ARGS[0] = 'starlets':
 	end
 
 	AlbinaQW['ShowTriggerCount'] += 1
-	
+
 	act 'Leave': gt 'gdksport', 'start'
 
 	if AlbinaQW['ShowTriggerCount'] >= iif(week > 5, rand(1,3), rand(3,6)):
@@ -349,7 +350,7 @@ if $ARGS[0] = 'starlets':
 								'You see a well groomed man in a modest suit approach Albina and start talking to her.'
 							elseif AlbinaQW['StarletCustomer'] = 7:
 								AlbinaQW['StarletCustomerCount'] = 12
-								'You see an older man with greying hair wearing an expensive shirt with the sleeves rolled up to his elbows talking to Albina.' 
+								'You see an older man with greying hair wearing an expensive shirt with the sleeves rolled up to his elbows talking to Albina.'
 								AlbinaQW['StarletPay'] = rand (6,9)
 							elseif AlbinaQW['StarletCustomer'] = 8:
 								AlbinaQW['StarletCustomerCount'] = 1
@@ -450,12 +451,12 @@ if $ARGS[0] = 'parkrally':
 	'She directs you to follow her, saying her father had someone drop off special outfits for you to wear. As you walk into the changing room, a box sits on the bench.'
 	'Albina pulls a lycra leotard out and her fist clenches around it as she sees how skimpy it is, but resigns herself and hands them out to the reluctant girls.'
 	*nl
-	'You undress and slide the outfit on.' 
+	'You undress and slide the outfit on.'
 	if tits = 4:
 		'It''s skin tight and your large breasts are just about able to fit, your nipples poking through the thin fabric as you try to adjust the outfit into a comfortable state. The back isn''t much better...'
 	elseif tits > 4:
 		'It''s skin tight and strains against your bust, your enormous breasts in danger of falling out as your nipples clearly poke through the thin fabric. The back isn''t much better...'
-	else	
+	else
 		'It''s skin tight and your nipples poke through the thin fabric as you adjust the straps. The back isn''t much better...'
 	end
 	*nl
@@ -493,7 +494,7 @@ end
 
 if $ARGS[0] = 'StarletsEnd':
 	cla
-	'You enter the locker room and immediately see the disapproving looks on the girls faces. Albina walks over to you and, looking severely disappointed, shakes her head. "Why <<$pcs_nickname>>? You used to be cool, but now you''ve gone and done this to yourself. I''m sorry, but I just can''t have someone like you being associated with us anymore."' 
+	'You enter the locker room and immediately see the disapproving looks on the girls faces. Albina walks over to you and, looking severely disappointed, shakes her head. "Why <<$pcs_nickname>>? You used to be cool, but now you''ve gone and done this to yourself. I''m sorry, but I just can''t have someone like you being associated with us anymore."'
 	'She motions to the door and you walk out in shame as tears well up in your eyes.'
 	starlets_practice = 0
 	minut += 2

+ 71 - 71
locations/albina_starlets_sex.qsrc

@@ -8,10 +8,10 @@ if $ARGS[0] = 'whore1':
 	$AlbinaQW['Cust'] = $npclastgenerated
 	gs 'boyStat', $AlbinaQW['Cust']
 	gs 'stat'
-	
+
 	if AlbinaQW['client1'] = 0:
 		'The Armenian, still tightly gripping your arm, drags you into his hotel room where he forces you to strip naked, his hungry eyes inspecting every inch of you. "Time to earn your money, whore!" he says as he forces you to your knees in front of him.'
-		
+
 		act 'Please him':
 			*clr & cla
 			guy += 1
@@ -22,19 +22,19 @@ if $ARGS[0] = 'whore1':
 			'"Oh yes, just like that you little fucking slut!"'
 			gs 'arousal', 'bj', 10, 'sub'
 			gs 'stat'
-		
+
 			act 'Get your pussy fucked':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/miss1.mp4"></video></center>'
 				'You spend a few minutes sucking his dick when he suddenly pulls out, grabs you by the hair and roughly throws you face down onto the bed.'
 				'The man moves in, roughly flips you on your back and spreads your legs. "This pussy looks like it will be worth every ruble!" You feel the tip of his cock spread your labia apart as he pushes into you before grabbing your throat and pinning you to the bed as he starts to very roughly pound your pussy. He occasionally uses his other hand to very tightly squeeze and twist your nipple, seemingly enjoying treating you roughly.'
-				
+
 				act 'You like it':
 					cla
 					AlbinaQW['client1_like'] = 1
 					gs 'stat'
-					'He twists your nipple even harder and you try holding back your moans of pleasure to hide the fact that you''re enjoying the roughness, but he can see the pleasure in your eyes and smiles sadistically as he tightens his grip around your neck.' 
-					
+					'He twists your nipple even harder and you try holding back your moans of pleasure to hide the fact that you''re enjoying the roughness, but he can see the pleasure in your eyes and smiles sadistically as he tightens his grip around your neck.'
+
 					act 'Panic':
 						cla
 						'You thrash your arms in distress, but he just smiles and doesn''t loosen his grip until you''re on the verge of blacking out. He then resumes fucking you, faster and seemingly closer to climax as you clutch your neck and gasp for air.'
@@ -53,7 +53,7 @@ if $ARGS[0] = 'whore1':
 
 						act 'Call a taxi': gt 'albina_starlets_sex', 'cab_home'
 					end
-					
+
 					act 'Enjoy it':
 						cla
 						'You feel yourself becoming aroused as you struggle to breathe and he smiles even wider. "You''re enjoying this, bitch. I can feel your pussy getting tighter!"'
@@ -70,11 +70,11 @@ if $ARGS[0] = 'whore1':
 						gs 'cum_call', 'labia', $AlbinaQW['Cust']
 						gs 'arousal', 'end'
 						gs 'stat'
-						
+
 						act 'Call a taxi': gt 'albina_starlets_sex', 'cab_home'
 					end
 				end
-				
+
 				act 'You hate it':
 					cla
 					'You squeal in pain as he continues twisting your nipple. "That''s right, keep squealing like a bitch!"'
@@ -98,7 +98,7 @@ if $ARGS[0] = 'whore1':
 		end
 	else
 		'The Armenian leads you into his hotel room where he looks at you expectantly. Knowing what he wants, you strip naked and get on your knees in front of him, his perverted gaze watching you as you do.'
-		
+
 		act 'Please him':
 			*clr & cla
 			'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/oral1.mp4"></video></center>'
@@ -107,17 +107,17 @@ if $ARGS[0] = 'whore1':
 			guy += 1
 			gs 'arousal', 'bj', 10, 'sub'
 			gs 'stat'
-			
+
 			act 'Get your pussy fucked':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/miss1.mp4"></video></center>'
-				'After a few minutes of this, the man roughly flips you on your back and spreads your legs, smiling crudely as he massages your clit with his fat thumb. "This pussy is one of the finest my money has ever bought, and I''m going to get my money''s worth, slut. You''re going to milk every drop of cum from my cock. Got it?"' 
+				'After a few minutes of this, the man roughly flips you on your back and spreads your legs, smiling crudely as he massages your clit with his fat thumb. "This pussy is one of the finest my money has ever bought, and I''m going to get my money''s worth, slut. You''re going to milk every drop of cum from my cock. Got it?"'
 				'You just silently nod and feel the thick tip of his fat cock spreading your labia apart as he pushes into you.'
-				
+
 				if AlbinaQW['client1_like'] = 1:
 					cla
-					'Knowing you like it rough, his hand immediately reaches for your nipple and roughly twists it as he starts pounding your pussy. You squeal in pleasure and instintively clench your pussy around his cock. "That''s it, slut! Squeeze harder!" he smirks before wrapping his hand around your neck and squeezing.' 
-					
+					'Knowing you like it rough, his hand immediately reaches for your nipple and roughly twists it as he starts pounding your pussy. You squeal in pleasure and instintively clench your pussy around his cock. "That''s it, slut! Squeeze harder!" he smirks before wrapping his hand around your neck and squeezing.'
+
 					act 'Panic':
 						cla
 						'You look at him in distress, but he just smiles and doesn''t loosen his grip until you''re on the verge of blacking out. He then resumes fucking you, faster and seemingly closer to climax as you clutch your neck and gasp for air.'
@@ -136,7 +136,7 @@ if $ARGS[0] = 'whore1':
 
 						act 'Call a taxi': gt 'albina_starlets_sex', 'cab_home'
 					end
-					
+
 					act 'Enjoy it':
 						cla
 						'You feel yourself becoming aroused as you struggle to breathe and he smiles even wider. "Oh yes, I can feel your pussy getting tighter!"'
@@ -153,13 +153,13 @@ if $ARGS[0] = 'whore1':
 						gs 'cum_call', 'labia', $AlbinaQW['Cust']
 						gs 'arousal', 'end'
 						gs 'stat'
-						
+
 						act 'Call a taxi': gt 'albina_starlets_sex', 'cab_home'
 					end
 				else
 					cla
 					'His hand immediately reaches for your nipple and he painfully twists it between his fat fingers, causing you to squeal loudly in pain and thrash about underneath him. "I like it when sluts put up a bit of resistance. Making pounding your tight little pussy more interesting," he says with a lewd smile before wrapping his hand around your neck and squeezing.'
-					
+
 					act 'Panic':
 						cla
 						'You thrash your arms in distress, but he just smiles and doesn''t loosen his grip until you''re on the verge of blacking out. He then resumes fucking you, faster and seemingly closer to climax as you clutch your neck and gasp for air.'
@@ -181,7 +181,7 @@ if $ARGS[0] = 'whore1':
 				end
 			end
 		end
-		
+
 	end
 end
 
@@ -194,13 +194,13 @@ if $ARGS[0] = 'whore2':
 	$AlbinaQW['Cust1'] = $npclastgenerated
 	gs 'boyStat', $AlbinaQW['Cust1'], 'a'
 	gs 'stat'
-	
+
 	if AlbinaQW['client2'] = 0:
 		AlbinaQW['client2'] = 1
 		gs 'stat'
 		'Laughing, the two Armenians shove you into their hotel room and you fall to the floor. "Get up. It''s time to show us what you''ve got little lamb!" one says.'
 		'"I want to see what those <<$pc_desc[''lips'']>> lips of yours can do. They look like they were made to suck cock!" the other man replies.'
-		
+
 		act 'Please them':
 			*clr & cla
 			guy += 2
@@ -215,12 +215,12 @@ if $ARGS[0] = 'whore2':
 			gs 'arousal', 'hj', 3, 'dick1', 'group', 'sub'
 			gs 'arousal', 'bj', 3, 'dick1', 'group', 'sub'
 			gs 'stat'
-			
+
 			act 'Continue':
 				'"It''s time for you to get roasted, little lamb!" one of them says after you''ve spent a few minutes sucking their cocks.'
 				'You''re grabbed by the hair and roughly pulled to your feet before you''re thrown onto the bed on all fours. The two men undress and move into position at both ends. "You might be the sweetest thing I''ve ever seen. Even sweeter than that last whore your friend gave us!" one of the men laughs.'
 				'You start thinking of that girl and how she handled these men when a sharp slap to the face brings you back and you notice the cock hanging in front of you. "Get back to work whore!" he shouts.'
-				
+
 				act 'Get spitroasted':
 					*clr & cla
 					'<center><video autoplay loop src="images/shared/sex/group/threesomepm8.mp4"></video></center>'
@@ -232,7 +232,7 @@ if $ARGS[0] = 'whore2':
 					gs 'arousal', 'bj', -1, 'dick1', 'group', 'sub', 'rough'
 					gs 'pain', 1, 'cheeks', 'slap'
 					gs 'stat'
-				
+
 					act 'Get roughly pounded':
 						*clr & cla
 						'<center><video autoplay loop src="images/shared/sex/group/threesomepm6.mp4"></video></center>'
@@ -245,7 +245,7 @@ if $ARGS[0] = 'whore2':
 						gs 'arousal', 'vaginal', 30, 'dick1', 'group', 'sub'
 						gs 'cum_call', 'precum', $AlbinaQW['Cust1']
 						gs 'stat'
-						
+
 						act 'Swallow':
 							*clr & cla
 							'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1.11.mp4"></video></center>'
@@ -277,7 +277,7 @@ if $ARGS[0] = 'whore2':
 	else
 		'Laughing, the two Armenians shove you into their hotel room and you fall to the floor. "Get up. It''s time for another roasting, little lamb!" one says.'
 		'"Yeah, I want to see those <<$pc_desc[''lips'']>> lips of yours wrapped around my cock again!" the other man replies.'
-		
+
 		act 'Please them':
 			*clr & cla
 			guy += 2
@@ -292,12 +292,12 @@ if $ARGS[0] = 'whore2':
 			gs 'arousal', 'hj', 3, 'dick1', 'group', 'sub'
 			gs 'arousal', 'bj', 3, 'dick1', 'group', 'sub'
 			gs 'stat'
-			
+
 			act 'Continue':
 				'"It''s time for you to get roasted, little lamb!" one of them says after you''ve spent a few minutes sucking their cocks.'
 				'You''re grabbed by the hair and roughly pulled to your feet before you''re thrown onto the bed on all fours. The two men undress and move into position at both ends. "You''re definetely the best whore your friend has ever given us!" one of the men laughs.'
 				'You start thinking about what he just said when a sharp slap to the face brings you back and you notice the cock hanging in front of you. "Get back to work, whore!" he shouts.'
-				
+
 				act 'Get spitroasted':
 					*clr & cla
 					'<center><video autoplay loop src="images/shared/sex/group/threesomepm8.mp4"></video></center>'
@@ -309,7 +309,7 @@ if $ARGS[0] = 'whore2':
 					gs 'arousal', 'bj', -1, 'dick1', 'group', 'sub', 'rough'
 					gs 'pain', 1, 'cheeks', 'slap'
 					gs 'stat'
-				
+
 					act 'Get roughly pounded':
 						*clr & cla
 						'<center><video autoplay loop src="images/shared/sex/group/threesomepm6.mp4"></video></center>'
@@ -322,7 +322,7 @@ if $ARGS[0] = 'whore2':
 						gs 'arousal', 'vaginal', 30, 'dick1', 'group', 'sub'
 						gs 'cum_call', 'precum', $AlbinaQW['Cust1']
 						gs 'stat'
-					
+
 						act 'Swallow':
 							*clr & cla
 							'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1.11.mp4"></video></center>'
@@ -363,12 +363,12 @@ if $ARGS[0] = 'whore3':
 	$AlbinaQW['Cust1'] = $npclastgenerated
 	gs 'boyStat', $AlbinaQW['Cust1'], 'a'
 	gs 'stat'
-	
+
 	if AlbinaQW['client3'] = 0:
 		AlbinaQW['client3']= 1
 		gs 'stat'
 		'The young men take you to their hotel room. One of them impatiently pulls you along while the other shyly tags along behind you.'
-		
+
 		act 'Get started':
 			*clr & cla
 			guy += 2
@@ -378,7 +378,7 @@ if $ARGS[0] = 'whore3':
 			'As you continue sucking his dick, the shy boy''s confidence grows and he pulls out his much larger cock.'
 			gs 'arousal', 'bj', 5, 'dick', 'sub'
 			gs 'stat'
-			
+
 			act 'Suck their dicks':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjd.jpg"></center>'
@@ -387,7 +387,7 @@ if $ARGS[0] = 'whore3':
 				gs 'arousal', 'bj', 5, 'dick', 'sub', 'group'
 				gs 'arousal', 'bj', 10, 'dick1', 'sub', 'group'
 				gs 'stat'
-			
+
 				act 'Get fucked':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/threesome1.jpg"></center>'
@@ -402,7 +402,7 @@ if $ARGS[0] = 'whore3':
 					gs 'cum_call', 'precum', $AlbinaQW['Cust1']
 					gs 'arousal', 'bj', 5, 'dick', 'sub', 'group'
 					gs 'stat'
-					
+
 					act 'Swallow':
 						*clr & cla
 						'<center><video autoplay loop src="images/shared/sex/cum/mouth/yum.mp4"></video></center>'
@@ -422,7 +422,7 @@ if $ARGS[0] = 'whore3':
 		end
 	else
 		'The two young men take you to their hotel room. The shy one looks a lot more confident than last time.'
-		
+
 		act 'Suck their dicks':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjd.jpg"></center>'
@@ -431,7 +431,7 @@ if $ARGS[0] = 'whore3':
 			gs 'arousal', 'bj', 5, 'dick', 'sub', 'group'
 			gs 'arousal', 'bj', 10, 'dick1', 'sub', 'group'
 			gs 'stat'
-			
+
 			act 'Get fucked':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/threesome1.jpg"></center>'
@@ -448,7 +448,7 @@ if $ARGS[0] = 'whore3':
 				gs 'arousal', 'vaginal', -1, 'dick1', 'sub', 'group'
 				gs 'cum_call', 'precum', $AlbinaQW['Cust1']
 				gs 'stat'
-				
+
 				act 'Facial':
 					*clr & cla
 					'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,5.mp4"></video></center>'
@@ -477,7 +477,7 @@ if $ARGS[0] = 'whore4':
 	npc_spermpot[$AlbinaQW['Cust']] = 20000
 	gs 'boyStat', $AlbinaQW['Cust']
 	gs 'stat'
-	
+
 	'<center><video autoplay loop src="images/shared/home/tv/seeporn.mp4"></video></center>'
 	'His huge arm wrapped around your shoulder, the black man leads you into the hotel room. Your mind drifts to what you''ve seen watching porn and heard from girls at school and you can''t help but notice his huge bulge.'
 
@@ -486,14 +486,14 @@ if $ARGS[0] = 'whore4':
 		guy += 1
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/blackbj.mp4"></video></center>'
 		'The man silently motions for you to strip as he sits on a sofa. You comply and kneel between his legs before unzipping his pants. "Oh. My. God!" you exclaim and stare in bewilderment. His cock is absolutely <i>enormous</i>, about the same size and thickness of your forearm.'
-	    'Wide eyed, you wrap your hands around it and slowly jerk it before taking it into your mouth. You suck and jerk the monster cock as the thought of it being inside you enters your mind...'
+		'Wide eyed, you wrap your hands around it and slowly jerk it before taking it into your mouth. You suck and jerk the monster cock as the thought of it being inside you enters your mind...'
 		gs 'arousal', 'bj', 10, 'sub'
 		gs 'stat'
-	
+
 		act 'Deepthroat':
 			*clr & cla
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/blackdeep.mp4"></video></center>'
-			'After a few minutes, he suddenly takes your head in his hands and pushes you down. You try to relax your throat as he forces your head down on his thick shaft and you do your best to handle it, trying not to choke as he slides in and out of your throat.' 
+			'After a few minutes, he suddenly takes your head in his hands and pushes you down. You try to relax your throat as he forces your head down on his thick shaft and you do your best to handle it, trying not to choke as he slides in and out of your throat.'
 			'Before long, tears are flooding down your cheeks and drool drips from your mouth, but the deepthroating continues as he grabs your hair and starts roughly fucking your throat, causing you to gag and choke as he holds a tight grip on you.'
 			gs 'arousal', 'bj', 10, 'sub', 'deepthroat'
 			gs 'pain', 1, 'throat', 'choke'
@@ -517,7 +517,7 @@ if $ARGS[0] = 'whore4':
 				gs 'cum_call', 'precum', $AlbinaQW['Cust']
 				gs 'arousal', 'end'
 				gs 'stat'
-			
+
 				act 'Take it in the ass':
 					*clr & cla
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/blackanal.mp4"></video></center>'
@@ -530,7 +530,7 @@ if $ARGS[0] = 'whore4':
 					gs 'cum_call', 'legs', $AlbinaQW['Cust']
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act 'Finish':
 						*clr & cla
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/blackfacial1.mp4"></video></center>'
@@ -556,7 +556,7 @@ if $ARGS[0] = 'whore5':
 	npc_dick[$AlbinaQW['Cust']] = 25
 	npc_spermpot[$AlbinaQW['Cust']] = 20000
 	gs 'boyStat', $AlbinaQW['Cust']
-	
+
 	gs 'npcgeneratec', 0, 'the second black man', rand(18,32)
 	$AlbinaQW['Cust1'] = $npclastgenerated
 	$npc_thdick[$AlbinaQW['Cust1']] = 'massive'
@@ -564,7 +564,7 @@ if $ARGS[0] = 'whore5':
 	npc_spermpot[$AlbinaQW['Cust1']] = 20000
 	gs 'boyStat', $AlbinaQW['Cust1'], 'a'
 	gs 'stat'
-	
+
 	'<center><video autoplay loop src="images/shared/home/tv/seeporn.mp4"></video></center>'
 	'As the two black guys lead you into the room, your mind drifts to what you''ve seen watching porn and heard from girls at school. You can''t help but stare at their bulges.'
 
@@ -602,7 +602,7 @@ if $ARGS[0] = 'whore5':
 				gs 'cum_call', 'anus', $AlbinaQW['Cust1'], 0, 0, 0, 120
 				gs 'cum_call', 'legs', $AlbinaQW['Cust1']
 				gs 'stat'
-				
+
 				act 'Swallow':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/blackfacial.jpg"></center>'
@@ -627,7 +627,7 @@ if $ARGS[0] = 'whore5':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/blackthreesome1.jpg"></center>'
-				'You relax your lips and the huge girth slides all the way into your throat as the other monster cock pushes into your pussy, stretching and filling you.' 
+				'You relax your lips and the huge girth slides all the way into your throat as the other monster cock pushes into your pussy, stretching and filling you.'
 				'"<i>Fuck</i>, white pussy is so fucking tight!"'
 				'"Her throat is good too. Bitch knows how to work a cock!"'
 				'You gag and moan as the guys start to fuck you. They also each grab hold of your breasts, kneading them and pinching your nipples.'
@@ -638,13 +638,13 @@ if $ARGS[0] = 'whore5':
 				gs 'cum_call', 'precum', $AlbinaQW['Cust1']
 				minut -= 30
 				gs 'stat'
-				
+
 				act 'Facial':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/blackfacial.jpg"></center>'
 					'You cough when the cock in your mouth is pulled out. "Get ready for it, girl!"'
 					'You''re barely able to close your eyes before you''re hit in the face with a massive stream of cum that drenches you.'
-					'Your eyes glued closed, you feel the other guy pull out of your pussy and telling you to stay still before another huge load of thick cum splatters over your face and into your hair.' 
+					'Your eyes glued closed, you feel the other guy pull out of your pussy and telling you to stay still before another huge load of thick cum splatters over your face and into your hair.'
 					'You wipe the cum away from your eyes and crawl off the bed between the two men as they smile down at you.'
 					'"Damn girl, you are a hot mess!" one of them laughs as you finish them off by slowly jerking their massive cocks.'
 					gs 'cum_call', 'face', $AlbinaQW['Cust'], 0, 0, 0, 120
@@ -704,7 +704,7 @@ if $ARGS[0] = 'whore6':
 				gs 'cum_call', 'precum', $AlbinaQW['Cust']
 				gs 'arousal', 'BDSM', -1, 'sub'
 				gs 'stat'
-				
+
 				act 'Beg to cum':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/souvenir.jpg"></center>'
@@ -729,7 +729,7 @@ if $ARGS[0] = 'whore6':
 						gs 'cum_call', 'pantyrear', $AlbinaQW['Cust']
 						gs 'pain', 1, 'asscheeks', 'slap'
 						gs 'arousal', 'end'
-      					gs 'stat'
+						  gs 'stat'
 						act 'Call a taxi' : gt 'albina_starlets_sex', 'cab_home', 'no_clean'
 					end
 				end
@@ -740,7 +740,7 @@ end
 
 if $ARGS[0] = 'whore7':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bukkake1.jpg"></center>'
-	'The older man brings you to his luxury car and takes you to an upscale hotel in the city center. Once there, he leads you up to his penthouse suite, opening the door and motioning for you to step inside. You gulp when you enter the room and see a group of similar aged men gathered around smoking and drinking.' 
+	'The older man brings you to his luxury car and takes you to an upscale hotel in the city center. Once there, he leads you up to his penthouse suite, opening the door and motioning for you to step inside. You gulp when you enter the room and see a group of similar aged men gathered around smoking and drinking.'
 	'They all look at you with lust in their eyes as the door closes loudly behind you and you jump in fright. You''re now in a hotel room alone with a dozen older men. The man walks over to the group and sits down, taking the drink that''s offered to him. He motions for you to come over and you sheepishly comply.
 	"What''s your name, girl?" he asks as he takes a swig of his drink.
 	"<<$pcs_firstname>>..." you quietly reply and the men laugh.
@@ -805,9 +805,9 @@ if $ARGS[0] = 'whore7':
 end
 
 if $ARGS[0] = 'whore7_1':
-    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bukkake3.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bukkake3.jpg"></center>'
 	'Once the last drops of vodka have burned their way down your throat, the men release you and you collapse forward onto your hands, but a hand lifts you up and your blindfold is ripped off to reveal that all of them have their dicks out and are surrounding you.'
-	'Before you can react, a rather large dick is stuffed into your mouth. You look up and see the man looking down at you impatiently, so you start bobbing your head up and down his shaft as you suck his dick. Two other men then grab your hands and force you to jerk them off as the man in your mouth starts getting rough, causing you to choke and gag, but nobody seems to care. Between the alcohol and your gag reflex, you almost throw up a few times, but manage to endure the rough treatment until he pulls out.' 
+	'Before you can react, a rather large dick is stuffed into your mouth. You look up and see the man looking down at you impatiently, so you start bobbing your head up and down his shaft as you suck his dick. Two other men then grab your hands and force you to jerk them off as the man in your mouth starts getting rough, causing you to choke and gag, but nobody seems to care. Between the alcohol and your gag reflex, you almost throw up a few times, but manage to endure the rough treatment until he pulls out.'
 	'However, you don''t have a chance to recover before you''re passed to another man who starts roughly throat fucking you. You lose focus and track of time as you''re passed around by the men and roughly abused by them.'
 	s=0
 	:loop_whore7_0
@@ -822,9 +822,9 @@ if $ARGS[0] = 'whore7_1':
 
 	act 'Finish':
 		*clr & cla
-	    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bukkake4.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bukkake4.jpg"></center>'
 		'Thankfully, they eventually stop and throw you back into the middle of the circle. You see them all jerking their dicks and squeal when one of them grabs you by the hair and cums over your face.'
-		'The rest of them take their turns blowing their loads over you. When they''re done, your face and hair are covered in sticky cum that drips off your chin. The men are seemingly finished with you, fixing their clothes and going back to smoking and drinking while ignoring you. Exhausted and drunk, you collapse into a ball on the floor, dejected as tears well up in your eyes.' 
+		'The rest of them take their turns blowing their loads over you. When they''re done, your face and hair are covered in sticky cum that drips off your chin. The men are seemingly finished with you, fixing their clothes and going back to smoking and drinking while ignoring you. Exhausted and drunk, you collapse into a ball on the floor, dejected as tears well up in your eyes.'
 		'After a few minutes, you''re able to get up on all fours, gather your clothes and slowly crawl to the bathroom, none of the men caring about you.'
 		s = 0
 		:loop_whore7_1
@@ -839,7 +839,7 @@ if $ARGS[0] = 'whore7_1':
 		act 'Clean up and flee':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bukkake5.jpg"></center>'
-			'Once in the bathroom, you pull yourself up to the sink and turn the water on. You rinse your face and hair as best as you can before collapsing onto the cold tiled floor of the bathroom. You sit there for a few minutes, overwhelmed by what''s happened, but you eventually manage to get dressed and stumble out of the bathroom. The men don''t ackowledge you and don''t say anything as you open the door and leave, slowly making your way down to the lobby where you phone a taxi to take you home.' 
+			'Once in the bathroom, you pull yourself up to the sink and turn the water on. You rinse your face and hair as best as you can before collapsing onto the cold tiled floor of the bathroom. You sit there for a few minutes, overwhelmed by what''s happened, but you eventually manage to get dressed and stumble out of the bathroom. The men don''t ackowledge you and don''t say anything as you open the door and leave, slowly making your way down to the lobby where you phone a taxi to take you home.'
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			minut += 5
@@ -859,7 +859,7 @@ if $ARGS[0] = 'whore7_1':
 			act 'Leave':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/dom_car.jpg"></center>'
-			    'You sit quietly in the back of the taxi as it takes you far from the hotel and the men inside it. All you can think about is how dirty you feel and wanting a thorough shower.'
+				'You sit quietly in the back of the taxi as it takes you far from the hotel and the men inside it. All you can think about is how dirty you feel and wanting a thorough shower.'
 				gs 'underwear','wear'
 				gs 'clothing', 'recover_lost_clothes', 'HotelRoom', 1
 				act 'Go home': gt 'pav_residential'
@@ -870,30 +870,30 @@ end
 
 if $ARGS[0] = 'whore8':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/dom_start.jpg"></center>'
-    'The woman takes you to her car and makes you sit in the back seat. After a silent journey, you arrive at her home and she leads you inside to her bedroom.'
+	'The woman takes you to her car and makes you sit in the back seat. After a silent journey, you arrive at her home and she leads you inside to her bedroom.'
 	'"I want you naked by the time I get back, pet!" she barks and pushes you forward before disappearing out of the room.'
 	if AlbinaQW['client8'] = 0:
-		'Not wanting to anger your client, you strip out of your clothes and place them aside, finishing just as the woman reappears with some items, having exchanged her clothes for a leather dress. She pushes you down on all fours and pulls your ass up into the air. You look back and see she''s holding a buttplug with a tail.' 
+		'Not wanting to anger your client, you strip out of your clothes and place them aside, finishing just as the woman reappears with some items, having exchanged her clothes for a leather dress. She pushes you down on all fours and pulls your ass up into the air. You look back and see she''s holding a buttplug with a tail.'
 		'She spreads your ass and the buttplug is eased into you, causing you to wince slightly as it stretches your anus. She then applies a collar tightly around your neck and pulls roughly on the leash, choking you slightly as she lifts you to your knees and pulls your head up so you''re looking up at her.'
 	else
 		'Knowing what you need to do, you quickly undress and get on all fours with your ass in the air. The woman walks back into the room and smiles at your display. "Good girl," she says and pats you on the head. She inserts the buttplug into you before applying the collar around your neck and pulling you along. "Time for your walk, pet."'
 	end
-	
+
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/dom_walk.jpg"></center>'
-        if AlbinaQW['client8'] = 0:
+		if AlbinaQW['client8'] = 0:
 			'"Now don''t you just look adorable, my little pet! Why don''t we go for a walk?" she asks rhetorically before pulling on your leash and forcing you to crawl around the house on your hands and knees behind her before she brings you back to the room and pulls up her dress, exposing her pussy to you.'
 			'"You''re going to lick my pussy like a good little bitch. If you do it properly, you might get a reward." She then roughly pulls on the leash, dragging your head up to her crotch.'
 		else
 			'You obediently crawl along behind the woman as she takes you on a walk around the house before returning to the bedroom where she pulls up her dress, exposing her pussy.'
 			'"You know what you need to do, pet. You want your reward, yes?" She pulls on your leash and you crawl up to her crotch.'
 		end
-		
+
 		act 'Lick her pussy':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/dom_play.jpg"></center>'
-            'You start licking her pussy and sucking on her clit. Her moans are soft and pleasured, but she suddenly pulls on the leash, removing you from her crotch to look up at her.'
+			'You start licking her pussy and sucking on her clit. Her moans are soft and pleasured, but she suddenly pulls on the leash, removing you from her crotch to look up at her.'
 			if AlbinaQW['client8'] = 0:
 				'"You''ll have to do better than that, bitch! You don''t want me to punish you!" With that, she grabs the back of your head and forces you back into her crotch. She starts grinding against you as you resume eating her out, her moans louder and more pleasured this time.'
 			else
@@ -923,12 +923,12 @@ if $ARGS[0] = 'whore8':
 							'"Ne...next time?" you sheepishly reply.'
 							'"Yes. I quite like you. I might speak to that sweet little friend of yours too. She seems like she''d make a good pet as well..."'
 							'You just nod and spend the rest of the journey in silence. Reaching the gas station, she ushers you out of the car and quickly drives away without another word.'
-							act 'Leave': gt 'zaprF', 'start'
+							act 'Leave': gt 'fuelstation', 'start'
 						else
 							'"You did good tonight, pet. Keep being a good girl like that and everything will be fine. When I''m happy, my pet is happy."'
 							'"Thank you, mistress. I''m glad I could please you," you reply.'
 							'You spend the rest of the journey in silence. Reaching the gas station, she ushers you out of the car and quickly drives away without another word.'
-							act 'Leave': gt 'zaprF', 'start'
+							act 'Leave': gt 'fuelstation', 'start'
 						end
 					end
 				else
@@ -937,9 +937,9 @@ if $ARGS[0] = 'whore8':
 					'"No, no, no! Bad girl! You''re supposed to make me cum like a good little bitch! I''m going to have to punish you now!"'
 					'She forces you down onto all fours and walks up behind you. You yelp when she gives you a hard smack on the ass.'
 					'"You need to learn to be a good little pet!" she barks before delivering another hard smack to your ass, making you yelp even louder. She continues spanking you until your ass is red and stinging.'
-					'"Maybe you''ll remember your purpose now, pet! To make <i>me</i> feel good!"' 
+					'"Maybe you''ll remember your purpose now, pet! To make <i>me</i> feel good!"'
 					'You just nod as tears well up in your eyes.'
-                    gs 'pain', 2, 'asscheeks', 'spank'
+					gs 'pain', 2, 'asscheeks', 'spank'
 					gs 'stat'
 
 					act 'Finished':
@@ -955,13 +955,13 @@ if $ARGS[0] = 'whore8':
 							'"Ne...next time?" you sheepishly reply.'
 							'"Yes. I quite like you but next time I feel like playing, you better be a good girl. I might speak to that sweet little friend of yours too. She seems like she''d make a good pet..."'
 							'You just nod and spend the rest of the journey in silence. Reaching the gas station, she ushers you out of the car and quickly drives away without another word.'
-							act 'Leave': gt 'zaprF', 'start'
+							act 'Leave': gt 'fuelstation', 'start'
 						else
 							'"I thought I told you to be a good girl from now on? You didn''t see me cumming, did you?" she sternly asks.'
 							'"I''ll... I''ll do better next time, mistress..." you sheepishly reply.'
 							'"You better. Otherwise I''m going to have to keep punishing you until you learn."'
 							'You just nod and spend the rest of the journey in silence. Reaching the gas station, she ushers you out of the car and quickly drives away without another word.'
-							act 'Leave': gt 'zaprF', 'start'
+							act 'Leave': gt 'fuelstation', 'start'
 						end
 					end
 				end

+ 32 - 23
locations/albina_wine_event.qsrc

@@ -24,14 +24,15 @@ if $ARGS[0] = 'wine_invite':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
 					'You head downstairs towards the front door, passing by the kitchen along the way. True to her word, Albina is on the couch, still naked and already red faced pouring what is definitely not her first glass of wine.'
-					'"Bye Albina!" you call while waving your hand. She picks up the glass and starts chugging with one hand while giving you the finger with the other as you close the door behind you.'
+					'"Bye, Albina!" you call while waving your hand. She picks up the glass and starts chugging with one hand while giving you the finger with the other as you close the door behind you.'
 					act 'Leave': gt 'pav_residential'
 				end
 			end
 		else
 			cla & *nl
 			'You shake your head. "After getting drunk and chewed out by your mom last time? No thanks. I already get enough from my <<$npc_nickname[''A29'']>> back home."'
-			'"Ugh! You''re such a pussy, <<$pcs_nickname>>!" she replies while rolling her eyes. "Fine, you go shower. <i>I''m</i> getting drunk again." She pads off into the kitchen, leaving you and a trail of wet footprints behind.'
+			'"Ugh! You''re such a pussy, <<$pcs_nickname>>!" she replies while rolling her eyes. "Fine, you go shower. <i>I''m</i> getting drunk again."'
+			'She pads off into the kitchen, leaving you and a trail of wet footprints behind.'
 		end
 		act 'Go and shower':
 			*clr & cla
@@ -43,7 +44,7 @@ if $ARGS[0] = 'wine_invite':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
 				'You head downstairs towards the front door, passing by the kitchen along the way. True to her word, Albina is on the couch, still naked and already red faced pouring what is definitely not her first glass of wine.'
-				'"Bye Albina!" you call while waving your hand. She picks up the glass and starts chugging with one hand while giving you the finger with the other as you close the door behind you.'
+				'"Bye, Albina!" you call while waving your hand. She picks up the glass and starts chugging with one hand while giving you the finger with the other as you close the door behind you.'
 				act 'Leave': gt 'pav_residential'
 			end
 		end
@@ -53,7 +54,7 @@ if $ARGS[0] = 'wine_invite':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/kitchen.jpg"></center>'
 			'Watching Albina walk away, a twinge of regret flashes through your stomach. After a moment''s hesitation, you follow after, entering the kitchen right as she''s pulling a wine bottle out of a cabinet.'
 			*nl
-			'"Well, well..." she says, letting her surprise fade into a smug smirk. "Feeling left out are we?"'
+			'"Well, well..." she says, letting her surprise fade into a smug smirk. "Feeling left out, are we?"'
 			'"Maybe a little," you admit.'
 			'"Well lucky for you, you came just in time." She grabs a pair of glasses and bumps the cabinet closed with her ass before making her way over to you and pulling you to the couch. You wait awkwardly while she opens the bottle before she plops down next to you and hands you a glass.'
 			*nl
@@ -69,8 +70,8 @@ if $ARGS[0] = 'wine_invite':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/kitchen.jpg"></center>'
 		if AlbinaQW['wine'] = 0:
 			'"Sure, that sounds nice. Should I just get dressed and meet you back-"'
-			'"Fuck that," Albina cuts you off and drags you to the kitchen. "It''s better if you drink it right after coming out."'
-			'She puts you down on a couch and saunters over to the wine cabinet, shaking her naked ass along the way, and plucks out two glasses and a bottle. You wait awkwardly while she opens the bottle before she plops down next to you and hands you a glass.'
+			'"Fuck that," she replies, cutting you off and dragging you to the kitchen. "It''s better if you drink it right after coming out."'
+			'She puts you down on a couch and saunters over to the wine cabinet, shaking her naked ass along the way, and plucks out two glasses and a bottle. You wait awkwardly while she opens the bottle before she sits down next to you and hands you a glass.'
 			'"Cheers!" she says with a grin, clinking her glass against yours and downing half the thing in one gulp. You take a more reserved sip, but you feel warmth spread through your chest almost immediately.'
 			*nl
 			'<i>Wow, that <b>is</b> really nice,</i> you think, taking another sip.'
@@ -83,7 +84,7 @@ if $ARGS[0] = 'wine_invite':
 		act 'Drink': gt 'albina_wine_event','start'
 	end
 !!{	if AlbinaQW['wine'] > 0:
-		act'I can''t get drunk right now':
+		act 'I can''t get drunk right now':
 			cla & *nl
 			'You shake your head. "No thanks, I can''t get drunk right now. I have things to do."'
 		end
@@ -102,7 +103,7 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
 	if AlbinaQW['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. And judging by the change in conversation and the wetness between her thighs, it seems Albina is a <i>horny</i> drunk.'
+		'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 she''s a <i>horny</i> drunk.'
 		*nl
 		'"<<$pcs_nickname>>!" Albina shouts, interrupting your thoughts. "I''m fucking talking to you!"'
 		'You blink in confusion.'
@@ -206,7 +207,7 @@ end
 
 if $ARGS[0] = 'pussy_taste':
 	'"I love the taste of my own pussy," Albina abruptly says out loud. "Is that weird?"'
-	act'Super weird':
+	act 'Super weird':
 		cla & *nl
 		'"That''s super fucking weird," you slur back.'
 		'"Bullshit!" she shouts even louder than before. "You can''t tell me you don''t like the taste of ''ur own brand. I know you do, you filthy slut!"'
@@ -309,7 +310,7 @@ if $ARGS[0] = 'dominate_albina':
 		'"First, I''d bend you over my lap," you smile gently, running your fingers through her hair. Something in your voice makes her eyes go wide. She glances to the side as if realizing that her head is exactly where you said you''d bend her over.'
 		'"Then, I''d sit you up so your ass is nice and high," you continue. "And then I''d <i>spank you within an inch of your life.</i>" You keep your easy tone, but give Albina a hard stare and her breath hitches. "I''d keep going until your ass is red and swollen. Let my fingers trail over your pussy, edging you until you <i>beg</i> me to let you cum. And then, <i>I won''t.</i>"'
 		*nl
-		'Albina''s face flushes red and she swallows reflexively. Looking down her body, you see her nipples are rock-hard and her thighs are practically dripping with girl cum.'
+		'Her face flushes red and she swallows reflexively. Looking down her body, you see her nipples are rock-hard and her thighs are practically dripping with girl cum.'
 		'"That..." she gulps. "Would be a pretty good way of doing it..."'
 		*nl
 		'She tears herself away from your gaze and buries her face in her wine glass, taking big desperate gulps.'
@@ -347,21 +348,21 @@ if $ARGS[0] = 'dominate_albina':
 	act 'Grab you by the hair and fuck your ass':
 		cla & *nl
 		'"Well, first thing I would get a nice, <i>big</i>, strapon," you smirk. Albina bites her lip, unconsciously rubbing her thighs together while she waits for your next words. "And then I''d grab you by the hair, nice and tight, and shove it right up your ass!"'
-		'"<i>Fuck!</i> That''s good!" Albina moans, her hand snaking between her legs and shamelessly rubbing her pussy. "Have you been watching me and Lazar or something? That''s <i>just</i> how I like it," she says, a twinkle in her eye as her fingers come back up wet and sticky. She maintains eye contact as she runs her tongue across them, licking up her own juices.'
+		'"<i>Fuck!</i> That''s good!" she moans, her hand snaking between her legs and shamelessly rubbing her pussy. "Have you been watching me and Lazar or something? That''s <i>just</i> how I like it," she says, a twinkle in her eye as her fingers come back up wet and sticky. She maintains eye contact as she runs her tongue across them, licking up her own juices.'
 		gs 'albina_wine_event','wine_chat2'
 	end
 	
 	act 'Tie you down':
 		cla & *nl
 		'"I''d get some rope and tie you to your own bed," you grin. "And then... I think I''d do whatever I want to you."'
-		'You let imagination take over for you and it seems to work. Albina''s cheeks immediately flush and her breath grows heavy. Her nipples harden and her thighs rub together as moisture glistens between them.'
+		'You let imagination take over for you and it seems to work. Her cheeks immediately flush and her breath grows heavy. Her nipples harden and her thighs rub together as moisture glistens between them.'
 		'"That," she gulps. "Sounds like a pretty good way of doing it..."'
 		gs 'albina_wine_event','wine_chat2'
 	end
 end
 
 if $ARGS[0] = 'masturbation_talk':
-	'"How often do you masturbate <<$pcs_nickname>>?" Albina asks loudly, without even a shred of shame or decency.'
+	'"How often do you masturbate, <<$pcs_nickname>>?" Albina asks loudly, without even a shred of shame or decency.'
 	act 'Embarrassed':
 		cla & *nl
 		'"Albina! That''s..." you stammer and trail off. You suddenly can''t look at her anymore and your face grows hot for reasons you try to rationalize is just the wine.'
@@ -550,11 +551,11 @@ if $ARGS[0] = 'porn_talk':
 				'"Something about the taboo nature of it I guess," you shrug. "That it''s so forbidden. I don''t know, it''s just fucking hot."'
 				'"Well I think it''s <i>fucking gross</i>." She makes a gagging face.'
 			else
-				'"<i><b>OH!</b></i>" Albina abuptly sits up in your lap. "Ew! Ew! Ew! Ew!"'
+				'"<i><b>OH!</b></i>" She abuptly sits up in your lap. "Ew! Ew! Ew! Ew!"'
 				'"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-!" Albina cuts you off in a way that prevents further argument.'
+				'"Not-! Discussing-!" She cuts you off in a way that prevents further argument.'
 			end
 			gs 'albina_wine_event','wine_chat2'
 		end
@@ -597,7 +598,7 @@ if $ARGS[0] = 'porn_talk':
 				*nl
 				'"I... I broke... I begged him to make it stop. I apologized, told him I was sorry for being a delinquent daughter, that I would never do it again. And he... he just let them keep going. They kept raping me until I passed out. I don''t even know if they stopped after that..."'
 				*nl
-				'Albina lets her hair fall over her face, but you can see her shoulder shaking with silent sobs.'
+				'She lets her hair fall over her face, but you can see her shoulder shaking with silent sobs.'
 				act 'Comfort her':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
@@ -627,7 +628,7 @@ if $ARGS[0] = 'tell_raped':
 			*nl
 			if stat['rape_count'] = 1:
 				if pav_swimpool['rape'] = 1 or pav_swimpool['virgin_rape'] = 1:
-					'"At the swimming pool in town. I was have a late evening swim when some old man attacked me right there in the water."'
+					'"At the swimming pool in town. I was having a late evening swim when some creepy old man attacked me right there in the water."'
 				end
 				
 				if memory['city_res_rape'] = 1 or memory['city_center_rape'] = 1:
@@ -816,7 +817,8 @@ if $ARGS[0] = 'commando_talk':
 end
 
 if $ARGS[0] = 'stripper_talk':
-	'"Do you think I would make a good stripper?" Albina asks.'
+	'"Do you think I''d make a good stripper?" she asks.'
+	
 	act 'Probably':
 		cla & *nl
 		'"Probably?" you mumble back. "You can dance and love shoving your ass in people''s faces. Prime stripper qualities. Why do you ask?"'
@@ -824,6 +826,13 @@ if $ARGS[0] = 'stripper_talk':
 		gs 'albina_wine_event','wine_chat2'
 	end
 	
+	act 'Hell yeah':
+		cla & *nl
+		'"Hell yeah!" you laugh, almost spilling your wine on both yourself and Albina. "You''d make a killing shaking that big fat ass in guy''s faces!"'
+		'Albina silently takes a swig of her wine, but you catch a glimpse of the smug grin on her face as she looks up at you.'
+		gs 'albina_wine_event', 'wine_chat2'
+	end
+	
 	act 'Too bitchy':
 		cla & *nl
 		'"Nah." You wave your hand dismissively. "Too bitchy."'
@@ -888,7 +897,7 @@ if $ARGS[0] = 'wine_chat2':
 		end
 	end}
 	
-	act'Your mom is is very pretty':
+	act 'Your mom is is very pretty':
 		*clr & cla
 		'<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.'
@@ -929,7 +938,7 @@ if $ARGS[0] = 'wine_chat2':
 					gs 'stat'
 					*clr & cla
 					'<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 arms, 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 this for a few minutes and when you finally release her, a real smile is spread across her face.'
+					'Despite her supposed acceptance, it''s easy to tell that she''s trying to be stoic, covering up for the still-open wounds inside her. Taking her head in your arms, 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 this 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'
@@ -944,7 +953,7 @@ if $ARGS[0] = 'wine_chat2':
 						'"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.'
+						'She 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
@@ -1479,7 +1488,7 @@ if $ARGS[0] = 'caught':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/kitchen.jpg"></center>'
 		'"What the hell do you think you''re doing, young lady?!" Zoya asks before grabbing Albina by the ear and yanking her to her feet. "Drunk in the middle of the day?! And while <i>naked</i>?!"'
-		'"Ow! Ow ow ow ow ow!" Albina whines in pain while standing on her tiptoes trying to escape her mother''s grasp. "We''re just having some fun! Lay off Mama!"'
+		'"Ow! Ow ow ow ow ow!" Albina whines in pain while standing on her tiptoes trying to escape her mother''s grasp. "We''re just having some fun! Lay off, Mama!"'
 		'Zoya ignores her pleas. "I thought even you had better sense than this, Albina!"'
 		'"What are you gonna do? <i>Spank me</i>?" Albina glares back rebelliously. "Don''t be such a bitch!"'
 		'"What did you just say to me?!" Zoya sputters before she drags Albina off towards the stairs, howls of pain following. "I am your <i>mother</i>! I will not tolerate such disrespect!"' 
@@ -1488,7 +1497,7 @@ if $ARGS[0] = 'caught':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
 			'You stumble around, drunkenly finding your clothes as shouts of pain and anger echo down from above until a door slams and they finally cease. Zoya then comes huffing down the stairs.'
-			'"I can''t believe that girl sometimes..." she mutters to herself. "Damn you Boris. Grooming my daughter into a shameless slut..."'
+			'"I can''t believe that girl sometimes..." she mutters to herself. "Damn you, Boris! Grooming my daughter into a shameless slut..."'
 			*nl
 			'Once she gets to the bottom of the stairs, she straightens her skirt and grabs you by the hand.'
 			'"Come, I''m taking you home."'

+ 196 - 655
locations/albinahome.qsrc

@@ -4,39 +4,54 @@
 !! Albina House Schedule
 !! 23 - 07 ... no reply
 
-if $ARGS[0] = 'gate':
-	AlbinaQW['event'] = 0
-	act 'Leave':gt 'pav_residential'
+if $ARGS[0] = 'door_bell':
+	act 'Leave': gt 'pav_residential'
 	
     if hour = 23 or hour < 7:
 		'There are better times for a house call than right now.'
 	elseif hour < 9:
-		'You push a button on the intercom, and a female voice blasts through. "What kind of ungodly hour do you call this?! Come back later for a social call!" That must have been her mother.'	
-	elseif hour <17:
-		if (kanikuli = 0) and (week < 6):
-			'Nobody answers when you buzz the intercom a few times, and you decide to leave.'
-		else
-			gt 'albinahome', 'mom answers'
+		'You push a button on the intercom, and a female voice blasts through.'
+		'"What kind of ungodly hour do you call this?! Come back later for a social call!"'
+		'That must have been her mother.'
+	else
+		'You push a button on the intercom and hear a female voice on the other end.'
+		'"May I ask who this is?" the voice says.'
+		'"It''s <<$pcs_firstname>>," you answer. "I''m a friend of Albina''s."'
+		if hour < 17:
+			if (kanikuli = 0) and (week < 6):
+				'Nobody answers when you buzz the intercom a few times, and you decide to leave.'
+			else
+				'"Of course, please come in."'
+				'The gate buzzes and you hear the click of the latch unlocking.'
+				act 'Walk up the driveway': gt 'albinahome', 'maid_greet'
+			end
+		elseif hour < 21:
+			'"Of course, please come in."'
+			'The gate buzzes and you hear the click of the latch unlocking.'
+			act 'Walk up the driveway': gt 'albinahome', 'maid_greet'
+		else	
+			'"I''m terribly sorry, but Miss Barlovskaya is not available right now. You might try again later."'
+			'The line goes <i>click</i> and the gate remains closed.'
 		end
-	elseif hour < 20:
-		gt 'albinahome', 'mom answers'
-	else	
-		if hour >= 9:'You push a button on the intercom, and a female voice asks who it is. When you say you''re here to see Albina, she tells you that Albina is unavailable and you should come back later.'
 	end
 	gs 'stat'
 end
 
-if $ARGS[0] = 'mom answers':
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinahome.jpg"></center>'
-	if AlbinaQW['albride'] = 2:
-		AlbinaQW['albride'] = 3
-		'You push a button on the intercom, and you''re surprised to hear a somewhat cautious-sounding female voice crackle through the speaker as you hear Albina in the background.'
-		'The strange voice asks who you are and when she says your name to Albina, Albina gleefully tells you to excuse her mother''s caution and invites you in. The voice apologizes to you as the gate slowly opens.'
-		act 'Walk up the driveway': gt 'albinahome', 'hallway'
-	else
-		'You push a button on the intercom and hear the familiar voice of Albina''s mother on the other end. You tell her it''s you, and she opens the gate.'
-		'"She enjoys having you come round and visit her, you know? It''s good for her to have such a dependable friend to rely on after everything she''s been through," she adds.'
-		act 'Walk up the driveway': gt 'albinahome', 'hallway'
+if $ARGS[0] = 'maid_greet':
+	if AlbinaQW['visiting'] ! daystart:
+		!! Entering the house and getting random chances for events/being met by random household member
+		AlbinaQW['visiting'] = daystart
+		if rand(1,5) = 1:
+			gt 'albina_house_events','alb_yoga_start'
+		elseif rand(1,4) = 2:
+			gt 'albina_sex_scenes','lazar_start'
+		else
+			!! maid greeting sveta at front door
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/maid.jpg"></center>'
+			'The maid answers the door with a polite smile.'
+			'"Please make yourself at home Miss <<$pcs_lastname>>," she says, motioning for you to enter and taking your coat.'
+			act 'Continue': gt 'albinahome', 'hallway'
+		end
 	end
 end
 
@@ -52,100 +67,24 @@ if $ARGS[0] = 'hallway':
 	minut += 3
 	gs 'stat'
 	gs 'themes', 'indoors'
-	if AlbinaQW['albride'] = 3:
-		!!First time visiting on your own after she shows you where she lives
-		AlbinaQW['visiting'] = 1
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
-		'You walk up the long driveway to the front door and knock. It opens to reveal a woman you estimate to be in her late 30s. She''s beautiful and well-dressed. She wears high heels, a pencil skirt, and a partially unbuttoned blouse that gives you a view of her substantial cleavage that bulges against the fabric.'
-		'"You must be <<$pcs_firstname>>!" she smiles. "Albina has told me quite a bit about you. All good things, I assure you," she adds with a laugh.'
-		'The woman holds her hand for you to shake, and you do so tentatively. "I''m sorry, and you are...?"'
-		'"Oh! Forgive my rudeness. I''m Albina''s mother, Zoya Petrenko." <i>Albina''s mother??</i> You think, shocked by the introduction.'
-		'"It''s a pleasure to meet you!" you blurt out. "Mrs... Ms... Uhh..." you flounder, realizing she didn''t use Albina''s surname, and you''re unsure what to do.'
-		'"Doctor, actually," she says, handling it with grace. "But," she continues, holding up her hand. "You can just call me Zoya."'
-		'"Oh no! I could-"'
-		'"I insist," she smiles warmly. "Would you like to come inside?"'
-		act 'Continue':
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
-			'"Albina is in her room right now. I expect the maid has told her of your arrival already." She grabs her coat and clatters her way to the front door. "I wish I could be a more entertaining host, but I have to get to the hospital, so I will just have to leave that to my daughter. If you are a frequent visitor, you might not see me often, but do come and say hello if I''m ever home when you visit. It was nice meeting you, <<$pcs_firstname>>."'
-			'She gives a parting smile and closes the door behind her.'
-			act 'Continue': gt 'albinahome', 'bedroom'
-		end
-	elseif AlbinaQW['visiting'] = 0:
-		!! Entering the house and getting random chances for events/being met by random household member
-		AlbinaQW['visiting'] = 1
-		temp = iif((month < 9) and (month > 5) and (week = 3 or week = 6), rand(1, 12), rand(1,10)) 
-		if temp < 3 or temp > 10: AlbinaQW['event'] = 1
-		if temp = 1:
-			!! Lazar Sex Event
-			gt 'albina_lazar_sex', 'lazar_start'
-		elseif temp = 2:
-			!! hot tub
-			gt 'albina_house_events', 'hot_tub1'
-		elseif temp = 3 and temper < 10:
-			!! swim winter
-			AlbinaQW['event'] = 1
-			gt 'albina_house_events', 'swim_winter1'
-		elseif temp <= 5 and AlbinaQW['studylock'] = 0 and AlbinaQW['flashdrive'] = 0:
-			!! laptop event
-			gt 'albina_house_events', 'study_door'
-		elseif temp = 11:
-			!! Mom Event
-			gt 'albina_mother_events', 'zoya_sunbathing_solo'
-		elseif (temp = 12) :
-			!! Mom Albina Event
-			gt 'albina_mother_events', 'zoya_sunbathing_albina'
-		else
-			!! Greeted by maid(Wed or Sat) or Mother(Zoya) or Albina
-			if week = 3 or week = 6:
-				if temper > 10 and rand(1, 5) = 1:
-					if rand(0, 1) = 0:
-						!! Albina yoga
-						gt 'albina_house_events', 'alb_yoga_1'
-					else
-						!! Albina sunbathing
-						gt 'albina_house_events', 'alb_sunbathe_1'
-					end
-				else
-					!! maid greeting sveta at front door
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/maid.jpg"></center>'
-					'The maid answers the door with a polite smile.'
-					'"Miss Albina is in her room and said you should meet her there," she says before motioning for you to enter and closing the door before returning to her duties.'
-					act 'Continue': gt 'albinahome', 'bedroom'
-				end
-			else
-				temp = rand(1, 2)
-				if temp = 1:
-					!! Zoya greets you
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
-					'The door opens, and you see that it''s Zoya, who smiles at you.'
-					'"Please make yourself at home <<$pcs_nickname>>. Albina is up in her room. I''m sure she''ll be thrilled to see you."'
-					act 'Continue': gt 'albinahome', 'bedroom'
-				else
-					!! Albina greets you
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-					'The door flies open, and Albina greets you with a tight hug.'
-					'"<<$pcs_nickname>>! Come in, come in," she says while dragging you inside and closing the door.'
-					act 'Continue': gt 'albinahome', 'bedroom'
-				end
-			end
-		end
-	else
-		!! For leaving the house or going to the bathroom, no random event chances
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
-		'The foyer is well-appointed with hardwood flooring, numerous arches and tasteful decor. Lighting is sunk into the exquisite staircase with wraparound balconies on either side.'
-		'You have been asked not to wander around the house alone, so you''re limited in where you can go.'
-		act 'Go back to town':
-			AlbinaQW['visiting'] = 0
-			minut += 3
-			gt 'pav_residential'
-		end
-		act 'Go to the bathroom':gt 'albinahome', 'bathroom'
-		act 'Go to Albina''s bedroom':gt 'albinahome', 'bedroom'
+
+	!! For leaving the house or going to the bathroom, no random event chances
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
+	'The foyer is well-appointed with hardwood flooring, numerous arches and tasteful decor. Lighting is sunk into the exquisite staircase with wraparound balconies on either side.'
+	'You have been asked not to wander around the house alone, so you''re limited in where you can go.'
+	act 'Leave':
+		!! AlbinaQW['visiting'] = 0
+		minut += 3
+		gt 'pav_residential'
 	end
+	act 'Go to Albina''s bedroom': gt 'albinahome', 'bedroom'
+!!	act 'Go to Zoya''s bedroom': gt 'albinahome', 'zoya_room'
+	act 'Go to the bathroom': gt 'albinahome', 'downstairs_bathroom'
+	act 'Go to the kitchen': gt 'albinahome', 'kitchen'
+	act 'Go to the pool': gt 'albinahome', 'pool_side'
 end
 
-if $ARGS[0] = 'bathroom':
+if $ARGS[0] = 'downstairs_bathroom':
 	$loc_arg = 'bathroom'
 	$loc = 'albinahome'
 	$locM = 'albinahome'
@@ -170,7 +109,8 @@ if $ARGS[0] = 'bathroom':
 		if pain['total'] > 0 and pain['killer'] = 0:
 			act 'Take a painkiller':
 				cla
-				gs 'drugs', 'painkiller'
+				pain['killer'] += 1
+				mc_inventory['painkillers'] -= 1
 				pcs_hydra += 20
 				gs 'stat'
 				*nl
@@ -182,6 +122,25 @@ if $ARGS[0] = 'bathroom':
 	gs 'din_van', 'prvt_pee'
 end
 
+if $ARGS[0] = 'bedroom_event_random':
+	!!temp = iif((month < 9) and (month > 5) and (week = 3 or week = 6), rand(1, 12), rand(1,10)) 
+	if rand(1,6) = 1:
+		!! Lazar Sex Event
+		gt 'albina_sex_scenes', 'lazar_start'
+	elseif rand(1,5) = 1:
+		!! hot tub
+		gt 'albina_house_events', 'hot_tub1'
+	elseif rand(1,4) = 1 and temper < 10:
+		!! swim winter
+		gt 'albina_house_events', 'swim_winter1'
+	elseif rand(1,3) = 1 and AlbinaQW['studylock'] = 0 and AlbinaQW['flashdrive'] = 0:
+		!! laptop event
+		gt 'albina_house_events', 'study_door'
+	elseif rand(1,2) = 1:
+		gt 'albina_house_events','alb_bedroom_shower'
+	end
+end
+
 if $ARGS[0] = 'bedroom':
 	$loc = 'albinahome'
 	$loc_arg = 'bedroom'
@@ -190,22 +149,15 @@ if $ARGS[0] = 'bedroom':
 	$menu_loc = 'albinahome'
 	$menu_arg = 'bedroom'
 	menu_off = 0
-	
-	if AlbinaQW['event'] = 0:
-		AlbinaQW['event'] = 1
-
-		if month >=11 or month <=3:
-            AlbinaQW['activities'] = rand(1,3)
-            if AlbinaQW['activities'] = 1:
-                gt 'albina_house_events', 'swim_winter1'
-            end
-        end
-		if AlbinaQW['extra'] ! daystart: 
-			if rand(0,10) = 0: 
-				gt 'albina_house_events','dancing' 
-			elseif rand(0,9) = 0:
-				gt 'albina_house_events','ass_too_big'
-			end
+	if AlbinaQW['daily_event'] < daystart:
+		AlbinaQW['daily_event'] = daystart
+		gs 'albinahome', 'bedroom_event_random'
+	elseif AlbinaQW['extra_event'] ! daystart:
+		AlbinaQW['extra_event'] = daystart
+		if rand(1,10) = 1: 
+			gs 'albina_house_events','dancing' 
+		elseif rand(1,9) = 1:
+			gs 'albina_house_events','ass_too_big'
 		end
 	end
 	minut += 1
@@ -219,16 +171,112 @@ if $ARGS[0] = 'bedroom':
 		act 'Hang out': gt $loc, $loc_arg
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-		'You are impressed at how nice Albina''s bedroom looks, the centerpiece being a large double bed covered in soft pillows. A door at the back of the room leads to her en-suite bathroom, and she even has a sliding door leading to a balcony that overlooks the nearby lake. A closet full of expensive-looking clothes is built into one of the walls.'
-		'By the bed is a small <a href="exec:gt ''albina_house_events'',''night_stand''">nightstand</a>, and on a desk is a <a href="exec:gt ''albina_house_events'',''computer''">laptop</a>'
+		'Albina''s bedroom is, in a word, <i>extravagant</i>. The centrepiece is a large double bed covered in soft pillows and a door at the back of the room leads to her en-suite <a href="exec:gt ''albinahome'',''albina_bathroom''">bathroom</a>. There''s even a sliding door leading to a balcony that overlooks the pool. A closet full of expensive-looking clothes is built into one of the walls.'
+		'A small <a href="exec:gt ''albina_house_events'',''night_stand''">nightstand</a> rests next to the bed and a <a href="exec:gt ''albina_house_events'',''computer''">laptop</a> is sitting on the desk.'
 		act 'Return to the hallway': gt 'albinahome', 'hallway'
 		act 'Chat with Albina': gt 'albina_chat', 'chat'
-		act 'Talk about video games': gt 'albinahome', 'game'
+		act 'Talk about video games': gt 'albina_house_events', 'tekken_game'
 		act 'Talk about clothes': gt 'albinahome', 'dressing'
-		if AlbinaQW['SportDay'] ! daystart:
-			act 'Talk about dancing': gt 'albinahome', 'dancing'
+!!		if AlbinaQW['SportDay'] ! daystart:
+!!			act 'Talk about dancing': gt 'albinahome', 'dancing'
+!!		end
+	end
+end
+
+if $ARGS[0] = 'albina_bathroom':
+	$loc_arg = 'bathroom'
+	$loc = 'albinahome'
+	$locM = 'albinahome'
+	$locM_arg ='albina_bathroom'
+	$menu_loc = 'albinahome'
+	$menu_arg = 'albina_bathroom'
+	menu_off = 0
+	$location_type = 'bathroom'
+	*clr & cla
+	minut += 1
+	gs 'stat'
+	gs 'themes', 'indoors'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/bathroom.jpg"></center>'
+	'Albina''s bathroom.'
+	*nl
+	'There is a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh < 1,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a separate bath tub.'
+	!! add a dildo?
+	act 'Return to Albina''s room': gt 'albina_chat', 'chat_exit'
+	dynamic $tampon
+	dynamic $quickwash
+	dynamic $basin
+	if mc_inventory['painkillers'] > 0:
+		if pain['total'] > 0 and pain['killer'] = 0:
+			act 'Take a painkiller':
+				cla
+				pain['killer'] += 1
+				mc_inventory['painkillers'] -= 1
+				pcs_hydra += 20
+				gs 'stat'
+				*nl
+				'You take a painkiller and gulp it down with a glass of water.'
+				act 'Finish': gt $loc, $loc_arg
+			end
+		end
+	end
+	gs 'din_van', 'prvt_pee'
+end
+
+
+if $ARGS[0] = 'kitchen':
+	$locM_arg = 'kitchen'
+	$locM = 'albinahome'
+	$loc_arg = 'kitchen'
+	$loc = 'albinahome'
+	$menu_loc = 'albinahome'
+	$menu_arg = 'kitchen'
+	$location_type = 'indoors'
+	menu_off = 0
+	CLOSE ALL
+	*clr & cla
+	minut += 1
+	$locclass = 'kitr'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/albina/home/kitchen.jpg"></center>'
+	'Albina''s kitchen.'
+	gs 'kit_din'
+	act 'Back to the hall': gt 'albinahome', 'hallway'
+	act 'Go to Albina''s bedroom': gt 'albinahome', 'bedroom'
+!!	act 'Go to Zoya''s bedroom': gt 'albinahome', 'zoya_room'
+	act 'Go to the bathroom': gt 'albinahome', 'downstairs_bathroom'
+	act 'Go to the pool': gt 'albinahome', 'pool_side'
+end
+
+if $ARGS[0] = 'pool_side':
+	if AlbinaQW['daily_event'] ! daystart and rand(1,2) = 1 and temper > 20 and daystage >= 2 and daystage <= 4:
+		AlbinaQW['daily_event'] = daystart
+		if week < 6:
+			!! Albina sunbathing
+			gt 'albina_house_events', 'alb_sunbathe_1'
+		else
+			if rand(1,2) = 1:
+				!! Mom Event
+				gt 'albina_mother_events', 'zoya_sunbathing_solo'
+			else
+				!! Mom Albina Event
+				gt 'albina_mother_events', 'zoya_sunbathing_albina'
+			end
 		end
 	end
+	*clr & cla
+	minut += 1
+	gs 'stat'
+	if month >= 11 or month <= 3:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
+	end
+	'Albina''s pool.'
+	act 'Back to the hall': gt 'albinahome', 'hallway'
+	act 'Go to Albina''s bedroom': gt 'albinahome', 'bedroom'
+!!	act 'Go to Zoya''s bedroom': gt 'albinahome', 'zoya_room'
+	act 'Go to the bathroom': gt 'albinahome', 'downstairs_bathroom'
+	act 'Go to the kitchen': gt 'albinahome', 'kitchen'
 end
 
 if $ARGS[0] = 'dancing':
@@ -250,7 +298,7 @@ if $ARGS[0] = 'dancing':
 			'"Eyes up here, <<$pcs_nickname>>! Anyway, if you want, I could teach you about stripping and pole dancing?"'
 			act 'No thanks': AlbinaQW['SportDay'] = daystart & gt 'albinahome', 'bedroom'
 			act 'Teach me stripping': gt 'albinahome', 'stripping'
-			act 'Teach me pole-dancing': gt 'albinahome', 'poledancing'
+			act 'Teach me poledancing': gt 'albinahome', 'poledancing'
 		end
 	else
 		'<center><video autoplay loop src="images/locations/pavlovsk/resident/albinahome/train.mp4"></video></center>'
@@ -258,7 +306,7 @@ if $ARGS[0] = 'dancing':
 		'She smiles at you. "Well? Want me to teach you some things?"'
 		act 'No thanks': AlbinaQW['SportDay'] = daystart & gt 'albinahome', 'bedroom'
 		act 'Teach me stripping': gt 'albinahome', 'stripping'
-		act 'Teach me pole-dancing': gt 'albinahome', 'poledancing'
+		act 'Teach me poledancing': gt 'albinahome', 'poledancing'
 	end
 end
 
@@ -272,7 +320,8 @@ if $ARGS[0] = 'stripping':
 	if pcs_danc >= 40:
 		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.'
+		'"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 don''t learn anything new since you already know everything she can teach you.'
 	else
@@ -281,7 +330,7 @@ if $ARGS[0] = 'stripping':
 		'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
 	gs 'albinahome', 'post_workout_shower'
-	act 'Rest':gt 'albinahome', 'bedroom'
+	act 'Rest': gt 'albinahome', 'bedroom'
 end
 
 if $ARGS[0] = 'poledancing':
@@ -296,10 +345,10 @@ if $ARGS[0] = 'poledancing':
 		'Albina leads you to the home gym, where she teaches various acrobatic moves on the pole. The two of you greatly enjoy yourselves.'
 		if pcs_dancpol >= 100: 'You didn''t learn anything new since you already know everything she can teach you.'
 		gs 'albinahome', 'post_workout_shower'
-		act 'Rest':gt 'albinahome', 'bedroom'
+		act 'Rest': gt 'albinahome', 'bedroom'
 	elseif pcs_stren < 40 and pcs_dancero > 50:
-		'You try your best to follow Albina''s instructions but end up smacking your head on the pole instead and falling to the floor.'
-		'You are flat on your back and see Albina kneeling over you. "Are you okay, <<$pcs_nickname>>? You''re still too weak for pole dancing, so we need to develop your strength instead."'
+		'You try your best to follow Albina''s instructions, but end up smacking your head on the pole instead and falling to the floor.'
+		'You''re flat on your back and see Albina kneeling over you. "Are you okay, <<$pcs_nickname>>? It looks like you''re still too weak for pole dancing, so we need to develop your strength instead."'
 		'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
@@ -309,7 +358,7 @@ if $ARGS[0] = 'poledancing':
 			'Albina shows you how to develop your strength using various exercises.'
 			'You wonder if these exercises are how she has such a great-looking ass.'
 			gs 'albinahome', 'post_workout_shower'
-			act 'Rest':gt 'albinahome', 'bedroom'
+			act 'Rest': gt 'albinahome', 'bedroom'
 		end
 	else
 		gs 'stat'
@@ -321,20 +370,19 @@ if $ARGS[0] = 'poledancing':
 			gs 'stat'
 			'Albina teaches you how to passionately dance to the music while stripping.'
 
-			if pcs_dancero >= 100:'You don''t learn anything new since you already know everything she can teach you.'
+			if pcs_dancero >= 100: 'You don''t learn anything new since you already know everything she can teach you.'
 		else
 			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
 		gs 'albinahome', 'post_workout_shower'
-		act 'Rest':gt 'albinahome', 'bedroom'
+		act 'Rest': gt 'albinahome', 'bedroom'
 	end
 end
 
 if $ARGS[0] = 'post_workout_shower':
 	'"You''re looking a little sweaty there, <<$pcs_nickname>>. You should go and have a shower. Mama wouldn''t like it if you got sweat marks all over the furniture. Meet me in my bedroom when you''re done."'
-	'You nod and take a quick shower before returning to her.'
 	dynamic $shower
 end
 
@@ -352,515 +400,8 @@ if $ARGS[0] = 'dressing':
 	end
 end
 
-if $ARGS[0] = 'game':
-	*clr & cla
-	menu_off = 1
-	minut += 2
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-	'You notice the flat-screen TV and a games console sitting in front of it. A row of various Tekken and Mortal Kombat games sit underneath them.' 
-	'"I wish I could afford a console..." you mumble.'
-	'She smiles at you. "You want to play a few games?"'
-	act 'No':
-		*clr & cla
-		menu_off = 1
-		minut += 2
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-		'You shake your head. "Not right now, thanks. I just noticed them, is all. Maybe some other time."'
-		'She shrugs. "Sure. If you ever want to play, all you have to do is ask."'
-		act 'Do something else': gt 'albinahome', 'bedroom'
-	end
-	act 'Yes':
-		*clr & cla
-		menu_off = 1
-		minut += 30
-		pcs_mood += 15
-		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>'
-		if AlbinaQW['gamebet'] = 1:
-			'You and Albina lie down in front of the TV after picking one of the games. She turns towards you and gives you a grin. "Feel like putting your ass on the line and betting again?"'
-			act 'Accept the bet': gt 'albinahome', 'game_bet'
-			gs 'willpower', 'sex', 'resist', 'medium'
-			if will_cost <= pcs_willpwr:
-				act 'Refuse (<<will_cost>> Willpower)':
-					*clr & cla
-					menu_off = 1
-					minut += 60
-					pcs_mood += 15
-					gs 'exp_gain', 'react', rand(0, 1)
-					gs 'exp_gain', 'gaming', rand(1, 2)
-					npc_rel['A23'] -= 1
-					gs 'willpower', 'pay', 'resist'
-					gs 'stat'
-					'You shake your head. "Not this time."'
-					'She''s clearly a little disappointed, but turns her attention back to the game. "You''re so going to lose!" she laughs. You play some games for a while, although things are a little awkward between you. Eventually, Albina stops. "Well, I had fun, but there''s some stuff I need to take care of," she says as she turns the console off.'
-					'Getting the hint, you get up as well. "Yeah, I should probably get going myself." You exchange a brief hug before you leave.'
-					act 'Say goodbye and go home':
-						AlbinaQW['visiting'] = 0
-						minut += 1
-						gt 'pav_residential'
-					end
-				end
-			else
-				act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
-		else
-			'You and Albina lie down in front of the TV after picking one of the games. You play while chatting about various things and trash-talking each other. However, neither of you are giving your full attention to the game. Instead, you''re just having fun together.'
-			act 'Finish playing': gt 'albinahome', 'bedroom'
-			act 'Keep playing': gt 'albinahome', 'playgame'
-		end
-	end
-end
 
-if $ARGS[0] = 'playgame':
-	*clr & cla
-	menu_off = 1
-	minut += 30
-	pcs_mood += 15
-	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>'
-	'The two of you keep playing games while trash-talking and even bumping each other to try and screw each other up. Still, neither of you are taking it seriously. Instead, you mostly just laugh at the silly mistakes you both make while only partially paying attention to the game.'
-	if hotcat >= 5:
-		'Once you finish the game, Albina turns to you instead of starting another one. "How about we see who actually <i>is</i> the better gamer?" she asks with a confident smile.'
-		'You laugh and nod. "Sure, but you''re so going down!"'
-		'She laughs in response. "You''re that sure? How about we make it a bit more interesting then?"'
-		'You arch your brow curiously. "What do you have in mind?"'
-		'She grins at you, gets up and walks over to her dresser. She rummages around in it before pulling out a strapon harness with a large black dildo attached. "The winner gets to use this on the loser... However. They. Want," she says with a smirk.'
-		gs 'willpower', 'sex', 'resist', 'medium'
-		if will_cost <= pcs_willpwr:
-			act 'Refuse the bet (<<will_cost>> Willpower)':
-				*clr & cla
-				menu_off = 1
-				minut += 60
-				pcs_mood += 15
-				gs 'exp_gain', 'react', rand(0, 1)
-				gs 'exp_gain', 'gaming', rand(1, 2)
-				npc_rel['A23'] -= 2
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				'You shake your head. "Uhhh... I''m really not interested in doing that."'
-				'Albina puts the strapon away, and you can tell she''s a little disappointed as she comes back over and lies down beside you again. "You''re so going to lose!" she laughs.' 
-				'You continue to play games for a while, although things are awkward between you. Eventually, Albina stops. "Well, I had fun, but there''s some stuff I need to take care of," she says as she turns the console off.'
-				'Getting the hint, you get up as well. "Yeah, I should probably get going myself." You exchange a brief hug before you leave.'
-				act 'Say goodbye and go home':
-					AlbinaQW['visiting'] = 0
-					minut += 1
-					gt 'pav_residential'
-				end
-			end
-		else
-			act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
-		act 'Accept the bet': gt 'albinahome', 'game_bet'
-	else
-		'Albina turns to you. "So, want to lose again?"'
-		'You shove her gently. "Oh please! I was winning!"'
-		act 'Finish playing': gt 'albinahome', 'bedroom'
-		act 'Keep playing': gt 'albinahome', 'playgame'
-	end
-end
 
-if $ARGS[0] = 'game_bet':
-	*clr & cla
-	menu_off = 1
-	AlbinaQW['gamebet'] = 1
-	minut += 30
-	pcs_mood += 15
-	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>'
-	'You smile. "You''re on. You''re so going to get fucked!"'
-	'Albina laughs as she brings the strapon over with a bottle of lube and tosses them on the bed before she lies back beside you and picks her controller up. "<i>Please</i>! You''re so going to lose!"' 
-	'She starts the game, and you both fall silent, your focus only on winning.'
-	act 'Play until someone wins':
-		*clr & cla
-		menu_off = 1
-		gameresult = rand(1, 100) + pcs_gaming
-		if gameresult >= 150:
-			albplay = 3
-		elseif gameresult  >= 100:
-			albplay = 2
-		elseif gameresult  >= 75:
-			albplay = 1
-		else
-			albplay = 0
-		end
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
-		if albplay = 3:
-			'She doesn''t even come close to beating you. Before the game can end, she lets out an exacerbated sigh and tosses her controller down in defeat, knowing she has no chance. You give her a gloating smirk as she reaches over and grabs the strapon harness before handing it to you. You both undress, and you grin as you slide the harness on.'
-			act 'Continue': gt 'albinahome', 'wear_strapon'
-		elseif albplay = 2:
-			'It''s close, but in the end, you just manage to win the game. "Yes!" you exclaim triumphantly, and she laughs as she grabs the strapon harness and hands it to you. You both undress, and you grin as you slide the harness on.'
-			act 'Continue': gt 'albinahome', 'wear_strapon'
-		elseif albplay = 1:
-			'Although you try your best, Albina proves a worthy opponent and barely defeats you. Laughing in a mocking and villainous tone, she slaps you on the ass. "You''re my bitch now, <<$pcs_nickname>>!" You both undress, and Albina slides the harness on with a smirk on her face.'
-			act 'Get fucked with the strapon': gt 'albinahome', 'receive_strapon'
-		elseif albplay = 0:
-			'Although you try your best, Albina simply outplays you at every turn. You stand no chance, and she easily beats you. Laughing in a mocking and villainous tone, she slaps you on the ass. "You''re my bitch now, <<$pcs_nickname>>!" You both undress, and Albina slides the harness on with a smirk on her face.'
-			act 'Get fucked with the strapon': gt 'albinahome', 'receive_strapon'
-		end
-		killvar 'gameresult'
-		killvar 'albplay'
-	end
-	act 'Throw the game':
-		*clr & cla
-		menu_off = 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
-		'You''re not sure why, but part of you <i>wants</i> her to use the strap-on on you, so you purposefully lose the game. Albina looks at you suspiciously with a raised brow before smiling and smacking your ass. "You''re my bitch now, <<$pcs_nickname>>!" You both undress, and Albina slides the harness on with a smirk on her face.'
-		act 'Get fucked with the strapon': gt 'albinahome', 'receive_strapon'
-	end
-end
-
-if $ARGS[0] = 'wear_strapon':
-	*clr & cla
-	menu_off = 1
-	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/albina/sex/game/spank.mp4"></video></center>'
-	'Before you can begin, Albina smirks at you while wiggling her ass. "I need to be punished for losing first. Spank me, <<$pcs_nickname>>, and don''t stop until my pussy is wet and my ass is red and stinging!"'
-	'She pushes you down onto the bed and lays across your lap before looking up at you. "Don''t make me beg, <<$pcs_nickname>>."'
-	'You smile at her before raising your hand and giving her a firm smack on the ass. "Harder!" she blurts out, and you respond by delivering a hard smack that leaves both her ass and your hand red and stinging. "Oh FUCK, <i>yeeesss</i>! Do that again!" she moans in an almost orgasmic tone.'
-	'You continue spanking her as hard as you can until the stinging in your hand becomes too much, and you have to stop. "That was fucking amazing, <<$pcs_nickname>>! I''m so fucking wet after that!" True to her word, you can feel her juices trickling down your leg. "I need you to fuck me just as hard now. Pound me until I cum!" She climbs off of you, and you stand to adjust the harness around your hips.' 
-	gs 'arousal', 'BDSM_give', 8, 'dom', 'lesbian'
-	gs 'stat'
-
-	act 'Fuck her with the strapon':
-		npc_sex['A23'] += 1
-		lesbian += 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
-		'With the strapon firmly in place, you stand next to the bed and pull her head down to the dildo. "Suck my dick, loser!" you giggle.'
-		'She laughs before she takes the dildo in her mouth and starts sucking while stroking the shaft with one hand. You spend several minutes making her suck on the dildo, getting it wet with her drool.'
-		gs 'arousal', 'foreplay', 5, 'lesbian'
-		gs 'stat'
-		act 'Fuck her pussy':
-			*clr & cla
-			gs 'boyStat', 'D3'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
-			'You pull away until the dildo slides out of her mouth, climb onto the bed next to her and lie on your back. "Come and ride it, cowgirl!" you laugh. She straddles you and lowers herself down until the dildo slides easily inside her wet pussy, causing her to moan in pleasure. She starts riding you slowly but picks up speed, moaning louder and louder.'
-			gs 'arousal', 'vaginal_strap_give', 8, 'lesbian'
-			gs 'stat'
-			act 'Fuck her faster':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
-				'You slap her on the ass. "Come on, Albina! Ride it like you mean it!" With your encouragement, she starts really riding you hard and fast, her ass slapping against your thighs as she takes the whole length inside her. She rides you for several minutes before she slides off the dildo, glistens with her juices, and collapses on the bed next to you. She looks at you with an appreciative smile before she leans over and whispers in your ear.'
-				'"I want you to fuck my ass now..."' 
-				'You grin as she giggles and gets on all fours to wiggle her bubble butt at you.'
-				gs 'arousal', 'vaginal_strap_give', 7, 'lesbian'
-				gs 'stat'
-				act 'Fuck her ass': gt 'albinahome', 'fuck_albina_ass'
-			end
-		end
-		act 'Fuck her ass': gt 'albinahome', 'fuck_albina_ass'
-	end
-end
-
-if $ARGS[0] = 'fuck_albina_ass':
-	*clr & cla
-	menu_off = 1
-	npc_sex['A23'] += 1
-	lesbian += 1
-	gs 'boyStat', 'D3'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-	'You grab the bottle of lube and squirt some onto the dildo. You rub it up and down the shaft until it is very slick before spreading her ass cheeks and applying a generous amount onto her asshole. You grab her ass in your hand and appreciate how firm it feels in your grip.'
-	'"Like what you see?" she giggles. You kneel down behind her, line the head of the dildo up with her asshole and slowly push forward. There is little resistance, and the large dildo slides into her ass easily, causing her to moan as you go deeper and faster. You look down and admit that her ass is fantastic, the dildo enveloping her huge, firm cheeks as you thrust in and out of her back door.' 
-	'You wonder what the guys in your class would do to be in your position as you continue fucking her ass. Finally, after a few minutes, you pull out of her, and she looks back over her shoulder at you.'
-	gs 'arousal', 'anal_strap_give', 5, 'lesbian'
-	gs 'stat'
-	act 'Keep fucking her ass':
-		*clr & cla
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
-		'"Come on, <<$pcs_nickname>>. Put it back in and fuck me... hard," she says while wiggling her hips. You smile at her and slide the dildo back into her hole with ease, making her moan in pleasure. Next, you grab onto her hips and start fucking her balls deep, filling her ass with the dildo as she reaches back and starts rubbing her clit. After several minutes, you feel her ass tighten around your fake cock. Finally, she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy, soaking the sheets beneath her. You keep fucking her throughout her orgasm, only pulling out once her shudders have passed.'
-		'After you''ve pulled out, she thrusts her fingers into her gaping hole as juices leak from her pussy. "That was fucking amazing!" she says as she pulls her fingers out of her ass and sucks on them.'
-		'"Fucking such a nice-looking ass was amazing!" you reply, and you both laugh.'
-		gs 'arousal', 'anal_strap_give', 5, 'lesbian'
-		gs 'stat'
-		act 'Finish': gt 'albinahome', 'strapon_finish'
-	end
-end
-
-if $ARGS[0] = 'receive_strapon':
-	*clr & cla
-	menu_off = 1
-	lesbian += 1
-	gs 'stat'
-	if stat['bj'] = 0:
-		stat['bj'] += 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
-		'Albina notices you staring at the dildo as she tightens the straps firmly around her hips. "You okay, <<$pcs_nickname>>?"'
-		'"Yeah, it''s just..." you start to answer.'
-		'"You''ve never sucked dick before, have you?" she interrupts with a smile. "It''s okay. I can show you what to do so you''re ready for the real thing." She sits back on the bed and spreads her legs, motioning for you to crawl between them.'
-		'"Okay, first thing''s first. You''ll want to start off with a handjob. It gets them in the mood and wanting more," she explains as she takes your hand and places it on the dildo. "Take a firm grip of the shaft, but not too tight, and start moving your hand up and down."'
-		*nl
-		'You follow her instructions and slowly run your hand up and down the dildo. "That''s it, <<$pcs_nickname>>. Just keep doing that. If you feel like it, you can also lick the shaft or suck on their balls while jerking them off. They like it when you tease them like that."'
-		'After a few minutes, Albina moves on with her lesson. "Okay <<$pcs_nickname>>, you ready?" she asks and you nod your head. "Okay. Start off with a little teasing. Run your tongue around the tip while jerking them off."'
-		'You do as she says and she makes you look up at her. "Eye contact, <<$pcs_nickname>>. They like that." You nod at her and look her in the eye as you continue jerking off her fake cock. "Good. Now some guys like taking control, but only let them do that if it''s what you want. That''s enough teasing anyway. Now I want you take as much of the shaft into your mouth as you can."' 
-		*nl
-		'You obediently take as much of the dildo into your mouth as you can without choking. "Good," Albina says. "Now start bobbing your head up and down; imagine that you''re sucking on a popsicle while swirling your tongue around the head. And keep using your hand."'
-		'You spend the next few minutes practicing on the dildo until your arm and jaw start to ache and you stop. You pop the dildo out of your mouth and look up at Albina, who smiles. "You''re a natural, <<$pcs_nickname>>! If I had a dick, then my cum would be all over your face by now."'
-		'You smile at the compliment. "Time for me to fuck you now," Albina says with a grin.'
-		gs 'arousal', 'foreplay', 5, 'lesbian'
-		gs 'stat'
-		act 'Continue': gt 'albinahome', 'albina_fucks_you'
-	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
-		'You slide your panties off as she tightens the strapon firmly while standing next to the bed. You lie next to her, and she pulls your head down to the dildo. "Suck my dick, loser!" she says with a giggle.'
-		'You take the dildo into your mouth and start sucking on it while stroking the shaft with one hand. "Yeah, just like that, <<$pcs_nickname>>..." she moans as she reaches between the straps and gently rubs her pussy. You spend several minutes sucking on the dildo, getting it wet with your drool before she pulls it out of your mouth. "I''m so going to enjoy fucking you!"'
-		gs 'arousal', 'foreplay', 5, 'lesbian'
-		gs 'stat'
-		act 'Continue': gt 'albinahome', 'albina_fucks_you'
-	end
-end
-
-if $ARGS[0] = 'albina_fucks_you':
-	*clr & cla
-	menu_off = 1
-	gs 'stat'
-	if stat['think_virgin'] = 1:
-		*clr & cla
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
-		'You blush deeply, and she looks at you. "Oh, right. You haven''t done this before," she says, remembering that you''re still pure.'
-		'You blush even more. "Yes, I''m... still a virgin..." you reply.'
-		'"Well, I can just fuck your ass if you want?" She then gives you a small smile. "Unless you want me to pop your cherry?"'
-		act 'Just fuck my ass': gt 'albinahome', 'albina_ass_fucks_you'
-		act 'Get your cherry popped':
-			*clr & cla
-			npc_sex['A23'] += 1
-			lesbian += 1
-			gs 'boyStat', 'D3'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
-			'You give her an awkward smile in return. "I... I want you to... take me. My... virginity that is..." you tell her as your cheeks burn bright red.' 
-			'She smiles back. "Okay, don''t worry. I''ll be gentle since it''s your first time. Just lie on your back and spread your legs." You do as she commands, and she climbs onto the bed and scoots between your legs. She rubs your pussy with her fingers to make sure it''s wet enough but adds some lube to the dildo anyway. You feel it rubbing against your slit before she slowly slides it into your virgin pussy.' 
-			'It''s both painful and pleasurable, and you moan softly as she starts to fuck you. After a few minutes, it starts to hurt less, and you find yourself moaning louder.'
-			*nl
-			'After a few more minutes, Albina starts growing tired and pulls out, leaving you empty. "So how was that for your first time?" she asks with a smile.'
-			'"It was amazing! I''m glad it was you I shared it with. You were so gentle and considerate," you reply, and Albina smiles even wider.'
-			'"I couldn''t have your first time being a shitty experience like mine...." she replies, but gasps and looks away when she realises what she said.'
-			*nl
-			'You quickly sit up next to her and give her a hug. "Hey, it''s okay. This was the best thing I could hope for when losing my virginity."'
-			'She looks at you as tears well up in her eyes, the memories of a traumatic event flooding her. "Really? I wanted it to be good for you because-"'
-			'You can see this is a painful memory for her, and pull her into another hug. "I know..." you gently reassure her, and you both sit silently for a few minutes. Finally, she gets up, takes the harness off, cleans the dildo and tosses it back in the drawer.'
-			'"This is supposed to be your happy memory, and I don''t want to ruin it for you. So let''s do something fun!" She clearly needs a distraction, so you nod in agreement.'
-			gs 'arousal', 'vaginal_strap', 5, 'lesbian'
-			gs 'stat'
-			act 'Continue': gt 'albinahome', 'bedroom'
-		end
-	else
-		*clr & cla
-		npc_sex['A23'] += 1
-		lesbian += 1
-		gs 'boyStat', 'D3'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
-		'"Lie on your back and spread your legs." You do as she commands, and she climbs onto the bed and scoots between your legs. She rubs the head of the dildo against your pussy before she pushes it inside you. You moan as she slowly starts fucking your pussy, going a little faster the louder you moan.'
-		gs 'arousal', 'vaginal_strap', 8, 'lesbian'
-		gs 'stat'
-		act 'Keep getting your pussy fucked':
-			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag2.jpg"></center>'
-			'She proceeds to fuck you hard, but not too hard, settling into a near-perfect thrusting rhythm that you enjoy, feeling yourself slowly getting wetter. She seems to enjoy it as much as you, moaning softly as she fucks you. Finally, she leans in and kisses you before suddenly stopping and pulling out. "Okay, that''s enough, but I''m not finished with you just yet. Roll over so I can fuck that tight little ass of yours."'
-			gs 'arousal', 'vaginal_strap', 7, 'lesbian'
-			gs 'stat'
-			act 'Take it up the ass': gt 'albinahome', 'albina_ass_fucks_you'
-		end
-	end
-end
-
-if $ARGS[0] = 'albina_ass_fucks_you':
-	if stat['anal'] = 0 and stat['anal_strap'] = 0:
-		if stat['anal_dildo'] = 0 and stat['anal_fist'] = 0 and stat['self_fisting_anal'] = 0:
-			!!The player character has never had anything larger than a finger in her ass
-			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-			'Thoughts race through your head as you look at the massive dildo, and Albina notices your hesitation.'
-			'"<<$pcs_nickname>>, have you ever been fucked in the ass before?"'
-			'You shake your head as you feel your cheeks burning bright red. "Uhh... No, I haven''t..."'
-			'She places a hand on your shoulder. "Hey, it''s nothing to be embarrassed about. Plenty of girls don''t do anal."'
-			'You stare at the dildo again before Albina snaps your attention back to her. "<<$pcs_nickname>>, be honest with me. Do you want me to fuck your ass? I''ll be as gentle as you want."'
-			act 'Yes': gt 'albinahome', 'first_anal'
-			act 'No': gt 'albinahome', 'anal_refuse'
-		elseif stat['anal_dildo'] = 0 and (stat['anal_fist'] > 0 or stat['self_fisting_anal'] > 0):
-			!!The player character has had a fist (her own or another persons) in her ass
-			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-			'Thoughts race through your head as you look at the huge dildo, and Albina notices your hesitation.'
-			'"<<$pcs_nickname>>, have you ever been fucked in the ass before?"'
-			'You feel your cheeks burning bright red. "Well, I''ve managed to take a fist..."'
-			*nl
-			'Albina looks at you in what you can only describe as awe. "God damn, <<$pcs_nickname>>, even I''ve never taken a fist up my ass, and I''m the queen of butt stuff!"'
-			'"Is it weird to do that?" you ask with concern.'
-			'"No, not at all! I''ve always wanted to try it myself. Maybe I will now that I need to up my game."'
-			'She looks you over with lustful desire before continuing. "Practicing with a dildo makes your first butt fuck easier, but a whole fucking hand?! A cock or dildo would be a breeze for you!"'
-			'She then places a hand on your shoulder. "<<$pcs_nickname>>, be honest with me. Do you want me to fuck your ass? I''ll be as gentle as you want."'
-			act 'Yes': gt 'albinahome', 'first_anal1'
-			act 'No': gt 'albinahome', 'anal_refuse'
-		else
-			!!The player character has used a dildo on her ass
-			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-			'Thoughts race through your head as you look at the massive dildo, and Albina notices your hesitation.'
-			'"<<$pcs_nickname>>, have you ever been fucked in the ass before?"'
-			'You feel your cheeks burning bright red. "Well, I''ve used a dildo..."'
-			*nl
-			'"Oh, a buttslut in training!" she teases. "No, it''s good that you''re experimenting back there. It''ll make your first proper butt fuck easier if you''ve had some experience shoving something up there first."'
-			'She then places a hand on your shoulder. "<<$pcs_nickname>>, be honest with me. Do you want me to try the real thing? I''ll be as gentle as you want."'
-			act 'Yes': gt 'albinahome', 'first_anal1'
-			act 'No': gt 'albinahome', 'anal_refuse'
-		end
-	else	
-		*clr & cla
-		menu_off = 1
-		npc_sex['A23'] += 1
-		lesbian += 1
-		gs 'boyStat', 'D3'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-		'As you get on all fours, you glance back and see her applying lube to the dildo. She squirts some on the dildo and strokes the shaft with it before she massages a generous amount into your asshole with her fingers. You and the dildo now lubed up, she moves behind you, and you feel the dildo pressing against your asshole, the pressure building until the tip pops into your ass, causing you to groan slightly in pain. Next, she slowly slips the dildo up your ass, steadily working it deeper.'
-		gs 'arousal', 'anal_strap', 5, 'lesbian'
-		gs 'stat'
-
-		act 'Get your ass hammered':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
-			'Once you''re comfortable with her in your ass, she stands up over you. "Get ready because now I''m really going to fuck your ass!" she laughs before slamming the dildo in and out of your ass, causing you to grip the sheets tightly. Despite this, she isn''t too rough, and you start enjoying the pleasurable sensation. Albina seemingly grows more aroused the more she fucks you.' 
-			'Just as it''s starting to hurt, she lets out a loud, pleasured scream as you feel her juices spraying across your legs. You then feel the dildo slide out of you and turn to see Albina sprawled out on the bed in orgasmic bliss, her juices slowly trickling out of her soaking wet pussy as a huge wet patch soaks into the sheets. "You were such a good little buttslut, <<$pcs_nickname>>..." she says softly.'
-			'After riding through her orgasm, she pulls the harness off and tosses it aside.'
-			gs 'arousal', 'anal_strap', 10, 'lesbian'
-			gs 'stat'
-			act 'Finish': gt 'albinahome', 'strapon_finish'
-		end
-	end
-end
-
-if $ARGS[0] = 'first_anal':
-	*clr & cla
-	menu_off = 1
-	npc_sex['A23'] += 1
-	lesbian += 1
-	gs 'boyStat', 'D3'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-	'"Y-yes, I would. Just promise you''ll be gentle," you reply, and Albina smiles.'
-	'"I will. Get on all fours and bring your ass up as high as possible."'
-	'As you get on all fours, you glance back and see her squirting lube onto her fingers. You shiver when you feel the cold liquid being applied to your asshole. Albina starts massaging it before you feel her slowly pushing a finger inside you. You moan softly at the sensation as you feel her finger curling up inside you.'
-	'After spending a few minutes fingering you, she pulls her finger out. "Okay, that should be enough. Are you sure you want to do this, <<$pcs_nickname>>? Just because I''m a buttslut doesn''t mean you have to be one too."'
-	'You stare at the dildo hanging between her legs but steel yourself and nod. "Yes, I want to do this. Just go slow, please?"'
-	gs 'arousal', 'anal_finger', 5, 'lesbian'
-	gs 'stat'
-
-	act 'Get your ass fucked':
-		*clr & cla
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-		'Your heart races as you feel Albina moving in behind you. You instinctively tense up when you feel the head of the dildo pressing against your asshole. "Okay, <<$pcs_nickname>>, this is going to feel strange and definitely hurt a little, but you''re going to have to try and relax as best as you can for me," Albina tells you. You grip the sheets tightly as you do what she says.' 
-		'You feel her start slowly pushing, and the pressure builds until the tip of the dildo suddenly pops into your ass, causing you to groan and grit your teeth while gripping the sheets even tighter. It''s a painful sensation, and you instinctively feel the urge to free yourself. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks as you feel a stinging pain shooting through you.'
-		'Remembering what she said, you fight the urge to pull away and try to relax. "No, I just need a second," you reply as you look back at her, and she nods.'
-		*nl
-		'After taking a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the slick dildo before placing her hands on your hips. "Okay, just keep your ass relaxed and tell me if it gets too painful. I don''t want you hurting yourself trying to impress me. Got it?"'
-		'You nod and prepare yourself as you feel Albina slowly push the dildo deeper into your ass. You feel stretched out as she reaches a depth she feels you''ll be comfortable with and starts gently thrusting.'
-		'Despite the shallow depth and Albina being gentle, the pain becomes too much after a few minutes, and you ask her to pull out. You sit on your knees and clutch your ass cheeks in your hands as pain pulses through your stretched asshole.'
-		'"You lasted longer than I thought you would. Not bad for your first go, <<$pcs_nickname>>," Albina says as she hands you some wipes to clean yourself up. "Next time you lose, maybe we can go deeper and... harder," she adds with a teasing grin as she cleans the dildo and puts it away.'
-		*nl
-		'As the stinging pain continues to pulse through your ass, you slowly get dressed. Albina watches with an amused grin. "Don''t worry. It gets less painful the more you do it."'
-		'"You would know," you reply with a smirk, and she laughs.'
-		gs 'arousal', 'anal_strap', 10, 'lesbian'
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Do something else': gt 'albinahome', 'bedroom'
-	end
-end
-
-if $ARGS[0] = 'first_anal1':
-	*clr & cla
-	menu_off = 1
-	npc_sex['A23'] += 1
-	lesbian += 1
-	gs 'boyStat', 'D3'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-	'"Yes, I would," you reply, and Albina smiles.'
-	'"Okay, get on all fours and bring your ass up as high as possible."'
-	'As you get on all fours, you glance back and see her squirting lube onto her fingers. You shiver when you feel the cold liquid being applied to your asshole. Albina starts massaging it before you feel her slowly pushing a finger inside you. You moan softly at the sensation as you feel her finger curling up inside you.'
-	'After spending a few minutes fingering you, she pulls her finger out. "Okay, that should be enough. Are you sure you want to do this, <<$pcs_nickname>>? Just because I''m a buttslut doesn''t mean you have to be one too."'
-	'You stare at the dildo hanging between her legs but steel yourself and nod. "Yes, I want to do this."'
-	gs 'arousal', 'anal_finger', 5, 'lesbian'
-	gs 'stat'
-
-	act 'Get your ass fucked':
-		*clr & cla
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-		'Your heart is racing even though you know what to expect. Albina presses the tip of the dildo against your asshole, and you feel the familiar sensation of the pressure building as she pushes forward until the dildo suddenly pops into your ass, causing you to groan. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks.'
-		*nl
-		'After a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the slick dildo before placing her hands on your hips. "Okay, just tell me if it gets too painful for you."'
-		'You nod and prepare yourself as you feel Albina slowly push the dildo deeper into your ass and start thrusting.'
-		'Having had your ass penetrated before, Albina goes faster and deeper than you think she usually would have. However, the sensation of being buttfucked is still new to you, and you soon ask her to stop when it becomes too much.'
-		*nl
-		'"Not bad for your first go, <<$pcs_nickname>>. I bet the prior ''practice'' helped," Albina says as she hands you some wipes to clean yourself up. "Next time you lose, maybe we can go deeper and... harder," she adds with a teasing grin as she cleans the dildo and puts it away.'
-		'You slowly get dressed as Albina watches with an amused grin. "It feels great, doesn''t it? It gets better the more you do it."'
-		'"You would know," you reply with a smirk and she laughs.'
-		gs 'arousal', 'anal_strap', 10, 'lesbian'
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Do something else': gt 'albinahome', 'bedroom'
-	end
-end
-
-if $ARGS[0] = 'anal_refuse':
-	*clr & cla
-	menu_off = 1
-	gs 'arousal', 'end'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-	'You shake your head. "No, I don''t think I''m ready for that yet."'
-	'Albina smiles. "That''s okay, but if you want to do it with me or want some advice, then just ask. It''s best to get help from someone with... experience on the matter," she says with a grin.'
-	'You grin back. "I''ll be sure to ask the master buttslut for any of her wisdom."'
-	'She punches you in the arm. "Damn right you will."'
-	act 'Do something else': gt 'albinahome', 'bedroom'
-end
-
-if $ARGS[0] = 'strapon_finish':
-	*clr & cla
-	menu_off = 1
-	npc_sex['A23'] += 1
-	lesbian += 1
-	gs 'stat'
-	if rand(0,3) = 0:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
-		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she gives you a sly smile and moves into position to start scissoring you. Before she can, her phone buzzes, and she looks at it before frowning in disappointment. "Sorry, but I need to go, <<$pcs_nickname>>. I''ll see you later?"'
-		'You nod in understanding. "Sure, not a problem. I had fun."'
-		'You finally kiss each other before you both quickly get dressed. She wipes the dildo clean and shoves it back in the drawer before ushering you out of her room. She walks with you into town before leaving you to attend to her business.'
-		gs 'arousal', 'foreplay', 5, 'lesbian'
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Finish':gt 'pav_residential'
-	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
-		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she collapses next to you, and you both just lie naked on her bed in silence. She eventually gets up and cleans the dildo before shoving it back in the drawer and getting dressed.'
-		'You get dressed, and when you finish, she smiles at you. "Okay, what do you want to do now?" she asks.'
-		gs 'arousal', 'foreplay', 5, 'lesbian'
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Finish': gt 'albinahome', 'bedroom'
-	end
-end
 
 --- albinahome ---------------------------------
 

+ 9 - 8
locations/anush_bedroom.qsrc

@@ -56,6 +56,7 @@ if $ARGS[0] = 'anushroom':
 	menu_off = 0
 	$locclass = 'bedr'
 	CLOSE ALL
+	killvar '$returnLoc'
 	$track_loop = ''
 	music_loop = 1
 	*clr & cla
@@ -106,7 +107,7 @@ if $ARGS[0] = 'nushdresser':
 		'One drawer seems to be filled entirely with makeup. You see dozens of lipsticks, blushes, eyeliners, eye shadows and foundations inside it. Most of it matches her more alternative emo look she typically sports. Still, you spy a few more natural and mainstream colours among them. A couple of the other drawers contain folded pants, and one seems to be nothing but socks. Another one is stuffed full of bras, while the final one seems to be her panty drawer, which also contains several of her dildos. You notice her watching you snoop and close the drawers.'
 		act 'Find something else to look at':gt 'anush_bedroom','anushroom'
 	else
-		'One drawer seems to be filled entirely with makeup. You see dozens of lipsticks, blushes, eyeliners, eye shadows and foundations inside. Most of it matches her more alternative emo look she typically sports. Still, you spy a few more natural and mainstream colours among them. A couple of the other drawers contain folded pants, and one seems to be nothing but socks. Another is stuffed full of bras. The final drawer appears to be her panty drawer, which also contains several of her dildos. With no one around, you do a little digging and find a little box. Inside it is a baggy of white power, several small bags of different kinds of pills, a baggy of pot and some rolling papers.' 
+		'One drawer seems to be filled entirely with makeup. You see dozens of lipsticks, blushes, eyeliners, eye shadows and foundations inside. Most of it matches her more alternative emo look she typically sports. Still, you spy a few more natural and mainstream colours among them. A couple of the other drawers contain folded pants, and one seems to be nothing but socks. Another is stuffed full of bras. The final drawer appears to be her panty drawer, which also contains several of her dildos. With no one around, you do a little digging and find a little box. Inside it is a baggy of white power, several small bags of different kinds of pills, a baggy of pot and some rolling papers.'
 		'You also find some papers shoved along the side of the drawer. They appear to be some of her recent tests and homework assignments. You''re surprised to discover that she''s getting good grades; these are easily good enough for her to attend most universities. Despite fucking around during class, she takes her coursework seriously.'
 		act 'Find something else to look at':gt 'anush_bedroom','anushroom'
 	end
@@ -143,7 +144,7 @@ if $ARGS[0] = 'nushcloset':
 					act 'Try on more clothes': gt 'anush_bedroom', 'more_clothes'
 				else
 					'"Wow, you have so many outfits. Can I try some on?" you ask her.'
-					'Anushka smiles and nods. "Sure, let''s do it." She gets up to join you at the closet and pulls out different outfits. She picks the ones that she apparently thinks will work best for you. Her clothes don''t fit perfectly since you''re taller than her, but other than that, they fit you pretty well and look good on you.' 
+					'Anushka smiles and nods. "Sure, let''s do it." She gets up to join you at the closet and pulls out different outfits. She picks the ones that she apparently thinks will work best for you. Her clothes don''t fit perfectly since you''re taller than her, but other than that, they fit you pretty well and look good on you.'
 					'As you check yourself out in the mirror on the door, she steps up next to you, showing both of your reflections. "Looking good, <<$pcs_nickname>>."'
 					act 'Try on more clothes': gt 'anush_bedroom', 'more_clothes'
 				end
@@ -507,7 +508,7 @@ if $ARGS[0] = 'computer':
 							AnushkaLoc = 2
 							'You''re so caught up in what you''re doing that you don''t hear the door opening or someone walking in behind you. You practically jump out of the chair in shock when you feel a pair of arms wrap around your shoulders and start fondling your breasts. You turn around to see... Anushka rolling with laughter.'
 							'You give her a dirty look, making her laugh even more. "You almost scared me to death! That really wasn''t funny!" There is very little real heat in your voice as you''re so embarrassed to have been caught masturbating. "Sorry about—" you start to say, but she waves you to stop.'
-							if hotcat >= 6:
+							if pcs_hotcat >= 6:
 								'"It''s fine. I don''t care if you masturbate in my room while you wait for me. If you''re that horny, I could always help you out with it..." she says while licking her upper lip.'
 								act 'No thanks':
 									*clr & cla
@@ -629,7 +630,7 @@ if $ARGS[0] = 'guitar':
 			act 'Keep checking out the guitars': gt 'anush_bedroom','guitar'
 		end
 
-		if anushkaQW['guitar_play'] = 0: 
+		if anushkaQW['guitar_play'] = 0:
 			act 'Would you play me something?':
 				cla
 				'"I''ve heard you''re pretty good. Would you mind playing me something?" you ask.'
@@ -638,7 +639,7 @@ if $ARGS[0] = 'guitar':
 				act 'Wait for her': gt 'anush_bedroom', 'nush_guitar'
 			end
 		elseif anushkaQW['guitar_play'] >= 1:
-			act 'Would you play something again?': 
+			act 'Would you play something again?':
 				cla
 				'"Would you play me another song?" you ask and Anushka smiles.'
 				*nl
@@ -740,7 +741,7 @@ if $ARGS[0] = 'nush_guitar':
 	gs 'stat'
 	if anushkaQW['guitar_day'] ! daystart:
 		anushkaQW['guitar_day'] = daystart
-		if anushkaQW['guitar_play'] = 0: 
+		if anushkaQW['guitar_play'] = 0:
 			*clr & cla
 			music_loop = 0
 			PLAY 'sound/nushunplugged0.mp3', 100
@@ -797,7 +798,7 @@ if $ARGS[0] = 'nush_guitar':
 				'She turns silent, making you think she was being evasive and knew precisely what you meant before she sighs. "Rad thinks I was a good girl playing a bad girl and that he corrupted me and made me fall in love with him and life. So to him, the song was always about that. He saw himself as the seductive charmer that drew me in."'
 				'She shrugs. "I suppose there''s a tiny bit of truth to that, but I was already well on my way to being a wild rocker chick by that point. He might have sped me into who I always was going to be, but he didn''t make me." She stops, but you know there''s more to it. You''re not sure she wants to talk about it though.'
 				act 'Let it go': gt 'anush_bedroom','anushroom'
-				act 'Press it': 
+				act 'Press it':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 					'You nod. "So he wasn''t right, not in the way he thinks?"'
@@ -885,7 +886,7 @@ if $ARGS[0] = 'nush_guitar':
 				'You can tell by her expression she was expecting you to ask this or something like it. "A few weeks ago, it came on while I was listening to the radio. It just... encapsulated how I was feeling that day."'
 				'Knowing what you do and what you''ve heard, you can guess who was making her feel that way. You know she hates talking about her and Radomir, but maybe it wasn''t him... Still, should you push the issue or just drop it? You can tell she isn''t thrilled talking about it.'
 				act 'Let it go': gt 'anush_bedroom','anushroom'
-				act 'Press it': 
+				act 'Press it':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 					'You nod. "We all have those days, but what, or who, was making you feel that way that day?" you ask.'

+ 1 - 1
locations/anush_bedroom_city.qsrc

@@ -72,7 +72,7 @@ if $ARGS[0] = 'anushroom':
 	music_loop = 1
 	*clr & cla
 	minut += 1
-	killvar '$returnLoc'
+	$returnLoc = '_city'
 	gs 'stat'
 	'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom.jpg"></center>'

File diff suppressed because it is too large
+ 242 - 236
locations/anushapt.qsrc


+ 159 - 140
locations/anushapt_city.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'home':
 	minut += 1
 	bonusZ = 0
 	gs 'shortgs', 'setloc', 'anushapt_city', $ARGS[0]
-	$location_type = 'private'	
+	$location_type = 'private'
 	gs 'themes', 'indoors'
 	gs 'stat'
 !!! Probably we should have an init call here that sets all the locations, depending on time. Then those locations get updated when other locations are entered.
@@ -103,13 +103,13 @@ if $ARGS[0] = 'home':
 !!Arkadi is home Mon-Tues and Thurs from 18:00 for rest of night, Sun all day
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptdoor.jpg"></center>'
-	'You walk up the stairs to the top floor where Anushka, Radomir, Valentin, and Arkadi, are now renting a three bedroom apartment.'
+	'You walk up the stairs to the top floor where Anushka, Radomir, Valentin and Arkadi are renting a three bedroom apartment.'
 !!make sure I did all the day and times right below
 	if hour >= 23:
-		'It''s too late in the day to visit Anushka, Radomir, Valentin, or Arkadi.'
+		'It''s too late in the day to visit Anushka, Radomir, Valentin or Arkadi.'
 		act 'Move away from the door': gt 'city_island'
 	elseif hour < 8:
-		'It''s too early in the day to visit Anushka, Radomir, Valentin, or Arkadi.'
+		'It''s too early in the day to visit Anushka, Radomir, Valentin or Arkadi.'
 		act 'Move away from the door': gt 'city_island'
 	!elseif week = 1 and hour >= 18 and hour < 23:
 	!elseif locat['A144'] and locat['A156'] >= 0 and locat['A144'] and locat['A156'] < 8:
@@ -126,16 +126,16 @@ if $ARGS[0] = 'home':
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 				if npc_rel['A156'] >= 60:
 					'Arkadi answers the door. "What''s up?"'
-					'You give him one of your big smiles. "Nothing much. Thought I would stop by and hang out."'
-					'He nods a bit. "Nush is in her room if you are looking for her. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+					'You give him one of your big smiles. "Nothing much. Just thought I''d stop by and hang out."'
+					'He nods. "Nush is in her room if you''re looking for her, but you''re welcome to hang out," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				elseif npc_rel['A156'] <= 20:
 					'Arkadi answers the door. "What the fuck do you want?"'
-					'You give him a careful smile. "Nothing much. Thought I would stop by and hang out."'
-					'He gives you a look of disgust. "Nush is in her room if you are looking for her. Otherwise you can fuck off." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+					'You give him a careful smile. "Nothing much. Just thought I''d stop by and hang out."'
+					'He gives you a look of disgust. "Nush is in her room if you''re looking for her. Otherwise you can fuck off," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				else
 					'Arkadi answers the door. "What''s up?"'
-					'You smile at him. "Nothing much. Thought I would stop by and hang out."'
-					'He nods a bit. "Nush is in her room if you are looking for her." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+					'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+					'He nods. "Nush is in her room if you''re looking for her," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				end
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
@@ -158,7 +158,7 @@ if $ARGS[0] = 'home':
 	!elseif (week = 2 or week = 4) and hour >= 18 and hour < 23:
 		*clr & cla
 		!! Anushka is at work
-		
+
 		!! Arkadi or Valentin
 		locat['A156'] = 1
 		locat['A158'] = 1
@@ -169,21 +169,22 @@ if $ARGS[0] = 'home':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 			if npc_rel['A156'] >= 60:
 				'Arkadi answers the door. "What''s up?"'
-				'You smile at him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work, but you''re welcome to hang out," he says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			elseif npc_rel['A156'] <= 20:
 				'Arkadi answers the door. "What the fuck do you want?"'
-				'You carefully smile to him. "Nothing much. Thought I would stop by and hang out."'
-				'He gives you a look of disgust. "Nush is at work, so fuck off." He says as he closes the door in your face.'
+				'You carefully smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He gives you a look of disgust. "Nush is at work, so fuck off," he says as he closes the door in your face.'
 				act 'Leave': gt 'city_island'
 			else
 				'Arkadi answers the door. "What''s up?"'
-				'You smile to him. "Nothing much. Thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work."'
-				'"OK well is it cool if I just hang out here?" You ask him.'
-				'He shrugs as he walks away from the door, "Whatever." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work."'
+				'"Okay. Is it cool if I just hang out here?"'
+				'He shrugs as he walks away from the door. "Whatever."'
+				'He leaves you to decide if you want to enter as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
@@ -191,20 +192,20 @@ if $ARGS[0] = 'home':
 			locat['A158'] = 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 			if npc_rel['A158'] >= 60:
-				'Valentin answers the door. "Hey girl what you up to?"'
-				'You smile at him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Valentin answers the door. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work, but you''re welcome to hang out," he says as he walks away from the door, leaving you to decide if you want to enter as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			elseif npc_rel['A158'] <= 20:
-				'Valentin answers the door. "Nush is at work." He says just before closing the door in your face again.'
+				'Valentin answers the door. "Nush is at work," he says just before closing the door in your face again.'
 				act 'Leave': gt 'city_island'
 			else
-				'Valentin answers the door. "Hey girl what you up to?"'
-				'You smile to him. "Nothing much. Thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work."'
-				'"OK well is it cool if I just hang out?" You ask him.'
-				'He shrugs as he walks away from the door, "Sure, come in." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Valentin answers the door. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work."'
+				'"Okay. Is it cool if I just hang out?"'
+				'He shrugs as he walks away from the door. "Sure, come in."'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
@@ -222,27 +223,27 @@ if $ARGS[0] = 'home':
 !		act 'Enter': gt 'anush_bedroom_city','anushroom'
 	!elseif day <= 7 and week = 6 and hour >= 8 and hour < 16:
 	elseif locat['A144'] = 11:
-	!! Amushka in the studio. Only happens on the first Saturday of the month, otherwise it goes to the Saturday elseif code below
+	!! Anushka in the studio. Only happens on the first Saturday of the month, otherwise it goes to the Saturday elseif code below
 		*clr & cla
 		minut += 1
 		!Force Valentin to be in the hallway for now. Need to get a better solution in schedule.
 		locat['A158'] = 1
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 		if npc_rel['A158'] >= 60:
-			'Valentin answers the door. "Hey girl what you up to?"'
-			'You smile at him. "Nothing much Valentin. Thought I would stop by and hang out."'
-			'He nods a bit. "Nush is at the modeling studio. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+			'Valentin answers the door. "Hey girl, what you up to?"'
+			'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+			'He nods. "Nush is at the modeling studio, but you''re welcome to hang out," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 			act 'Leave': gt 'city_island'
 			act 'Enter': gt 'anushapt_city','hallway'
 		elseif npc_rel['A158'] <= 20:
-			'Valentin answers the door. "Nush is at the modeling studio." He says just before closing the door in your face.'
+			'Valentin answers the door. "Nush is at the modeling studio," he says just before closing the door in your face.'
 			act 'Leave': gt 'city_island'
 		else
 			'Valentin answers the door. "Hey girl, what you up to?"'
-			'You smile to him. "Nothing much thought I would stop by and hang out."'
-			'He nods a bit. "Nush is at the modeling studio."'
-			'"OK well is it cool if I just hang out?" you ask him.'
-			'He shrugs as he walks away from the door, "Sure, come in." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+			'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+			'He nods. "Nush is at the modeling studio."'
+			'"Okay. Is it cool if I just hang out?"'
+			'"Sure, come in," he shrugs as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 			act 'Leave': gt 'city_island'
 			act 'Enter': gt 'anushapt_city','hallway'
 		end
@@ -262,19 +263,19 @@ if $ARGS[0] = 'home':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 			if npc_rel['A158'] >= 60:
 				'Valentin answers the door. "Hey girl, what you up to?"'
-				'You smile at him. "Nothing much, just thought I would stop by and hang out."'
-				'He nods a bit. "Nush is in her room if you are looking for her. You are welcome to hangout as well." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is in her room if you''re looking for her. You''re welcome to hang out as well," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			elseif npc_rel['A158'] <= 20:
-				'Valentin answers the door. "Nush is in her room." He says as he turns and walks away before you can say anything in return.'
+				'Valentin answers the door. "Nush is in her room," he says as he turns and walks away before you can say anything in return.'
 				act 'Leave': gt 'city_island'
 			else
-				'Valentin answers the door. "Hey girl what you up to?"'
-				'You smile to him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is in her room if you are looking for her."'
-				'"OK well is it cool if I just hang out?" You ask him.'
-				'He shrugs as he walks away from the door, "Sure come in." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Valentin answers the door. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is in her room if you''re looking for her."'
+				'"Okay. Is it cool if I just hang out?"'
+				'"Sure, come in," he shrugs as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
@@ -290,16 +291,16 @@ if $ARGS[0] = 'home':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 			if npc_rel['A156'] >= 60:
 				'Arkadi answers the door. "What''s up?"'
-				'You smile at him. "Nothing much, thought I would stop by and hang out."'
-				'He nods. "Nush is in her room if you are looking for her. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is in her room if you''re looking for her. You''re welcome to hang out," he says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
 			elseif npc_rel['A156'] <= 20:
 				'Arkadi answers the door. "What the fuck do you want?"'
-				'You smile to him. "Nothing much. Just thought I would stop by and hang out."'
-				'He gives you a look of disgust. "Nush is in her room if you are looking for her. Otherwise, just fuck off." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He gives you a look of disgust. "Nush is in her room if you''re looking for her. Otherwise, just fuck off," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 			else
-				'Arkadi answers the door. "Whats up?"'
-				'You smile to him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is in her room if you are looking for her." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Arkadi answers the door. "What''s up?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is in her room if you''re looking for her," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 			end
 			act 'Leave': gt 'city_island'
 			act 'Enter': gt 'anushapt_city','hallway'
@@ -310,20 +311,20 @@ if $ARGS[0] = 'home':
 		else
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 			if npc_rel['A158'] >= 60:
-				'Valentin answers the door. "Hey girl what you up to?"'
-				'You smile to him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is in her room if you are looking for her. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Valentin answers the door. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is in her room if you''re looking for her. You are welcome to hang out," he says as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			elseif npc_rel['A158'] <= 20:
-				'Valentin answers the door. "Nush is in her room." He says as he turns and walks away before you can say anything in return.'
+				'Valentin answers the door. "Nush is in her room," he says as he turns and walks away before you can say anything in return.'
 				act 'Leave': gt 'city_island'
 			else
-				'Valentin answers the door. "Hey girl what you up to?"'
-				'You smile to him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is in her room if you are looking for her."'
-				'"OK well is it cool if I just hang out?" You ask him.'
-				'He shrugs as he walks away from the door, "Sure come in." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Valentin answers the door. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is in her room if you''re looking for her."'
+				'"Okay. Is it cool if I just hang out?"'
+				'"Sure, come in," he shrugs as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
@@ -338,21 +339,21 @@ if $ARGS[0] = 'home':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 			if npc_rel['A156'] >= 60:
 				'Arkadi answers the door. "What''s up?"'
-				'You smile to him. "Nothing much, just thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work. You are welcome to hangout." He says with a smile as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work, but you''re welcome to hang out," he says with a smile as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			elseif npc_rel['A156'] <= 20:
 				'Arkadi answers the door. "What the fuck do you want?"'
-				'You smile to him. "Nothing much thought I would stop by and hang out."'
-				'He gives you a look of disgust. "Nush is at work, so fuck off." He says as he closes the door in your face.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He gives you a look of disgust. "Nush is at work, so fuck off," he says as he closes the door in your face.'
 				act 'Leave': gt 'city_island'
 			else
 				'Arkadi answers the door. "What''s up?"'
-				'You smile to him. "Nothing much thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work."'
-				'"OK well is it cool if I just hang out?" You ask him.'
-				'He shrugs as he walks away from the door, "Whatever man." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work."'
+				'"Okay. Is it cool if I just hang out?"'
+				'"Whatever," he shrugs as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
@@ -360,9 +361,9 @@ if $ARGS[0] = 'home':
 			locat['A158'] = 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 			if npc_rel['A158'] >= 60:
-				'Valentin answers the door. "Hey girl what you up to?"'
-				'You smile at him. "Nothing much, thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work. You are welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'Valentin answers the door. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work, but you''re welcome to hangout." He says as he walks away from the door, leaving you to decide if you want to walk in. You see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			elseif npc_rel['A158'] <= 20:
@@ -370,10 +371,10 @@ if $ARGS[0] = 'home':
 				act 'Leave': gt 'city_island'
 			else
 				'Valentin answers the door. "Hey girl, what you up to?"'
-				'You smile to him. "Nothing much really, just thought I would stop by and hang out."'
-				'He nods a bit. "Nush is at work."'
-				'"OK, well is it cool if I just hang out?" You ask him.'
-				'He shrugs as he walks away from the door, "Sure, come in." leaving you to decide if you want to walk in. You see him walk back to the living room.'
+				'You smile at him. "Nothing much. Just thought I''d stop by and hang out."'
+				'He nods. "Nush is at work."'
+				'"Okay. Is it cool if I just hang out?"'
+				'"Sure, come in," he shrugs as he walks away from the door, leaving you to decide if you want to walk in as you see him walk back to the living room.'
 				act 'Leave': gt 'city_island'
 				act 'Enter': gt 'anushapt_city','hallway'
 			end
@@ -387,16 +388,16 @@ end
 if $ARGS[0] = 'hallway':
 	*clr & cla
 	menu_off = 0
-	if sound = 0:play 'sound/korr.mp3',30
+	if sound = 0: play 'sound/korr.mp3',30
 	gs 'shortgs', 'setloc', 'anushapt_city', $ARGS[0]
-	$location_type = 'indoors'	
+	$location_type = 'indoors'
 	killvar '$locclass'
 	minut += 1
 	gs 'stat'
 	gs 'anushapt_city_schedule'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/hallway.jpg"></center>'
-	'This is the entrance hall to the apartment. It''s devoid of any furniture, the walls and floor are completely bare. The only thing you can see is a single row of coat hooks by the door which is mostly empty. Other than that the hall just has a series of doors leading to the other rooms in the apartment.'
+	'This is the entrance hall to the apartment. It''s devoid of any furniture and the walls and floor are completely bare. The only thing you can see is a single row of coat hooks by the door, which is mostly empty. Other than that the hall, just has a series of doors leading to the other rooms in the apartment.'
 	act '<b>Leave the apartment</b>': gt 'city_island'
 	act 'Anushka''s room': gt 'anush_bedroom_city','anushroom'
 	act 'Radomir''s room': gt 'anushapt_city','rad_room'
@@ -416,7 +417,7 @@ if $ARGS[0] = 'bathroom':
 	gs 'stat'
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/bathroom.jpg"></center>'
-	'The bathroom is fairly clean. It is larger than most apartment bathrooms you have seen. It has a very green style, white floor tiles, with dark green lower wall tiles, and lighter green ones above. The one thing you notice right away is the toilet set is up, which is not a surprise really with three guys living here.'
+	'The bathroom is fairly clean and larger than most apartment bathrooms you''ve seen. It has white floor tiles with dark green lower wall tiles and lighter green ones above. The one thing you notice right away is the toilet set is up, which is not a surprise with three guys living here.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
@@ -439,7 +440,7 @@ if $ARGS[0] = 'bathroom':
 			act 'Uhm excuse me?':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showergetout.jpg"></center>'
-				'You pull the shower curtain tight against your body to make sure there is nothing for him to see other than your head, but you look out at him in consternation.'
+				'You pull the shower curtain tight against your body to make sure there''s nothing for him to see other than your head, but you look out at him in consternation.'
 				'He looks up at you when you question him. It takes him a moment to realize who you are and he quickly zips up his pants. "Shit sorry... I thought you were my wife." He turns away and hurries for the door. "I''ll just be going... Sorry again." he says as he pulls the door closed. Unsure about what to think, you just decide to finish your shower.'
 				act 'Get out of the shower': gt 'anushapt_city','bathroom'
 			end
@@ -517,47 +518,55 @@ if $ARGS[0] = 'livingroom':
 !!note to self expand these interactions in the future.
 	if week = 1 and hour >= 18 and hour < 23:
 		locat['A156'] = 5
-		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table. Several empty beer bottles and cups are spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is a average size flat screen tv, under it is a tv stand with several game systems and other electronics on it. In one corner you see a drum set. There are speakers, amps, guitars, bass guitars and a variety of other musical electronics as well along side the two walls not occupied by the TV or the couch. The room isn''t exactly messy, but it is far from clean. It doesn''t look like it gets cleaned more often than once a month. The TV is on and Arkadi is playing some playstation game on it.'
+		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table with several empty beer bottles and cups spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is an average size flat screen TV, underneath which is a TV stand with several game systems and other electronics on it. A drum set sits in one corner while speakers, amps, guitars and a variety of other musical electronics sit along the two walls not occupied by the TV or the couch.'
+		'The room isn''t exactly messy, but it''s far from clean. Arkadi is sitting on the couch playing a game.'
 		act 'Leave': gt 'anushapt_city','hallway'
-		act 'Join Arkadi':
+		act 'Join him':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A156', 'like'
 			minut += 30
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/video_games/videogame_boy.jpg"></center>'
-			'You take a seat next to Arkadi as he plays a video game. After a few minutes he switches games to a two player game. Smiling to him you pick up the other controller and start playing with him. The two of you have a good time playing games for awhile, but after a bit you get kinda tired playing the game you are playing and he seems to have no interest in switching games. So you get up and decide to look around the rest of the apartment.'
-			act 'Leave the livingroom':gt 'anushapt_city', 'hallway'
+			'You take a seat next to Arkadi. After a few minutes, he switches to a two player game and you pick up the other controller and start playing with him. The two of you have a good time playing games for a while, but you eventually get bored and he seems to have no interest in switching games, so you get up and decide to look around the rest of the apartment.'
+			act 'Leave the livingroom': gt 'anushapt_city', 'hallway'
 		end
-!!check I did these week/hour times correct 
+!!check I did these week/hour times correct
 	!! Tuesday or Thursday 18-23 or Sunday 8-23
 	elseif (week = 2 or week = 4 and hour >= 18 and hour < 23) or (week = 7 and hour >= 8 and hour < 23):
 		locat['A156'] = 5
 		locat['A158'] = 5
-		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table. Several empty beer bottles and cups are spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is a average size flat screen tv, under it is a tv stand with several game systems and other electronics on it. In one corner is a drum set, there is speakers, amps, guitar''s, bass guitar''s and a variety of other musical electronics, along the two walls not occupied by the TV or couch. The room isn''t exactly messy, but it is far from clean. It doesn''t look like it gets cleaned much more than once a month. The TV is on while Arkadi and Valentin are playing some playstation game on it.'
+		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table with several empty beer bottles and cups spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is an average size flat screen TV, underneath which is a TV stand with several game systems and other electronics on it. A drum set sits in one corner while speakers, amps, guitars and a variety of other musical electronics sit along the two walls not occupied by the TV or the couch.'
+		'The room isn''t exactly messy, but it''s far from clean. Arkadi and Valentin are sitting on the couch playing a game.'
 		act 'Leave': gt 'anushapt_city','hallway'
-		act 'Join Arkadi and Valentin':
+		act 'Join themn':
 			*clr & cla
-			! Arkadi
 			gs 'npc_relationship', 'modify', 'A156', 'like'
-! Also increase for 158/Valentin?
-			!minut += 30
+			gs 'npc_relationship', 'modify', 'A158', 'like'
+			minut += 30
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/video_games/videogame_2boys' + rand(1,2) + '.jpg"></center>'
-			'You take a seat between the boys and watch as they play games together. Valentin asks you how things have been going and generally makes pleasant conversation with you as he plays. Arkadi mostly ignores you except when you ask him something. He seems very intent on winning his game against Valentin and has no time for talking. After a while you start to get bored just making small talk with Valentin while he is distracted and watching them play games. Eventually you excuse yourself and leave the room, they barely even notice you leave.'
-			act 'Leave the livingroom': minut += 30 & gt 'anushapt_city', 'hallway'
+			'You take a seat between the boys and watch as they play the game. Valentin asks you how things have been going and generally makes pleasant conversation with you as he plays, while Arkadi mostly ignores you. He seems very intent on winning his game against Valentin and has no time for talking.'
+			'After a while, you get bored and eventually excuse yourself, but they barely even notice you leaving.'
+			act 'Leave the living room': gt 'anushapt_city', 'hallway'
 		end
 	elseif week = 6 and hour >= 8 and hour < 20:
 		locat['A158'] = 5
-		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table. Several empty beer bottles and cups are spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is a average size flat screen tv, under it is a tv stand with several game systems and other electronics on it. In one corner is a drum set, there is speakers, amps, guitar''s, bass guitar''s and a variety of other musical electronics, along the two walls not occupied by the TV or couch. The room isn''t exactly messy, but it is far from clean. It doesn''t look like it gets cleaned much more than once a month. The TV is on and Valentin is playing some playstation game on it.'
+		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table with several empty beer bottles and cups spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is an average size flat screen TV, underneath which is a TV stand with several game systems and other electronics on it. A drum set sits in one corner while speakers, amps, guitars and a variety of other musical electronics sit along the two walls not occupied by the TV or the couch.'
+		'The room isn''t exactly messy, but it''s far from clean. Valentin is sitting on the couch playing a game.'
 		act 'Leave': gt 'anushapt_city','hallway'
 		act 'Join him':
 			*clr & cla
-			gs 'npc_relationship', 'modify', 'A156', 'like'
+			gs 'npc_relationship', 'modify', 'A158', 'like'
 			minut += 30
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/video_games/videogame_boy.jpg"></center>'
-			'You take a seat next to Valentin as he plays video games, after a few minutes he switches games to a two player game. Smiling to him you pick up the other controller and start playing with him. As the two of you play, he asks how things are going for you and politely chats while you play. After a bit you get kinda tired playing the game you are playing and he seems to have no interest in switching games. So you get up and decide to look around the rest of the apartment.'
+			'You take a seat next to Valentin. After a few minutes, he switches to a two player game and you pick up the other controller and start playing with him. As the two of you play, he asks how things are going and politely chats while you play.'
+			'You eventually get bored and he seems to have no interest in switching games, so you get up and decide to look around the rest of the apartment.'
 			act 'Leave the room': gt 'anushapt_city', 'hallway'
 		end
 	else
-		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table. Several empty beer bottles and cups are spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is a average size flat screen tv, under it is a tv stand with several game systems and other electronics on it. In one corner is a drum set, there is speakers, amps, guitar''s, bass guitar''s and a variety of other musical electronics, along the two walls not occupied by the TV or couch. The room isn''t exactly messy, but it is far from clean. It doesn''t look like it gets cleaned much more than once a month. Looks like no one is here right now.'
+		'The room has a couple of recliners and a couch. In front of the couch is a large coffee table with several empty beer bottles and cups spread across the table, along with some scattered papers and a pill bottle. Opposite the couch, mounted on the wall is an average size flat screen TV, underneath which is a TV stand with several game systems and other electronics on it. A drum set sits in one corner while speakers, amps, guitars and a variety of other musical electronics sit along the two walls not occupied by the TV or the couch.'
+		'The room isn''t exactly messy, but it''s far from clean. No one is here right now.'
 		act 'Leave the room': gt 'anushapt_city', 'hallway'
 	end
 end
@@ -577,8 +586,9 @@ if $ARGS[0] = 'kitchen':
 	gs 'kit_din'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/kitchen.jpg"></center>'
-	'The first thing that stands out about the room is one corner is more of a curve where the cabinets are. Along the back wall is one narrow window, next to it the cabinets start and go all the way up along one wall, leaving two walls covered in cabinets, a stove, sink, and refrigerator. Most of the counter space is filled with small appliances, cups, and varies other items. A few dirty dishes are in the sink, while a few others someone washed and put in the dish rack. Against the wall opposite the cabinets not to far from a window is a small table with four chairs. It is also covered in bags of chips, papers, and other things. You wouldn''t exactly call the kitchen dirty but it isn''t exactly clean either. Mostly it is just really messy and haphazard.'
-	act 'Leave':gt 'anushapt_city','hallway'
+	'The first thing that stands out about the room is that one corner is more of a curve where the cabinets are. Along the back wall is one narrow window where the cabinets start and go all the way up along one wall, leaving two walls covered in cabinets, a stove, sink and refrigerator. Most of the counter space is filled with small appliances, cups, and various other items and a few dirty dishes are in the sink.'
+	'Against the wall opposite the cabinets is a small table with four chairs, which is covered in bags of chips, papers and other things. You wouldn''t call the kitchen dirty, but it isn''t exactly clean either.'
+	act 'Leave': gt 'anushapt_city','hallway'
 	act 'Look in the fridge': gt 'anushapt_city', 'fridge'
 	dynamic $fill_bottle
 	dynamic $driwater
@@ -621,7 +631,7 @@ if $ARGS[0] = 'fridge':
 		$anush_sup = ''
 	end
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/fridge.jpg"></center>'
-	'You open the fridge and see some left overs of different kinds, a couple of fifth''s of vodka, about two dozen beers, milk, juice, yogurt, some soda''s, and some fresh vegetables. The vegetables and yogurt has to be Anushka''s, you can''t see the boys eating that. Though you have a bit of a hard time seeing her eating healthy. Though maybe that is why she is always so skinny.'
+	'You open the fridge and see some leftovers of different kinds, some vodka, about two dozen beers, milk, juice, yogurt, some sodas and some fresh vegetables. The vegetables and yogurt have to be Anushka''s, even though you have a bit of a hard time seeing her eating healthy.'
 	act 'Close the refrigerator': gt 'anushapt_city', 'kitchen'
 	if anushbeer_count > 0:
 		act 'Have a beer':
@@ -646,7 +656,7 @@ if $ARGS[0] = 'fridge':
 			anushvodka_count -= 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka'+rand(1,2)+'.jpg"></center>'
-			'You pour some vodka in a glass and drink it. You shiver as you feel the warm, burning sensation slowly slide down your gullet.'
+			'You pour some vodka into a glass and drink it. You shiver as you feel the warm, burning sensation slowly slide down your gullet.'
 			act 'Put the bottle back in the fridge': gt 'anushapt_city', 'fridge'
 			act 'Close the refrigerator': gt 'anushapt_city', 'kitchen'
 			act 'Drink more vodka':
@@ -710,7 +720,7 @@ if $ARGS[0] = 'fridge':
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0
-			'You get out a plate of fresh vegetables from the fridge and put them on a plate. You take a seat and eat them, when you are done you rinse your plate off in the sink.'
+			'You grab a plate of fresh vegetables from the fridge and put them on a plate before you take a seat and eat them. When you''re done, you rinse your plate off in the sink.'
 			act 'Continue': gt 'anushapt_city', 'fridge'
 			act 'Close the refrigerator': gt 'anushapt_city', 'kitchen'
 		end
@@ -741,7 +751,7 @@ if $ARGS[0] = 'snack':
 	'She gets up and heads to the kitchen with you, the two of you talking and laughing the whole way.'
 	'As you walk into the kitchen, Anushka points to a refrigerator. "Grab some drinks out of the fridge and anything else good."'
 	'While you are doing that, she grabs a couple of snack cakes and chips from the cabinets, and once you both have your spoils from your raid on the kitchen, you head back to her room.'
-	act 'Back to her room': locat['A144']=2& gt 'anush_bedroom_city','anushroom'
+	act 'Back to her room': locat['A144'] = 2 & gt 'anush_bedroom_city','anushroom'
 end
 
 !!Radomir is home Mon-Tues and Thurs from 18:00 for rest of night, Sat from 08:00 till 20:00, Sun all day
@@ -761,74 +771,81 @@ if $ARGS[0] = 'rad_room':
 		tempRad = rand(0,4)
 		if tempRad = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/door.jpg"></center>'
-			'Just as you walk up to the door, you hear sounds coming from the other side. As you lean in close to the door, you can make out the soft moans and cries of a girl, with a louder Radomir''s voice partially drowning them out. "Yeah! That''s right bitch, take my cock." Followed my a loud feminine "Ahhh!" "Fuck yeah! You love my big cock pounding your tight little ass, don''t you slut!" If she replies you can''t hear it, it sounds like they are both having fun, so perhaps you should leave them alone.'
+			'Just as you walk up to the door, you hear sounds coming from the other side. As you lean in close to the door, you can make out the soft moans and cries of a girl, with a louder Radomir''s voice partially drowning them out. "Yeah, that''s right bitch! Take my cock! You love my big cock pounding your tight little ass, don''t you slut?!"'
+			'You can''t hear a reply, but it sounds like they''re both having fun, so you should leave them alone.'
 ! Add some arousal from voyeur?
 			act 'Leave his room': gt 'anushapt_city', 'hallway'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/rad_room.jpg"></center>'
-			'The room is surprisingly clean and well kept. There is a large build in the middle of the room against the opposite wall. Above the bed is spelled out Rock Star, along the left side of the room is a dresser, with a guitar in front of it. Along the opposite wall is a desk with a laptop on it, next to that is a medium sized tv, bean bag chair in front of it, while a play station on the floor in front of the tv. Currently Radomir is sitting at the desk working on his laptop.'
+			'The room is surprisingly clean and well kept. There is a large build in the middle of the room against the opposite wall. "Rock Star" is spelled out above the bed, a dresser sits on one side of the room with a guitar in front of it. Along the opposite wall is a desk with a laptop on it with a medium sized TV and bean bag chair in front of it.'
+			'Radomir is sitting at the desk, working on his laptop.'
 			act 'Leave his room': gt 'anushapt_city', 'hallway'
 			act 'Say hi':
 				*clr & cla
 				'<center><b><font color = maroon>Radomir''s Room</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
-				'You walk into his room, crossing it over near him, as you say. "Hi, you busy?"'
+				'You walk into his room. "Hi. You busy?"'
 !!note to self to expand this in the future
 				if npc_rel['A154'] >= 60:
 					minut += 10
-					'Radomir glances over to you. "Hey girl what you up to?"'
-					'You smile to him. "Nothing much thought I would stop by and see what you was doing."'
-					'He nods a bit. "Just working on a new song is all."'
-					'The two of you talk about music for a bit but he keeps getting distracted by working on the song. After a bit you decide to leave him to it.'
+					'He glances over at you. "Hey girl, what you up to?"'
+					'You smile at him. "Nothing much. Just thought I''d stop by and see what you were doing."'
+					'He nods. "Just working on a new song is all."'
+					'The two of you talk about music, but he keeps getting distracted by working on the song. After a while, you decide to leave him to it.'
 					act 'Leave his room': gt 'anushapt_city', 'hallway'
 				elseif npc_rel['A154'] <= 20:
 					minut += 1
-					'He glances over at you and immediately has a look of anger on his face. "What the fuck are you doing? Get the fuck out of my room." He says, as he gets up and crosses over to you. He grabs you by the arm and shoves your out of his room, closing the door afterwards.'
+					'He glances over at you and immediately has a look of anger on his face.'
+					'"What the fuck are you doing? Get the fuck out of my room!" he says as he gets up and crosses over to you. He grabs you by the arm and shoves your out of his room, closing the door afterwards.'
 					act 'Leave his room': gt 'anushapt_city', 'hallway'
 				else
 					minut += 5
-					'Radomir glances up at you and then back at his computer. "Yeah, I''m busy."'
-					'"Oh sorry, can I ask what you are doing?" You ask him trying to strike up more of a conversation.'
-					'He sighs and looks over at you. "I''m working on a new song, now if you don''t mind I would like to be left alone." After that he just ignores you, after a couple of minutes of being ignore you just leave.'
+					'He glances up at you and then back at his computer. "Yeah, I''m busy."'
+					'"Can I ask what you''re doing?" you ask, trying to strike up more of a conversation.'
+					'He sighs and looks over at you. "I''m working on a new song. Now if you don''t mind, I''d like to be left alone."'
+					'He returns his focus to his laptop and ignores you, so you decide to leave.'
 					act 'Leave his room': gt 'anushapt_city', 'hallway'
 				end
 			end
 		killvar 'tempRad'
 		end
-	! Saturday timed 
+	! Saturday timed
 	! and Sunday all day if that should be
 	elseif week = 7 or (week = 6 and hour >= 8 and hour < 20):
 		'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/rad_room.jpg"></center>'
-		'The room is surprisingly clean and well kept. There is a large build in the middle of the room against the opposite wall. Above the bed is spelled out Rock Star, along the left side of the room is a dresser, with a guitar in front of it. Along the opposite wall is a desk with a laptop on it, next to that is a medium sized tv, bean bag chair in front of it, while a play station on the floor in front of the tv. Currently Radomir is sitting at the desk working on his laptop.'
+		'The room is surprisingly clean and well kept. There is a large build in the middle of the room against the opposite wall. "Rock Star" is spelled out above the bed, a dresser sits on one side of the room with a guitar in front of it. Along the opposite wall is a desk with a laptop on it with a medium sized TV and bean bag chair in front of it.'
+		'Radomir is sitting at the desk, working on his laptop.'
 		act 'Leave his room': gt 'anushapt_city','hallway'
 		act 'Say hi':
 			*clr & cla
 			'<center><b><font color = maroon>Radomir''s Room</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
-			'You walk into his room, crossing it over near him, as you say. "Hi, you busy?"'
+			'You walk into his room. "Hi. You busy?"'
 !!note to self to expand this in the future
 			if npc_rel['A154'] >= 60:
 				minut += 10
-				'Radomir glances over to you. "Hey girl what you up to?"'
-				'You smile to him. "Nothing much thought I would stop by and see what you was doing."'
-				'He nods a bit. "Just working on a new song is all."'
-				'The two of you talk about music for a bit but he keeps getting distracted by working on the song. After a bit you decide to leave him to it.'
+				'He glances over at you. "Hey girl, what you up to?"'
+				'You smile at him. "Nothing much. Just thought I''d stop by and see what you were doing."'
+				'He nods. "Just working on a new song is all."'
+				'The two of you talk about music, but he keeps getting distracted by working on the song. After a while, you decide to leave him to it.'
 				act 'Leave his room': gt 'anushapt_city','hallway'
 			elseif npc_rel['A154'] <= 20:
 				minut += 1
-				'He glances over at you and immediately has a look of anger on his face. "What the fuck are you doing? Get the fuck out of my room." He says, as he gets up and crosses over to you. He grabs you by the arm and shoves your out of his room, closing the door afterwards.'
+				'He glances over at you and immediately has a look of anger on his face.'
+				'"What the fuck are you doing? Get the fuck out of my room!" he says as he gets up and crosses over to you. He grabs you by the arm and shoves your out of his room, closing the door afterwards.'
 				act 'Leave his room': gt 'anushapt_city','hallway'
 			else
 				minut += 5
-				'Radomir glances up at you and then back at his computer. "Yeah, I''m busy."'
-				'"Oh sorry, can I ask what you are doing?" You ask him trying to strike up more of a conversation.'
-				'He sighs and looks over at you. "I''m working on a new song, now if you don''t mind I would like to be left alone." After that he just ignores you, after a couple of minutes of being ignore you just leave.'
+				'He glances up at you and then back at his computer. "Yeah, I''m busy."'
+				'"Can I ask what you are doing?" you ask, trying to strike up more of a conversation.'
+				'He sighs and looks over at you. "I''m working on a new song. Now if you don''t mind, I''d like to be left alone."'
+				'He returns his focus to his laptop and ignores you, so you decide to leave.'
 				act 'Leave his room': gt 'anushapt_city','hallway'
 			end
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/rad_room.jpg"></center>'
-		'The room is surprisingly clean and well kept. There is a large build in the middle of the room against the opposite wall. Above the bed is spelled out Rock Star, along the left side of the room is a dresser, with a guitar in front of it. Along the opposite wall is a desk with a laptop on it, next to that is a medium sized tv, bean bag chair in front of it, while a play station on the floor in front of the tv.'
+		'The room is surprisingly clean and well kept. There is a large build in the middle of the room against the opposite wall. "Rock Star" is spelled out above the bed, a dresser sits on one side of the room with a guitar in front of it. Along the opposite wall is a desk with a laptop on it with a medium sized TV and bean bag chair in front of it.'
 		'Since nobody''s here, you should probably leave, but you could take a look around if you''re curious.'
 		act 'Leave his room': gt 'anushapt_city','hallway'
 		act 'Look around':
@@ -836,7 +853,7 @@ if $ARGS[0] = 'rad_room':
 			minut += 10
 			'<center><b><font color = maroon>Radomir''s Room</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/rad_nightstand.jpg"></center>'
-			'You snoop around, opening drawers and looking in the closet, but you don''t find anything of interest. His computer is password connected so you can''t use it. The only thing of note is some condoms and other stuff in one of the night stands.'
+			'You snoop around, opening drawers and looking in the closet, but you don''t find anything of interest. His computer is password protected, so you can''t use it. The only thing of note is some condoms and other stuff in one of the night stands.'
 			act 'Leave his room': gt 'anushapt_city','hallway'
 		end
 	end
@@ -853,14 +870,15 @@ if $ARGS[0] = 'ark_val_room':
 	gs 'anushapt_city_schedule'
 	'<center><b><font color = maroon>Arkadi and Valentin''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/ark_val_room.jpg"></center>'
-	'The room is pretty small, obviously the smallest bedroom in the apartment. In each corner opposite the door is a bed, both are a mess and neither looks like they have ever been made. The walls and even the ceiling is covered in posters along with a few records. Most of the posters are of varies bands, but a few are of scantly or completely naked girls, along with one rather larger star wars poster on the ceiling. Between the beds along the back wall is two night stands, one by each bed. Both are pretty cluttered looking with a single window just between the night stands. Other than that the room is pretty empty but the beds almost completely fill the room, there is a small closest near the door and two dressers along the same wall as the drawer.'
+	'The room is pretty small, the smallest bedroom in the apartment. In each corner opposite the door is a bed; both are a mess and neither looks like they''ve ever been made. The walls and even the ceiling are covered in posters along with a few records. Most of the posters are of various bands, but a few are of scantly or completely naked girls, along with one rather larg Star Wars poster on the ceiling.'
+	'Between the beds along the back wall are two night stands, one by each bed. Both are pretty cluttered looking, with a single window just between the night stands. Other a closet near the door, the room is otherwise pretty empty.'
 	act 'Leave': gt 'anushapt_city','hallway'
 	act 'Look around':
 		*clr & cla
 		minut += 10
 		'<center><b><font color = maroon>Arkadi and Valentin''s room</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/ark_val_room.jpg"></center>'
-		'You snoop around, opening drawers and looking in the closet, but you don''t find anything of interest. The room is too disorganized for you to find much. Beyond guys clothes, along with a pile on the floor of which you can''t tell if they are clean or not, nothing stands out, other than you find a few joints and condoms in the nightstands.'
+		'You snoop around, opening drawers and looking in the closet, but you don''t find anything of interest. The room is too disorganized for you to find much. Beyond clothes, nothing stands out other than a few joints and condoms in the nightstands.'
 		act 'Leave': gt 'anushapt_city', 'hallway'
 	end
 end
@@ -877,10 +895,9 @@ if $ARGS[0] = 'nushlivroom':
 	locat['A144'] = 5
 	'<center><b><font color = maroon>Living room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/homes/band_apt/living_room.jpg"></center>'
-	'The room has a couple of recliners and a couch where Anushka is sitting. In front of the couch is a large coffee table. Several empty beer bottles and cups are spread across the table. There are also some scattered papers and a pill bottle sitting on the table. Opposite the couch but in front of the window is a fairly large TV playing an action movie of some sort and a stereo system. The room isn''t exactly messy, but it is far from clean. It doesn''t look like it has been dusted in months or the floor has been recently swept. You walk over and sit down next to Anushka.'
-	*nl
-	'You notice that you don''t hear anything else. "Where''s everyone else?" you ask her.'
-	'She shrugs a bit. "I think they all went out to see a movie, so I have the place all to myself for a change."'
+	'The room has a couple of recliners and a couch where Anushka is sitting. In front of the couch is a large coffee table with several empty beer bottles and cups spread across it. There are also some scattered papers and a pill bottle sitting on the table. Opposite the couch in front of the window is a fairly large TV playing an action movie of some sort and a stereo system. The room isn''t exactly messy, but it''s far from clean. You walk over and sit down next to Anushka.'
+	'You notice that you don''t hear anything else. "Where''s everyone else?"'
+	'She shrugs. "I think they all went out to see a movie, so I have the place to myself."'
 	act 'Watch the show with her':
 		*clr & cla
 		gs 'stat'
@@ -889,22 +906,23 @@ if $ARGS[0] = 'nushlivroom':
 		gs 'anushapt_city_schedule'
 		'<center><b><font color = maroon>Living room</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/shared/home/tv/tv_watch_1.jpg"></center>'
-		'The two of you watch some cheesy American action movie. You chat about how nice it will be when you are on your own without always having people around and parents telling you what to do. You barely pay attention to the movie as you talk. In fact, it ends, and something else comes on that you don''t even remember. After a couple of hours though, you hear keys in the lock of the door and Anushka says "Shit they''re home already. Come on let''s go." As she gets up and heads to her room, her brothers come running by on the way to theirs. They are quickly followed by Valeria complaining about where they ate. Ed walks by and gives you a slight nod, then goes into the kitchen.'
-		act 'Follow Anushka to her room': locat['A144']=2& gt 'anush_bedroom_city','anushroom'
+		'The two of you chat while watching some cheesy American action movie, so you barely pay attention to it. In fact, it ends and something else comes on that you don''t even remember. After a few hours though, you hear keys in the lock of the door.'
+		'"Shit, they''re home already. Come on, let''s go," she says as she gets up and heads to her room.'
+		act 'Follow Anushka to her room': locat['A144'] = 2 & gt 'anush_bedroom_city','anushroom'
 	end
 	if strapnumber > 0:
 		act 'Pull out your strap-on':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap1.jpg"></center>'
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'Anushka arches her eyebrows when you pull the strap-on out of your purse, then bites her lower lip. "Just what are you planning to do with that?"'
 				'You give her a grin. "I was thinking about fucking you with it, or maybe having you fuck me with it? With nobody home, it would be a crime to waste the freedom it gives us."'
-				'She gets flushed, and you can tell she is turned on. "Yeah? Well hand it over and I will fuck your tight little asshole until you scream for me."'
+				'She gets flushed, and you can tell she is turned on. "Yeah? Well hand it over and I''ll fuck your tight little asshole until you scream for me."'
 				act 'Fuck her': gt 'anushkaev1', 'couch_strapon_give', 'city'
 				act 'Give her the strap-on': gt 'anushkaev1', 'couch_strapon_get', 'city'
 			else
-				'Anushka reaches up and takes the strap-on from you. She takes a look at it then gives the straps a few good tugs while she checks the size of the dildo. "Pretty nice one. It''s a quality dildo and sturdy harness. You made a good choice." she says as she hands it back to you and turns her attention back to the movie. Taking the hint that she doesn''t want to play, you put the strap-on away and join her in watching the TV.'
+				'Anushka reaches up and takes the strap-on from you. She takes a look at it then gives the straps a few good tugs while she checks the size of the dildo. "Pretty nice one. It''s a quality dildo and sturdy harness. You made a good choice," she says as she hands it back to you and turns her attention back to the movie. Taking the hint that she doesn''t want to play, you put the strap-on away and join her in watching the TV.'
 				act 'Watch the show with her':
 					*clr & cla
 					gs 'stat'
@@ -913,8 +931,9 @@ if $ARGS[0] = 'nushlivroom':
 					gs 'anushapt_city_schedule'
 					'<center><b><font color = maroon>Living room</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/shared/home/tv/tv_watch_1.jpg"></center>'
-					'The two of you watch some cheesy American action movie. You chat about how nice it will be when you are on your own without always having people around and parents telling you what to do. You barely pay attention to the movie as you talk. In fact, it ends, and something else comes on that you don''t even remember. After a couple of hours though, you hear keys in the lock of the door and Anushka says "Shit they''re home already. Come on, let''s go." As she gets up and heads to her room, her brothers come running by on the way to theirs. They are quickly followed by Valeria complaining about where they ate. Ed walks by and gives you a slight nod, then goes into the kitchen.'
-					act 'Follow Anushka to her room': locat['A144']=2& gt 'anush_bedroom_city','anushroom'
+					'The two of you chat while watching some cheesy American action movie, so you barely pay attention to it. In fact, it ends and something else comes on that you don''t even remember. After a few hours though, you hear keys in the lock of the door.'
+					'"Shit, they''re home already. Come on, let''s go," she says as she gets up and heads to her room.'
+					act 'Follow Anushka to her room': locat['A144' ] = 2 & gt 'anush_bedroom_city','anushroom'
 				end
 			end
 		end

+ 163 - 160
locations/anushaptbr.qsrc

@@ -15,8 +15,8 @@ if $ARGS[0] = 'brotherroom':
 	gs 'stat'
 	'<center><b><font color = maroon>Anushka''s brother''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
-	'The room is disorganized and untidy. It''s fairly messy with a lot of clothes scattered about in various piles. Two beds are crammed against opposite walls, leaving an open space in the center. There is a small TV on a stand in the room with a PlayStation console lying partially hidden under some clothes in front of it.'	
-	act 'Leave': gt 'anushapt', 'hallway'	
+	'The room is disorganized and untidy. It''s fairly messy with a lot of clothes scattered about in various piles. Two beds are crammed against opposite walls, leaving an open space in the center. There is a small TV on a stand in the room with a PlayStation console lying partially hidden under some clothes in front of it.'
+	act 'Leave': gt 'anushapt', 'hallway'
 	if AnushkaLoc = 3 and maksimQW['QWstage'] = 0:
 		maksimQW['QWstage'] = 1
 		menu_off = 1
@@ -119,7 +119,7 @@ if $ARGS[0] = 'brotherroom':
 						'"But dad! She cheated again!" Timofey pleads with him.'
 						'"But dad nothing. Weren''t you supposed to be studying?" Eduard asks.'
 						*nl
-						'"Y-Yes..." both brothers answer.' 
+						'"Y-Yes..." both brothers answer.'
 						'"Well get to it!" he says to them, then turns to you and Anushka. "You two get out of their room and stop tormenting your brothers, Nush!" He holds the door open until you both leave, then pulls it shut hard.'
 						'Anushka starts to respond, but Eduard interrupts her. "I don''t care! Leave them alone so they can study. Take your friend to your room." With that, he turns and goes back to the living room.'
 					else
@@ -141,7 +141,7 @@ if $ARGS[0] = 'brotherroom':
 						'The door closes before you can hear any more, leaving you unable to make out anything beyond muffled sounds.'
 					end
 					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
-				end	
+				end
 			end
 		end
 	elseif AnushkaLoc ! 3:
@@ -187,13 +187,13 @@ if $ARGS[0] = 'brotherroom':
 							'"No, because he''s a pussy magnet! He can get any girl he wants!" he says while giving you his best seductive grin. It''s laughable at best.'
 							*nl
 							'"That was way too much information for me. I think it''s time for me to head out. I''m feeling a bit nauseous." You see a disappointed look on Maksim''s face.'
-							'As you''re walking out, Maksim turns to his brother. "Bitches are a ruble a dozen, just like Radomir said!"' 
+							'As you''re walking out, Maksim turns to his brother. "Bitches are a ruble a dozen, just like Radomir said!"'
 							'As you close the door, you hear Timofey agreeing. It''s very likely that he has no idea what he''s agreeing with, though.'
 							act 'Leave': gt 'anushapt', 'hallway'
 						end
-					end	
+					end
 				end
-			end	
+			end
 		elseif brotherroom = 2 and maksimQW['QWstage'] = 2:
 			gs 'stat'
 			maksimQW['QWstage'] = 3
@@ -228,7 +228,7 @@ if $ARGS[0] = 'brotherroom':
 						'Giving up on reasoning with him, you shrug and turn to the magazine. As you flip through the pages, you realize the boy has some kinky tastes and wonder who might have bought something like this for him. Whoever it was, you figure there''s no harm in him looking at pictures, so when you reach the end, you throw the magazine back onto his bed. "I won''t tell anyone your secret, but try to be nice to each other at least."'
 						act 'Leave': gt 'anushapt', 'hallway'
 					end
-				end	
+				end
 			end
 		elseif brotherroom = 3 and maksimQW['QWstage'] >= 3:
 			maksimQW['QWstage'] = 4
@@ -283,7 +283,7 @@ if $ARGS[0] = 'brotherroom':
 						end
 						act 'Deal': gt 'anushaptbr', 'race_maksim_result'
 						if pcs_inhib > 30: act 'Deal (Go easy on Maksim)': gt 'anushaptbr', 'race_maksim_result', 1
-					end	
+					end
 				end
 			end
 		else
@@ -294,7 +294,7 @@ if $ARGS[0] = 'brotherroom':
 		end
 		killvar 'brotherroom'
 	end
-end 
+end
 
 
 if $ARGS[0] = 'race_maksim_result':
@@ -325,6 +325,7 @@ if $ARGS[0] = 'race_maksim_result':
 			*clr & cla
 			gs 'flash', 'tits', 'indoors', 1, 1
 			gs 'stat'
+
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksimshow.jpg"></center>'
 			'"A bet''s a bet," you shrug.'
 			'You stand and pull your top up, his eyes growing wide as he stares at your breasts. Before either of you can say anything, you hear the front door slam. "Maksim... Maksim... Come see... Come see!" Timofey yells as he runs down the hall.'
@@ -337,15 +338,15 @@ if $ARGS[0] = 'race_maksim_result':
 		'You smile, knowing he only switched games because he couldn''t win. "Well?"'
 		'He glances at you. "Well what?"'
 		'You smile at him. "You said you would tell me a secret about your sister, so what is it?"'
-		if maksimQW['secret1'] = 0 and hotcat >= 6 and npc_rel['A144'] >= 50:
+		if maksimQW['secret1'] = 0 and pcs_hotcat >= 6 and npc_rel['A144'] >= 50:
 			maksimQW['secret1'] = 1
-			'He makes a ''V'' shape with his fingers and puts it against his mouth before sticking his tongue between them in the universal sign for eating pussy, mimicking licking for a few seconds. "She <i>likes</i> you."' 
+			'He makes a ''V'' shape with his fingers and puts it against his mouth before sticking his tongue between them in the universal sign for eating pussy, mimicking licking for a few seconds. "She <i>likes</i> you."'
 			'You just shake your head. You should have known he wouldn''t actually tell you anything you didn''t already know.'
 		elseif maksimQW['secret2'] = 0:
 			maksimQW['secret2'] = 1
 			'He looks around for a few seconds. "She keeps a bunch of drugs in her dresser."'
 			'You smile. "How would you know that? Have you been going through her panty drawer?" you ask in a teasing tone.'
-			'He turns bright red. "NO! Shut up and get out of my room!"' 
+			'He turns bright red. "NO! Shut up and get out of my room!"'
 			'You sigh and get up, leaving his room before he throws a fit.'
 		else
 			'He sighs and tells you about some nonsense thing she did as a kid that no one would care about, once again learning nothing worth knowing. You don''t know why you keep playing against him. You just shake your head and leave.'
@@ -390,66 +391,67 @@ if $ARGS[0] = 'rematch':
 			'Both of them get excited. "Your friend better be great. We''ve been practicing really hard and we''ll definitely beat you this time!"'
 			'Anushka quickly questions him while smiling. "You really think you can beat us this time?"'
 			'The boys nod at each other. "We''re sure!"'
-			act 'Sit down and play':
+		end
+		act 'Sit down and play':
+			*clr & cla
+			maksimQW['nush_games'] = 2
+			minut += 15
+			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.'
+			'"Let''s play!" Timofey says smiling.'
+			'The four of you play for several minutes. It''s the same shooter game as last time, and you''re a little bit better than before.'
+			act 'Finish':
 				*clr & cla
-				maksimQW['nush_games'] = 2
 				minut += 15
-				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.'
-				'"Let''s play!" Timofey says smiling.'
-				'The four of you play for several minutes. It''s the same shooter game as last time, and you''re a little bit better than before.'
-				act 'Finish':
-					*clr & cla
+				if pcs_gaming <= 20:
+					maksimQW['nush_games_win'] = 1
+					'The game is pretty much over and both of them are still better players than you are. Anushka does what she can again, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, we win and you lose!" Maksim taunts.'
+					'Anushka rolls her eyes at their antics. "Yeah, yeah. You won." She reaches over and ruffles Timofey''s hair, which he tries and fails to dodge. "Good job, kiddo."'
+					'"Pfft, I won it! Timo almost caused us to lose, but I carried his sorry ass!" Maksim says.'
+					'Timofey pulls away from his sister. "Nuh-uh, I almost scored as good you as you did!" This quickly turns into them arguing over who did better.'
+					'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like brats anytime soon." You get up and follow her out.'
+				elseif pcs_gaming <= 40:
+					maksimQW['nush_games_win'] = 2
 					minut += 15
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-					if pcs_gaming <= 20:
-						maksimQW['nush_games_win'] = 1
-						'The game is pretty much over and both of them are still better players than you are. Anushka does what she can again, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, we win and you lose!" Maksim taunts.'
-						'Anushka rolls her eyes at their antics. "Yeah, yeah. You won." She reaches over and ruffles Timofey''s hair, which he tries and fails to dodge. "Good job, kiddo."'
-						'"Pfft, I won it! Timo almost caused us to lose, but I carried his sorry ass!" Maksim says.'
-						'Timofey pulls away from his sister. "Nuh-uh, I almost scored as good you as you did!" This quickly turns into them arguing over who did better.'
-						'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like brats anytime soon." You get up and follow her out.'
-					elseif pcs_gaming <= 40:
-						maksimQW['nush_games_win'] = 2
-						minut += 15
-						'The game is pretty much a draw with no one getting the upper hand until Anushka starts to cheat again. She starts jabbing Maksim with her foot and covers Timofey''s eyes with her hand at a critical moment. The brothers try to return the favor, and soon the three of them are more interested in wrestling and fighting than actually winning the game. With everyone else distracted, you take advantage and win the match.'
-						'Realizing what happened, Maksim starts yelling. "Not fair! You cheated again!"'
-						'"You were doing the same to me, so you were cheating too!" Anushka replies, teasing them with a smile on her face.'
-						*nl
-						'Maksim doesn''t see it that way. "You started it, and your groupie took advantage of the situation!"'
-						'Anushka just laughs. "Well, whose fault is that? If you weren''t so consumed with trying to get back at me, you would have noticed what she was doing and maybe won."'
-						'"SHUT UP!" Maksim yells in response.'
-						'Anushka interjects before he can say more. "Be quiet! Do you want Dad to come in here again?"'
-						'He immediately goes quiet and glances at the door, as if expecting their dad to burst in any moment. When the moment passes, Maksim jumps on Anushka. "Cheater!" He''s loud, but not too loud.'
-						*nl
-						'Anushka and Maksim start to wrestle. She quickly starts to get the upper hand because he just isn''t big enough to beat his older sister yet. Once it becomes clear she''s about to pin him down, Timofey jumps on her back and the three of them wrestle around. Anushka manages to pin one of them, but the other gets loose as she tries to pin them both. They come close a few times to pinning her down, but in the end, they all just give up, out of breath and lying in a heap.'
-						'Finally, Anushka gets up and untangles herself from them. "Come on, let''s go back to my room," she says to you. As you follow her out of the room, the brothers start to play another game. "We''ll win next time!" you hear Maksim say as Anushka closes the door on them.'
-					else
-						maksimQW['nush_games_win'] = 3
-						'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
-						'Maksim throws down his controller and turns on Timofey. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
-						'Timofey tries to defend himself. "It''s not my fault that Nush and <<$pcs_nickname>> are just too good!"'
-						'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive like always, which makes it easier for me to kill you. You''re just mad because you got beat by a girl... Again!" she says in a teasing tone, then sticks her tongue out at him.'
-						'Maksim''s eyes flare at Anushka and it looks like he''s about to scream at her again until she interjects. "Calm down, we don''t want Dad in here again." He shuts his mouth and glances at the door, then glares at Anushka.'
-						*nl
-						'"Get out! Get out of our room!" he says as he tries to shove her off the bed.'
-						'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
-						'He pushes her towards the door. "Good, then don''t... Get out!"'
-						'Anushka sounds exasperated. "Fine, I won''t, you little brat!"'
-						*nl
-						'She turns towards you. "Come on, let''s go before this little shit starts to cry."'
-						'"Fuck you, bitch! Get out of our room!" he starts to yell, but catches himself and lowers his voice partway through.'
-						'Timofey runs up to his sister. "No, come back and play with us!" he pleads.'
-						'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
-						'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
-					end
-					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
-				end	
+					'The game is pretty much a draw with no one getting the upper hand until Anushka starts to cheat again. She starts jabbing Maksim with her foot and covers Timofey''s eyes with her hand at a critical moment. The brothers try to return the favor, and soon the three of them are more interested in wrestling and fighting than actually winning the game. With everyone else distracted, you take advantage and win the match.'
+					'Realizing what happened, Maksim starts yelling. "Not fair! You cheated again!"'
+					'"You were doing the same to me, so you were cheating too!" Anushka replies, teasing them with a smile on her face.'
+					*nl
+					'Maksim doesn''t see it that way. "You started it, and your groupie took advantage of the situation!"'
+					'Anushka just laughs. "Well, whose fault is that? If you weren''t so consumed with trying to get back at me, you would have noticed what she was doing and maybe won."'
+					'"SHUT UP!" Maksim yells in response.'
+					'Anushka interjects before he can say more. "Be quiet! Do you want Dad to come in here again?"'
+					'He immediately goes quiet and glances at the door, as if expecting their dad to burst in any moment. When the moment passes, Maksim jumps on Anushka. "Cheater!" He''s loud, but not too loud.'
+					*nl
+					'Anushka and Maksim start to wrestle. She quickly starts to get the upper hand because he just isn''t big enough to beat his older sister yet. Once it becomes clear she''s about to pin him down, Timofey jumps on her back and the three of them wrestle around. Anushka manages to pin one of them, but the other gets loose as she tries to pin them both. They come close a few times to pinning her down, but in the end, they all just give up, out of breath and lying in a heap.'
+					'Finally, Anushka gets up and untangles herself from them. "Come on, let''s go back to my room," she says to you. As you follow her out of the room, the brothers start to play another game. "We''ll win next time!" you hear Maksim say as Anushka closes the door on them.'
+				else
+					maksimQW['nush_games_win'] = 3
+					'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
+					'Maksim throws down his controller and turns on Timofey. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
+					'Timofey tries to defend himself. "It''s not my fault that Nush and <<$pcs_nickname>> are just too good!"'
+					'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive like always, which makes it easier for me to kill you. You''re just mad because you got beat by a girl... Again!" she says in a teasing tone, then sticks her tongue out at him.'
+					'Maksim''s eyes flare at Anushka and it looks like he''s about to scream at her again until she interjects. "Calm down, we don''t want Dad in here again." He shuts his mouth and glances at the door, then glares at Anushka.'
+					*nl
+					'"Get out! Get out of our room!" he says as he tries to shove her off the bed.'
+					'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
+					'He pushes her towards the door. "Good, then don''t... Get out!"'
+					'Anushka sounds exasperated. "Fine, I won''t, you little brat!"'
+					*nl
+					'She turns towards you. "Come on, let''s go before this little shit starts to cry."'
+					'"Fuck you, bitch! Get out of our room!" he starts to yell, but catches himself and lowers his voice partway through.'
+					'Timofey runs up to his sister. "No, come back and play with us!" he pleads.'
+					'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
+					'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
+				end
+				act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
 			end
 		end
+
 	elseif maksimQW['nush_games'] = 2:
 		'The two of you walk down the hall and enter her brothers'' room. As you do you hear moaning sounds, you have heard enough porn to recognize that sound. Maksim looks up with huge wide eyes like he was caught in the middle of something. He slams a small laptop closed and the sounds stop as he turns bright red, you notice Timofey is nowhere to be found. Anushka just stops a moment, she obviously knows the sounds as well as she says. "Just what was you doing you little pervert?"'
 		*nl
@@ -491,65 +493,66 @@ if $ARGS[0] = 'rematch':
 			'"You really think you can beat us this time?" Anushka quickly replies while smiling. '
 			'The boys nod at each other. "This time will be different. We''re sure we''ll win!"'
 			'Anushka laughs. "Nah, I don''t think so. Maybe you boys just like getting beat by girls?"'
-			'Maksim looks mad. "Just shut up and play!"' 
+			'Maksim looks mad. "Just shut up and play!"'
 			'Anushka just laughs again and mimics what he said in a manner that taunts him.'
-			act 'Play':
+		end
+		act 'Play':
+			*clr & cla
+			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>'
+			'"Come on guys, let''s just have fun!" you tell them.'
+			'"We''ll win this time!" Maksim says as he looks at the two of you, determined.'
+			'"Let''s play!" Timofey says smiling.'
+			'The four of you play for several minutes. You''ve gotten better since the last time you played. You learned a lot and are able to help out more than you did before.'
+			act 'Finish':
 				*clr & cla
-				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>'
-				'"Come on guys, let''s just have fun!" you tell them.'
-				'"We''ll win this time!" Maksim says as he looks at the two of you, determined.'
-				'"Let''s play!" Timofey says smiling.'
-				'The four of you play for several minutes. You''ve gotten better since the last time you played. You learned a lot and are able to help out more than you did before.'
-				act 'Finish':
-					*clr & cla
-					minut += 15
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-					if pcs_gaming <= 20:
-						'It''s not enough, however, as all of them are still better players than you. Anushka does what she can again, but the brothers easily manage to win back-to-back matches. Both brothers jump up and do some weird little victory dance. "Haha, go suck a dick that''s all your good at!" Maksim taunts as he looks directly at Anushka.'
-						'Anushka reaches out and grabs him by the shirt. "Shut your fucking mouth, I am so sick of your fucking shit." She looks visibly angry this time.'
-						'Maksim actually goes a little white, like he is actually afraid of her, while Timofey jumps up and grabs Anushka''s arm. "Stop... stop fighting, he didn''t mean it."'
-						*nl
-						'Anushka turns to look at Timofey and you see the anger melt away from her as she lets go of Marksim. "Ok for you." Then she kisses him on the top of his head much to his dismay, unable to get away from her until she finishes.'
-						'"EEEWWW stop it!" Timofey whines while Maksim laughs at him. Then he gives Maksim a dirty look while he is laughing. "Why do you both have to always be so mean."'
-						'Anushka rolls her eyes. "I wasn''t being mean."'
-						'Maksim decides to taunt his brother more. "Now you got all her sex cooties from all the guys she lets fuck her."'
-						*nl
-						'Timofey looks more distressed and then leaves the room. Anushka gives Maksim a dirty look. "Why do you always have to be such an asshole."'
-						'"Fuck you, get out!" Maksim says as Anushka just shakes her head in obvious disgust at her brother and then leaves the room.'
-						'You follow her, she catches up to Timofey as he is going into the bathroom. "Hey I don''t have cooties, stop listening to him."'
-						'He looks at her like she is stupid. "All girls have cooties, I need to wash them off." Then he goes into the bathroom closing the door.'
-						'Anushka just shakes her head and laughs. "God boys are so stupid, in a few years he will be chasing girls." Then the two of you go back to her room.'
-					elseif pcs_gaming <= 40:
-						'The two of you are slightly better than they are, and after some time, you come out on top. Maksim gets mad and throws his controller down. "Fuck!" He then turns on his brother. "Why are you so bad, if you didn''t suck so much we would have won."'
-						'Timofey shakes his head. "No, you suck and you''re why we lost. You always have to try and be the hero and try and win on your own, instead of sticking with me."'
-						'"I leave you because you suck and slow me down!" Maksim yells.'
-						'Before you can even react, Anushka tells him. "You want dad to come back in here?"'
-						'Maksim pushes Anushka. "Get out of my room. Get out!"'
-						'Anushka just shakes her head and goes for the door. "Come on <<$pcs_nickname>>, let''s get out of here."' 
-						'Maksim rushes across the room and pushes the two of you the rest of the way out before slamming the door closed. Anushka angrily goes back to her room.'
-					else
-						'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
-						'Maksim throws down his controller. "Fuck!" He then turns on his brother. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
-						'Timofey tries to defend himself. "It''s not my fault. Nush and <<$pcs_nickname>> are just too good."'
-						'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive, and don''t work with Timofey. You just try to win it on your own. Also, you''re just mad because you got beat by a girl... again." she says in a teasing tone.'
-						'Maksim''s eyes flare at Anushka "Get out... Get out of our room!" he says as he tries to shove her off the bed.'
-						*nl
-						'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
-						'He pushes her towards the door. "You only play with us to bully us! I don''t want to play with you anymore!"'
-						'Anushka sounds exasperated. "Fine then, you little brat! I won''t!" She turns towards you. "Come on, let''s go before this little shit starts to cry."'
-						'"Go suck a cock!" Maksim starts to yell, but catches himself and lowers his voice partway through.'
-						'Timofey runs up to his sister. "You will play with us again, won''t you?" he asks in a somewhat pleading tone.'
-						'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
-						'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
-					end
-					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
+				if pcs_gaming <= 20:
+					'It''s not enough, however, as all of them are still better players than you. Anushka does what she can again, but the brothers easily manage to win back-to-back matches. Both brothers jump up and do some weird little victory dance. "Haha, go suck a dick that''s all your good at!" Maksim taunts as he looks directly at Anushka.'
+					'Anushka reaches out and grabs him by the shirt. "Shut your fucking mouth, I am so sick of your fucking shit." She looks visibly angry this time.'
+					'Maksim actually goes a little white, like he is actually afraid of her, while Timofey jumps up and grabs Anushka''s arm. "Stop... stop fighting, he didn''t mean it."'
+					*nl
+					'Anushka turns to look at Timofey and you see the anger melt away from her as she lets go of Marksim. "Ok for you." Then she kisses him on the top of his head much to his dismay, unable to get away from her until she finishes.'
+					'"EEEWWW stop it!" Timofey whines while Maksim laughs at him. Then he gives Maksim a dirty look while he is laughing. "Why do you both have to always be so mean."'
+					'Anushka rolls her eyes. "I wasn''t being mean."'
+					'Maksim decides to taunt his brother more. "Now you got all her sex cooties from all the guys she lets fuck her."'
+					*nl
+					'Timofey looks more distressed and then leaves the room. Anushka gives Maksim a dirty look. "Why do you always have to be such an asshole."'
+					'"Fuck you, get out!" Maksim says as Anushka just shakes her head in obvious disgust at her brother and then leaves the room.'
+					'You follow her, she catches up to Timofey as he is going into the bathroom. "Hey I don''t have cooties, stop listening to him."'
+					'He looks at her like she is stupid. "All girls have cooties, I need to wash them off." Then he goes into the bathroom closing the door.'
+					'Anushka just shakes her head and laughs. "God boys are so stupid, in a few years he will be chasing girls." Then the two of you go back to her room.'
+				elseif pcs_gaming <= 40 and pcs_gaming > 20:
+					'The two of you are slightly better than they are, and after some time, you come out on top. Maksim gets mad and throws his controller down. "Fuck!" He then turns on his brother. "Why are you so bad, if you didn''t suck so much we would have won."'
+					'Timofey shakes his head. "No, you suck and you''re why we lost. You always have to try and be the hero and try and win on your own, instead of sticking with me."'
+					'"I leave you because you suck and slow me down!" Maksim yells.'
+					'Before you can even react, Anushka tells him. "You want dad to come back in here?"'
+					'Maksim pushes Anushka. "Get out of my room. Get out!"'
+					'Anushka just shakes her head and goes for the door. "Come on <<$pcs_nickname>>, let''s get out of here."'
+					'Maksim rushes across the room and pushes the two of you the rest of the way out before slamming the door closed. Anushka angrily goes back to her room.'
+				else
+					'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
+					'Maksim throws down his controller. "Fuck!" He then turns on his brother. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
+					'Timofey tries to defend himself. "It''s not my fault. Nush and <<$pcs_nickname>> are just too good."'
+					'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive, and don''t work with Timofey. You just try to win it on your own. Also, you''re just mad because you got beat by a girl... again." she says in a teasing tone.'
+					'Maksim''s eyes flare at Anushka "Get out... Get out of our room!" he says as he tries to shove her off the bed.'
+					*nl
+					'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
+					'He pushes her towards the door. "You only play with us to bully us! I don''t want to play with you anymore!"'
+					'Anushka sounds exasperated. "Fine then, you little brat! I won''t!" She turns towards you. "Come on, let''s go before this little shit starts to cry."'
+					'"Go suck a cock!" Maksim starts to yell, but catches himself and lowers his voice partway through.'
+					'Timofey runs up to his sister. "You will play with us again, won''t you?" he asks in a somewhat pleading tone.'
+					'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
+					'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
 				end
+				act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
 			end
 		end
+
 	elseif maksimQW['nush_games'] = 4:
 		'The two of you walk down the hall and enter her brothers'' room. As you do you only see Timofey on his bed reading a comic, he looks up at the two of you but doesn''t say anything. "Where''s your brother?" Anushka asks.'
 		'Timofey shrugs. "I don''t know, he ran off outside with his friends, they wouldn''t let me play with them." He says sadly.'
@@ -568,7 +571,7 @@ if $ARGS[0] = 'rematch':
 				'They are both way better at the game than you are, you are pretty sure Anushka is better than Timofey because each time he messes up. She suddenly messes up to and seems unable to get going again until he passes her. You quickly realize she is keeping it close but letting him win on purpose, but he doesn''t seem to notice as he is into the game, getting excited as he wins. After playing a couple of times, he exclaims "I WIN!" Anushka just laughs as she gets up and ruffles his hair much to his annoyance. "Yeah you did, you are getting really good at it, but need to go." He suddenly looks crest fallen as she says you are going. "I will come play with your later, ok?"'
 				'He smiles again and nods. "Ok but I won''t take it easy on you."'
 				'She for her part just smiles. "I know you won''t." Then she turns to look at you. "Come on let''s go back to my room."'
-			elseif pcs_gaming <= 40:
+			elseif pcs_gaming <= 40 and pcs_gaming > 20:
 				'You are about as good as Timofey, you think Anushka is better than you both though. You notice each time he makes a mistake and you get in the lead she gets by him too suddenly, not long after she always manages to crash into you, letting Timofey get back ahead of both of you. You quickly realize she is keeping it close but letting him win on purpose, but he doesn''t seem to notice as he is into the game, getting excited as he wins. After playing a couple of times, he exclaims "I WIN!" Anushka just laughs as she gets up and ruffles his hair much to his annoyance. "Yeah you did, you are getting really good at it, but need to go." He suddenly looks crest fallen as she says you are going. "I will come play with your later, ok?"'
 				'He smiles again and nods. "Ok but I won''t take it easy on you."'
 				'She for her part just smiles. "I know you won''t." Then she turns to look at you. "Come on let''s go back to my room."'
@@ -603,57 +606,57 @@ if $ARGS[0] = 'rematch':
 			'"You really think you can beat us this time?" Anushka quickly replies while smiling. '
 			'The boys nod at each other. "This time will be different. We''re sure we''ll win!"'
 			'Anushka laughs. "Nah, I don''t think so. Maybe you boys just like getting beat by girls?"'
-			'Maksim looks mad. "Just shut up and play!"' 
+			'Maksim looks mad. "Just shut up and play!"'
 			'Anushka just laughs again and mimics what he said in a manner that taunts him.'
-			act 'Play':
+		end
+		act 'Play':
+			*clr & cla
+			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>'
+			'"Come on guys, let''s just have fun!" you tell them.'
+			'"We''ll win this time!" Maksim says as he looks at the two of you, determined.'
+			'"Let''s play!" Timofey says smiling.'
+			'The four of you play for several minutes. You''ve gotten better since the last time you played. You learned a lot and are able to help out more than you did before.'
+			act 'Finish':
 				*clr & cla
-				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>'
-				'"Come on guys, let''s just have fun!" you tell them.'
-				'"We''ll win this time!" Maksim says as he looks at the two of you, determined.'
-				'"Let''s play!" Timofey says smiling.'
-				'The four of you play for several minutes. You''ve gotten better since the last time you played. You learned a lot and are able to help out more than you did before.'
-				act 'Finish':
-					*clr & cla
-					minut += 15
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/playgamebro.jpg"></center>'
-					if pcs_gaming <= 20:
-						'It''s not enough, however, as all of them are still better players than you. Anushka does what she can again, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, see told you girls suck at video games!" Maksim taunts.'
-						'Anushka rolls her eyes at their antics. "Yeah, yeah. You won." She reaches over and ruffles Timofey''s hair, which he tries and fails to dodge. "Good job, kiddo."'
-						'"Pfft, I won it! Timo almost caused us to lose, but I carried his sorry ass!" Maksim says.'
-						'Timofey pulls away from his sister. "Nuh-uh, I almost scored as good you as you did!" It quickly turns into them arguing over who did better.'
-						'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like brats anytime soon." You get up and follow her out.'
-					elseif pcs_gaming <= 40:
-						'The two of you are slightly better than they are, and after some time, you come out on top. Maksim gets mad and throws his controller down. "Fuck!" He then turns on his brother. "It''s your fault we lost! God, you''re so stupid!"'
-						'Timofey shakes his head. "No, you''re stupid and you''re why we lost. You always have to try and be the hero, so Nush tricks you every time."'
-						'Maksim suddenly leaps on top of his brother. "Shut your mouth, you little shit! She doesn''t trick me!" he yells as he starts beating on him. Before you can even react, Anushka grabs Maksim by the back of his collar and yanks him off Timofey. "Leave him alone! He''s right. I baited you out then <<$pcs_nickname>> killed you. It''s not his fault."'
-						'Maksim gets back up and pushes Anushka. "Get out of my room. Get out or I''ll tell Dad you''re picking on us again!"'
-						'Anushka just shakes her head and goes for the door. "Come on <<$pcs_nickname>>, let''s get out of here." Just as you start to leave, Anushka stops and looks back in. "Maksim, you better leave him alone or I''ll come back in here and beat your ass."' 
-						'Maksim rushes across the room and pushes the two of you the rest of the way out before slamming the door closed. Anushka angrily goes back to her room.'
-					else
-						'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
-						'Maksim throws down his controller. "Fuck!" He then turns on his brother. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
-						'Timofey tries to defend himself. "It''s not my fault. Nush and <<$pcs_nickname>> are just too good."'
-						'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive, and don''t work with Timofey. You just try to win it on your own. Also, you''re just mad because you got beat by a girl... again." she says in a teasing tone.'
-						'Maksim''s eyes flare at Anushka "Get out... Get out of our room!" he says as he tries to shove her off the bed.'
-						*nl
-						'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
-						'He pushes her towards the door. "You only play with us to bully us! I don''t want to play with you anymore!"'
-						'Anushka sounds exasperated. "Fine then, you little brat! I won''t!" She turns towards you. "Come on, let''s go before this little shit starts to cry."'
-						'"Go suck a cock!" Maksim starts to yell, but catches himself and lowers his voice partway through.'
-						'Timofey runs up to his sister. "You will play with us again, won''t you?" he asks in a somewhat pleading tone.'
-						'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
-						'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
-					end
-					act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
+				if pcs_gaming <= 20:
+					'It''s not enough, however, as all of them are still better players than you. Anushka does what she can again, but the brothers easily manage to win back to back matches. Both brothers jump up and do some weird little victory dance. "Haha, see told you girls suck at video games!" Maksim taunts.'
+					'Anushka rolls her eyes at their antics. "Yeah, yeah. You won." She reaches over and ruffles Timofey''s hair, which he tries and fails to dodge. "Good job, kiddo."'
+					'"Pfft, I won it! Timo almost caused us to lose, but I carried his sorry ass!" Maksim says.'
+					'Timofey pulls away from his sister. "Nuh-uh, I almost scored as good you as you did!" It quickly turns into them arguing over who did better.'
+					'Anushka gets up and shakes her head. "Come on, let''s go. They''re not going to stop acting like brats anytime soon." You get up and follow her out.'
+				elseif pcs_gaming <= 40 and pcs_gaming > 20:
+					'The two of you are slightly better than they are, and after some time, you come out on top. Maksim gets mad and throws his controller down. "Fuck!" He then turns on his brother. "It''s your fault we lost! God, you''re so stupid!"'
+					'Timofey shakes his head. "No, you''re stupid and you''re why we lost. You always have to try and be the hero, so Nush tricks you every time."'
+					'Maksim suddenly leaps on top of his brother. "Shut your mouth, you little shit! She doesn''t trick me!" he yells as he starts beating on him. Before you can even react, Anushka grabs Maksim by the back of his collar and yanks him off Timofey. "Leave him alone! He''s right. I baited you out then <<$pcs_nickname>> killed you. It''s not his fault."'
+					'Maksim gets back up and pushes Anushka. "Get out of my room. Get out or I''ll tell Dad you''re picking on us again!"'
+					'Anushka just shakes her head and goes for the door. "Come on <<$pcs_nickname>>, let''s get out of here." Just as you start to leave, Anushka stops and looks back in. "Maksim, you better leave him alone or I''ll come back in here and beat your ass."'
+					'Maksim rushes across the room and pushes the two of you the rest of the way out before slamming the door closed. Anushka angrily goes back to her room.'
+				else
+					'Before too long, it''s pretty clear you and Anushka have the upper hand. The brothers keep it close, but they fall a little short in both matches.'
+					'Maksim throws down his controller. "Fuck!" He then turns on his brother. "Why are you so bad? We could have beat them if you didn''t suck so much!"'
+					'Timofey tries to defend himself. "It''s not my fault. Nush and <<$pcs_nickname>> are just too good."'
+					'Before Maksim can respond, Anushka cuts him off. "It''s not Timo''s fault, and you know it. When you fall behind, you get too aggressive, and don''t work with Timofey. You just try to win it on your own. Also, you''re just mad because you got beat by a girl... again." she says in a teasing tone.'
+					'Maksim''s eyes flare at Anushka "Get out... Get out of our room!" he says as he tries to shove her off the bed.'
+					*nl
+					'Anushka gets up. "Oh my God, you''re such a baby! I don''t even know why I bother playing with you."'
+					'He pushes her towards the door. "You only play with us to bully us! I don''t want to play with you anymore!"'
+					'Anushka sounds exasperated. "Fine then, you little brat! I won''t!" She turns towards you. "Come on, let''s go before this little shit starts to cry."'
+					'"Go suck a cock!" Maksim starts to yell, but catches himself and lowers his voice partway through.'
+					'Timofey runs up to his sister. "You will play with us again, won''t you?" he asks in a somewhat pleading tone.'
+					'Anushka instantly eases up, and her anger seems to melt away. "Some other time, squirt..." she says with a smile and ruffles his hair, much to his annoyance.'
+					'As she closes the door and leaves, you can hear Maksim berating his brother for being a pussy and pleading with their sister to play games with them.'
 				end
+				act 'Go to Anushka''s room': AnushkaLoc = 2 & gt 'anush_bedroom', 'anushroom'
 			end
 		end
 	end
 end
 
---- anushaptbr ---------------------------------
 
+--- anushaptbr ---------------------------------

+ 48 - 36
locations/anushka.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'plan':
 	gs 'gschool_events', 'rand_teacher_arg'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-	'Valentin sits across from you while Anushka takes the seat next to you. She slides her arm around your shoulders and pulls you close to her. "<<$pcs_nickname>>, we need your help with a plan."' 
+	'Valentin sits across from you while Anushka takes the seat next to you. She slides her arm around your shoulders and pulls you close to her. "<<$pcs_nickname>>, we need your help with a plan."'
 	'"What plan?" you ask. You look from her to Valentin, then back. Anushka''s answer comes so fast that you''re certain she was waiting for that exact question. "We want to drug Mr <<$rand_teacher>>... You know, so we can go have fun." You''re almost certain you misheard her, but she casually ignores your shocked expression and explains the part she expects you to play. "I''ll go up and distract him. When I do, we need you to drop these in his drink." She places several pills in your hand.'
 	*nl
 	'You look at the pills, turning them uncertainly in your fingers before looking up at them again. "What exactly will these do to him?"'
@@ -32,7 +32,7 @@ if $ARGS[0] = 'plan':
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 	act 'Agree':
 		*clr & cla
 		npc_rel['A144'] += 1
@@ -71,9 +71,9 @@ if $ARGS[0] = 'plan':
 					gs 'stat'
 					'<center><b><font color="maroon">Detention</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/sex/det3sum.jpg"></center>'
-					'You shake your head, denying the offered drink. He snorts and she rolls her eyes before pulling out a joint and lighting it up. Before long, the two of them are ignoring you while having a smoke and a drink together. It doesn''t take long for the two of them to start making out next to you and you watch in fascination as he starts pulling his pants down.' 
+					'You shake your head, denying the offered drink. He snorts and she rolls her eyes before pulling out a joint and lighting it up. Before long, the two of them are ignoring you while having a smoke and a drink together. It doesn''t take long for the two of them to start making out next to you and you watch in fascination as he starts pulling his pants down.'
 					gs 'stat'
-					if hotcat >= 6:
+					if pcs_hotcat >= 6:
 						'As Anushka and Valentin make out, she reaches down to close her hand around his cock and immediately starts to jerk him. After she has him good and hard, she reaches toward you with both hands to grab your head and push you down into his lap.'
 						gs 'willpower', 'bj', 'resist'
 						if will_cost <= pcs_willpwr:
@@ -92,7 +92,7 @@ if $ARGS[0] = 'plan':
 							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	
+						end
 						act 'Suck him':
 							*clr & cla
 							npc_rel['A144'] += 1
@@ -111,7 +111,7 @@ if $ARGS[0] = 'plan':
 				end
 			else
 				act 'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 			act 'Take a drink':
 				*clr & cla
 				npc_rel['A144'] += 1
@@ -123,8 +123,8 @@ if $ARGS[0] = 'plan':
 				'<center><b><font color="maroon">Detention</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/sex/detcbj.jpg"></center>'
 				'You take the offered drink and take a swig as well. You immediately regret it because you choke and cough from the burning liquid. This results in them both laughing. Whatever is in the flask is much stronger than you expected. Anushka soon takes out a joint and lights it up before passing it around. After only a few drinks each, the flask is empty, and the joint doesn''t last much longer. With the flask empty and the joint smoked to ashes, you''re feeling pretty buzzed and watch in dazed fascination as Valentin pulls his pants down.'
-				if hotcat >= 6:
-					'As Anushka and Valentin make out, she reaches down to close her hand around his cock and immediately starts to jerk him. After she has him good and hard, she reaches toward you with both hands to grab your head and push you down into his lap.'			
+				if pcs_hotcat >= 6:
+					'As Anushka and Valentin make out, she reaches down to close her hand around his cock and immediately starts to jerk him. After she has him good and hard, she reaches toward you with both hands to grab your head and push you down into his lap.'
 					gs 'willpower', 'bj', 'resist'
 					if will_cost <= pcs_willpwr:
 						act 'Pull away (<<will_cost>> Willpower)':
@@ -161,7 +161,7 @@ if $ARGS[0] = 'plan':
 			end
 		end
 	end
-end					
+end
 
 if $ARGS[0] = 'Her turn':
 	*clr & cla
@@ -205,12 +205,12 @@ if $ARGS[0] = 'Her turn':
 					'<center><b><font color="maroon">Detention</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/sex/detccum.jpg"></center>'
 					'As Anushka''s orgasm finishes, you hear Valentin pant and grunt as her ass squeezes and twitches around his cock. You know he''s getting close and it seems Anushka does as well. She quickly climbs off him and kneels down in front of him, pulling you down as well so you can join her. She grabs his dick and rapidly starts jerking it. A few seconds later, a stream of cum spurts out and hits you in the face. The next spurt she aims at her own face followed by your tits, then her own tits. She spreads his spunk between the two of you, coating both of your tits and faces with his sticky cum.'
-					'When he''s finished, she diligently licks you clean and you return the favor. When all the cum has been collected, she gives you a deep and passionate kiss, both of you making sure to share the cum you licked up together. With that done, the three of you get dressed. As Valentin unlocks the lounge door, he gives you a smirk. "Okay, I admit it. You''re not as much of a killjoy as I thought, <<$pcs_nickname>>. Nush was right; you''re a pretty cool chick. Not to mention you really know how to suck cock." You give Anushka a sideways glance and find her grinning at you.' 
+					'When he''s finished, she diligently licks you clean and you return the favor. When all the cum has been collected, she gives you a deep and passionate kiss, both of you making sure to share the cum you licked up together. With that done, the three of you get dressed. As Valentin unlocks the lounge door, he gives you a smirk. "Okay, I admit it. You''re not as much of a killjoy as I thought, <<$pcs_nickname>>. Nush was right; you''re a pretty cool chick. Not to mention you really know how to suck cock." You give Anushka a sideways glance and find her grinning at you.'
 					gs 'arousal', 'kiss', 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					'Going back to the library, you see that the teacher is still out like a light and all the other students are gone. There''s less than an hour of detention left, so the three of you leave the school. Once outside, you each go your separate ways.'
-					
+
 					act 'Go home': gt 'gschool_grounds', 'main'
 				end
 			end
@@ -314,7 +314,7 @@ if $ARGS[0] = 'wedgie fight':
 						'You quickly gather up your clothes and get dressed again. As the two of you head out, Anushka turns to you. "Hey <<$pcs_nickname>>, you want to come by my place?"'
 						act 'Can''t':
 							*clr & cla
-							'You shake your head. "Sorry Nush, I have some things I need to do. Maybe some other time."' 
+							'You shake your head. "Sorry Nush, I have some things I need to do. Maybe some other time."'
 							'She shrugs. "Sure. Whatever..." she replies noncommittally.  '
 							act 'Leave': gt 'gschool_grounds', 'main'
 						end
@@ -398,7 +398,7 @@ if $ARGS[0] = 'temptation':
 				end
 			else
 				act 'I would like to, but... (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 		end
 	end
 end
@@ -449,7 +449,7 @@ if $ARGS[0] = 'naked':
 				end
 			else
 				act 'Decline (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 		end
 	end
 end
@@ -459,7 +459,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/hiding.jpg"></center>'
 	'You''re waiting for the janitor to pass.'
-	
+
 	if anushLimitedQuestions > 0:
 		if anushTalkedofDolls = 0:
 			act 'Make small talk':
@@ -488,7 +488,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 				end
 			end
 		end
-		
+
 		act 'Ask about her reputation':
 			*clr & cla
 			anushLimitedQuestions -= 1
@@ -504,7 +504,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 			'She shakes her head. "Nope, not even in the slightest. Half of it isn''t even true anyway, and the stuff that is shouldn''t be an issue. If I feel like fucking someone, then I do. Just because I like it." she shrugs slightly before continuing. "While I party a lot and screw around, that''s not what makes me, <b>me</b>. All that is just small parts of me. I do what I want, and that makes <b>me</b> happy. Those who understand that are my friends. The rest... Well, fuck''em."'
 			act 'Talk about something else': gt 'anushka', 'chatwhilewaiting'
 		end
-		
+
 		act 'Ask about her getting naked':
 			*clr & cla
 			anushLimitedQuestions -= 1
@@ -517,7 +517,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 			'Looking at her naked like this, you just have to ask. "So what''s the deal with always getting naked? I mean I know of a few times, and if even half the gossip is true, this is a pretty normal state for you." You add a bit of friendly ribbing to your tone.'
 			'Snorting, she seems to think about it before shrugging. "Honestly, I don''t know. I''m proud of my body and not ashamed of it. I don''t see why it should be a big thing anyway. Plus, I like the thrill that you get from doing something that''s a little taboo, where you can get caught, I just love it! Like knowing the janitor is going to be passing by this room shortly, maybe coming in and catching us without a stitch on..." She bites her lower lip and looks mildly turned on. "I just love the thrill of almost getting caught... or actually getting caught."'
 			act 'Talk about something else': gt 'anushka', 'chatwhilewaiting'
-		end		
+		end
 
 		act 'Ask about the band':
 			*clr & cla
@@ -540,7 +540,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 			end
 			!!ToDo: A flag probably needs to be set here to keep track of Nush having Sveta''s number.
 			act 'Talk about something else': gt 'anushka', 'chatwhilewaiting'
-		end	
+		end
 
 		act 'Ask if she has a boyfriend':
 			*clr & cla
@@ -548,7 +548,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 			'<center><b><font color="maroon">Classroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/'+iif(rand(0,1) = 0, 'weed', 'hiding')+'.jpg"></center>'
 			'You know that she''s seeing some guys and girls, so it''s not really a secret. You''re not sure if you should even ask, but you''re curious. "Do you have a boyfriend? Or a girlfriend?"'
-			'She shakes her head. "Nope, not really looking right now. I''m young and carefree. I plan to, as they say, sow my wild oats while I can. I''m not against the idea mind you. If that right person came along and just blew me away, then I would likely consider it." She pauses for a second and gives you a wicked grin. "Why do you ask? Are you wanting to fill that <i>slot?</i>"' 
+			'She shakes her head. "Nope, not really looking right now. I''m young and carefree. I plan to, as they say, sow my wild oats while I can. I''m not against the idea mind you. If that right person came along and just blew me away, then I would likely consider it." She pauses for a second and gives you a wicked grin. "Why do you ask? Are you wanting to fill that <i>slot?</i>"'
 			'The way she says it makes you blush. She leaves no doubt about what she means and makes it sound so dirty, yet so exciting at the same time.'
 			act 'Maybe':
 				*clr & cla
@@ -598,7 +598,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 								'You nod, accepting her apology of sorts, and you both let the topic drop.'
 								act 'Talk about something else': gt 'anushka', 'chatwhilewaiting'
 							else
-								if hotcat >= 6:
+								if pcs_hotcat >= 6:
 									'She arches a slender brow. "Fedor? Really? Come on now, if you were going to date a jock why not go for one of the better athletes like Lazar or Ivan? I mean <b>Fedor</b>? He''s like an Ivan-lite," she says with a giggle.'
 									'You''re mad at her for talking smack about your boyfriend, but she can''t keep a straight face and you realize that she''s just yanking your chain. "Yeah, I like him. He''s sweet."'
 									'She snorts. "Yeah sure he is... Uh-huh. Be honest <<$pcs_nickname>>, it''s because he has a really big dick, isn''t it?" she asks with a grin while pretending to hold a really big imaginary dick between her legs.'
@@ -650,7 +650,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 						act 'Vitek':
 							cla
 							'"Vitek," you tell her.'
-							'She just stares at you. "Really? Yeah, I get that he has that bad boy vibe going for him, but you really could do better."' 
+							'She just stares at you. "Really? Yeah, I get that he has that bad boy vibe going for him, but you really could do better."'
 							'She notices your facial expression from her bad mouthing your boyfriend, so she holds up her hand. "Hey, it''s your life, so do what you want, but doesn''t it feel like you''re dating Lena at the same time because of how much she talks about how great he is? At least, when she isn''t bitching about him ruining her sex life. You would think she wants to suck his dick or something," she says with a smirk. You just roll your eyes and she lets it drop.'
 							act 'Talk about something else': gt 'anushka', 'chatwhilewaiting'
 						end
@@ -661,7 +661,7 @@ if $ARGS[0] = 'chatwhilewaiting':
 							'"Artem," you tell her.'
 							'She arches a slender brow slightly. "Artem? The nerd?" She seems to consider it for a moment. "Well, I guess he is kind of cute, and I bet you have him totally pussy whipped to do whatever you want. Yeah ok, I can see the appeal." she says with a giggle.'
 							'You shake your head at her comment. "He''s sweet and really nice to me."'
-							if hotcat >= 6:
+							if pcs_hotcat >= 6:
 								'She snorts. "Yeah, I''m sure he is, but the real question is - Is he any good at fucking?"'
 								'You roll your eyes at her. "There''s more to life than just sex you know!" Seeing the look on her face you add, "Okay yeah, he''s pretty good at it... Good enough anyway."'
 								'She grins. "Oh ''good enough'', huh? I''m sure that''s a ringing endorsement that strokes his ego," she says while pretending to stroke her imaginary dick. "Hmm, well maybe I should find out for myself. Do you think he''d be up for a threesome?" she asks as she winks and makes a kissy face at you.'
@@ -717,19 +717,25 @@ if $ARGS[0] = 'chatwhilewaiting':
 					end
 					i = 0
 					:lover_looop
-					if loverGender[i] ! 1: dynamic '	act ''<<$npc_usedname["<<$lover[i]>>"]>>'': gt ''anushka'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$lover[i]>>"]'
-					i +=1
-					if i < ARRSIZE('lover'): jump 'lover_looop'
+					if i < arrsize('lover'):
+						$temp_npcid = $lover[i]
+						if npc_gender[$temp_npcid] ! 1:
+							dynamic 'act ''<<$npc_usedname["<<$temp_npcid>>"]>>'': gt ''anushka'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$temp_npcid>>"]'
+						end
+						killvar '$temp_npcid'
+						i += 1
+						jump 'lover_looop'
+					end
 					Killvar 'i'
 				end
 			end
-		end	
+		end
 
 		if anushAskedofAlyona = 0:
 			act 'Ask about Alyona':
 				*clr & cla
 				anushLimitedQuestions -= 1
-				anushAskedofAlyona = 1		
+				anushAskedofAlyona = 1
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/'+iif(rand(0,1) = 0, 'weed', 'hiding')+'.jpg"></center>'
 				'You''ve heard some messed up things about Alyona, so you''re curious about her friendship with Anushka. "You''re friends with Alyona, right?" you ask and she nods. "How''s she doing?"'
@@ -747,14 +753,14 @@ if $ARGS[0] = 'chatwhilewaiting':
 					'Knowing you''ve pushed things as far as you dare, you change the subject.'
 					act 'Talk about something else': gt 'anushka', 'chatwhilewaiting'
 				end
-			end		
+			end
 		end
-		
+
 		if anushAskedGrad = 0:
 			act 'Ask what she plans to do after graduation':
 				*clr & cla
 				anushLimitedQuestions -= 1
-				anushAskedGrad = 1	
+				anushAskedGrad = 1
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/'+iif(rand(0,1) = 0, 'weed', 'hiding')+'.jpg"></center>'
 				'Curious about her plans for the future, you decide to ask what she plans to do once school is over. "Once we graduate, what do you plan to do? Are you going to focus on the band more?"'
@@ -785,11 +791,17 @@ if $ARGS[0] = 'chatwhilewaiting':
 				if NikoVolkovQW >= 5:	act 'Get married to Niko': gt 'anushka', 'telling_marrige_dreams', 'Niko'
 				i = 0
 				:marrid_looop
-				if loverGender[i] ! 1: dynamic '	act ''Get married to <<$npc_usedname["<<$lover[i]>>"]>>'': gt ''anushka'', ''telling_marrige_dreams'', $npc_usedname["<<$lover[i]>>"]'
-				i +=1
-				if i < ARRSIZE('lover'): jump 'marrid_looop'
-				Killvar 'i'		
-			end		
+				if i < arrsize('lover'):
+					$temp_npcid = $lover[i]
+					if npc_gender[$temp_npcid] ! 1:
+						dynamic 'act ''Get married to <<$npc_usedname["<<$temp_npcid>>"]>>'': gt ''anushka'', ''telling_marrige_dreams'', $npc_usedname["<<$temp_npcid>>"]'
+					end
+					killvar '$temp_npcid'
+					i += 1
+					jump 'marrid_looop'
+				end
+				Killvar 'i'
+			end
 		end
 	elseif anushLimitedQuestions <= 0:
 		act 'You hear that?':

+ 30 - 18
locations/anushkachat.qsrc

@@ -318,10 +318,16 @@ if $ARGS[0] = 'chat':
 			if NikoVolkovQW >= 5:	act 'Get married to Niko': gt 'anushkachat', 'telling_marrige_dreams', 'Niko'
 			i = 0
 			:marrid_looop
-			if loverGender[i] ! 1: dynamic '	act ''Get married to <<$npc_usedname["<<$lover[i]>>"]>>'': gt ''anushkachat'', ''telling_marrige_dreams'', $npc_usedname["<<$lover[i]>>"]'
-			i +=1
-			if i < ARRSIZE('lover'): jump 'marrid_looop'
-			killvar 'i'			
+			if i < arrsize('lover'):
+				$temp_npcid = $lover[i]
+				if npc_gender[$temp_npcid] ! 1:
+					dynamic 'act ''Get married to <<$npc_usedname["<<$temp_npcid>>"]>>'': gt ''anushkachat'', ''telling_marrige_dreams'', $npc_usedname["<<$temp_npcid>>"]'
+				end
+				killvar '$temp_npcid'
+				i += 1
+				jump 'marrid_looop'
+			end
+			killvar 'i'
 		else
 			act 'Get married':
 				*clr & cla
@@ -436,7 +442,7 @@ if $ARGS[0] = 'chat':
 			end
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/brtkiss.jpg"></center>'
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'You look at her as you sit side by side. Maybe for too long, or maybe she just senses it, since she turns her head to look at you. Her face is not that far from yours and you can''t help it; she''s so damn pretty! You lean over to give her a kiss, a kiss she fully returns. The two of you kiss for a bit, but you are not sure she wants to do more yet or not. Perhaps you should press on or maybe you should wait and try some other time for more.'
 				gs 'arousal', 'foreplay', 1, 'lesbian'
 				gs 'stat'
@@ -454,7 +460,7 @@ if $ARGS[0] = 'chat':
 						act 'Stop making out':
 							*clr & cla
 							gs 'npc_relationship', 'modify', 'A144', 'hate'
-							'You pull away before things go too far and catch your breath. You see her slightly confused look and you feel a little bad about it. "Sorry, I got carried away. Can we just go back to talking?"' 
+							'You pull away before things go too far and catch your breath. You see her slightly confused look and you feel a little bad about it. "Sorry, I got carried away. Can we just go back to talking?"'
 							'She frowns. "Yeah, whatever." You don''t blame her for her reaction since you did just give her the girl equivalent of blue balls.'
 							gs 'arousal', 'end'
 							gs 'stat'
@@ -590,7 +596,7 @@ if $ARGS[0] = 'chat':
 					end
 				else
 					act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
+				end
 				act 'Drop it':
 					*clr & cla
 					'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
@@ -692,7 +698,7 @@ if $ARGS[0] = 'boyfriend_chat':
 				act 'Stop talking': gt 'anush_bedroom','anushroom'
 				act 'Keep talking': gt 'anushkachat', 'chat'
 			else
-				if hotcat >= 6:
+				if pcs_hotcat >= 6:
 					'"Fedor," you tell her.'
 					'She arches a slender brow. "Fedor? Really? Come on now, if you were going to date a jock why not go for one of the better athletes like Lazar or Ivan? I mean <b>Fedor</b>? He''s like an Ivan-lite," she says with a giggle.'
 					'You''re mad at her for talking smack about your boyfriend, but she can''t keep a straight face and you realize that she''s just yanking your chain. "Yeah, I like him. He''s sweet."'
@@ -751,7 +757,7 @@ if $ARGS[0] = 'boyfriend_chat':
 		act 'Vitek':
 			cla
 			'"Vitek," you tell her.'
-			'She just stares at you. "Really? Yeah, I get that he has that bad boy vibe going for him, but you really could do better."' 
+			'She just stares at you. "Really? Yeah, I get that he has that bad boy vibe going for him, but you really could do better."'
 			'She notices your facial expression from her bad mouthing your boyfriend, so she holds up her hand. "Hey, it''s your life, so do what you want, but doesn''t it feel like you''re dating Lena at the same time because of how much she talks about how great he is? At least, when she isn''t bitching about him ruining her sex life. You would think she wants to suck his dick or something," she says with a smirk. You just roll your eyes and she lets it drop.'
 			act 'Stop talking': gt 'anush_bedroom','anushroom'
 			act 'Keep talking': gt 'anushkachat', 'chat'
@@ -760,7 +766,7 @@ if $ARGS[0] = 'boyfriend_chat':
 	if artemQW['bf'] = 1:
 		act 'Artem':
 			cla
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'"Artem," you tell her.'
 				'She arches a slender brow. "Artem? The nerd?" She seems to consider it for a moment. "Well, I guess he is kind of cute and I bet you have him totally pussy whipped to do whatever you want. Yeah okay, I can see the appeal," she says with a giggle.'
 				'You shake your head at her comment. "He''s sweet and really nice to me."'
@@ -837,9 +843,15 @@ if $ARGS[0] = 'boyfriend_chat':
 	end
 	i = 0
 	:lover_looop
-	if loverGender[i] ! 1: dynamic '	act ''<<$npc_usedname["<<$lover[i]>>"]>>'': gt ''anushkachat'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$lover[i]>>"]'
-	i +=1
-	if i < ARRSIZE('lover'): jump 'lover_looop'
+	if i < arrsize('lover'):
+		$temp_npcid = $lover[i]
+		if npc_gender[$temp_npcid] ! 1:
+			dynamic 'act ''<<$npc_usedname["<<$temp_npcid>>"]>>'': gt ''anushkachat'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$temp_npcid>>"]'
+		end
+		killvar '$temp_npcid'
+		i += 1
+		jump 'lover_looop'
+	end
 	killvar 'i'
 end
 
@@ -852,7 +864,7 @@ if $ARGS[0] = 'tell_about_generic_boyfreind':
 	*nl
 	'"Who?" she asks as she cocks her head slightly.'
 	'You shake your head slightly. "You''ve never met him. I just met him."'
-	'She smiles. "Just some guy you met, huh?"' 
+	'She smiles. "Just some guy you met, huh?"'
 	'You laugh, then tell her about him.'
 	act 'Stop talking': gt 'anush_bedroom','anushroom'
 	act 'Keep talking': gt 'anushkachat', 'chat'
@@ -1166,13 +1178,13 @@ if $ARGS[0] = 'photoshoot':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 	if anushkaQW['photoshoot'] = 1:
 		'You shake your head when you realize you can''t think of a good place to take a photo of her. "I don''t know what I was thinking! I can''t think of a good location, can you?"'
-		'She thinks for a second before grinning. "Yeah, this building has a fire escape we can use. Fairly private and undisturbed."'	
+		'She thinks for a second before grinning. "Yeah, this building has a fire escape we can use. Fairly private and undisturbed."'
 		'You grin back. "That sounds great, lead on." She giggles and leads you down the hall to the window. She opens it and you both crawl outside onto the fire escape.'
 		act 'Start photoshoot': gt 'anushkachat', 'photoshoot1'
 	else
 		'You shake your head when you realize you can''t think of a good place to take a photo of her. "I don''t know what I was thinking! I can''t think of a good location, can you?"'
-		'She thinks for a second before shrugging. "No, not really."'	
-		act 'Go back to her room': 
+		'She thinks for a second before shrugging. "No, not really."'
+		act 'Go back to her room':
 			*clr & cla
 			minut +=5
 			gs 'stat'
@@ -1279,7 +1291,7 @@ if $ARGS[0] = 'photoshoot1':
 										gs 'arousal', 'voyeur', 5
 										gs 'arousal', 'end'
 										gs 'stat'
-										act 'Go back to her room': 
+										act 'Go back to her room':
 											*clr & cla
 											minut +=5
 											gs 'stat'

+ 19 - 13
locations/anushkachat_city.qsrc

@@ -403,7 +403,7 @@ if $ARGS[0] = 'chat':
 			end
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/brtkiss.jpg"></center>'
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'You look at her as you sit side by side. Maybe for too long, or maybe she just senses it, since she turns her head to look at you. Her face is not that far from yours and you can''t help it; she''s so damn pretty! You lean over to give her a kiss, a kiss she fully returns. The two of you kiss for a bit, but you are not sure she wants to do more yet or not. Perhaps you should press on or maybe you should wait and try some other time for more.'
 				gs 'arousal', 'foreplay', 1, 'lesbian'
 				gs 'stat'
@@ -421,7 +421,7 @@ if $ARGS[0] = 'chat':
 						act 'Stop making out':
 							*clr & cla
 							gs 'npc_relationship', 'modify', 'A144', 'hate'
-							'You pull away before things go too far and catch your breath. You see her slightly confused look and you feel a little bad about it. "Sorry, I got carried away. Can we just go back to talking?"' 
+							'You pull away before things go too far and catch your breath. You see her slightly confused look and you feel a little bad about it. "Sorry, I got carried away. Can we just go back to talking?"'
 							'She frowns. "Yeah, whatever." You don''t blame her for her reaction since you did just give her the girl equivalent of blue balls.'
 							gs 'arousal', 'end'
 							gs 'stat'
@@ -546,7 +546,7 @@ if $ARGS[0] = 'chat':
 					end
 				else
 					act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
+				end
 				act 'Drop it':
 					*clr & cla
 					'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
@@ -646,7 +646,7 @@ if $ARGS[0] = 'boyfriend_chat':
 				act 'Stop talking': gt 'anush_bedroom_city','anushroom'
 				act 'Keep talking': gt 'anushkachat_city', 'chat'
 			else
-				if hotcat >= 6:
+				if pcs_hotcat >= 6:
 					'"Fedor," you tell her.'
 					'She arches a slender brow. "Fedor? Really? Come on now, if you were going to date a jock why not go for one of the better athletes like Lazar or Ivan? I mean <b>Fedor</b>? He''s like an Ivan-lite," she says with a giggle.'
 					'You''re mad at her for talking smack about your boyfriend, but she can''t keep a straight face and you realize that she''s just yanking your chain. "Yeah, I like him. He''s sweet."'
@@ -705,7 +705,7 @@ if $ARGS[0] = 'boyfriend_chat':
 	if artemQW['bf'] = 1:
 		act 'Artem':
 			cla
-			if hotcat >= 6:
+			if pcs_hotcat >= 6:
 				'"Artem," you tell her.'
 				'She arches a slender brow. "Artem? The nerd?" She seems to consider it for a moment. "Well, I guess he is kind of cute and I bet you have him totally pussy whipped to do whatever you want. Yeah okay, I can see the appeal," she says with a giggle.'
 				'You shake your head at her comment. "He''s sweet and really nice to me."'
@@ -769,9 +769,15 @@ if $ARGS[0] = 'boyfriend_chat':
 	end
 	i = 0
 	:lover_looop
-	if loverGender[i] ! 1: dynamic '	act ''<<$npc_usedname["<<$lover[i]>>"]>>'': gt ''anushkachat_city'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$lover[i]>>"]'
-	i +=1
-	if i < ARRSIZE('lover'): jump 'lover_looop'
+	if i < arrsize('lover'):
+		$temp_npcid = $lover[i]
+		if npc_gender[$temp_npcid] ! 1:
+			dynamic 'act ''<<$npc_usedname["<<$temp_npcid>>"]>>'': gt ''anushkachat_city'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$temp_npcid>>"]'
+		end
+		killvar '$temp_npcid'
+		i += 1
+		jump 'lover_looop'
+	end
 	killvar 'i'
 end
 
@@ -784,7 +790,7 @@ if $ARGS[0] = 'tell_about_generic_boyfreind':
 	*nl
 	'"Who?" she asks as she cocks her head slightly.'
 	'You shake your head slightly. "You''ve never met him. I just met him."'
-	'She smiles. "Just some guy you met, huh?"' 
+	'She smiles. "Just some guy you met, huh?"'
 	'You laugh, then tell her about him.'
 	act 'Stop talking': gt 'anush_bedroom_city','anushroom'
 	act 'Keep talking': gt 'anushkachat_city', 'chat'
@@ -1082,13 +1088,13 @@ if $ARGS[0] = 'photoshoot':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 	if anushkaQW['photoshoot'] = 1:
 		'You shake your head when you realize you can''t think of a good place to take a photo of her. "I don''t know what I was thinking! I can''t think of a good location, can you?"'
-		'She thinks for a second before grinning. "Yeah, this building has a fire escape we can use. Fairly private and undisturbed."'	
+		'She thinks for a second before grinning. "Yeah, this building has a fire escape we can use. Fairly private and undisturbed."'
 		'You grin back. "That sounds great, lead on." She giggles and leads you down the hall to the window. She opens it and you both crawl outside onto the fire escape.'
 		act 'Start photoshoot': gt 'anushkachat_city', 'photoshoot1'
 	else
 		'You shake your head when you realize you can''t think of a good place to take a photo of her. "I don''t know what I was thinking! I can''t think of a good location, can you?"'
-		'She thinks for a second before shrugging. "No, not really."'	
-		act 'Go back to her room': 
+		'She thinks for a second before shrugging. "No, not really."'
+		act 'Go back to her room':
 			*clr & cla
 			minut +=5
 			gs 'stat'
@@ -1195,7 +1201,7 @@ if $ARGS[0] = 'photoshoot1':
 										gs 'arousal', 'voyeur', 5
 										gs 'arousal', 'end'
 										gs 'stat'
-										act 'Go back to her room': 
+										act 'Go back to her room':
 											*clr & cla
 											minut +=5
 											gs 'stat'

+ 12 - 12
locations/anushkaev1.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'strapon1':
 	gs 'npc_relationship', 'modify', 'A144', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/strapon.jpg"></center>'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		if npc_sex['A144'] = 0:npc_sex['A144'] = 1 & girl += 1
 		if anushkaQW['dom_nush'] >= 100:
 			'You pull out the strap-on harness and hold it up. "Yeah, I like this... I''m going to use it to fuck you like the little slut you are."'
@@ -911,7 +911,7 @@ if $ARGS[0] = 'domnush_doggy':
 	menu_off = 1
 	AnushkaLoc = 2
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush4.jpg"></center>'
-	'You crawl up behind her and rub the tip of the dildo against her wet slit. With just a slight movement of your hips, the cock easily slides into her wet pussy, eliciting a soft moan of pleasure. You grab onto her hips with your hands and bury the cock balls deep into her, causing her to gasp and moan loudly in pleasure.' 
+	'You crawl up behind her and rub the tip of the dildo against her wet slit. With just a slight movement of your hips, the cock easily slides into her wet pussy, eliciting a soft moan of pleasure. You grab onto her hips with your hands and bury the cock balls deep into her, causing her to gasp and moan loudly in pleasure.'
 	'While hanging onto her hips, you pull nearly all the way out of her and slam it back as far as it will go before you start fucking her as hard and rough as you can. You could keep fucking her pussy, but you can''t help but notice her asshole just looks like it''s begging for a big cock to rip it up.'
 	gs 'arousal', 'vaginal_strap_give', 5, 'lesbian', 'dom', 'rough'
 	gs 'stat'
@@ -955,7 +955,7 @@ if $ARGS[0] = 'domnush_doggy_magic':
 	menu_off = 1
 	AnushkaLoc = 2
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush4.jpg"></center>'
-	'You crawl up behind her and rub the tip of your dick against her wet slit. With just a slight movement of your hips, your cock easily slides into her tight warm wet pussy, eliciting a soft moan of pleasure, from you both. You grab onto her hips with your hands and bury the cock balls deep into her, causing her to gasp and moan loudly in pleasure.' 
+	'You crawl up behind her and rub the tip of your dick against her wet slit. With just a slight movement of your hips, your cock easily slides into her tight warm wet pussy, eliciting a soft moan of pleasure, from you both. You grab onto her hips with your hands and bury the cock balls deep into her, causing her to gasp and moan loudly in pleasure.'
 	'While hanging onto her hips, you pull nearly all the way out of her and slam it back as far as it will go before you start fucking her as hard and rough as you can. You could keep fucking her pussy, but you can''t help but notice her asshole just looks like it''s begging for a big cock to rip it up and you just so happen to be magically endowed with a big cock.'
 	gs 'arousal', 'magicd_vaginal', 5, 'lesbian', 'dom', 'rough'
 	gs 'stat'
@@ -999,7 +999,7 @@ if $ARGS[0] = 'domnush_fuckass1':
 	menu_off = 1
 	AnushkaLoc = 2
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush6.jpg"></center>'
-	'You slip your dick out of her wet pussy while letting go of one of her hips with one of your hands. You use that hand to grip the fake cock and guide it to her asshole. You feel her start to pull away when the tip makes content with her asshole, but you hold her fast with your one remaining hand. You shove your hips forward and feel her ass resisting the invasion of the dildo, but then feel it give way and your fake wet cock slides into her ass.' 
+	'You slip your dick out of her wet pussy while letting go of one of her hips with one of your hands. You use that hand to grip the fake cock and guide it to her asshole. You feel her start to pull away when the tip makes content with her asshole, but you hold her fast with your one remaining hand. You shove your hips forward and feel her ass resisting the invasion of the dildo, but then feel it give way and your fake wet cock slides into her ass.'
 	'She cries out in a mix of surprise, pain and pleasure. You''re not sure which is the stronger emotion she''s feeling, but you don''t really care as you shove the full length of the shaft balls deep into her ass.'
 	gs 'arousal', 'anal_strap_give', 3, 'lesbian', 'dom', 'rough'
 	gs 'stat'
@@ -1057,7 +1057,7 @@ if $ARGS[0] = 'domnush_fuckass_magic1':
 	menu_off = 1
 	AnushkaLoc = 2
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush6.jpg"></center>'
-	'You slip your dick out of her wet pussy while letting go of one of her hips with one of your hands. You use that hand to grip your cock and guide it to her asshole. You feel her start to pull away when the tip makes content with her asshole, but you hold her fast with your one remaining hand. You shove your hips forward and feel her ass resisting the invasion your dick, but then feel it give way and your wet cock slides into her ass.' 
+	'You slip your dick out of her wet pussy while letting go of one of her hips with one of your hands. You use that hand to grip your cock and guide it to her asshole. You feel her start to pull away when the tip makes content with her asshole, but you hold her fast with your one remaining hand. You shove your hips forward and feel her ass resisting the invasion your dick, but then feel it give way and your wet cock slides into her ass.'
 	'She cries out in a mix of surprise, pain and pleasure. You''re not sure which is the stronger emotion she''s feeling, but you don''t really care as you shove the full length of the shaft balls deep into her ass, making you moan in pleasure.'
 	gs 'arousal', 'magicd_anal', 3, 'lesbian', 'dom', 'rough'
 	gs 'stat'
@@ -1153,7 +1153,7 @@ if $ARGS[0] = 'domnush_fuckass_lubed':
 	*nl
 	'You add a little extra to the tip, then put a little on your fingers and rub it against her asshole. "Like you don''t let any guy just shove his cock up your ass anytime he wants! I know you''re a little butt slut and love it." Once her asshole is lubed up, you hold the dildo with one hand while placing another on her hip and guiding the dildo to her asshole.'
 	*nl
-	'Her ass resists the invasion of your fake cock. You feel the pressure building up as she tries to pull away when you try and force it in, but you hold her fast with your one remaining hand. "Just relax and take a deep breath bitch," you tell her as you slap her ass. She takes a deep breath and stops moving as she tries to relax.' 
+	'Her ass resists the invasion of your fake cock. You feel the pressure building up as she tries to pull away when you try and force it in, but you hold her fast with your one remaining hand. "Just relax and take a deep breath bitch," you tell her as you slap her ass. She takes a deep breath and stops moving as she tries to relax.'
 	'You shove your hips forward and feel her asshole give way as your fake cock slides into her ass. She hisses in a mix of pain and pleasure. You''re not sure which is the stronger emotion she''s feeling, but you don''t really care as you shove the full length of the shaft balls deep into her ass.'
 	gs 'arousal', 'anal_strap_give', 3, 'lesbian', 'dom', 'rough'
 	gs 'stat'
@@ -1201,7 +1201,7 @@ if $ARGS[0] = 'domnush_fuckass_lubed_magic':
 	'You decide it will be more fun for both of you if you use plenty of lube. You squirt a generous amount onto your dick and stroke it several times, working the lube the length of the shaft. She looks back over her shoulder at you and notices what you''re doing. "What, straight in my ass? You''re not going to at least get me going and fuck my pussy first? Or at least lick me or finger bang me first?"'
 	'You add a little extra to the tip, then put a little on your fingers and rub it against her asshole. "Like you don''t let any guy just shove his cock up your ass anytime he wants! I know you''re a little butt slut and love it." Once her asshole is lubed up, you hold your dick with one hand while placing another on her hip and guiding yoru cock to her asshole.'
 	*nl
-	'Her ass resists the invasion of your cock. You feel the pressure building up as she tries to pull away when you try and force it in, but you hold her fast with your one remaining hand. "Just relax and take a deep breath bitch," you tell her as you slap her ass. She takes a deep breath and stops moving as she tries to relax.' 
+	'Her ass resists the invasion of your cock. You feel the pressure building up as she tries to pull away when you try and force it in, but you hold her fast with your one remaining hand. "Just relax and take a deep breath bitch," you tell her as you slap her ass. She takes a deep breath and stops moving as she tries to relax.'
 	'You shove your hips forward and feel her asshole give way as your cock slides into her well lubed ass, once it is in, it slides pretty easily with all the lube the rest of the way in. She hisses in a mix of pain and pleasure. You''re not sure which is the stronger emotion she''s feeling, but you don''t really care as you shove the full length of your dick balls deep into her ass.'
 	gs 'arousal', 'magicd_anal', 3, 'lesbian', 'dom', 'rough'
 	gs 'stat'
@@ -1399,7 +1399,7 @@ if $ARGS[0] = 'domnush_fuckass_nolube_magic':
 			end
 		else
 			act 'Fuck her ass raw (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 		act 'Use lube':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush7.jpg"></center>'
@@ -1475,7 +1475,7 @@ if $ARGS[0] = 'couch_strapon_give':
 		act 'Eat her':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap5.jpg"></center>'
-			'You use her hair to pull her head back and she gives you a questioning look. You just keep leaning forward and pulling her hair until she has to lie on her back. Once on her back, you pull her legs apart and start gently kissing your way down the insides of her thighs, slowly working your way to her pussy. You find her pussy soaking wet, and she starts moaning as soon as your tongue makes contact with her clit. You alternate between slipping your tongue as deep into her wet pussy as you can and flicking her clit with your tongue for several minutes.' 
+			'You use her hair to pull her head back and she gives you a questioning look. You just keep leaning forward and pulling her hair until she has to lie on her back. Once on her back, you pull her legs apart and start gently kissing your way down the insides of her thighs, slowly working your way to her pussy. You find her pussy soaking wet, and she starts moaning as soon as your tongue makes contact with her clit. You alternate between slipping your tongue as deep into her wet pussy as you can and flicking her clit with your tongue for several minutes.'
 			'You then stop, step into the harness and pull it up before pulling the straps tight and adjusting the dildo so it is firm against your pelvis.'
 			gs 'arousal', 'cuni_give', 3, 'lesbian'
 			gs 'stat'
@@ -1517,7 +1517,7 @@ if $ARGS[0] = 'couch_strapon_give':
 							act 'Fuck her ass': gt 'anushkaev1','couch_fuck_her_ass_magic'
 						end
 					else
-						'You use her hair to pull her head back and she gives you a questioning look. You just keep leaning forward and pulling her hair until she has to lie on her back. Once on her back, you pull her legs apart and start gently kiss your way down the insides of her thighs, slowly working your way to her pussy. You find her pussy soaking wet, and she starts moaning as soon as your tongue makes contact with her clit. You alternate between slipping your tongue as deep into her wet pussy as you can and flicking her clit with your tongue for several minutes.' 
+						'You use her hair to pull her head back and she gives you a questioning look. You just keep leaning forward and pulling her hair until she has to lie on her back. Once on her back, you pull her legs apart and start gently kiss your way down the insides of her thighs, slowly working your way to her pussy. You find her pussy soaking wet, and she starts moaning as soon as your tongue makes contact with her clit. You alternate between slipping your tongue as deep into her wet pussy as you can and flicking her clit with your tongue for several minutes.'
 						'You then stop and step into the harness and pull it up before pulling the straps tight and adjusting the dildo so it is firm against your pelvis.'
 						gs 'arousal', 'cuni_give', 3, 'lesbian'
 						gs 'stat'
@@ -1786,7 +1786,7 @@ if $ARGS[0] = 'buttplug':
 	gs 'stat'
 	'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/buttplug.jpg"></center>'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		'You pull out the butt plug and hold it up. "Yeah, I like this."'
 		'Her eyes widen ever so slightly. "Just what do you plan to do with that?"'
 		'You grin at her. "I was planning on sticking it up your ass."'
@@ -2009,7 +2009,7 @@ if $ARGS[0] = 'bedstrapongetanal':
 	'She smiles at you. "I''m going to fuck you like a whore."'
 	'You laugh and help her get into the harness. "Can you just fuck my ass?" you ask her without really asking. She nods ever so slightly and grins at the request.'
 	'Once she has the harness firmly in place, she pushes you down on your stomach. "Spread your ass cheeks," she commands and you do as she says.'
-	'You look back to see her squirting some lube onto the shaft of the dildo before she rubs some lube onto your asshole as well. "That''s right slut, give me that ass!" she says as she scoots up behind you and you feel the tip of the dildo rubbing against your asshole, followed by pressure until it finally pops into your ass.' 
+	'You look back to see her squirting some lube onto the shaft of the dildo before she rubs some lube onto your asshole as well. "That''s right slut, give me that ass!" she says as she scoots up behind you and you feel the tip of the dildo rubbing against your asshole, followed by pressure until it finally pops into your ass.'
 	'You groan slightly in pain and she stops to let you adjust to it before she slowly starts ass fucking you. The more you moan, the deeper and faster she starts to fuck you.'
 	anushkaQW['dom_nush'] -= 1
 	gs 'arousal', 'anal_strap', 3, 'lesbian', 'lube'

+ 8 - 8
locations/anushkaev2.qsrc

@@ -111,7 +111,7 @@ if $ARGS[0] = 'wait_nushrad':
 	*clr & cla
 	minut += 1
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		'You only take a few steps from the door when it opens and turn like you were just heading to the room. He gives you a knowing smirk. "Hey <<$pcs_nickname>>, why don''t you join us next time? I wouldn''t mind giving you the fucking of your life. I''m sure Nush wouldn''t mind either since her ass could use a break. She finds me a bit too big, but what can a guy do?" he asks rhetorically with a laugh.'
 		act 'Say nothing':
 			*clr & cla
@@ -155,7 +155,7 @@ if $ARGS[0] = 'rad3some':
 	menu_off = 1
 	AnushkaLoc = 2
 	gs 'stat'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		radomirQW['had_sex'] += 1
 		if npc_sex['A144'] = 0:npc_sex['A144'] = 1 & girl += 1
 		if npc_sex['A154'] = 0:npc_sex['A154'] = 1 & boy += 1
@@ -538,7 +538,7 @@ if $ARGS[0] = 'val3some':
 	menu_off = 1
 	AnushkaLoc = 2
 	gs 'stat'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		if npc_sex['A144'] = 0:npc_sex['A144'] = 1 & girl += 1
 		if npc_sex['A158'] = 0:npc_sex['A158'] = 1 & boy += 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/walkin1.jpg"></center>'
@@ -903,7 +903,7 @@ if $ARGS[0] = 'mar3some':
 	AnushkaLoc = 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/walkin3.jpg"></center>'
-	if hotcat >= 6:
+	if pcs_hotcat >= 6:
 		if npc_sex['A144'] = 0:npc_sex['A144'] = 1 & girl += 1
 		if npc_sex['A146'] = 0:npc_sex['A146'] = 1 & boy += 1
 		'You walk in, confident in joining them, and close the door. You manage to walk all the way over to the bed before Anushka finally notices you and gives you a slight wave as she keeps sucking Marcus'' dick. Perhaps hearing you or noticing her wave, Marcus turns his head and notices you, quickly stepping away and using his hands to cover himself up. As he does, he backs into the bed and ends up falling onto it. He gives you and Anushka a very confused and awkward look. "I... Uh... I mean..." he stammers, not sure what to say.'
@@ -1267,7 +1267,7 @@ if $ARGS[0] = 'disco_emptyroom':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	
+
 	if spellKnown['penisenvy'] = 1:
 		'<center><img <<$set_imgh>> src="images/pc/activities/misc/strapon_under_dress.jpg"></center>'
 		'You find an unlocked door and tell her to go inside. "Head in, I''ll join you in a minute." You quickly walk to the women''s restroom, enter one of the stalls and slide the strap-on harness on under your skirt so the dildo hangs between your legs. The strap-on in place, you head back to the room where you left Anushka.'
@@ -1307,7 +1307,7 @@ if $ARGS[0] = 'disco_emptyroom_show_strapon':
 	gs 'stat'
 	if strapnumber >= 5:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-		'You grab the straps that loosely hold the harness in place and pull them tight. The dildo rises up like you''re getting a hard-on, lifting your skirt as it does. Pulling your skirt up, you expose it to her to see her reaction. At first, she looks turned on, but when you reveal the full size of it, she starts shaking her head. "No way, that thing wouldn''t fit in my ass. I thought you had... you know, a human-sized dildo, not some horse cock." You try to talk her into it, but she flat out refuses to let you stick something that big up her ass.' 
+		'You grab the straps that loosely hold the harness in place and pull them tight. The dildo rises up like you''re getting a hard-on, lifting your skirt as it does. Pulling your skirt up, you expose it to her to see her reaction. At first, she looks turned on, but when you reveal the full size of it, she starts shaking her head. "No way, that thing wouldn''t fit in my ass. I thought you had... you know, a human-sized dildo, not some horse cock." You try to talk her into it, but she flat out refuses to let you stick something that big up her ass.'
 		'After a few minutes, she tells you she''s going back to the disco, leaving you alone with your horse cock dildo.'
 		act 'Go back to the disco': gt 'pav_disco'
 		act 'Leave': gt 'pav_commcenter'
@@ -1441,7 +1441,7 @@ if $ARGS[0] = 'disco_emptyroom_show_strapon_magic':
 		act 'Show her the strapon':
 			if strapnumber >= 5:
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-				'You grab the straps that loosely hold the harness in place and pull them tight. The dildo rises up like you''re getting a hard-on, lifting your skirt as it does. Pulling your skirt up, you expose it to her to see her reaction. At first, she looks turned on, but when you reveal the full size of it, she starts shaking her head. "No way, that thing wouldn''t fit in my ass. I thought you had... you know, a human-sized dildo, not some horse cock." You try to talk her into it, but she flat out refuses to let you stick something that big up her ass.' 
+				'You grab the straps that loosely hold the harness in place and pull them tight. The dildo rises up like you''re getting a hard-on, lifting your skirt as it does. Pulling your skirt up, you expose it to her to see her reaction. At first, she looks turned on, but when you reveal the full size of it, she starts shaking her head. "No way, that thing wouldn''t fit in my ass. I thought you had... you know, a human-sized dildo, not some horse cock." You try to talk her into it, but she flat out refuses to let you stick something that big up her ass.'
 				'After a few minutes, she tells you she''s going back to the disco, leaving you alone with your horse cock dildo.'
 				act 'Go back to the disco': gt 'pav_disco'
 				act 'Leave': gt 'pav_commcenter'
@@ -1458,7 +1458,7 @@ if $ARGS[0] = 'disco_emptyroom_show_strapon_magic':
 		*clr & cla
 		if strapnumber >= 5:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-			'You grab the straps that loosely hold the harness in place and pull them tight. The dildo rises up like you''re getting a hard-on, lifting your skirt as it does. Pulling your skirt up, you expose it to her to see her reaction. At first, she looks turned on, but when you reveal the full size of it, she starts shaking her head. "No way, that thing wouldn''t fit in my ass. I thought you had... you know, a human-sized dildo, not some horse cock." You try to talk her into it, but she flat out refuses to let you stick something that big up her ass.' 
+			'You grab the straps that loosely hold the harness in place and pull them tight. The dildo rises up like you''re getting a hard-on, lifting your skirt as it does. Pulling your skirt up, you expose it to her to see her reaction. At first, she looks turned on, but when you reveal the full size of it, she starts shaking her head. "No way, that thing wouldn''t fit in my ass. I thought you had... you know, a human-sized dildo, not some horse cock." You try to talk her into it, but she flat out refuses to let you stick something that big up her ass.'
 			'After a few minutes, she tells you she''s going back to the disco, leaving you alone with your horse cock dildo.'
 			act 'Go back to the disco': gt 'pav_disco'
 			act 'Leave': gt 'pav_commcenter'

+ 9 - 8
locations/anushkamaksim.qsrc

@@ -121,8 +121,8 @@ if $ARGS[0] = 'maksim_blackmail':
 			gs 'stat'
 			minut += 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
-			'"Fuck off, you little shit!" you snarl and he blinks in surprise, eliciting a smirk from you. He obviously expected you to agree without question.'
-			'Anger washes over him. "Fine bitch! I''ll just go and show her!"'
+			'"Fuck off, you little shit!" you snarl and he blinks in surprise, eliciting a smirk from you. He clearly expected you to agree without question.'
+			'Anger washes over him. "Fine then, bitch! I''ll just go and show her!"'
 			'You smirk at him. "Go right ahead, I''m sure your sister won''t mind that you were trying to blackmail one of her friends. Who do you think she''ll be more pissed at?"'
 			'He sneers at you and pauses before angrily walking away.'
 
@@ -141,7 +141,7 @@ if $ARGS[0] = 'hallway_flash_tits':
 	gs 'fame', 'pav', 'sex', 1
 	inhib_exp += rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/hallflashtits.jpg"></center>'
-	'You sigh as you pull your clothes aside and show him your bare breasts. His grin widens as he stares at you. A few moments pass and you''re about to say something when he reaches out with his hand.' 
+	'You sigh as you pull your clothes aside and show him your bare breasts. His grin widens as he stares at you and a few seconds pass before he reaches out with his hand.' 
 	'You quickly pull your shirt back down. "You said show you."'
 	'"Fine," he sneers before stepping out of your way. "Go on then."'
 	gs 'arousal', 'flashlite', 1, 'humiliation', 'sub'
@@ -159,12 +159,12 @@ if $ARGS[0] = 'hallway_flash_pussy':
 	inhib_exp += rand(1,3)
 	if PCLoSkirt > 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim_blackmail/flash_pussy_dress.jpg"></center>'
-		'You sigh as you lift your skirt to show him your naked pussy. His grin widens as he stares at you. A few moments pass and you''re about to say something when he reaches out with his hand.' 
+		'You sigh as you lift your skirt to show him your naked pussy. His grin widens as he stares at you and a few seconds pass before he reaches out with his hand.' 
 		'You quickly pull your skirt back down. "You said show you."'
 		'"Fine," he sneers before stepping out of your way. "Go on then."'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim_blackmail/flash_pussy_pants.jpg"></center>'
-		'You sigh as you pull your pants down to show off your naked pussy to him. His grin widens as he stares at you. A few moments pass and you''re about to say something when he reaches out with his hand.' 
+		'You sigh as you pull your pants down to show off your naked pussy to him. His grin widens as he stares at you and a few seconds pass before he reaches out with his hand.' 
 		'You quickly pull your pants back up. "You said show you."'
 		'"Fine," he sneers before stepping out of your way. "Go on then."'
 	end
@@ -182,9 +182,10 @@ if $ARGS[0] = 'maksim_room_naked':
 	gs 'fame', 'pav', 'sex', 1
 	inhib_exp += rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim_blackmail/strip_naked.jpg"></center>'
-	'You follow him to his room and just as he said Timofey is not there. Maksim sits on his bed looking at you with a huge grin. "Well go on, strip. Slow and sexy."' 
-	'You sigh loudly but then do as he says. You slowly start stripping out of your clothes, while he leers at you. Once you are finally naked, you stand there for a minute or two. "Ok you seen enough."'
-	'"Fine," he sneers. "You can go then." You quickly get dressed and once you are you leave his room.'
+	'You follow him to his room and, just as he said, Timofey isn''t here. Maksim sits on his bed looking at you with a huge grin. "Well go on, strip. Slow and sexy."' 
+	'You sigh loudly, but do as he says. You slowly start stripping out of your clothes as he leers at you. Once you''re naked, you stand still for a few minutes and he continues to leer at you before you start grabbing your clothes. "You''ve seen enough."'
+	'"Fine," he sneers. "You can go then."'
+	'You quickly get dressed and leave his room.'
 	gs 'arousal', 'flash', 5, 'humiliation', 'sub'
 	gs 'arousal', 'end'
 	gs 'stat'

+ 8 - 30
locations/arousal.qsrc

@@ -114,8 +114,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($temp_dick_girth+'x',1,6))/2
 
 	!! first let us determine how slippery are pc''s holes
-	if anal_slip < max(1, 8 + pain['asshole']/2 - pcs_ass) _ 
-	and mid($ARGS[0],1,4) = 'anal' and arrpos('$ARGS', 'anal_finger') < 0:
+	if anal_slip < max(1, 8 + pain['asshole']/2 - pcs_ass) and mid($ARGS[0],1,4) = 'anal' and arrpos('$ARGS', 'anal_finger') < 0:
 		!! cum
 		if cumloc[3] > 0: anal_slip += rand(cumvol[3]/15, cumvol[3]/10)
 		!! spit
@@ -127,14 +126,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 				anal_slip += 8
 				ar_anal_lube = 1
 			!! PC lube
-			elseif auto_anal_lube = 1 _ 
-			and arrpos('$ARGS', 'rape') < 0 _ 
-			and arrpos('$ARGS', 'gangbang') < 0 _ 
-			and arrpos('$ARGS', 'rough') < 0 _ 
-			and arrpos('$ARGS', 'beast') < 0 _ 
-			and arrpos('$ARGS', 'BDSM') < 0 _ 
-			and arrpos('$ARGS', 'bound') < 0 _ 
-			and arrpos('$ARGS', 'humiliation') < 0:
+			elseif auto_anal_lube = 1 and arrpos('$ARGS', 'rape') < 0 and arrpos('$ARGS', 'gangbang') < 0 and arrpos('$ARGS', 'rough') < 0 and arrpos('$ARGS', 'beast') < 0 and arrpos('$ARGS', 'BDSM') < 0 and arrpos('$ARGS', 'bound') < 0  and arrpos('$ARGS', 'humiliation') < 0:
 				gs 'arousal', 'auto_lube', 'anal'
 			end
 		end
@@ -145,8 +137,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		end
 	end
 
-	if vaginal_slip < max(1, 8 + pain['vaginal']/2 - pcs_vag) _ 
-	and mid($ARGS[0],1,4) = 'vagi' and arrpos('$ARGS', 'vaginal_finger') < 0:
+	if vaginal_slip < max(1, 8 + pain['vaginal']/2 - pcs_vag) and mid($ARGS[0],1,4) = 'vagi' and arrpos('$ARGS', 'vaginal_finger') < 0:
 		!! horny
 		if vaginal_slip < pcs_horny / 10: vaginal_slip = pcs_horny / 10
 		!! cum
@@ -160,14 +151,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 				vaginal_slip += 8
 				ar_vag_lube = 1
 			!! PC lube
-			elseif auto_vag_lube = 1 _ 
-			and arrpos('$ARGS', 'rape') < 0 _ 
-			and arrpos('$ARGS', 'gangbang') < 0 _ 
-			and arrpos('$ARGS', 'rough') < 0 _ 
-			and arrpos('$ARGS', 'beast') < 0 _ 
-			and arrpos('$ARGS', 'BDSM') < 0 _ 
-			and arrpos('$ARGS', 'bound') < 0 _ 
-			and arrpos('$ARGS', 'humiliation') < 0:
+			elseif auto_vag_lube = 1 and arrpos('$ARGS', 'rape') < 0 and arrpos('$ARGS', 'gangbang') < 0	and arrpos('$ARGS', 'rough') < 0  and arrpos('$ARGS', 'beast') < 0 and arrpos('$ARGS', 'BDSM') < 0 and arrpos('$ARGS', 'bound') < 0  and arrpos('$ARGS', 'humiliation') < 0:
 				gs 'arousal', 'auto_lube', 'vag'
 			end
 		end
@@ -319,10 +303,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 			if pain_coeff > 0:gs 'pain', rand(pain_coeff), 'mouth', 'stretch'
 			if pcs_lipbalm > 0:
 				pcs_lipbalm = max(0, pcs_lipbalm - 1*max(1,stim_time/5))
-				if arrpos('$ARGS', 'rape') >= 0 _ 
-				or arrpos('$ARGS', 'rough') >= 0 _ 
-				or arrpos('$ARGS', 'gangbang') >= 0 _ 
-				or arrpos('$ARGS', 'beast') >= 0:
+				if arrpos('$ARGS', 'rape') >= 0 or arrpos('$ARGS', 'rough') >= 0  or arrpos('$ARGS', 'gangbang') >= 0 or arrpos('$ARGS', 'beast') >= 0:
 					pcs_lipbalm = max(0, pcs_lipbalm - 1*max(1,stim_time/5))
 				end
 			end
@@ -738,10 +719,8 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if arrpos('$ARGS', 'maso') >= 0:          pcs_hairbsh = iif(rand(30, pcs_hairlng)>125,rand(-1,0),pcs_hairbsh)
 		if arrpos('$ARGS', 'prostitution') >= 0:  pcs_hairbsh = iif(rand(30, pcs_hairlng)>150,rand(-1,0),pcs_hairbsh)
 		if arrpos('$ARGS', 'unknown') >= 0:       pcs_hairbsh = iif(rand(30, pcs_hairlng)>200,rand(-1,pcs_hairbsh),pcs_hairbsh)
-		if arrpos('$ARGS', 'anal') >= 0 _ 
-		or arrpos('$ARGS', 'anal_strap') >= 0:    pcs_hairbsh = iif(rand(30, pcs_hairlng)>220,rand(-1,pcs_hairbsh),pcs_hairbsh)
-		if arrpos('$ARGS', 'vaginal') >= 0 _ 
-		or arrpos('$ARGS', 'vaginal_strap') >= 0: pcs_hairbsh = iif(rand(30, pcs_hairlng)>240,rand(-1,pcs_hairbsh),pcs_hairbsh)
+		if arrpos('$ARGS', 'anal') >= 0 or arrpos('$ARGS', 'anal_strap') >= 0: pcs_hairbsh = iif(rand(30, pcs_hairlng)>220,rand(-1,pcs_hairbsh),pcs_hairbsh)
+		if arrpos('$ARGS', 'vaginal') >= 0 or arrpos('$ARGS', 'vaginal_strap') >= 0: pcs_hairbsh = iif(rand(30, pcs_hairlng)>240,rand(-1,pcs_hairbsh),pcs_hairbsh)
 		if pcs_hairbsh > 0:
 			if arrpos('$ARGS', 'bound') >= 0:     pcs_hairbsh = iif(rand(30, pcs_hairlng)>270,rand(0,pcs_hairbsh),pcs_hairbsh)
 			if arrpos('$ARGS', 'sub') >= 0:       pcs_hairbsh = iif(rand(30, pcs_hairlng)>300,rand(0,pcs_hairbsh),pcs_hairbsh)
@@ -764,8 +743,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 			end
 		end
 		if pcs_makeup > 1:
-			if (arrpos('$ARGS', 'bj') >= 0 _ 
-			or arrpos('$ARGS', 'cuni_give') >= 0):        pcs_makeup = iif(rand(pcs_makeup, pcs_makupskl/10)<3,rand(0,1),pcs_makeup)
+			if (arrpos('$ARGS', 'bj') >= 0 or arrpos('$ARGS', 'cuni_give') >= 0):  pcs_makeup = iif(rand(pcs_makeup, pcs_makupskl/10)<3,rand(0,1),pcs_makeup)
 		end
 	end
 	

+ 22 - 22
locations/artem_date_events.qsrc

@@ -74,7 +74,7 @@ if $ARGS[0] = 'firstdate':
 			act 'Go home': gt 'pod_ezd', 'etaj_2'
 		end
 	end
-end 
+end
 
 if $ARGS[0] = 'artem_date':
 	*clr & cla
@@ -83,21 +83,21 @@ if $ARGS[0] = 'artem_date':
 	gt 'artem_date_events', 'firstdate'
 !{this is what it will look like when batman finishes the dates, 3 special dates that each happen once and then three repeatable dates. For now can we just temporarily have it repeat the first date above so we can get the artem revamp in the dev builds to bug hunt and then we can add the others when he finishes them.
 	if artem_date = 1:
-	
+
 	elseif artem_date = 2:
-	
+
 	elseif artem_date = 3:
-	
+
 	else
 		repeat_date = rand(1,3)
 		if repeat_date = 1:
-		
+
 		elseif repeat_date = 2:
-		
+
 		elseif repeat_date = 3:
-		
+
 		else
-		
+
 		end
 	end}
 end
@@ -116,7 +116,7 @@ if $ARGS[0] = 'artemGopSkver':
 			'<center><img <<$set_imgh>> src="images/pc/reactions/fuckoff1.jpg"></center>'
 			'You give them a look of disdain showing you''re not impressed. "Mind your own fucking business," you reply and Artem tenses up beside you.'
 			'The leader laughs. "Come on, don''t be like that. Dump this loser and have some fun with us, girl."'
-			'You push your way past him and flip them the bird. Fortunately, other than throwing a few taunting remarks at you, they leave you alone. Once you make it away from them, Artem relaxes a little and walks you home.' 
+			'You push your way past him and flip them the bird. Fortunately, other than throwing a few taunting remarks at you, they leave you alone. Once you make it away from them, Artem relaxes a little and walks you home.'
 			*nl
 			'Arriving at your apartment, Artem smiles. "I had fun <<$pcs_nickname>>, you know other than when we ran into those gopniks. I can''t believe you said that!"'
 			'You smile back at him. "They respect strength and attitude. Don''t take their shit and they will respect you for it, just be willing to back it up if you have to. Anyway, I had fun too."'
@@ -206,7 +206,7 @@ if $ARGS[0] = 'stand_up':
 				*clr & cla
 				minut += 5
 				'<center><img <<$set_imgh>> src="images/locations/shared/park/walk_<<rand(1,2)>>.jpg"></center>'
-				'Once you make it away from them, Artem relaxes a little. Artem walks you back home.' 
+				'Once you make it away from them, Artem relaxes a little. Artem walks you back home.'
 				'Arriving at your apartment, Artem smiles. "I had fun <<$pcs_nickname>>, you know other than when we ran into those gopniks."'
 				'You smile back at him. "Yeah, it was a little scary, but I had fun too."'
 				'He smiles widely. "Great! Maybe we can do it again some time?"'
@@ -265,15 +265,15 @@ if $ARGS[0] = 'stand_up':
 				pcs_mood -= 20
 				minut += 5
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/strip2.jpg"></center>'
-				if hotcat <= 4:
-					'You slowly remove all of your clothes until you''re completely naked in front of them and they turn off the music. The leader walks up to you with a scowl. "Fuck, you''re even uglier naked. I didn''t think that was even possible. Put some clothes on before I throw up." The others all burst out laughing before they all walk away laughing. You quickly get dressed as Artem struggles to his feet and wipes the blood from his face, deeply embarrassed you had to see him like this. You walk in silence as you help him get home.' 
+				if pcs_hotcat <= 4:
+					'You slowly remove all of your clothes until you''re completely naked in front of them and they turn off the music. The leader walks up to you with a scowl. "Fuck, you''re even uglier naked. I didn''t think that was even possible. Put some clothes on before I throw up." The others all burst out laughing before they all walk away laughing. You quickly get dressed as Artem struggles to his feet and wipes the blood from his face, deeply embarrassed you had to see him like this. You walk in silence as you help him get home.'
 					'Once you get him home, you help him to bed. "You didn''t have to do that."'
 					'You smile at him. "I couldn''t let them hurt you like that."'
 					'He frowns. "I would have healed! Anyway, I could use some rest, so see you later okay?" He rolls over, obviously not wanting to talk anymore, so you get up and leave.'
 					gs 'stat'
 					act 'Leave': gt 'pod_ezd', 'etaj_1'
 				else
-					'You slowly remove all of your clothes until you''re completely naked in front of them and they turn off the music. They all gather round you as the leader grins. "Not bad, <<$pcs_nickname>>. You''ve got nice tits, just a shame that you''re wasting them on him. Now you''re going to suck all us off. If you do a good job, we''ll let you go."' 
+					'You slowly remove all of your clothes until you''re completely naked in front of them and they turn off the music. They all gather round you as the leader grins. "Not bad, <<$pcs_nickname>>. You''ve got nice tits, just a shame that you''re wasting them on him. Now you''re going to suck all us off. If you do a good job, we''ll let you go."'
 					'Trying to fight them all would most likely result in you getting the shit beat out of you and raped. Maybe you can make a run for it if you distract them first?'
 					act 'Get down on your knees': gt 'artem_date_events', 'blow_bang'
 					gs 'willpower', 'misc', 'self', 'hard'
@@ -336,7 +336,7 @@ if $ARGS[0] = 'stand_up':
 											'After catching your breath and not seeing Artem anywhere, you run the rest of the way home. You don''t stop for anyone or anything until you''re safely inside your apartment.'
 											act 'Home': gt 'korrPar'
 										end
-										act 'Wait for Artem': 
+										act 'Wait for Artem':
 											*clr & cla
 											artemQW['waited'] = 1
 											minut += 60
@@ -349,14 +349,14 @@ if $ARGS[0] = 'stand_up':
 											'He smiles. "Yeah? Well maybe our next date won''t be so exciting. The pain meds are kicking in and I could really use some sleep, so I''ll see you later, okay?" You get up and leave him to rest.'
 											act 'Leave': gt 'pod_ezd', 'etaj_1'
 										end
-										act 'Call the police': 
+										act 'Call the police':
 											*clr & cla
 											minut += 60
 											artemQW['called_police'] = 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/shared/police/patrol.jpg"></center>'
 											'Once you''re safe, you pull out your phone and call the police, telling them that the gopniks are assaulting Artem and tried to attack you as well. After you give them all the details you can, you hang up. Almost half an hour later, a police car pulls up at the entrance of the park and two officers get out. You hurry over to them and try and get them to hurry, but they write down your information and ask you several questions. They won''t be hurried and each time you try, they just tell you to calm down and answer their questions. In frustration, you finally answer all their questions while they write it all down.'
-											'By the time they finish, you see Artem limping towards you. He smiles through busted bloody lips when he sees you. You rush over to him and help him walk, putting one of his arms over your shoulder as he wipes the blood from his face, deeply embarrassed you have to see him like this. "I''m glad you got away. They said they were going to rape you if they caught you."' 
+											'By the time they finish, you see Artem limping towards you. He smiles through busted bloody lips when he sees you. You rush over to him and help him walk, putting one of his arms over your shoulder as he wipes the blood from his face, deeply embarrassed you have to see him like this. "I''m glad you got away. They said they were going to rape you if they caught you."'
 											'Before you can help him, the police walk over and help Artem over to their car before they start asking him questions. They tell you go home, warning you that this is no place for a young lady such as yourself.'
 											act 'Home': gt 'korrPar'
 										end
@@ -492,10 +492,10 @@ if $ARGS[0] = 'fight_gang':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop.jpg"></center>'
 	'You glare at them. "Fuck you, I''ll kill any of you that touch me."'
 	'They all laugh as one of them reaches out to grab you. You quickly punch him in the stomach, which causes him to step back, surprised you''re actually willing to fight back. Seeing this, Artem gets up. "Leave her alone!" It was a chivalrous effort, but one in vain. He never even makes it onto his feet before two of the gopniks start beating him and he goes down in a heap, where they start kicking him as the rest come for you.'
-!!fight code goes here, it is 6 adult men vs Sveta. I don''t see any way she could win, but I wanted to give the players the option, plus with magic that could change things. Below I am doing a version of if she wins and if she loses. 
+!!fight code goes here, it is 6 adult men vs Sveta. I don''t see any way she could win, but I wanted to give the players the option, plus with magic that could change things. Below I am doing a version of if she wins and if she loses.
 	if win = 1:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walk_save.jpg"></center>'
-		'You put on a demonstration of how to fight against several opponents at once. You use their numbers against them, constantly moving so they get in each others way, then taking your shots in their confusion. It takes a while and they get in some hits of their own, but in the end you finally put enough of a beat down on them for them to give up. They all turn tail and flee, leaving you huffing and puffing, still naked. You check on Artem, who''s barely conscious, before you get dressed. You help Artem up as he wipes the blood from his face, deeply embarrassed you have to see him like this. You walk in silence as you help him get home.' 
+		'You put on a demonstration of how to fight against several opponents at once. You use their numbers against them, constantly moving so they get in each others way, then taking your shots in their confusion. It takes a while and they get in some hits of their own, but in the end you finally put enough of a beat down on them for them to give up. They all turn tail and flee, leaving you huffing and puffing, still naked. You check on Artem, who''s barely conscious, before you get dressed. You help Artem up as he wipes the blood from his face, deeply embarrassed you have to see him like this. You walk in silence as you help him get home.'
 		'Once you get him home, you help him to bed. "I can''t believe you won!"'
 		'You laugh. "I can''t either, but I couldn''t let them hurt you like that."'
 		'He shakes his head and seems to have mixed feelings on the subject. "Thanks anyway, but I could use some rest. See you later, okay?" He rolls over, so you get up and leave.'
@@ -517,7 +517,7 @@ if $ARGS[0] = 'gang_rape':
 	gs 'fame', 'pav', 'sex', 10
 	rape += 1
 	gang += 1
-	
+
 	!! Destroying clothing
 	$clothingworntype = 'nude'
 	KILLVAR '$lastwornclothingtype'
@@ -528,11 +528,11 @@ if $ARGS[0] = 'gang_rape':
 	if $braworntype ! 'none':
 		gs 'bras', 'dispose'
 	end
-	
+
 	gs 'artem_date_events', 'generatgopniks'
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/stripped.jpg"></center>'
-	'They lift you off the ground, one covering your mouth as they drag you off deeper into the park far away from any of the paths. You see two others are dragging the unconscious Artem along. You eventually arrive in a clearing with a dirty old mattress laying on the ground, where they start ripping your clothes off. Artem is dumped nearby and the two gopniks go to stand watch as you hear your clothes ripping and tearing, which they seem to be doing intentionally. They keep ripping and tearing at your clothes until you''re completely naked.' 
+	'They lift you off the ground, one covering your mouth as they drag you off deeper into the park far away from any of the paths. You see two others are dragging the unconscious Artem along. You eventually arrive in a clearing with a dirty old mattress laying on the ground, where they start ripping your clothes off. Artem is dumped nearby and the two gopniks go to stand watch as you hear your clothes ripping and tearing, which they seem to be doing intentionally. They keep ripping and tearing at your clothes until you''re completely naked.'
 	gs 'arousal', 'flash', 5, 'gangbang', 'rape', 'rough'
 	gs 'stat'
 	act 'Continue':
@@ -636,7 +636,7 @@ if $ARGS[0] = 'gang_rape':
 										'When you get to just outside the apartment complex, he stops. "Maybe we should call the police?" he asks, but you shake your head. You know they wouldn''t care and would just blame you, then everyone would know. He sighs. "At least go to the hospital?" he asks in a pleading voice.'
 										*nl
 										'You shake your head again. You don''t want anyone to know, you just want to go to your room and curl up in your bed. "Just take me home, Artem!"'
-										'He sighs and nods before walking you inside and up the stairs to your door. When you get there, he finally says something. "<<$pcs_nickname>>, I''m so sorry. I know what you did for me and... I owe you. Big time. I don''t know what I can do to repay you, but if you ever need anything... please. I''m there for you."' 
+										'He sighs and nods before walking you inside and up the stairs to your door. When you get there, he finally says something. "<<$pcs_nickname>>, I''m so sorry. I know what you did for me and... I owe you. Big time. I don''t know what I can do to repay you, but if you ever need anything... please. I''m there for you."'
 										'You don''t know what to say, so you just nod and go into your apartment.'
 										gs 'arousal', 'end'
 										gs 'stat'

+ 18 - 18
locations/artem_dorm.qsrc

@@ -28,7 +28,7 @@
 !! artemQW['nush3some_again'] = 1 can try and convince Artem and Nush to try it again
 !! artemQW['nush3some_again'] = 2 have convinced Artem
 !! artemQW['nush3some_again'] = 3 have convinced Anushka
-!! artemQW['nush3some_again'] = 4 opens up repeating threesomes 
+!! artemQW['nush3some_again'] = 4 opens up repeating threesomes
 !! artemQW['nush3some'] >= 3 had threesome with Nush more than once
 !! artemQW['nush3some'] = -1 blocks future 3somes
 !! artemQW['strapon'] = 1 means they had strapon sex and he liked it, -1 one means he did not like it and it blocks it going forward
@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><b><font color="maroon">Artem''s Dorm Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/artemroom/artem_dorm_room.jpg"></center>'
-	'The dorm room has two beds. The one on the left belongs to Artem''s roommate while the one on the right is Artem''s.' 
+	'The dorm room has two beds. The one on the left belongs to Artem''s roommate while the one on the right is Artem''s.'
 	if $locat['A2'] = 'dormroom_ studying_or _relaxing':
 		'Above his bed is a small <a href="exec:gt ''artem_dorm'',''bookshelf''">bookshelf</a> full of books, and the wall is plastered with sci-fi, fantasy, anime and super hero posters. At the foot of his bed is a small desk with a <a href="exec:gt ''artem_dorm'',''computer''">laptop</a> on it. Artem is sitting on a couch facing a TV sitting against the wall.'
 	elseif $locat['A2'] = 'dormroom_asleep':
@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 	else
 		'Artem is getting ready to leave, so you better do the same.'
 	end
-	
+
 	act 'Leave Artem''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
 	if $locat['A2'] = 'dormroom_ studying_or _relaxing':
 		act 'Talk to Artem': gt 'artem_dorm', 'chat'
@@ -76,8 +76,8 @@ if $ARGS[0] = 'bookshelf':
 			minut += 2
 			artemQW['artfall'] += 1
 			artem_borrowed_book = 1
-			artembook = 5
-!!need code to add a book for Sveta to read other than the ones she can buy.			
+			BookVars['artem_pages'] = rand(400, 600)
+!!need code to add a book for Sveta to read other than the ones she can buy.
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'You look through the books until you find one you like. "Do you mind if I borrow this to read?"'
@@ -92,7 +92,7 @@ if $ARGS[0] = 'bookshelf':
 			*clr & cla
 			minut += 2
 			artem_borrowed_book = 0
-			artembook = 0
+			BookVars['artem_pages'] = 0
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'"I brought your book back," you tell him as you take it out of your purse and put it back in place on the shelf, right where you got it from.'
@@ -112,7 +112,7 @@ if $ARGS[0] = 'bookshelf':
 				else
 					'"It was a bit bland and just bored me in the end. I could guess the outcome right at the start, and it turned out I was right."'
 				end
-				'Artem looks crushed at your answer.'				
+				'Artem looks crushed at your answer.'
 				act 'Look at more books': gt 'artem_dorm','bookshelf'
 				act 'Find something else to look at':gt 'artem_dorm', 'start'
 			end
@@ -180,7 +180,7 @@ if $ARGS[0] = 'chat':
 					'He pulls you in close and you''re soon passionately making out, the kisses full of eager lust and urgent need. You feel yourself getting more aroused as he scoots back against the wall and pulls you onto his lap. You can feel the hard bulge in his pants as you straddle him.'
 					gs 'arousal', 'foreplay', 2
 					gs 'stat'
-					act 'Stop making out': 
+					act 'Stop making out':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A2', 'dislike'
 						'<center><h4><font color="maroon">Artem''s Dorm Room</font></h4></center>'
@@ -259,7 +259,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you. "Do you want to go for a walk on the quad?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			artemQW['artfall'] -= 4
 			gs 'npc_relationship', 'modify', 'A2', 'hate'
@@ -283,7 +283,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you. "Would you like to go out on a date?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'stat'
@@ -342,7 +342,7 @@ if $ARGS[0] = 'chat':
 				end
 			else
 				act 'Tell him to stop it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 			act 'Enjoy his touch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
@@ -365,7 +365,7 @@ if $ARGS[0] = 'chat':
 					end
 				else
 					act 'Pull away and stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
+				end
 			end
 		end
 		act 'Reject the flowers':
@@ -385,7 +385,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you as he walks over and hugs you. "Would you like to go out on another date?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'stat'
@@ -466,7 +466,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you as he walks over and hugs you. "<<$pcs_nickname>>, would you like to go out on another date?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'stat'
@@ -742,9 +742,9 @@ if $ARGS[0] = 'chat':
 					act 'Have sex': gt 'artem_sex_uni', 'sex'
 				end
 			end
-		end			
+		end
 	end
-end	
+end
 
 if $ARGS[0] = 'artemgirlfriend':
 	act 'Tell him to stop':
@@ -760,7 +760,7 @@ if $ARGS[0] = 'artemgirlfriend':
 	act 'Enjoy his touch':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
-		'You return his kiss as his hands keep roaming over you body, but paying particular attention to your breasts and ass. He walks backwards, pulling you along with him until he sits on the bed with his back against the wall and pulls you on top of his lap.' 
+		'You return his kiss as his hands keep roaming over you body, but paying particular attention to your breasts and ass. He walks backwards, pulling you along with him until he sits on the bed with his back against the wall and pulls you on top of his lap.'
 		'You can feel quite the hard bulge in his pants as you keep making out. After a few seconds, he takes one of your hands and pulls it down to his crotch.'
 		gs 'arousal', 'kiss', 5
 		gs 'stat'
@@ -781,7 +781,7 @@ if $ARGS[0] = 'artemgirlfriend':
 			end
 		else
 			act 'Pull away and stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 end
 

+ 3 - 3
locations/artem_nush_sex.qsrc

@@ -25,19 +25,19 @@ if $ARGS[0] = 'anushka_3some1':
 		*nl
 		'He lets go of her and sits down between the two of you before he gives you a look and smiles. You give him a proud smile. "Now both of you strip and make out while I watch," he orders.'
 		'Anushka doesn''t say anything as she starts stripping down to her underwear. You do the same and the two of you are soon making out while Artem watches. After a few minutes of this, you turn and kiss Artem as Anushka pulls down her panties and bends over, inviting one of you to eat her out. Artem grabs you by the hair and forces your face into Anushka''s crotch from behind.'
-		act 'Eat her out': gt 'artem_nush_sex', 'anushka_3some11_oral2'
+		act 'Eat her out': gt 'artem_nush_sex', 'anushka_3some1_oral2'
 	elseif artemQW['rough_anal_nush'] = 1:
 		'As he turns around, he nods and gives her a confident smile. "I promised myself that if I ever got another chance to fuck you, that I was going to fuck your ass raw."'
 		'She looks up at him and bites her lower lip. "That''s a bold claim."'
 		'He confidently walks over and forces himself between the two of you. "It''ll be a fact soon enough. Now I want both of you to strip and make out while I watch."'
 		'Anushka doesn''t say anything as she starts stripping down to her underwear. You do the same and the two of you are soon making out while Artem watches. After a few minutes of this, you turn and kiss Artem as Anushka pulls down her panties and bends over, inviting one of you to eat her out. Artem grabs you by the hair and forces your face into Anushka''s crotch from behind.'
-		act 'Eat her out': gt 'artem_nush_sex', 'anushka_3some11_oral2'
+		act 'Eat her out': gt 'artem_nush_sex', 'anushka_3some1_oral2'
 	else
 		'As he turns around, he nods and gives her a confident smile. "That''s right, and I''m not going to hold back on you this time."'
 		'She looks around the room and you can see her smirking. "Promises, promises..."'
 		'He takes a deep breath before he walks over and sits between the two of you. "I think the two of you should strip and makeout while I watch."'
 		'Anushka grins at his comment. "Well look at you, all bossy and confident. I like it." She starts stripping down to her underwear and you do the same. The two of you are soon making out as you strip while Artem watches. After a few minutes of this, you turn and kiss Artem as Anushka pulls down her panties and bends over, inviting one of you to eat her out. Artem grabs you by the hair and forces your face into Anushka''s crotch from behind.'
-		act 'Eat her out': gt 'artem_nush_sex', 'anushka_3some11_oral2'
+		act 'Eat her out': gt 'artem_nush_sex', 'anushka_3some1_oral2'
 	end
 end
 

+ 21 - 24
locations/artem_sex.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'hj':
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/cleanhands.jpg"></center>'
 			'You grab some tissues off his nightstand and start cleaning his cum off your hands as he blushes. "Sorry."'
-			'You smile at him. "Nothing to be sorry for. It''s just part of sex."' 
+			'You smile at him. "Nothing to be sorry for. It''s just part of sex."'
 			'He just smiles and looks at you as if you''re the most fantastic thing in the world. You finish cleaning off your hands, then give him a quick kiss.'
 			cumspclnt = 9
 			gs 'cum_cleanup'
@@ -43,7 +43,7 @@ if $ARGS[0] = 'hj':
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/lickupcum.jpg"></center>'
 			'You keep hold of his dick and stroke it a few more times until you''ve milked every last drop out of him before you start licking the cum from your hands. His eyes grow wide as he watches you. Once you lick your hands clean, you also lick his dick clean. "You didn''t have to do that. I have tissues you can use."'
-			'You smile at him. "It''s okay. I like the way it tastes."' 
+			'You smile at him. "It''s okay. I like the way it tastes."'
 			'He just smiles and looks at you as if you''re the most fantastic thing in the world. You finish cleaning off your hands, then give him a quick kiss.'
 			cumspclnt = 9
 			gs 'cum_cleanup'
@@ -229,7 +229,7 @@ if $ARGS[0] = 'sex':
 								act 'Finish him with your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							end
 						end
-					end	
+					end
 				elseif stat['think_virgin'] = 1:
 					'You take his dick out of your mouth for a second and smile apologetically. "Sorry Artem, but I''m still a virgin, and I''m not sure if I''m ready yet. I bet I could still make you feel good with my mouth."'
 					'Artem blushes, but presses on. "I''d like to be your first. So it can be both of our first times together."'
@@ -277,7 +277,7 @@ if $ARGS[0] = 'sex':
 						act 'Just keep sucking': gt 'artem_sex', 'bj'
 					end
 				else
-					act 'Do anal instead': 
+					act 'Do anal instead':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/first5.jpg"></center>'
 						if artemQW['anal'] > 0:
@@ -569,7 +569,7 @@ if $ARGS[0] = 'slut_anal':
 			act 'Facial':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/facial.jpg"></center>'
-				'He suddenly pulls his dick out of you. "I want to cum on your face."' 
+				'He suddenly pulls his dick out of you. "I want to cum on your face."'
 				'You do as he asks and turn round before taking his dick in your hand and stroking it. Almost at once, a hot stream of jizz hits you right in the face, another hits your cheek and the last one lands on your chin.'
 				'"I think we''re done for the day, <<$pcs_nickname>>. I have some things I need to do, so can you please leave now?" he asks as he grabs a tissue to clean up his dick, so you gather your clothes and get dressed.'
 				gs 'arousal', 'hj', 2, 'sub'
@@ -617,7 +617,7 @@ if $ARGS[0] = 'anushka_3some_oral2':
 	*clr & cla
 	artemQW['nushart_oral'] += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some3.jpg"></center>'
-	'You look at her inviting pussy and can''t help yourself. You move in behind Anushka, bury your face in her pussy and start licking. She starts quickly getting wet as she moans loudly.' 
+	'You look at her inviting pussy and can''t help yourself. You move in behind Anushka, bury your face in her pussy and start licking. She starts quickly getting wet as she moans loudly.'
 	'You eat her out for a few minutes with no idea what Artem is doing before you pull away and see him staring at you wide-eyed and flushed.'
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'stat'
@@ -639,7 +639,7 @@ if $ARGS[0] = 'anushka_3some_bj':
 	act 'Tell Anushka to suck his dick':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some5.jpg"></center>'
-		'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck this cock like the good little slut you are!"' 
+		'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck this cock like the good little slut you are!"'
 		'She stops eating you out to look up at you with an amused smirk on her face before she moves up and kneels down beside the couch. She obediently takes his cock in one hand and starts stroking it while she takes the head of his dick into her mouth, tightly wraps her lips around his shaft and starts sucking. After you''re satisfied that she''s doing what you want, you start licking his balls and hear him moaning loudly.'
 		gs 'arousal', 'foreplay', 2
 		gs 'stat'
@@ -692,7 +692,7 @@ if $ARGS[0] = 'anushka_3some_bj':
 								end
 							else
 								act 'Encourage him to get rough (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end	
+							end
 							act 'Ask him to butt fuck you': gt 'artem_sex', 'anushka_3some_anal'
 						end
 					end
@@ -744,7 +744,7 @@ if $ARGS[0] = 'anushka_3some_doggy':
 	'She sits up and gives you a bemused look as Artem takes a step back to watch, eager to get it stuck back in. Anushka gets up and you get on the ottoman bench with your head facing Artem before you encourage her to straddle you and start licking her pussy. You push her forward so her upper body is lying on you, then slide your hands back to her ass and pull her ass cheeks apart, causing her asshole to gape a little. This is all the encouragement Artem needs as he quickly steps closer and slides his dick back up her ass. You can hear her moan loudly as he does.'
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'stat'
-	act 'Let him finish': 
+	act 'Let him finish':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some15.jpg"></center>'
 		'You decide not to encourage him further. If he doesn''t have what it takes to fuck a girl roughly, then that''s on him, but you know he''ll be a little disappointed in himself for not taking full advantage of his opportunity as you keep licking Anushka while Artem fucks her ass. It doesn''t take much longer before he starts to grunt, and you can tell he''s about to cum. In fact, he soon pulls out of Anushka''s asshole and starts stroking his cock.'
@@ -767,7 +767,7 @@ if $ARGS[0] = 'anushka_3some_doggy':
 			gs 'arousal', 'cuni_give', 3, 'lesbian', 'dom'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Let him finish': 
+			act 'Let him finish':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some15.jpg"></center>'
 				'You decide not to encourage him further. If he doesn''t have it in him, then that''s his fault, but you know he''ll be a little disappointed for not taking full advantage of his opportunity as you keep licking Anushka while Artem fucks her ass. It doesn''t take much longer before he starts to grunt, and you can tell he''s about to cum. In fact, he soon pulls out of Anushka''s asshole and starts stroking his cock.'
@@ -788,10 +788,8 @@ if $ARGS[0] = 'anushka_3some_doggy':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some16.jpg"></center>'
 					'"Don''t slow down, baby. Tear that ass up and show her who owns it!" you tell him as you grab hold of her hips to stop her from pulling away, as you go back to licking her pussy.'
 					'You feel his hands reach up and firmly grab her by the hips, one hand reaching up to hold her by the shoulder as he slides his dick nearly entirely out of her before slamming it back in and hammering her balls deep. You can feel her trying to pull away, but he holds her firm. "That''s right bitch, tonight your ass is mine!"'
-
 					'Her moans start turning into grunts, but he''s not done. "Who''s the pussy assed bitch now!?"'
 					'When she doesn''t respond, he reaches up and grabs her by the hair before turning her head until she''s looking back over her shoulder at him. "I asked you a question, bitch! Answer it!" You''re a little shocked that you''ve brought this side out of him, but are also feeling a little proud.'
-
 					gs 'arousal', 'cuni_give', 2, 'lesbian', 'dom'
 					gs 'stat'
 					act 'Let this play out':
@@ -802,7 +800,6 @@ if $ARGS[0] = 'anushka_3some_doggy':
 						'You can hear her grunts turning back into moans as well, not to mention her already soaking wet pussy is soaking your face even more, she is getting off this big time. Your thoughts are interrupted as she answers him. "OOOHHH... I... am..." Her reply is breathless.'
 						'You can hear the excitement in his voice, it seems he is really starting to get into this. "You are what?"'
 						'"OH... OH... I''m.... the pussy.... assed bitch." She struggles to get out from the hard fucking Artem is giving her, but her ever increasing soaking pussy tells you she''s loving it.'
-
 						*nl
 						'"That''s right. I own your ass and I''m going to tear it up because there''s nothing you can do about it!"'
 						'You have to admit that you wern''t expecting him to be this assertive as she grips your leg tightly. "Oh fuck... Oh fuck... Not... So hard." She''s starting to resist, but is still enjoying being used.'
@@ -815,11 +812,11 @@ if $ARGS[0] = 'anushka_3some_doggy':
 				end
 			else
 				act 'Encourage him to really pound her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 		end
 	else
 		act 'Encourage him to fuck her harder (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'anushka_3some_facial':
@@ -929,7 +926,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 	elseif artemQW['rough_anal_nush'] = 2:
 		'"I must admit, I was expecting this to be lackluster at best, but you surprised me, Artem. You were better than I expected." She looks directly at you and bites her lower lip. "You trained your nerd pretty well. I might be tempted to try again one day."'
 		'You grin at her comment. "I told you he was a great lover."'
-		'She just laughs. "Sure, he''s a great ''lover''," She makes it sound like it''s a bad thing. "But he''s still not a great fuck, at least not yet."'
+		'She just laughs. "Sure, he''s a great ''lover''." She makes it sound like it''s a bad thing. "But he''s still not a great fuck, at least not yet."'
 		'You''re pretty sure she''s just teasing him on purpose and doesn''t really mean it, but you doubt Artem will understand that.'
 		act 'Defend Artem':
 			*clr & cla
@@ -940,7 +937,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 			'"Ha!" you say in a scolding tone. "He did great. He tore your slutty ass up." You then turn to Artem. "You were great. Nush is just being a bitch."'
 			'She just laughs. "He was pretty good, but not great, and we both know it. Hell, look at him. Even he knows it." You glance over at Artem and his shoulders slump and his grin fades.'
-			'As she''s about to leave his room, he glances at you before looking back to her, then straightens up his shoulders. He seems more confident all of a sudden.'
+			'As she''s about to leave his room, he glances at you before looking back at her, then straightens up his shoulders. He seems more confident all of a sudden.'
 			*nl
 			'"That might be true. I might not be, as you put it, a great fuck, but what''s also true is that I bent you over and tore your ass up, showing you no mercy, and you couldn''t do anything about it. You just meekly and submissively took it, from a lowly nerd like me, while I made you my bitch."'
 			'She lifts her eyebrows in surprise. She starts to retort, but before she can, he continues. "When we see each other at school, we''ll both know that I totally made you my bitch, and nothing will ever change that."'
@@ -988,7 +985,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 								minut += 10
 								'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 								'"So does that mean you want to do this again?" you ask.'
-								'He nods. "Hell yes! Next time I''m going to totally own her!" Then he looks at you and blushes a bit. "I mean I''d like to, if you want to, of course."'
+								'He nods. "Hell yes! Next time I''m going to totally own her!" Then he looks at you and blushes. "I mean I''d like to, if you want to, of course."'
 								'You grin at how he can be so dominant one moment, but care about your feelings the next. "You made sure she said say yes already, so why waste that? I''ll let you know when I''m ready to invite her again." You also want to talk to Anushka about this now.'
 								'He nods. "Of course, just let me know." The two of you then talk for a while before he stops. "My mom will be home soon and I need to get started on my homework."'
 								act 'Leave': gt 'pod_ezd', 'etaj_1'
@@ -1086,7 +1083,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 				'You smile and kiss him again. "Look on the bright side! You got to fuck one of your bullies in the ass. How many people ever get to say that?"'
 				'He looks at you and laughs while shaking his head. "You''re right... I just wish..."'
 				'You look at him. "Wish what?"'
-				'He sighs. "I wish I had taken better advantage of the situation, maybe really paid her back for all the teasing she''s put me through over the years."' 
+				'He sighs. "I wish I had taken better advantage of the situation, maybe really paid her back for all the teasing she''s put me through over the years."'
 				'Before you can reply, he kisses you before walking you to the door. It seems it didn''t bother him too much, so you head on your way.'
 				act 'Leave': gt 'pod_ezd', 'etaj_1'
 			end
@@ -1198,7 +1195,7 @@ if $ARGS[0] = 'nush3some_how_he_feels':
 				'You''re a little surprised by this outburst, but also proud that he''s gaining self-confidence. "Wow! I didn''t know the bullying bothered you this much." He starts to say something, but you keep going. "But I get it, I really do. She and the other gopniks have bullied and sometimes hurt you, and you just wanted to get a little revenge. It''s only natural."'
 				'He relaxes a little, seemingly relieved you''re not upset by what he just said. "Yeah... I just regret missing my only chance to really get some payback." You think about what he said. You know you could likely talk her back into coming back eventually, but do you want to share your boyfriend with her again?'
 			end
-			act 'Agree he missed his chance': 
+			act 'Agree he missed his chance':
 				*clr & cla
 				artemQW['nush3some'] = -1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
@@ -1237,7 +1234,7 @@ if $ARGS[0] = 'nush3some_how_he_feels':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 					'You think for a few seconds before nodding. Anushka likes the rough stuff, and more importantly, you think this will do Artem some good. "Okay, I''ll try and talk her into it, but..." You pause and can tell he''s expecting you to ask him to not be too rough next time. "Only if you promise to not hold back."'
-					'He looks surprised by your comment. "Really!?"' 
+					'He looks surprised by your comment. "Really!?"'
 					act 'Yes':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
@@ -1329,7 +1326,7 @@ if $ARGS[0] = 'strapon_first':
 					act 'Keep fucking him hard':
 						*clr & cla
 						minut += 5
-						artemQW[strapon] = -1
+						artemQW['strapon'] = -1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
 						'You don''t do as he asks. "Come on baby, just relax."'
 						'His moans quickly turn to pained grunts. "Stop! That hurts!" he cries out and shoves you off before sitting up and glaring at you. "What the hell, <<$pcs_nickname>>?! That hurt!"'
@@ -1343,7 +1340,7 @@ if $ARGS[0] = 'strapon_first':
 					end
 					act 'Ease up':
 						*clr & cla
-						artemQW[strapon] = 1
+						artemQW['strapon'] = 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
 
 						'You ease up a little, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
@@ -1369,7 +1366,7 @@ if $ARGS[0] = 'strapon_first':
 				end
 				act 'Fuck him nice and steady':
 					*clr & cla
-					artemQW[strapon] = 1
+					artemQW['strapon'] = 1
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
 					'You keep your steady pace, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
 					'You grin. "You like taking my cock in your ass, don''t you?"'

+ 49 - 49
locations/artemhome.qsrc

@@ -24,7 +24,7 @@
 !! artemQW['nush3some'] >= 2 had threesome with Nush
 !! artemQW['nush3some'] = 1 Artem and Nush agreed to threesome
 !! artemQW['nush3some_again'] = 1 can try and convince Artem and Nush to try it again
-!! artemQW['nush3some_again'] = 2 have convinced Artem 
+!! artemQW['nush3some_again'] = 2 have convinced Artem
 !! artemQW['nush3some_again'] = 3 have convinced Anushka
 !! artemQW['nush3some_again'] = 4 opens up repeating threesomes
 !! artemQW['nush3some'] >= 3 had threesome with Nush more than once
@@ -50,15 +50,15 @@ if $ARGS[0] = 'home':
 	if sound = 0: PLAY 'sound/korr.mp3',30
 	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 	$location_type = 'private'
-	gs 'themes', 'indoors'		
+	gs 'themes', 'indoors'
 	popolaini = 0
 	saunaYouRoom = 0
 	boycherdaksex = 0
 	minut += 1
 	bonusZ = 0
 	gs 'stat'
-	
-	
+
+
 !! Artem''s location. He is out on Wednesday from 15-22.
 	if week = 3 and hour >= 15 and hour < 22:
 		ArtemLoc = 0
@@ -75,7 +75,7 @@ if $ARGS[0] = 'home':
 	else
 		ArtemParentsLoc = 0
 	end
-	
+
 !! Checking who opens the door
 	if ArtemLoc ! 0 and ArtemParentsLoc = 5:
 		DoorOpenedBy = rand(0,1)
@@ -99,7 +99,7 @@ if $ARGS[0] = 'home':
 		if artemQW['artemlove'] = 1:
 			'You hope that it''s Artem who will answer.'
 		end
-		
+
 		if DoorOpenedBy = 0:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
@@ -126,7 +126,7 @@ if $ARGS[0] = 'home':
 					'"I''m Glinina, Artem''s mother. Who are you?"'
 					'"<<$pcs_nickname>>," you answer, but don''t elaborate further.'
 					if artemQW['artlie'] = 2 or artemQW['artembrokenheart'] = 1 or artemQW['artemblok'] = 1:
-						'When she hears your name, her demeanor swiftly changes. "Oh. It''s you," she frowns. "I don''t know what you did to my sweet Artem, but he says he never wants to see you again, so please leave."' 
+						'When she hears your name, her demeanor swiftly changes. "Oh. It''s you," she frowns. "I don''t know what you did to my sweet Artem, but he says he never wants to see you again, so please leave."'
 						'She closes the door in your face without another word.'
 					else
 						'She keeps up her smile. "Is he going to tutor you, dear?"'
@@ -143,7 +143,7 @@ if $ARGS[0] = 'home':
 					if artemQW['artlie'] = 2 or artemQW['artembrokenheart'] = 1 or artemQW['artemblok'] = 1:
 						'"Who should I tell him is here?"'
 						'"I''m <<$pcs_nickname>>."'
-						'When she hears your name, her demeanor swiftly changes. "Oh. It''s you," she frowns. "I don''t know what you did to my sweet Artem, but he says he never wants to see you again, so please leave."' 
+						'When she hears your name, her demeanor swiftly changes. "Oh. It''s you," she frowns. "I don''t know what you did to my sweet Artem, but he says he never wants to see you again, so please leave."'
 						'She closes the door in your face without another word.'
 					else
 						'She seems pleased. "You must be one of Artem''s little friends. I''m Glinina, Artem''s mother. What''s your name, dear?"'
@@ -183,7 +183,7 @@ if $ARGS[0] = 'home':
 					end
 				end
 			end
-		else	
+		else
 			'You stand in the hallway, but it appears that nobody is home.'
 		end
 	end
@@ -197,7 +197,7 @@ if $ARGS[0] = 'hallway':
 	if sound = 0:PLAY 'sound/korr.mp3',30
 	*clr & cla
 	minut += 1
-	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]	
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 	gs 'stat'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/hall.jpg"></center>'
@@ -227,7 +227,7 @@ if $ARGS[0] = 'bathroom':
 	if ArtemLoc ! 3:
 		menu_off = 0
 		*clr & cla
-		minut += 1		
+		minut += 1
 		gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 		$location_type = 'bathroom'
 		gs 'stat'
@@ -277,7 +277,7 @@ if $ARGS[0] = 'bathroom':
 end
 
 if $ARGS[0] = 'artemroom':
-	menu_off = 0	
+	menu_off = 0
 	CLOSE ALL
 	$track_loop = ''
 	music_loop = 1
@@ -293,13 +293,13 @@ if $ARGS[0] = 'artemroom':
 	else
 		'The room is very clean and neat. Right next to the window is a bed, with a small night stand next to it. Against the opposite wall is a small computer desk and a chair, with a laptop on it. Next to the desk is a dresser. On the other side of the desk is a bookshelf with a fairly large collection of books.'
 	end
-	if $clothingworntype = 'nude': 
+	if $clothingworntype = 'nude':
 		act 'Dress yourself': gs 'shortgs','dress' & gt 'artemhome','artemroom'
 	end
 	if $clothingworntype ! 'nude':
 		act 'Leave Artem''s room': gt 'artemhome','hallway'
 	end
-	
+
 	if hour < 6:
 		gt 'artemhome', 'timecheck'
 	elseif hour > 22:
@@ -318,7 +318,7 @@ if $ARGS[0] = 'artemroom':
 				act 'Talk with him': gt 'artemhome', 'chat'
 			end
 		end
-	
+
 		if ArtemLoc = 2:
 			'Artem is sitting watching you with a friendly smile.'
 			act 'Let''s go to the living room': ArtemLoc = 5 & gt 'artemhome', 'livingroom'
@@ -326,7 +326,7 @@ if $ARGS[0] = 'artemroom':
 			if lernHome > 0:
 				act 'Do homework with Artem': gt 'artem_events','learn'
 			end
-			!! Nutluck needs to say at which point this should be enabled. Set it to artemQW['artfall'] > 5 for now		
+			!! Nutluck needs to say at which point this should be enabled. Set it to artemQW['artfall'] > 5 for now
 			if artemQW['artfall'] > 5 and artkissing ! daystart:
 				gs 'willpower', 'misc', 'self', 'easy'
 				if will_cost <= pcs_willpwr:
@@ -350,7 +350,7 @@ if $ARGS[0] = 'artemroom':
 							'He pulls you in close and you''re soon passionately making out, the kisses full of eager lust and urgent need. You feel yourself getting more aroused as he scoots back against the wall and pulls you onto his lap. You can feel the hard bulge in his pants as you straddle him.'
 							gs 'arousal', 'foreplay', 3
 							gs 'stat'
-							act 'Stop making out': 
+							act 'Stop making out':
 								*clr & cla
 								gs 'npc_relationship', 'modify', 'A2', 'dislike'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
@@ -370,7 +370,7 @@ if $ARGS[0] = 'artemroom':
 										act 'Strip to your panties': gt 'artem_events','artemdryhump1'
 										gs 'willpower', 'exhib', 'resist'
 										if will_cost <= pcs_willpwr:
-											act 'Refuse to strip (<<will_cost>> Willpower)': 
+											act 'Refuse to strip (<<will_cost>> Willpower)':
 												gs 'willpower', 'pay', 'resist'
 												gt 'artem_events','artemdryhump'
 											end
@@ -386,7 +386,7 @@ if $ARGS[0] = 'artemroom':
 									act 'Strip': gt 'artem_events','artemdryhump2'
 									gs 'willpower', 'exhib', 'resist'
 									if will_cost <= pcs_willpwr:
-										act 'Refuse to strip (<<will_cost>> Willpower)': 
+										act 'Refuse to strip (<<will_cost>> Willpower)':
 											gs 'willpower', 'pay', 'resist'
 											gt 'artem_events','artemdryhump'
 										end
@@ -490,8 +490,8 @@ if $ARGS[0] = 'bookshelf':
 			gs 'stat'
 			artemQW['artfall'] += 1
 			artem_borrowed_book = 1
-			artembook = 5
-			!!Need code to add a book for Sveta to read other than the ones she can buy.			
+			BookVars['artem_pages'] = rand(400, 600)
+			!!Need code to add a book for Sveta to read other than the ones she can buy.
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'You look through the books until you find one you like. "Do you mind if I borrow this?"'
@@ -506,7 +506,7 @@ if $ARGS[0] = 'bookshelf':
 			*clr & cla
 			minut += 2
 			artem_borrowed_book = 0
-			artembook = 0
+			BookVars['artem_pages'] = 0
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'"I brought your book back," you tell him as you take it out of your purse and put it back in place on the shelf, right where you got it from.'
@@ -525,7 +525,7 @@ if $ARGS[0] = 'bookshelf':
 				else
 					'"It was a bit too bland for me. I could guess the outcome right at the start, and it turned out I was right," you reply.'
 				end
-				'Artem looks crushed at your answer.'				
+				'Artem looks crushed at your answer.'
 				act 'Look at more books': gt 'artemhome','bookshelf'
 				act 'Find something else to look at': gt 'artemhome','artemroom'
 			end
@@ -591,7 +591,7 @@ if $ARGS[0] = 'snack':
 	'While you''re doing that, he grabs some drinks from the fridge before you head back to his room.'
 	act 'Back to his room': ArtemLoc = 2 & gt 'artemhome', 'artemroom'
 end
-	
+
 if $ARGS[0] = 'livingroom':
 	menu_off = 0
 	CLOSE ALL
@@ -644,7 +644,7 @@ if $ARGS[0] = 'livingroom':
 						act 'Leave': ArtemLoc = 2 & gt 'artemhome','artemroom'
 					end
 				end
-			else 
+			else
 				'As the two of you walk into the living room, Artem''s father jumps around, as if you startled him.'
 				'"Sorry, we didn''t mean to scare you!" you say.'
 				'He waves your fears away. "Don''t worry about it. I''m just happy to see Artem spending time with a nice girl like yourself."'
@@ -696,7 +696,7 @@ if $ARGS[0] = 'livingroom':
 								act 'Leave': gt 'artemhome','hallway'
 							end
 						end
-					else 
+					else
 						'You greet Masharin and he gives you a friendly nod back. "Hello <<$pcs_firstname>>, welcome back. Are you and Artem studying?"'
 						'"Hello, Mr. Chebotarev. Yes, Artem suggested that we could study in his room," you politely reply.'
 						'He chuckles. "There''s no need to be so formal, <<$pcs_firstname>>. Call me Masharin. So how is the studying going?"'
@@ -780,7 +780,7 @@ if $ARGS[0] = 'livingroom':
 							'You stretch, showing off your curves a little before turning and leaving the Chebotarevs looking at you in disbelief.'
 							act 'Leave': gt 'artemhome','hallway'
 						end
-					else 
+					else
 						'"Excuse me," you whisper, "I don''t want to bother you, but I needed a break and heard you watching TV..."'
 						'Glinina slowly turns around. "You''re not bother at all, <<$pcs_firstname>>. We were just watching the news. You can join us if you want."'
 						act 'Yes':
@@ -829,7 +829,7 @@ if $ARGS[0] = 'livingroom':
 					act 'Leave': gt 'pod_ezd', 'etaj_1'
 				end
 			end
-			act 'Play': 
+			act 'Play':
 				*clr & cla
 				ArtemLoc = 5
 				gs 'npc_relationship', 'modify', 'A2', 'like'
@@ -922,7 +922,7 @@ if $ARGS[0] = 'kitchen':
 						!! The dialogue above was obviously a first meeting one. If you want to add extra dialogue it should go here
 						act 'Leave': gt 'artemhome','hallway'
 					end
-				else 
+				else
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/glinina.jpg"></center>'
 					if artemQW['metArtemMom'] = 0:
@@ -1007,7 +1007,7 @@ if $ARGS[0] = 'fridge':
 	'You open the fridge and see:<<$artem_tea>><<$artem_water>><<$artem_sup>><<$artem_lefto>><<$artem_sanw>>'
 	act 'Close the refrigerator': gt 'artemhome', 'kitchen'
 	if artemlefto_count > 0:
-		act 'Eat some leftovers': 
+		act 'Eat some leftovers':
 			*clr & cla
 			minut += 5
 			artemfood_day = daystart
@@ -1030,7 +1030,7 @@ if $ARGS[0] = 'fridge':
 			act 'Continue': gt 'artemhome', 'kitchen'
 		end
 	elseif artemtea_count >= 0:
-		act 'Have some tea': 
+		act 'Have some tea':
 			*clr & cla
 			minut += 5
 			artemfood_day = daystart
@@ -1053,7 +1053,7 @@ if $ARGS[0] = 'fridge':
 			act 'Continue': gt 'artemhome', 'kitchen'
 		end
 	elseif artemwater_count >= 0:
-		act 'Have some water': 
+		act 'Have some water':
 			*clr & cla
 			minut += 5
 			artemfood_day = daystart
@@ -1076,7 +1076,7 @@ if $ARGS[0] = 'fridge':
 			act 'Continue': gt 'artemhome', 'kitchen'
 		end
 	elseif artemsup_count >= 0:
-		act 'Have some soup': 
+		act 'Have some soup':
 			*clr & cla
 			minut += 5
 			artemfood_day = daystart
@@ -1099,7 +1099,7 @@ if $ARGS[0] = 'fridge':
 			act 'Continue': gt 'artemhome', 'kitchen'
 		end
 	elseif artemsanw_count >= 0:
-		act 'Make a sandwich': 
+		act 'Make a sandwich':
 			*clr & cla
 			minut += 5
 			artemfood_day = daystart
@@ -1122,8 +1122,8 @@ if $ARGS[0] = 'fridge':
 			act 'Continue': gt 'artemhome', 'kitchen'
 		end
 	end
-end 
-	
+end
+
 if $ARGS[0] = 'artemparents':
 	menu_off = 0
 	CLOSE ALL
@@ -1257,7 +1257,7 @@ if $ARGS[0] = 'chat':
 		'"I still love you..." he whispers.'
 		'You smile at him. "Are you sure you want to be seen with a whore? Everyone will look down on you too!"'
 		'"I don''t care what others call you, or what they think... I just want to be with you," he tells you.'
-		if soniaPS > 0:
+		if soniaQW['slut'] > 0:
 			'You continue. "You saw what happened to Sonia! She used to get along with everyone, but ever since that night at the disco, they all treat her like dirt! That will happen to me too, I just know it! And you, if people see you near me!"'
 		else
 			'You shake your head sadly. "I know you think that now, but it won''t be the same. People will treat me like dirt, Artem! And they''ll do the same to you for dating a whore!"'
@@ -1294,7 +1294,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you. "<<$pcs_nickname>>, do you want to go for a walk in the park?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			artemQW['artfall'] -= 4
 			gs 'npc_relationship', 'modify', 'A2', 'hate'
@@ -1318,7 +1318,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you. "<<$pcs_nickname>>, would you like to go out on a date?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'stat'
@@ -1378,7 +1378,7 @@ if $ARGS[0] = 'chat':
 				end
 			else
 				act 'Tell him to stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 			act 'Enjoy his touch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
@@ -1401,7 +1401,7 @@ if $ARGS[0] = 'chat':
 					end
 				else
 					act 'Pull away and stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
+				end
 			end
 		end
 		act 'Reject the flowers':
@@ -1426,7 +1426,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you as he walks over and hugs you. "<<$pcs_nickname>>, would you like to go out on another date?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'stat'
@@ -1512,7 +1512,7 @@ if $ARGS[0] = 'chat':
 		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 		'Artem smiles at you as he walks over and hugs you. "<<$pcs_nickname>>, would you like to go out on another date?"'
-		act 'Stay here': 
+		act 'Stay here':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'stat'
@@ -1568,7 +1568,7 @@ if $ARGS[0] = 'chat':
 				act 'Stop talking': gt 'artemhome', 'artemroom'
 				act 'Keep talking': gt 'artemhome', 'chat'
 			end
-			
+
 			!! Checking who Sveta is dating
 			if Rex_Love = 1:
 				$boyfriend_temp = 'Rex'
@@ -1607,7 +1607,7 @@ if $ARGS[0] = 'chat':
 				end
 			end
 		end
-		
+
 		act 'What have you been up to?':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'like'
@@ -1862,9 +1862,9 @@ if $ARGS[0] = 'chat':
 					act 'Have sex': gt 'artem_sex', 'sex'
 				end
 			end
-		end			
+		end
 	end
-end	
+end
 
 if $ARGS[0] = 'askedstrip':
 	act 'Agree to strip': gt 'artemhome', 'stripagree', 0
@@ -1935,7 +1935,7 @@ if $ARGS[0] = 'artemgirlfriend':
 	act 'Enjoy his touch':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
-		'You return his kiss as his hands keep roaming over your body, but paying particular attention to your breasts and ass. He walks backward, pulling you along with him until he sits on the bed with his back against the wall and pulls you on top of his lap.' 
+		'You return his kiss as his hands keep roaming over your body, but paying particular attention to your breasts and ass. He walks backward, pulling you along with him until he sits on the bed with his back against the wall and pulls you on top of his lap.'
 		'You can feel quite the hard bulge in his pants as you keep making out. After a few seconds, he takes one of your hands and pulls it down to his crotch.'
 		gs 'arousal', 'kiss', 5
 		gs 'stat'
@@ -1958,7 +1958,7 @@ if $ARGS[0] = 'artemgirlfriend':
 			end
 		else
 			act 'Pull away and stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 end
 

+ 6 - 6
locations/arturQW.qsrc

@@ -1,7 +1,7 @@
 # arturQW
 if $ARGS[0] = 'arturQW_1':
 	menu_off = 1
-	if arturTimes >= 5 and fame['pav_slut'] >= 150 and hotcat >= 7:
+	if arturTimes >= 5 and fame['pav_slut'] >= 150 and pcs_hotcat >= 7:
 		*clr & cla
 		minut += 2
 		gs 'stat'
@@ -21,7 +21,7 @@ if $ARGS[0] = 'arturQW_1':
 			'"Well, if you''re really going to pay that well, then I can hardly refuse." You say smiling at the handsome Armenian.'
 			'My beauty, I will not only pay you that well, but I will treat you like the treasure you are." He assures you.'
 			'Excitedly Arthur comes over and gives your ass a hard squeeze, his fingers sinking into your plump flesh. You moan lightly, feeling him taking a sense of ownership over your body as he grips your butt cheek. "Now that the business is settled, let''s go eat barbecue, drink Chacha brandy!" He declares happily.'
-			
+
 			gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Leave (<<will_cost>> Willpower)':
@@ -43,7 +43,7 @@ if $ARGS[0] = 'arturQW_1':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/arturqw_2.jpg"></center>'
 			'You smile sadly at him. "Thank you for the tempting offer, but I have so much to do. School work, dancing, volleyball, and I simply don''t have any free time as it is.'
 			'"As you like beautiful." He responds somewhat sadly before adding. "Ah forget it, now let''s go eat barbecue, drink Chacha brandy." He says as he grabs you by your ass and gives it a squeeze, his fingers sinking into your soft flesh. You moan lightly, feeling him taking a sense of ownership over your body as he grips your butt cheek.'
-			
+
 			gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Leave (<<will_cost>> Willpower)':
@@ -62,7 +62,7 @@ if $ARGS[0] = 'arturQW_1':
 		gs 'stat'
 
 		'Arthur smiles kindly and hands you a tangerine. "Come to eat barbecue, drink Chacha brandy!"'
-		
+
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':
@@ -101,7 +101,7 @@ if $ARGS[0] = 'arturQW_2':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/arturqw_5.jpg"></center>'
 		'You smile at him, a mix of joy and lust. "Well, Arthur, that changes everything, I would love to keep the books for you."'
 		'"Yes! I knew you would." The Armenian exclaims happily. "Come my beauty, let''s go eat barbecue and drink Chaha brandy." He says as he roughly grabs your ass, palming your soft cheeks with his thick, muscular hands.'
-		
+
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':
@@ -123,7 +123,7 @@ if $ARGS[0] = 'arturQW_2':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/arturqw_2.jpg"></center>'
 		'"Thank you for the tempting offer, but I have so much to do. School work, dancing, volleyball, and I don''t have any free time as it is. It''s just too much." You say, sad to have to turn down such a generous opportunity.'
 		'"As you like beautiful." He said somewhat sadly before adding. "Ah forget it, now let''s go eat barbecue, drink Chacha brandy." He says as he grabs you by your ass and gives it a squeeze.'
-		
+
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':

+ 1 - 4
locations/audition_reflections.qsrc

@@ -964,7 +964,6 @@ if $ARGS[0] = 'horny':
 			else
 				'Concentrating on that flavor, you reach under your skirt and plunge your fingers into your pussy, frantically trying to fill the space that was occupied with cock moments ago. It''s blazing hot and when you draw your fingers back to your face, they''re totally wet, your juices hanging in thick strings between them.'
 			end
-		end	
 		else
 			'<<$boydesc>>'' cock in your pussy. The pulsing you felt. The cum spilling out inside. You shudder.'
 			if $pantyworntype ! 'none':
@@ -1033,9 +1032,7 @@ if $ARGS[0] = 'horny':
 	pcs_horny += 50
 	'... <i>horny.</i> '
 	*nl
-	if $actress_last_reflect = 'horny':
-	
-	else
+	if $actress_last_reflect ! 'horny':
 		$actress_last_reflect = 'horny'
 		if blah = 0:
 		elseif actress['cast_couch'] >= 10:

+ 94 - 94
locations/auditions.qsrc

@@ -12,7 +12,7 @@
 !! audition['roletype'] = 9 - A main character with nude scenes
 
 !! Audition Types
-!! 
+!!
 !! $audition['type'] = 'general' - general audition no special events usually for a minor speaking role
 !! $audition['type'] = 'extra' - an audition basically just to confirm scheduling and check that the PC isn''t grossly ugly
 !! $audition['type'] = 'titty' - an audition based solely on appearance and size of breasts, usually for a role as an extra
@@ -70,7 +70,7 @@ if $ARGS[0] = 'setup':
 end
 
 if $ARGS[0] = 'audition_end':
-	
+
 end
 
 if $ARGS[0] = 'role_denied':
@@ -96,7 +96,7 @@ end
 
 if $ARGS[0] = 'audition_result':
 	audition['result'] = ((audition['scene_prep'] * 5) + pcs_perform + audition['bonus'] - audition['penalty'])
-	if audition['cast_couch'] > 0:	
+	if audition['cast_couch'] > 0:
 		if audition['cast_couch'] > 5 and audition['cast_couch'] < 13:
 			actress['cast_couch_vag'] += 1
 			if audition['cast_couch_virgin'] = 1:
@@ -120,9 +120,9 @@ if $ARGS[0] = 'extra_audition':
 
 
 end
-	
+
 if $ARGS[0] = 'tit_audition':
-	cla & *clr
+	*clr & cla
 	if pcs_inhib > 45:
 		gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
 	else
@@ -142,13 +142,13 @@ if $ARGS[0] = 'tit_audition':
 		else
 			'"You have wonderful skin, very smooth and soft looking, even from here. That will be great for the camera. Now show me your breasts please."'
 		end
-		act'"Excuse me??"':
-			cla & *clr
+		act '"Excuse me??"':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'"Excuse me??" you ask, stunned. "What did you just ask me?"'
 			'The woman sighs in exasperation. "Ugh, this is why I hate dealing with amateurs. Did you even read what you''re auditioning for? You''re here for a bit role where you won''t be on screen for more than 10 seconds. This role <i>only</i> exists to show some tits on screen to excite the audience. And my job is to pick pretty girls with big pretty tits to make that a reality. Now either show me your tits and stop wasting my time or get out."'
-			act'Refuse':
-				cla & *clr
+			act 'Refuse':
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/hallway.jpg"></center>'
 				'Blushing, you can''t do it and leave the room red faced while you hear the casting director sneer in disgust again.'
 				'"Next!"'
@@ -158,7 +158,7 @@ if $ARGS[0] = 'tit_audition':
 				if will_cost <= pcs_willpwr:
 					*nl
 					act 'Show her your tits (<<will_cost>> Willpower)':
-						cla & *clr
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/showtits.jpg"></center>'
 						'Your face heats with embarassment, both at her beratement and because of how uncomfotable you are with doing this but you pull your clothes aside to reveal your breasts to the woman. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
 						'"How big are those? <<$titsize>>s?"'
@@ -171,11 +171,11 @@ if $ARGS[0] = 'tit_audition':
 						end
 						act 'Continue': gt 'auditions', 'tit_audition_result'
 					end
-				
+
 				end
 			else
 				act 'Show her your tits':
-					cla & *clr
+					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/citycenter/aurora/auditions/showtits.mp4"></video></center>'
 					'Your face heats with embarassment from her beratement but you otherwise brazenly pull out your breasts to show them to her. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
 					'"How big are those? <<$titsize>>s?"'
@@ -190,12 +190,12 @@ if $ARGS[0] = 'tit_audition':
 				end
 			end
 		end
-		
+
 		if pcs_inhib < 50:
 			if will_cost <= pcs_willpwr:
 				*nl
 				act 'Show her your tits (<<will_cost>> Willpower)':
-					cla & *clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/showtits.jpg"></center>'
 					'You blush with embarassment at the request but do as she says anyways seeing how you signed up for this in the first place. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
 					'"How big are those? <<$titsize>>s?"'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'tit_audition':
 			end
 		else
 			act 'Show her your tits':
-				cla & *clr
+				*clr & cla
 				'<center><video autoplay loop src="images/locations/city/citycenter/aurora/auditions/showtits.mp4"></video></center>'
 				'Not even slightly shy, you brazenly pull out your tits to show them to her in all their glory. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
 				'"How big are those? <<$titsize>>s?"'
@@ -230,7 +230,7 @@ end
 
 
 if $ARGS[0] = 'tit_audition_result':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	if audition['roletits'] > tits:
 		'"Well, if it were up to me, I''d hire you. You''ve got a great complexion and nice perky boobs, but the director specifically asked for, in his own words, ''big fat titties,'' and unfortunately you''re just too small. Thanks for coming anyways, maybe another time. Next!"'
@@ -261,16 +261,16 @@ if $ARGS[0] = 'tit_audition_result':
 end
 
 if $ARGS[0] = 'general_tit_audition':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
-	
+
 end
 
 !! ----------------------------------- Reluctant Results -----------------------------------------
 
 if $ARGS[0] = 'reluctant_swallow_end':
 	actress['cast_couch'] += 1
-	cla & *clr
+	*clr & cla
 	gs 'auditions','audition_result'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -295,8 +295,8 @@ if $ARGS[0] = 'reluctant_swallow_end':
 		end
 		'<<$boydesc>> reaches over to a stack of papers and looks through it for a bit before pulling one out and sliding it across the table towards you with a pen.'
 		'"Here''s the contract. Just sign here and it''s all official."'
-		act'Sign the contract':
-			if $clothingworntype = 'none':
+		act 'Sign the contract':
+			if $clothingworntype = 'nude':
 				gt 'auditions', 'naked_signature'
 			else
 				gt 'auditions', 'signature'
@@ -308,8 +308,8 @@ if $ARGS[0] = 'reluctant_swallow_end':
 		elseif audition['cast_couch'] = 2:
 			'"Meh," he shrugs noncommittally, sitting down behind the desk. "You should''ve swallowed. Maybe then I''d have considered it. Really impolite to spit out a man''s cum like that. Now get out. I have real applicants to audition."'
 		end
-		act'Leave the room':
-			cla & *clr
+		act 'Leave the room':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, finding yourself taken aback by the moment. That''s it? After everything? <<$boydesc>>''s already stopped paying attention to you and is sifting through papers on his desk.'
 			if $clothingworntype ! 'nude':
@@ -319,9 +319,9 @@ if $ARGS[0] = 'reluctant_swallow_end':
 			end
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if audition['cast_couch'] = 1:
 				'"What the fuck?!" You flush with anger and glare at <<$boydesc>>. "You just pressured me into sucking your dick, tricked me into thinking that it would help me land this role! I even swallowed your fucking cum! And now you''re just going to toss me out like some kind of gutter whore?"'
@@ -342,7 +342,7 @@ end
 
 if $ARGS[0] = 'reluctant_facial_end':
 	actress['cast_couch'] += 1
-	cla & *clr
+	*clr & cla
 	gs 'auditions','audition_result'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -359,16 +359,16 @@ if $ARGS[0] = 'reluctant_facial_end':
 		act 'Sign the contract': gt 'auditions', 'facial_signature_upset'
 	else
 		'"Pfff," he huffs. "As if. I''ve had better before. Either get better at acting or practice giving head cause neither one is a good enough justification to get you the job. Now get out. I have real applicants to audition."'
-		act'Leave the room':
-			cla & *clr
+		act 'Leave the room':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, finding yourself not exactly surprised, but also unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if cumloc[11] > 0:
 				'"What the fuck?!" Something suddenly snaps inside you and you''re filled with a harder emotion than before. "You just pressured me into sucking your dick, tricked me into thinking that it would help me land this role, <i>came on my fucking face</i>," you say, waving your cum covered hand at him, "and now you''re just going to toss me out like some kind of gutter whore?"'
@@ -393,7 +393,7 @@ end
 
 if $ARGS[0] = 'reluctant_results':
 	actress['cast_couch'] += 1
-	cla & *clr
+	*clr & cla
 	gs 'auditions','audition_result'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -436,26 +436,26 @@ if $ARGS[0] = 'reluctant_results':
 		else
 			'"You''re almost as lousy a fuck as you are you an actress. Nowhere good enough to justify giving you the part. Now get out. I have real applicants to audition. Maybe I''ll get lucky and one of them will have good acting ability while also being willing to put out."'
 		end
-		act'Speechless':
-			cla & *clr
+		act 'Speechless':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'Clench your jaw in anger and leave':
-			cla & *clr
+
+		act 'Clench your jaw in anger and leave':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
-			
+
 			if actress['cast_couch_deny'] > 0:'<i>Great, another stingy fucker,</i> you think to yourself. <i>And another wasted audition spent on the casting couch.</i>'
-			
+
 			'As pissed off as you are, there isn''t anything you can do about this. You grab your things and stomp to the door, slamming it shut on the way out.'
 			act 'Leave': gt 'auditions', 'reflection'
 		end
-		
-!!{		act'What the fuck?!':
-			cla & *clr
+
+!!{		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if audition['cast_couch'] < 6:
 				if cumloc[11] > 0:
@@ -505,7 +505,7 @@ end
 if $ARGS[0] = 'reluctant_virgin_results':
 	actress['cast_couch'] += 1
 	gs 'auditions','audition_result'
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'"Okay. I... I gave... I gave you my virginity... I get the role now right? You promised me right?"'
 	if audition['result'] >= audition['requirement']:
@@ -518,16 +518,16 @@ if $ARGS[0] = 'reluctant_virgin_results':
 		'You feel the blood drain from your face.'
 		'"What?"'
 		'"I''m saying that you''ve got a tight pussy and all but holy fuck are you a bad actress. I can''t justify hiring you just because of this performance, particularly when your last performance was so bad. You should try porn instead, maybe they''d hire you based on just a tight pussy. Now get out. I have real applicants to audition and maybe one of them will have good acting ability while also putting out.'
-		act'Speechless':
-			cla & *clr
+		act 'Speechless':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if cumloc[11] > 0:
 				'"What the fuck?!" Something suddenly snaps inside you and you''re practically blind with rage. "You just pressured me into fucking you for this! You tricked me into thinking that it would help me land this role! I gave you my virginity! You <i>came on my fucking face</i>," you say, waving your cum covered hand at him, "and now you''re just going to toss me out like some kind of gutter whore?"'
@@ -560,7 +560,7 @@ end
 
 if $ARGS[0] = 'neutral_results':
 	actress['cast_couch'] += 1
-	cla & *clr
+	*clr & cla
 	gs 'auditions','audition_result'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -568,7 +568,7 @@ if $ARGS[0] = 'neutral_results':
 		'"Okay. I sucked you off, I even swallowed. I get the role now right? That was the deal."'
 	elseif audition['cast_couch'] > 0 and audition['cast_couch'] < 6:
 		'"Okay. I sucked you off. I get the role now right? That was the deal."'
-		
+
 	elseif audition['cast_couch'] = 12:
 		'"Okay, I fucked you. Even let you cum inside me. So now I get the part right? That was the deal."'
 	elseif audition['cast_couch'] >= 6 and audition['cast_couch'] < 13:
@@ -608,26 +608,26 @@ if $ARGS[0] = 'neutral_results':
 		else
 			'"You''re almost as lousy a fuck as you are you an actress. Nowhere good enough to justify giving you the part. Now get out. I have real applicants to audition. Maybe I''ll get lucky and one of them will have good acting ability while also being willing to put out."'
 		end
-		act'Speechless':
-			cla & *clr
+		act 'Speechless':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'Clench your jaw in anger and leave':
-			cla & *clr
+
+		act 'Clench your jaw in anger and leave':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
-			
+
 			if actress['cast_couch_deny'] > 0:'<i>Great, another stingy fucker,</i> you think to yourself. <i>And another wasted audition spent on the casting couch.</i>'
-			
+
 			'As pissed off as you are, there isn''t anything you can do about this. You grab your things and stomp to the door, slamming it shut on the way out.'
 			act 'Leave': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if audition['cast_couch'] < 6:
 				if cumloc[11] > 0:
@@ -677,7 +677,7 @@ end
 if $ARGS[0] = 'neutral_virgin_results':
 	actress['cast_couch'] += 1
 	gs 'auditions','audition_result'
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'"Okay. I fucked you and gave you my virginity. I get the role now right? You promised me."'
 	if audition['result'] >= audition['requirement']:
@@ -696,16 +696,16 @@ if $ARGS[0] = 'neutral_virgin_results':
 		end
 		'"What?"'
 		'"I''m saying that it''s nice to bang virgins and all but holy fuck are you a bad actress. I can''t justify hiring you just because of this performance, particularly when your last performance was so bad. You should try porn instead, maybe they''d hire you based on just a tight pussy. Now get out. I have real applicants to audition and maybe one of them will have good acting ability while also putting out.'
-		act'Speechless':
-			cla & *clr
+		act 'Speechless':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if cumloc[11] > 0:
 				'"What the fuck?!" Something suddenly snaps inside you and you''re practically blind with rage. "You just pressured me into fucking you for this! You tricked me into thinking that it would help me land this role! I gave you my virginity! You <i>came on my fucking face</i>," you say, pointing at your spunk covered visage, "and now you''re just going to toss me out like some kind of gutter whore?"'
@@ -738,7 +738,7 @@ end
 
 if $ARGS[0] = 'slutty_results':
 	actress['cast_couch'] += 1
-	cla & *clr
+	*clr & cla
 	gs 'auditions','audition_result'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -779,26 +779,26 @@ if $ARGS[0] = 'slutty_results':
 		else
 			'"You''re almost as lousy a fuck as you are you an actress. Nowhere good enough to justify giving you the part. Now get out. I have real applicants to audition. Maybe I''ll get lucky and one of them will have good acting ability while also being willing to put out."'
 		end
-		act'Speechless':
-			cla & *clr
+		act 'Speechless':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'Clench your jaw in anger and leave':
-			cla & *clr
+
+		act 'Clench your jaw in anger and leave':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
-			
+
 			if actress['cast_couch_deny'] > 0:'<i>Great, another stingy fucker,</i> you think to yourself. <i>And another wasted audition spent on the casting couch.</i>'
-			
+
 			'As pissed off as you are, there isn''t anything you can do about this. You grab your things and stomp to the door, slamming it shut on the way out.'
 			act 'Leave': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if audition['cast_couch'] < 6:
 				if cumloc[11] > 0:
@@ -847,9 +847,9 @@ end
 
 if $ARGS[0] = 'slutty_virgin_results':
 	actress['cast_couch'] += 1
-	
+
 	gs 'auditions','audition_result'
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'"Soooo..." you say with a sultry smile. "Pretty good, fucking a virgin right? Good enough to make her an actress, am I right?"'
 	if audition['result'] >= audition['requirement']:
@@ -868,16 +868,16 @@ if $ARGS[0] = 'slutty_virgin_results':
 		end
 		'"What?"'
 		'"I''m saying that it''s nice to bang virgins and all but ho-ly, you are as bad a fuck as you are an actress. Even the hooker on the corner knows how to work it better than you. You should try porn instead, maybe they''d hire you based on just a tight pussy. Now get out. I have real applicants to audition and maybe one of them will have good acting ability while also putting out.'
-		act'Speechless':
-			cla & *clr
+		act 'Speechless':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if cumloc[11] > 0:
 				'"What the fuck?!" Something suddenly snaps inside you and you''re practically blind with rage. "You just pressured me into fucking you for this! You tricked me into thinking that it would help me land this role! I gave you my virginity! You <i>came on my fucking face</i>," you say, pointing at your spunk covered visage, "and now you''re just going to toss me out like some kind of gutter whore?"'
@@ -912,7 +912,7 @@ end
 
 
 if $ARGS[0] = 'signature':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/shared/misc/signature.jpg"></center>'
 	'You reach over to pick up the pen and sign your name at the bottom of the page.'
 	if cumloc[0] > 0 and $pantyworntype ! 'none':
@@ -920,7 +920,7 @@ if $ARGS[0] = 'signature':
 	elseif cumloc[0] > 0:
 		'As the pen scribbles on paper you feel a random glob of cum drip from your pussy and faintly splat onto the carpet.'
 	elseif cumloc[3] > 0:
-		'As the pen scribbles on paper you feel yet another glob of cum dribble from your anus, lingering uncomfortably between your asscheeks.'		
+		'As the pen scribbles on paper you feel yet another glob of cum dribble from your anus, lingering uncomfortably between your asscheeks.'
 	end
 	*nl
 	'<i>	<<$pcs_firstname>> <<$pcs_lastname>>.</i>'
@@ -931,7 +931,7 @@ if $ARGS[0] = 'signature':
 end
 
 if $ARGS[0] = 'naked_signature':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/shared/misc/signature.jpg"></center>'
 	'You reach over to pick up the pen and sign your name at the bottom of the page.'
 	if cumloc[0] > 0:
@@ -939,7 +939,7 @@ if $ARGS[0] = 'naked_signature':
 	elseif cumloc[3] > 0:
 		'As the pen scribbles on paper you feel yet another glob of cum squeeze out of your asshole and dribble down your left cheek.'
 	elseif cumloc[11] > 0:
-		'As the pen scribbles on paper, a drop of cum falls from your face and spatters on the page next to your name.'		
+		'As the pen scribbles on paper, a drop of cum falls from your face and spatters on the page next to your name.'
 	end
 	'"Love the view by the way," <<$boydesc>> says, shamelessly ogling your naked body while you sign.'
 	*nl
@@ -959,7 +959,7 @@ end
 
 
 if $ARGS[0] = 'facial_signature_upset':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/shared/misc/signature.jpg"></center>'
 	'You pick up the pen he hands you and sign it.'
 	*nl
@@ -981,8 +981,8 @@ if $ARGS[0] = 'audition_escape':
 	gs 'auditions', 'role_denied'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'"I have to go!" you yelp and rush out of the room.'
-	act'Rush out the door':
-		cla & *clr
+	act 'Rush out the door':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/hallway.jpg"></center>'
 		if actress['audition_pressure'] = 1 and actress['cast_couch'] < 1 and actress['cast_seduce'] < 1:
 			'You slam the door behind you and clutch your hand to your breast, heart pounding.'
@@ -1047,7 +1047,7 @@ end
 
 !! ----------------------------------- Post Casting Couch Reflection -----------------------------------------
 
-	
+
 if $ARGS[0] = 'reflection':
 	gs 'arousal', 'end'
 	if $clothingworntype = 'nude':
@@ -1081,7 +1081,7 @@ if $ARGS[0] = 'reflection_end':
 end
 
 !!if $ARGS[0] = 'reflect_first_time':
-!!	cla & *clr
+!!	*clr & cla
 !!	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/hallway.jpg"></center>'
 !!	'The door shuts behind you and you lean against it, thinking about what just happened.'
 !!	''

+ 18 - 17
locations/auditions_minor1.qsrc

@@ -3,7 +3,8 @@
 
 if $ARGS[0] = 'general_dialogue':
 	if audition['requirement'] = 0 or audition['requirement'] = '':audition['requirement'] = rand(40,70)
-	gs 'boygirl', 0, 'A Male', rand(30,50)
+	gs 'npcgeneratec', 0, 'A Male', rand(30,50)
+	gs 'boyStat', $npclastgenerated
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'You enter the room and see a man sitting at a desk with papers in front of him.'
@@ -100,7 +101,7 @@ if $ARGS[0] = 'general_dialogue_fail':
 	end
 	gs 'auditions_minor1','casting_couch'
 end
-	
+
 if $ARGS[0] = 'casting_couch':
 	gs 'willpower','misc','self','easy'
 	if will_cost > pcs_willpwr:
@@ -123,7 +124,7 @@ if $ARGS[0] = 'casting_couch':
 				'"Huh-? I... I, uhh..."'
 				gs 'willpower','misc','resist','easy'
 				act 'Run away (<<will_cost>> Willpower)': gt 'auditions', 'audition_escape'
-				
+
 				act'"Uhmm... Umm......"':
 					cla & *clr
 					'<center><video autoplay loop src="images/shared/sex/grab/kotovpr.mp4"></video></center>'
@@ -131,12 +132,12 @@ if $ARGS[0] = 'casting_couch':
 					'You yelp as you feel <<$boydesc[0]>>''s hand take a huge grab of your ass.'
 					'"I can get you this part," he whispers in your ear. "But what are you willing to do to make that happen?" <<$boydesc[0]>> moves his hand to your shoulder and begins to push you down towards the floor.'
 					act 'Run away (<<will_cost>> Willpower)': gt 'auditions', 'audition_escape'
-					
+
 					act'Don''t resist':gt 'audition_sex1', 'reluctant_bj1'
-					
+
 					act 'Kneel down and blow him': gt 'audition_sex2', 'neutral_bj1'
 				end
-				
+
 				act'"I''ll do anything" (neutral)':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -201,7 +202,7 @@ if $ARGS[0] = 'casting_couch':
 										'"Well let''s see that ass and then we''ll decide if you get the role."'
 										act 'Take off your clothes': gt 'auditions', 'neutral_anal1'
 									end
-									
+
 									act'Give in':
 										cla & *nl
 										'"Okay," you whisper, closing your eyes and taking a deep breath. "Okay. I''ll let you fuck me... If you promise to give me the role."'
@@ -277,7 +278,7 @@ if $ARGS[0] = 'casting_couch':
 										'"Well let''s see that ass and then we''ll decide if you get the role."'
 										act 'Take off your clothes': gt 'auditions', 'neutral_anal1'
 									end
-									
+
 									act'Give in':
 										audition['virgin'] = 1
 										cla & *nl
@@ -335,7 +336,7 @@ if $ARGS[0] = 'casting_couch':
 								gs 'underwear', 'remove'
 								gs 'stat'
 								'"By the way, I''m a virgin," you say hoping to entice him for a more favorable audition, bending over and spreading your pussy lips to show him the proof.'
-								if rand(1,2) = 1:									
+								if rand(1,2) = 1:
 									'"So?" You feel a hovering presence above your hands, a little too high for where he should be to line up with your pussy. "I was going to assfuck you."  And you gasp when his cock immediately starts pushing into your asshole.'
 									act 'Get assfucked': gt 'audition_sex3', 'slutty_assfuck2'
 								else
@@ -401,7 +402,7 @@ if $ARGS[0] = 'casting_couch':
 			end
 		end
 	end
-	
+
 	gs 'willpower','prostitution','self'
 	if will_cost > pcs_willpwr:
 		act'Slut up and offer sexual favors for the role (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -421,7 +422,7 @@ if $ARGS[0] = 'casting_couch':
 				'"Let''s see how good you are first," he responds while pushing you down to your knees.'
 				act 'Kneel down': gt 'audition_sex3', 'slutty_bj1'
 			end
-			
+
 			act'"I''ll fuck you for it"':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -429,7 +430,7 @@ if $ARGS[0] = 'casting_couch':
 				'"Then you''d have to be naked," he says tugging at your clothes.'
 				act 'Strip down': gt 'audition_sex3', 'slutty_fuck'
 			end
-			
+
 			act'"I''ll let you fuck my ass"':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -439,7 +440,7 @@ if $ARGS[0] = 'casting_couch':
 			end
 		end
 	end
-	
+
 !!	if $pantyworntype = 'none' and CloSkirtShortness > 0:
 !!		if pcs_inhib < 40:gs 'willpower','prostitution','self'
 !!		act'Flash your pussy':
@@ -452,7 +453,7 @@ end
 if $ARGS[0] = 'unique':
 	!! this is to leave room for the possibility of having more files than just this one
 	if $audition['role'] = 'Slutty Club Girl':gt 'auditions_minor1', 'SluttyClubGirl'
-	
+
 end
 
 if $ARGS[0] = 'SluttyClubGirl':
@@ -503,7 +504,7 @@ if $ARGS[0] = 'SluttyClubGirl':
 				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
 			end
 			if will_cost <= pcs_willpwr:
-				act 'Flash your tits (<<will_cost>> Willpower)':gt 'auditions_minor1', 'minor1_flash'				
+				act 'Flash your tits (<<will_cost>> Willpower)':gt 'auditions_minor1', 'minor1_flash'
 			else
 				act 'Flash your tits (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You''re too shy to show him your breasts.</font>'
 			end
@@ -569,7 +570,7 @@ if $ARGS[0] = 'minor1_skip_flash':
 			'"How was that?"'
 			act 'Finish the audition': gt 'auditions_minor1', 'minor1_result'
 		end
-		
+
 		act'Just flash him':
 			cla & *clr
 			audition['flash'] = 1
@@ -601,7 +602,7 @@ if $ARGS[0] = 'minor1_skip_flash':
 		'"How was that?"'
 		act 'Finish the audition': gt 'auditions_minor1', 'minor1_result'
 	end
-	
+
 	act'Just flash him':
 		cla & *clr
 		audition['flash'] = 1

+ 55 - 55
locations/autosalonF.qsrc

@@ -2,7 +2,7 @@
 if $ARGS[0] = 'start':
 	$loc_arg = $ARGS[0]
 	$loc = 'autosalonF'
-    $location_type = 'event'
+	$location_type = 'event'
 	menu_off = 1
 	cla
 	*clr
@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''111''">Bentley Continental GT</a>.</TD><TD> - </TD><TD> 13,000,000 <b>₽</b> </TD>'
 	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''112''">Ferrari 458 Italia</a>.</TD><TD> - </TD><TD> 14,000,000 <b>₽</b> </TD>'
 	$car_table += '</table></center>'
-	
+
 	$car_table
 
 	act 'Talk to the manager': gt 'autosalonF', 'manager1'
@@ -59,107 +59,107 @@ if $ARGS[0] = 'manager1':
 	minut += 5
 	'<center><b>Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/cardealer/manager.jpg"></center>'
-	'You have <<karta>> <b>₽</b> in your bank account.'
-	'The manager smiles affably and explains routinely what is required to purchase a car: A driver''s license and the sum, in full, in your bank account.' 
+	'You have <<karta - bankDebtLimit>> <b>₽</b> in your bank account.'
+	'The manager smiles affably and explains routinely what is required to purchase a car: A driver''s license and the sum, in full, in your bank account.'
 	'"With how the economy is right now, we can''t accept payment by installments at this time I''m afraid," he apologizes. "A few new laws have also been passed too: We cannot accept cash payment - the Duma believes that will help fight crime - and it is currently not possible to own more than one car, according to the Oblast''s new anti-corruption law.'
 
-	act 'Leave':gt 'city_industrial'
+	act 'Leave': gt 'city_industrial'
 
 	if prava = 1:
-		if karta + bankDebtLimit >= 535800:
-			act 'Buy a LADA Kalina (535,800 <b>₽</b>)':gt 'autosalonF', 'buy', 535800, 'LADA Kalina', 6, 400
+		if karta >= 535800:
+			act 'Buy a LADA Kalina (535,800 <b>₽</b>)': gt 'autosalonF', 'buy', 535800, 'LADA Kalina', 6, 400
 		end
 
-		if karta + bankDebtLimit >= 645000:
-			act 'Buy a LADA Vesta (645,000 <b>₽</b>)':gt 'autosalonF', 'buy', 645000, 'LADA Vesta', 7, 450
+		if karta  >= 645000:
+			act 'Buy a LADA Vesta (645,000 <b>₽</b>)': gt 'autosalonF', 'buy', 645000, 'LADA Vesta', 7, 450
 		end
 
-		if karta + bankDebtLimit >= 625000:
-			act 'Buy a Chevrolet Niva (625,000 <b>₽</b>)':gt 'autosalonF', 'buy', 625000, 'Chevrolet NIVA', 8, 500
+		if karta >= 625000:
+			act 'Buy a Chevrolet Niva (625,000 <b>₽</b>)': gt 'autosalonF', 'buy', 625000, 'Chevrolet NIVA', 8, 500
 		end
 
-		if karta + bankDebtLimit >= 600000:
-			act 'Buy a UAZ Hunter (600,000 <b>₽</b>)':gt 'autosalonF', 'buy', 600000, 'UAZ HUNTER', 9, 300
+		if karta >= 600000:
+			act 'Buy a UAZ Hunter (600,000 <b>₽</b>)': gt 'autosalonF', 'buy', 600000, 'UAZ HUNTER', 9, 300
 		end
 
-		if karta + bankDebtLimit >= 760000:
-			act 'Buy a UAZ Patriot (760,000 <b>₽</b>)':gt 'autosalonF', 'buy', 760000, 'UAZ Patriot', 10, 400
+		if karta >= 760000:
+			act 'Buy a UAZ Patriot (760,000 <b>₽</b>)': gt 'autosalonF', 'buy', 760000, 'UAZ Patriot', 10, 400
 		end
 
-		if karta + bankDebtLimit >= 884000:
-			act 'Buy a Ford Focus (884,000 <b>₽</b>)':gt 'autosalonF', 'buy', 884000, 'Ford Focus', 13, 800
+		if karta >= 884000:
+			act 'Buy a Ford Focus (884,000 <b>₽</b>)': gt 'autosalonF', 'buy', 884000, 'Ford Focus', 13, 800
 		end
 
-		if karta + bankDebtLimit >= 649990:
-			act 'Buy a Renault LOGAN (649,990 <b>₽</b>)':gt 'autosalonF', 'buy', 649990, 'Renault LOGAN', 102, 1000
+		if karta >= 649990:
+			act 'Buy a Renault LOGAN (649,990 <b>₽</b>)': gt 'autosalonF', 'buy', 649990, 'Renault LOGAN', 102, 1000
 		end
 
-		if karta + bankDebtLimit >= 1329000:
-			act 'Buy a Ford Mondeo (1,329,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1329000, 'Ford Mondeo', 110, 2000
+		if karta >= 1329000:
+			act 'Buy a Ford Mondeo (1,329,000 <b>₽</b>)': gt 'autosalonF', 'buy', 1329000, 'Ford Mondeo', 110, 2000
 		end
 
-		if karta + bankDebtLimit >= 1484000:
-			act 'Buy a Toyota Camry (1,484,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1484000, 'Toyota Camry', 104, 3000
+		if karta >= 1484000:
+			act 'Buy a Toyota Camry (1,484,000 <b>₽</b>)': gt 'autosalonF', 'buy', 1484000, 'Toyota Camry', 104, 3000
 		end
 
-		if karta + bankDebtLimit >= 1749990:
-			act 'Buy a Mitsubishi L200 (1,749,990 <b>₽</b>)':gt 'autosalonF', 'buy', 1749990, 'Mitsubishi L200', 95, 2000
+		if karta >= 1749990:
+			act 'Buy a Mitsubishi L200 (1,749,990 <b>₽</b>)': gt 'autosalonF', 'buy', 1749990, 'Mitsubishi L200', 95, 2000
 		end
 
-		if karta + bankDebtLimit >= 1097000:
-			act 'Buy a Toyota Corolla (1,097,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1097000, 'Toyota Corolla', 103, 3000
+		if karta >= 1097000:
+			act 'Buy a Toyota Corolla (1,097,000 <b>₽</b>)': gt 'autosalonF', 'buy', 1097000, 'Toyota Corolla', 103, 3000
 		end
 
-		if karta + bankDebtLimit >= 1299700:
-			act 'Buy a Mazda 6 (1,299,700 <b>₽</b>)':gt 'autosalonF', 'buy', 1299700, 'Mazda 6', 105, 3000
+		if karta >= 1299700:
+			act 'Buy a Mazda 6 (1,299,700 <b>₽</b>)': gt 'autosalonF', 'buy', 1299700, 'Mazda 6', 105, 3000
 		end
 
-		if karta + bankDebtLimit >= 2950000:
-			act 'Buy a Mercedes-Benz E-Class (2,950,000 <b>₽</b>)':gt 'autosalonF', 'buy', 2950000, 'Mercedes-Benz E-Class', 106, 5000
+		if karta >= 2950000:
+			act 'Buy a Mercedes-Benz E-Class (2,950,000 <b>₽</b>)': gt 'autosalonF', 'buy', 2950000, 'Mercedes-Benz E-Class', 106, 5000
 		end
 
-		if karta + bankDebtLimit >= 2914000:
-			act 'Buy an Audi A6 (2,914,000 <b>₽</b>)':gt 'autosalonF', 'buy', 2914000, 'Audi A6', 109, 5000
+		if karta >= 2914000:
+			act 'Buy an Audi A6 (2,914,000 <b>₽</b>)': gt 'autosalonF', 'buy', 2914000, 'Audi A6', 109, 5000
 		end
 
-		if karta + bankDebtLimit >= 3374000:
-			act 'Buy a Lexus RX 350(3,374,000 <b>₽</b>)':gt 'autosalonF', 'buy', 3374000, 'Lexus RX 350', 97, 4000
+		if karta >= 3374000:
+			act 'Buy a Lexus RX 350(3,374,000 <b>₽</b>)': gt 'autosalonF', 'buy', 3374000, 'Lexus RX 350', 97, 4000
 		end
 
-		if karta + bankDebtLimit >= 2721000:
-			act 'Buy a BMW 3-Seria (2,721,000 <b>₽</b>)':gt 'autosalonF', 'buy', 2721000, 'BMW 3-Seria', 101, 4000
+		if karta >= 2721000:
+			act 'Buy a BMW 3-Seria (2,721,000 <b>₽</b>)': gt 'autosalonF', 'buy', 2721000, 'BMW 3-Seria', 101, 4000
 		end
 
-		if karta + bankDebtLimit >= 7000000:
-			act 'Buy a BMW M5 (7,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 7000000, 'BMW M5', 107, 6000
+		if karta >= 7000000:
+			act 'Buy a BMW M5 (7,000,000 <b>₽</b>)': gt 'autosalonF', 'buy', 7000000, 'BMW M5', 107, 6000
 		end
 
-		if karta + bankDebtLimit >= 5366000:
-			act 'Buy a BMW X6 (5,366,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5366000, 'BMW X6', 99, 4000
+		if karta >= 5366000:
+			act 'Buy a BMW X6 (5,366,000 <b>₽</b>)': gt 'autosalonF', 'buy', 5366000, 'BMW X6', 99, 4000
 		end
 
-		if karta + bankDebtLimit >= 5000000:
-			act 'Buy an Audi Q7 (5,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5000000, 'Audi Q7', 96, 5000
+		if karta >= 5000000:
+			act 'Buy an Audi Q7 (5,000,000 <b>₽</b>)': gt 'autosalonF', 'buy', 5000000, 'Audi Q7', 96, 5000
 		end
 
-		if karta + bankDebtLimit >= 5500000:
-			act 'Buy a Porsche Cayenne (5,500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5500000, 'Porsche Cayenne', 98, 3000
+		if karta >= 5500000:
+			act 'Buy a Porsche Cayenne (5,500,000 <b>₽</b>)': gt 'autosalonF', 'buy', 5500000, 'Porsche Cayenne', 98, 3000
 		end
 
-		if karta + bankDebtLimit >= 6500000:
-			act 'Buy a Jaguar XJ (6,500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 6500000, 'Jaguar XJ', 108, 4000
+		if karta >= 6500000:
+			act 'Buy a Jaguar XJ (6,500,000 <b>₽</b>)': gt 'autosalonF', 'buy', 6500000, 'Jaguar XJ', 108, 4000
 		end
 
-		if karta + bankDebtLimit >= 7600000:
-			act 'Buy a Mercedes-Benz S-Class (7,600,000 <b>₽</b>)':gt 'autosalonF', 'buy', 7600000, 'Mercedes-Benz S-Class', 100, 8000
+		if karta >= 7600000:
+			act 'Buy a Mercedes-Benz S-Class (7,600,000 <b>₽</b>)': gt 'autosalonF', 'buy', 7600000, 'Mercedes-Benz S-Class', 100, 8000
 		end
 
-		if karta + bankDebtLimit >= 13000000:
-			act 'Buy a Bentley Continental GT (13,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 13000000, 'Bentley Continental GT', 111, 8000
+		if karta >= 13000000:
+			act 'Buy a Bentley Continental GT (13,000,000 <b>₽</b>)': gt 'autosalonF', 'buy', 13000000, 'Bentley Continental GT', 111, 8000
 		end
 
-		if karta + bankDebtLimit >= 14000000:
-			act 'Buy a Ferrari 458 Italia (14,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 14000000, 'Ferrari 458 Italia', 112, 10000
+		if karta >= 14000000:
+			act 'Buy a Ferrari 458 Italia (14,000,000 <b>₽</b>)': gt 'autosalonF', 'buy', 14000000, 'Ferrari 458 Italia', 112, 10000
 		end
 	end
 end
@@ -177,10 +177,10 @@ if $ARGS[0] = 'buy':
 	car['current_condition'] = ARGS[4]
 	wrek = 0
 
-	'The manager draws up a purchasing contract, and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
+	'The manager draws up a purchasing contract, and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.'
 	'"It''s waiting for you outside," he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
-	act 'Leave':gt'city_industrial'
+	act 'Leave': gt'city_industrial'
 end
 
 --- autosalonF ---------------------------------

+ 0 - 140
locations/ballet_npc.qsrc

@@ -1,140 +0,0 @@
-# ballet_npc
-!! Date Created: 17th Sept, 2022
-!! Modified date: 11th April, 2024
-!! Version: .01 - initial release
-!! Version: .02 - bug fixes, code refactor and new character variable $npc_img_path to link characters default profile image and related images.
-!! Author: Hooded Silence
-!!
-!! Set up dance school dramatis personae - Start at 3500 to avoid conflicts with main game.
-
-!! Pushkin Ballet School Students - Year one schoot start
-
-npctemp = 3501
-$npc_firstname['A<<npctemp>>'] = 'Maya'
-$npc_nickname['A<<npctemp>>'] = 'Maya'
-$npc_lastname['A<<npctemp>>'] = 'Semionova'
-$npc_usedname['A<<npctemp>>'] = 'Maya'
-$npc_notes['A<<npctemp>>'] = 'Maya is the daughter of Anitchka a freelance coryphée, she was encouraged to dance from a young age until she was nine when she started doing gymnastics. This changed when she was eleven when her mother became ill and she was asked to carry on the family tradition. Maya is a naturally gifted dancer and after six years is tipped to become one of Russia''s leading stars in the future.'
-npc_dob['A<<npctemp>>'] = 19990502
-npc_gender['A<<npctemp>>'] = 1
-npc_bust['A<<npctemp>>'] = 14
-npc_intel['A<<npctemp>>'] = 75
-hotcat_rating['A<<npctemp>>'] = 8
-gs 'npcstaticdefaults', 'defaults'
-gs 'npcstaticdefaults', 'skills', 'dance', 'sport'
-gs 'npcstaticdefaults', 'body', 'model'
-
-!! mod appearance NPC settings, height in cm, weight in kg
-$npc_haircolour['A<<npctemp>>'] = 'Blonde'
-$npc_eyecolour['A<<npctemp>>'] = 'blue'
-$npc_height['A<<npctemp>>'] = str(160)
-$npc_weight['A<<npctemp>>'] = str(50)
-$npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/maya'
-
-npctemp = 3502 
-!! Kima Agapova - The dance critic and fanatical to become a dancer, no matter the cost. Keeps a 'black book' of contacts and information. Arguably the best dancer in the school alongside Maya. She will try and gather information on Sveta's activities.
-!! will try and blackmail Sveta into either giving up if she learns if she's has dirty secrets such as prostitution, slut rep, etc or passing the information to Rudolph to destroy her career to remove her as competition.
-$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
-
-npctemp = 3503
-!! Tanis Komarova - Bitchy dancer who thinks she''s already the Principle Dancer. Age 17. Future concept as the class bully to other dancers and students.
-$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet' 
-
-npctemp = 3504
-!! Galina Molchalina - Quiet and shy student, age 16. Highly secretive and doesn't engage with the class, she also has a nervous personality as if she's afraid. This comes from her family being marked as 'radicals' by the old KGB and under constant watch from FSB even to this day.
-$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet' 
-
-npctemp = 3505 
-!! Taisiya Lebedeva - The eldest student, and an elegant beauty, Age 18. A quiet, but captivating beauty who has a enchanting charismatic presence that men can't keep their eyes off her leading to bitchy remarks from other girls. 
-!! She''s oblivous to her beauty instead focusing on acting and dance. (side note: surname is one of the most common in St P.), she's got a strong religous personality.
-!! Character model: Malta Aurelie
-$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
-
-npctemp = 3506
-!! Nikita Volkova - Bronya''s daughter. Age 16. Keep fit fanatic, and does tap, ballet, etc. As Bronya's daughter she's been given privileged access to the school, whilst not a great talent she's still one of the best dance students at the school but just not at ballet despite Bronya's hopes.
-$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
-
-npctemp = 3507
-$npc_firstname['A<<npctemp>>'] = 'Gasha'
-$npc_nickname['A<<npctemp>>'] = 'Gasha'
-$npc_lastname['A<<npctemp>>'] = 'Morozova'
-$npc_usedname['A<<npctemp>>'] = 'Gasha'
-$npc_notes['A<<npctemp>>'] = 'The youngest in the class at 15, close friend of Nikita as the grew up in the same village. Nikita and Galina are often seen in each others company in the local coffee shop and rarely seen alone leading to rumors. She''s a bit of a foodie, and love sweet things which conflicts with keeping in shape for her dance career.'
-npc_dob['A<<npctemp>>'] = 20000705
-npc_gender['A<<npctemp>>'] = 1
-npc_bust['A<<npctemp>>'] = 9
-npc_intel['A<<npctemp>>'] = 50
-hotcat_rating['A<<npctemp>>'] = 6
-gs 'npcstaticdefaults', 'defaults'
-gs 'npcstaticdefaults', 'skills', 'dance', 'sport'
-gs 'npcstaticdefaults', 'body', 'model'
-
-!! mod appearance NPC settings, height in cm, weight in kg
-$npc_haircolour['A<<npctemp>>'] = 'Brunette'
-$npc_eyecolour['A<<npctemp>>'] = 'Blue'
-$npc_height['A<<npctemp>>'] = str(145)
-$npc_weight['A<<npctemp>>'] = str(40)
-$npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/gasha'
-
-!! Calina
-npctemp = 3508 
-$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
-!! Ruza
-npctemp = 3509 
-$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
-!! Calina and Ruza Sokolova - Twin dancers. Not interested in ballet, but took the course to further their education into becoming dancers. Age 17. They also professional models with a Moscow agency. 
-!! Adel and Alina Fakhteeva twins?
-
-!! Ballet Staff 
-
-npctemp = 3510
-$npc_firstname['A<<npctemp>>'] = 'Rudolf'
-$npc_nickname['A<<npctemp>>'] = 'Rudolf '
-$npc_lastname['A<<npctemp>>'] = 'Baryshnikov'
-$npc_usedname['A<<npctemp>>'] = 'Rudolf'
-npc_dob['A<<npctemp>>'] = 19820920
-$npc_notes['A<<npctemp>>'] = 'Rudolf is a charming and handsome man, he was on course to become one of Russia''s best ballet dancers until a stage accident cut short his career. Today he works at the dance school as a instructor, agent and a board member. Many rumors about his life have swirled around him over the years but none have been proven.'
-npc_gender['A<<npctemp>>'] = 0
-gs 'npcstaticdefaults', 'defaults'
-$npc_thdick['A<<npctemp>>'] = 'slim'
-npc_dick['A<<npctemp>>'] = 10
-npc_sexskill['A<<npctemp>>'] = 2
-npc_intel['A<<npctemp>>'] = 67
-hotcat_rating['A<<npctemp>>'] = 8
-npc_spermpot['A<<npctemp>>'] = 15000
-$npc_img_path['A<<npctemp>>'] = 'images/characters/pushkin/rudolph'
-
-!! class teacher: Biserka Ananiashvili
-npctemp = 3511
-$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
-
-!! class teacher/pianist: Sofia Solovyova
-npctemp = 3512
-$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
-
-!! Residential Warden: Bronya Volkova and former violinist, strict but fair has two daughters with Nikita being the youngest training to be a ballet dancer and her eldest in Germany training to be a surgeon. 
-npctemp = 3513 
-$npc_firstname['A<<npctemp>>'] = 'Bronya'
-$npc_nickname['A<<npctemp>>'] = 'Bronya '
-$npc_lastname['A<<npctemp>>'] = 'Volkova'
-$npc_usedname['A<<npctemp>>'] = 'Bronya'
-gs 'npcstaticdefaults', 'defaults'
-$npc_img_path['A<<npctemp>>'] = 'images/characters/ballet'
-
-!! NPC temp: 3514 - Physio - Pelageya Makarova
-
-!! Make up teacher: Rada Egorova, the teacher never bothers to tell the class after a week. Former stage make up artist, beautician and scatterbrained.
-
-!! Staff Physio -  Syuzanna Zakharova / Klavdii Frolov (Klavdii is a pun)
-!! Mistress of Ballet - Zarya Popova
-
-!! Names f: Boleslava Grigoreva, Esfir Mikhaylova, Gavriila Makarova (warrior),Yustina Vinogradova
-!! Names m: Ipatiy Novikov, Venedikt Sorokin, Ony Volkov, Kazimir Sokolov
-
-killvar 'npctemp'
---- ballet_npc ---------------------------------
-
-
-
-
-

+ 114 - 90
locations/bank.qsrc

@@ -29,6 +29,7 @@ if $ARGS[0] = 'start':
 			act 'Open account':
 				cla
 				bankAccount = 1
+				karta = 5000
 				bankDebtLimit = 5000
 				'You are led to on open office and a member of the bank staff goes through your details and ID, then takes 50 <b>₽</b> from you before setting up your account'
 				'"Your account is now open with your 50 <b>₽</b> and an overdraft protection of 5,000 <b>₽</b>"'
@@ -61,23 +62,23 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if karta + bankDebtLimit > 0:
+		if karta > 0:
 			act 'Withdraw money':
 				cla
 				menu_off = 1
 				kartaOUT = input ("How much do you want to withdraw from account?")
 
-				if kartaOUT <= 0 or kartaOUT > karta + bankDebtLimit:
+				if kartaOUT <= 0 or kartaOUT > karta:
 					'That is not a valid operation.'
 				else
 					karta -= kartaOUT
 					money += kartaOUT
-					if karta > 0:
-						'<br>You withdraw <<kartaOUT>> <b>₽</b>. You have <<karta>> <b>₽</b> left in your bank account.'
-					elseif karta = 0:
+					if karta > bankDebtLimit:
+						'<br>You withdraw <<kartaOUT>> <b>₽</b>. You have <<karta - bankDebtLimit>> <b>₽</b> left in your bank account.'
+					elseif karta = bankDebtLimit:
 						'<br>You withdraw <<kartaOUT>> <b>₽</b>. You have no money left in your bank account.'
 					else
-						'<br>You withdraw <<kartaOUT>> <b>₽</b>. <font color="red">Your bank account is overdrawn by <b><<karta>> ₽</b>.</font>'
+						'<br>You withdraw <<kartaOUT>> <b>₽</b>. <font color="red">Your bank account is overdrawn by <b><<bankDebtLimit - karta>> ₽</b>.</font>'
 					end
 				end
 				killvar 'kartaOUT'
@@ -86,25 +87,25 @@ if $ARGS[0] = 'start':
 				act 'Walk away':gt 'bank', 'start'
 			end
 
-			if bankDebtLimitRaised = 0 and karta >= 10000:
+			if bankDebtLimitRaised = 0 and karta >= 15000:
 				act 'See about increasing your credit limit':
 					if $region = 'city':
 						gt 'bank', 'loan_officer', 'start'
 					else
-						'You approach the teller and say, “Hello, Id like to talk to someone about increasing my credit limit.”'
+						'You approach the teller and say, “Hello, I''d like to talk to someone about increasing my credit limit.”'
 						*nl
-						'The teller nods and tells you, “Unfortunately our credit limit functions are being handled through our Saint Petersburg branch. I’m sure they’d be happy to help you there.”'
+						'The teller nods and tells you, “Unfortunately our credit limit functions are being handled through our Saint Petersburg branch. I''m sure they''d be happy to help you there.”'
 						delact 'See about increasing your credit limit'
 					end
 				end
 			end
 		end
-		if karta >= 0:
-			'You have <<karta>> <b>₽</b> in your account.'
+		if karta >= bankDebtLimit:
+			'You have <<karta - bankDebtLimit>> <b>₽</b> in your account.'
 			'You can take out a loan of <font color="blue"><<bankDebtLimit>></font>!'
 		else
-			'You hava a debt of <font color="red"><<-1 * karta>></font> <b>₽</b>.'
-			'You can take out a loan of <font color="blue"><<bankDebtLimit + karta>></font>!'
+			'You hava a debt of <font color="red"><<bankDebtLimit - karta>></font> <b>₽</b>.'
+			'You can take out a loan of <font color="blue"><<karta>></font>!'
 		end
 	end
 
@@ -340,9 +341,9 @@ if $ARGS[0] = 'loan_officer':
 			gs 'fame', 'city', 'sex', 3
 			gs 'arousal', 'end'
 
-			bankDebtLimit = 50000
-			money += karta + bankDebtLimit
-			karta = -bankDebtLimit
+			bankDebtLimit += 45000
+			money += 45000
+
 			bankDebtLimitRaised = 1
 			minut += 30
 			gs 'stat'
@@ -352,6 +353,23 @@ if $ARGS[0] = 'loan_officer':
 	end
 end
 
+
+if $ARGS[0] = 'deposit_cash':
+	kartaIN = input ("How much money do you want to deposit into your account?")
+
+	if kartaIN <= 0 or kartaIN > money:
+		'Invalid operation.'
+	else
+		atmDeposit[] += kartaINATM - 100
+		atmDepositDate[] = daystart + 2
+		money -= kartaINATM
+
+		'<br>You deposit <<kartaINATM>> <b>₽</b> into your account.'
+		'It will take 2 days for funds to be available. Your new balance will be <<karta - bankDebtLimit + atmDeposit[]>> <b>₽</b>.'
+	end
+end
+
+
 if $ARGS[0] = 'cikl':
 	!!------------------------------------------------------------------------------------------------------------
 	!!	Banking
@@ -359,9 +377,9 @@ if $ARGS[0] = 'cikl':
 
 	!!MJ: Add some (daily) interest to the bank account.
 	!!Not very realistic but won''t make anyone too rich.
-	
+
 	if bankAccount = 1:
-		kartatotal = karta
+		kartatotal = karta - bankDebtLimit
 		:kartaloop
 		if kartatotal > 20000000:
 			kartacount += 1
@@ -371,10 +389,10 @@ if $ARGS[0] = 'cikl':
 		else
 			largekarta[0] = kartatotal
 		end
-		if karta >= 2000000:
+		if karta - bankDebtLimit >= 2000000:
 			!! yearly interest of 2.3% recalculated into daily interest = 0.006% daily
 			intrate = 60
-		elseif karta >= 0:
+		elseif karta - bankDebtLimit >= 0:
 			!! yearly interest of 1.15% recalculated into daily interest = 0.003% daily
 			intrate = 30
 		else
@@ -382,16 +400,16 @@ if $ARGS[0] = 'cikl':
 			intrate = 550
 		end
 		:intloop
-		if kartacount > 0:
+		if kartacount = 0:
+			smallmoneypos += (largekarta[0] * intrate)
+			largekarta[0] = 0
+			if kartacount ! 0: kartacount = 0
+		else
 			smallmoneypos += (largekarta[kartacount] * intrate)
 			if smallmoneypos >= 1000000 or smallmoneypos <= -1000000: karta += smallmoneypos / 1000000 & smallmoneypos = smallmoneypos mod 1000000
 			largekarta[kartacount] = 0
 			kartacount -= 1
 			jump 'intloop'
-		else
-			smallmoneypos += (largekarta[0] * intrate)
-			largekarta[0] = 0
-			if kartacount ! 0: kartacount = 0
 		end
 
 		if smallmoneypos >= 1000000 or smallmoneypos <= -1000000:
@@ -399,21 +417,34 @@ if $ARGS[0] = 'cikl':
 			smallmoneypos = smallmoneypos mod 1000000
 		end
 
-		if atmDeposit > 0 and atmDepositDate <= daystart:
-			karta += atmDeposit
-			atmDeposit = 0
+
+		bank_i = 0
+		:atmdeposit_loop
+		if arrsize('atmDeposit') > 0:
+			if atmDepositDate[bank_i] <= daystart:
+				if atmDeposit[bank_i] > 0:
+					karta += atmDeposit[bank_i]
+				end
+				killvar 'atmDeposit', bank_i
+				killvar 'atmDepositDate', bank_i
+			else
+				bank_i += 1
+			end
+			jump 'atmdeposit_loop'
 		end
+		killvar 'bank_i'
+
 
 
 		! Daily Internet and mobile checks
 		$internet_action_messages = func('internet_mobile', 'check_subscription_actions')
-		count = ARRSIZE('$internet_action_messages')
-		i = 0
+		count = arrsize('$internet_action_messages')
+		bank_i = 0
 		:loop_messages
-			if $internet_action_messages[i] ! '': *pl $internet_action_messages[i]
-			i += 1
-		if i < count: jump 'loop_messages'
-		killvar 'i'
+			if $internet_action_messages[bank_i] ! '': *pl $internet_action_messages[bank_i]
+			bank_i += 1
+		if bank_i < count: jump 'loop_messages'
+		killvar 'bank_i'
 		killvar 'count'
 	end
 
@@ -421,15 +452,33 @@ if $ARGS[0] = 'cikl':
 	!!	Payments
 	!!------------------------------------------------------------------------------------------------------------
 
-	if day = 25:
+	if day ! 25:
+		if paydayHusb = 1:paydayHusb = 0
+		if workKafe['job'] = 1 and paydayKafe = 1:paydayKafe = 0
+		if workSec = 1 and paydaySec = 1:paydaySec = 0
+		!! No idea what haday is, it does not show up anywhere else beyond this one line
+		!! All the checks for the whether Sveta owns certain properties make no sense, if it is the 25th, haday, electroday and
+		!! kabelday are set to 0. The fact that Sveta doesn''t own or rent properties only means that their value is meaningless
+		!! anyway.
+		if haday = 1: haday = 0
+		if electroday = 1: electroday = 0
+		if kabelday = 1: kabelday = 0
+		if scholarshipday = 1: scholarshipday = 0
+		if nopaytanwork = 1: nopaytanwork = 0
+		if nopaypoly = 1: nopaypoly = 0
+		if nopaysalon = 1: nopaysalon = 0
+		if paydaybistrosec = 1: paydaybistrosec = 0
+
+	else
 		!! meynold payment
-		if	mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] < 10 and mey_tamara['qw_end'] = 0:
-			karta += 10000
-			'<b><font color=green>For your efforts aunt Tamara gave you 10,000 rubles</font></b>'
-			mey_tamara['help_count'] = 0
-		elseif mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] >= 10 and mey_tamara['qw_end'] = 0:
-			karta += 15000
-			'<b><font color=green>For your efforts aunt Tamara gave you 15,000 rubles</font></b>'
+		if mey_vika['mey_vika_qw'] >= 35 and mey_tamara['qw_end'] = 0:
+			if mey_tamara['help_count'] < 10:
+				karta += 10000
+				'<b><font color=green>For your efforts aunt Tamara gave you 10,000 rubles</font></b>'
+			else
+				karta += 15000
+				'<b><font color=green>For your efforts aunt Tamara gave you 15,000 rubles</font></b>'
+			end
 			mey_tamara['help_count'] = 0
 		end
 
@@ -507,14 +556,14 @@ if $ARGS[0] = 'cikl':
 		! Utilities for all apartments.
 		if func('homes_properties', 'get_owned_homes_count') > 0 and electroday = 0:
 			gs 'housing', 'util'
-			if bankAccount = 1 and karta >= elektro:
+			if bankAccount = 1 and karta - bankDebtLimit >= elektro:
 				'<b><font color="green"><<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account.</font></b>'
 				electroday = 1
 				if elektro >= 2000:
 					elektro = 2000 + rand(0, 100)
 					karta -= elektro * hcount_util
 				end
-			elseif bankAccount = 1 and karta + bankDebtLimit >= elektro:
+			elseif bankAccount = 1 and karta >= elektro:
 				'<b><font color="green"><<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account and overdraw facility. Please contact your bank.</font></b>'
 				electroday = 1
 				if elektro >= 2000:
@@ -536,11 +585,11 @@ if $ARGS[0] = 'cikl':
 		! Cable for all apartments
 		if kabel > 0 and kabelday = 0:
 			gs 'housing', 'cable'
-			if bankAccount = 1 and karta >= (300 * hcount_cable):
+			if bankAccount = 1 and karta - bankDebtLimit >= (300 * hcount_cable):
 				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account, for you cable TV subscription.</font></b>'
 				kabelday = 1
 				karta -= 300 * hcount_cable
-			elseif bankAccount = 1 and karta + bankDebtLimit >= (300 * hcount_cable):
+			elseif bankAccount = 1 and karta >= (300 * hcount_cable):
 				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account and overdraw facility, for you cable TV subscription.</font></b>'
 				kabelday = 1
 				karta -= 300 * hcount_cable
@@ -552,69 +601,44 @@ if $ARGS[0] = 'cikl':
 				'<b><font color="red">Your card was declined during automatic debit of 300 <b>₽</b> for cable TV subscription.</font></b>'
 			end
 		end
-
-	end
-
-
-	if day ! 25:
-		if paydayHusb = 1:paydayHusb = 0
-		if workKafe['job'] = 1 and paydayKafe = 1:paydayKafe = 0
-		if workSec = 1 and paydaySec = 1:paydaySec = 0
-		!! No idea what haday is, it does not show up anywhere else beyond this one line
-		!! All the checks for the whether Sveta owns certain properties make no sense, if it is the 25th, haday, electroday and 
-		!! kabelday are set to 0. The fact that Sveta doesn''t own or rent properties only means that their value is meaningless
-		!! anyway.
-		if haday = 1: haday = 0
-		if electroday = 1: electroday = 0
-		if kabelday = 1: kabelday = 0
-		if scholarshipday = 1: scholarshipday = 0
-		if nopaytanwork = 1: nopaytanwork = 0
-		if nopaypoly = 1: nopaypoly = 0
-		if nopaysalon = 1: nopaysalon = 0
-		if paydaybistrosec = 1: paydaybistrosec = 0
 	end
 
 	!! Checking for tenants moving out
 	gs 'homes_properties', 'tenant_move_out_check'
-	
 
 	!!----------------------------------------
 	!! Rent
 	!!----------------------------------------
 	!! property_rent, property_days, $property_name, $property_display $property_code
 	gs 'homes_properties', 'get_rented_properties'
-	count = ARRSIZE('property_name')
-	if count > 0:
-		i = 0
+	bank_count = ARRSIZE('property_name')
+	if bank_count > 0:
+		bank_i = 0
 		:loop_rent_payments
-			if property_days[i] <= 2:
+			if property_days[bank_i] <= 2:
 				!From bank
-				if property_days[i] <= 0:
-					gs 'homes_properties', 'cancel_rent', $property_code[i]
-				elseif bankAccount = 1 and karta >= property_rent[i]:
-					'<b><font color="green">Your rent payment of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>, has automatically been deducted from your bank account.</font></b>'
-					gs 'homes_properties', 'pay_rent', $property_code[i], 'card'
-					!karta -= property_rent[i]
-					!gs 'homes_properties', 'add_rent_days', $property_code[i]
-				elseif bankAccount = 1 and karta + bankDebtLimit >= property_rent[i]:
-					'<b><font color="green">Your rent payment of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>, has automatically been deducted from your bank account and overdraw facility. Please contact your bank regarding your overdraw repayment.</font></b>'
-					gs 'homes_properties', 'pay_rent', $property_code[i], 'card'
-					!karta -= property_rent[i]
-					!gs 'homes_properties', 'add_rent_days', $property_code[i]
+				if bankAccount = 1 and karta >= property_rent[bank_i]:
+					'<b><font color="green">Your rent payment of <<property_rent[bank_i]>> <b>₽</b> for your <<$property_name[bank_i]>>, has automatically been deducted from your bank account' + iif(karta >= bankDebtLimit, '', ' and overdraw facility. Please contact your bank regarding your overdraw repayment') + '.</font></b>'
+					gs 'homes_properties', 'pay_rent', $property_code[bank_i], 'card'
+					!karta -= property_rent[bank_i]
+					!gs 'homes_properties', 'add_rent_days', $property_code[bank_i]
+				elseif property_days[bank_i] <= 0:
+					gs 'homes_properties', 'cancel_rent', $property_code[bank_i]
 				elseif bankAccount = 0:
-					'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>. To avoid eviction, please make a manual payment as soon as possible.</font></b>'
+					'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<property_rent[bank_i]>> <b>₽</b> for your <<$property_name[bank_i]>>. To avoid eviction, please make a manual payment as soon as possible.</font></b>'
 				else
 					nl
-					'<b><b><font color="red">Your card was declined during automatic rent deduction of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>. To avoid eviction, please rectify as soon as possible.</font></b>'
+					'<b><b><font color="red">Your card was declined during automatic rent deduction of <<property_rent[bank_i]>> <b>₽</b> for your <<$property_name[bank_i]>>. To avoid eviction, please rectify as soon as possible.</font></b>'
 				end
 			end
-			i += 1
-		if i < count: jump 'loop_rent_payments'
+			bank_i += 1
+		if bank_i < bank_count: jump 'loop_rent_payments'
 		gs 'homes_properties', 'clean_up_property_data'
-		killvar 'i'
+		killvar 'bank_i'
 	end
+	killvar 'bank_count'
 	!!------------------------------------------------------------------------------------------------------------
-
 end
---- bank ---------------------------------
 
+
+--- bank ---------------------------------

+ 4 - 4
locations/bdsm_mansion.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'start':
 				act 'Enter the club':gt 'bdsm_hallway', 'foyer'
 			end
 		end
-		gs 'taxi'		
+		gs 'taxi'
 	else
 		act 'Go to the elite settlement':gt 'city_suburbs', 'start'
 	end
@@ -155,7 +155,7 @@ if $ARGS[0] = 'office':
 		*nl
 		'You cannot afford the 10,000 rubes required to extend your club membership.'
 	else
-		if money > 10000:
+		if money >= 10000:
 			act 'Pay 10,000 <b>₽</b> to extend your membership and return to the dressing room':
 				bdsmclub['payday'] = daystart
 				bdsmclub['training_daystart'] = daystart
@@ -163,11 +163,11 @@ if $ARGS[0] = 'office':
 				gt 'bdsm_dressing'
 			end
 		end
-		if karta > 10000:
+		if karta >= 10000:
 			act 'Pay 10,000 <b>₽</b> to extend your membership and return to the dressing room':
 				bdsmclub['payday'] = daystart
 				bdsmclub['training_daystart'] = daystart
-				money -= 10000
+				karta -= 10000
 				gt 'bdsm_dressing'
 			end
 		end

+ 0 - 0
locations/BDSM_training.qsrc → locations/bdsm_training.qsrc


+ 3 - 3
locations/bed2.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'main':
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
 	end
 	*nl
-	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt ''bed2'', ''main''">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt ''bed2'', ''main''">ON</a>.')
+	func('alarmclock', 'base_alarmclock_text')
 	*nl
 	gs 'bed2', 'wear_panties_decider'
 	*nl
@@ -64,10 +64,10 @@ if $ARGS[0] = 'main':
 	act 'Get out of bed': gt 'bed_get_out', 'start'
 	act 'Take a nap (1:00)': gs 'sleep_simple', 'nap_bed'
 
-	gs 'events', 'read'
+	gs 'library_functions', 'set_home_read_acts'
 
 	if $loc ! 'bedrPar' or locat['Anya_inroom'] = 0 or locat['Anya'] = 1 or locat['Anya'] = 26:
-		if mc_inventory['mag_porn'] > 0: gs 'events', 'read_porn'
+		gs 'library_functions', 'set_read_porn_act'
 		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and (fame['pav_slut'] >= 150 or (fame['pav_slut'] >= 50 and pcs_inhib >= 60))):
 			act 'Masturbate':
 				InSleep = 0

+ 18 - 18
locations/bed_events.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			$sleep_events[] = 'gs ''bed_events'', ''vor'' '
 		end
 
-		gt 'bed_events', 'mod_sleepevents'
+		xgt 'bed_events', 'mod_sleepevents'
 	end
 
 	gt 'bed_events', 'continue'
@@ -52,7 +52,7 @@ if $ARGS[0] = 'mod_sleepevents':
 	!! IT WILL ALMOST CERTIANLY END BADLY WHEN MORE THAN 1 MOD IS INVOLVED.
 
 	gs 'LOCA', 'bed_events', 'mod_sleepevents'
-	gt 'bed_events', 'event_handler'
+	xgt 'bed_events', 'event_handler'
 end
 
 
@@ -65,12 +65,12 @@ if $ARGS[0] = 'event_handler':
 		end
 	end
 
-	gt 'bed_events', 'continue'
+	xgt 'bed_events', 'continue'
 end
 
 if $ARGS[0] = 'event_handler2':
 	sleepVars['events_done'] += 1
-	
+
 	if $ARGS[1] = 'priority':
 		temp_slev_id = rand(0, arrsize('$sleep_events_priority')-1)
 		$temp_sleep_event_chosen = $sleep_events_priority[temp_slev_id]
@@ -84,7 +84,7 @@ if $ARGS[0] = 'event_handler2':
 	killvar 'temp_slev_id'
 	dynamic $temp_sleep_event_chosen
 
-	gs 'bed_events', 'event_end'
+	xgt 'bed_events', 'event_end'
 end
 
 
@@ -94,7 +94,7 @@ if $ARGS[0] = 'event_end':
 !!		gt 'bed_events', 'event_handler2', 'priority'
 !!	end
 
-	gt 'bed_events', 'event_handler'
+	xgt 'bed_events', 'event_handler'
 end
 
 
@@ -114,7 +114,7 @@ if $ARGS[0] = 'continue':
 	killvar 'temp_slev_id'
 	killvar '$temp_sleep_event_chosen'
 
-	gt 'bed2', 'start'
+	xgt 'bed2', 'start'
 end
 
 
@@ -158,7 +158,7 @@ if $ARGS[0] = 'rab2':
 
 		gs 'arousal', 'bj', 5, 'sub', 'lesbian'
 		gs 'stat'
-		
+
 		act 'Lie down':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r2.jpg"></center>'
@@ -167,7 +167,7 @@ if $ARGS[0] = 'rab2':
 
 			gs 'arousal', 'bj', 5, 'sub', 'lesbian', 'rough'
 			gs 'stat'
-		
+
 			act 'Get up':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r3.jpg"></center>'
@@ -232,7 +232,7 @@ if $ARGS[0] = 'vor2':
 		act 'Scream': gt 'bed_events', 'vor3'
 
 	else
-		if dog_bravery = 0: 
+		if dog_bravery = 0:
 			dog_bravery = rand(1,100)
 		end
 
@@ -252,7 +252,7 @@ if $ARGS[0] = 'vor2':
 			act 'Check the lock':
 				cla
 				'You check the lock on the door and it appears to be intact. You''re not sure if you forgot to lock the door when you came in or if the lock was picked. Maybe you should have a second one installed...'
-				act 'Lock the door': 
+				act 'Lock the door':
 					gs 'bed_events', 'exit'
 					gt 'korr'
 				end
@@ -293,7 +293,7 @@ if $ARGS[0] = 'vor3':
 
 			gs 'arousal', 'bj', 15, 'rough', 'sub', 'group', 'bound'
 			gs 'stat'
-			
+
 			act 'Get up':
 				*clr & cla
 				orgasm += 1
@@ -314,8 +314,8 @@ if $ARGS[0] = 'vor3':
 				gs 'arousal', 'vaginal', 15, 'rough', 'sub', 'group', 'bound'
 				minut -= 15
 				gs 'stat'
-			
-				act 'Continue': 
+
+				act 'Continue':
 					picrand = 38
 					gs 'bed_events', 'exit'
 					xgt 'sexdvoe', 'var'
@@ -381,7 +381,7 @@ if $ARGS[0] = 'mast':
 				$orgasm_or = 'custom'
 				gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 				gs 'arousal', 'end'
-				
+
 				act 'Breathe': gs 'bed_events', 'event_end'
 
 			else
@@ -431,7 +431,7 @@ if $ARGS[0] = 'mast':
 								$orgasm_or = 'custom'
 								gs 'arousal', 'end'
 								gs 'stat'
-						
+
 								act 'Finish': gs 'bed_events', 'event_end'
 							end
 						end
@@ -499,7 +499,7 @@ if $ARGS[0] = 'mast':
 							gs 'arousal', 'vaginal_dildo', 10
 							gs 'arousal', 'bj', -10
 							gs 'stat'
-						
+
 							act 'Spread your legs ':
 								picrand = 89
 								gs 'bed_events', 'exit'
@@ -523,7 +523,7 @@ if $ARGS[0] = 'mast':
 								gs 'arousal', 'anal_dildo', 5
 								gs 'arousal', 'bj', -10
 								gs 'stat'
-								
+
 								act 'Offer your ass':
 									picrand = 89
 									gs 'bed_events', 'exit'

+ 4 - 4
locations/bed_get_out_events.qsrc

@@ -20,14 +20,14 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	if sleepVars['events_active'] = 1:
 		sleepVars['events_done'] = 0
-		
+
 		if vomit['morning_sick'] = 1 or vomit['hangover'] = 1 or vomit['unlucky'] = 1:
 			$sleep_events[] = 'gs ''bed_get_out_events'', ''vomit'' '
 		end
 
 		xgt 'bed_get_out_events', 'mod_sleepevents'
 	end
-	
+
 	xgt 'bed_get_out_events', 'continue'
 end
 
@@ -61,7 +61,7 @@ if $ARGS[0] = 'event_handler':
 		end
 	end
 
-	gs 'bed_get_out_events', 'continue'
+	xgt 'bed_get_out_events', 'continue'
 end
 
 if $ARGS[0] = 'event_handler2':
@@ -80,7 +80,7 @@ if $ARGS[0] = 'event_handler2':
 	killvar 'temp_slev_id'
 	dynamic $temp_sleep_event_chosen
 
-	gs 'bed_get_out_events', 'event_end'
+	xgt 'bed_get_out_events', 'event_end'
 end
 
 

+ 4 - 8
locations/bedr.qsrc

@@ -17,8 +17,8 @@ if rembedr = 0:
 	*nl
 	'A tight, little room with a <a href="exec:gt ''bed'', ''start''">double bed</a>.'
 	*nl
-	
-	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+
+	func('alarmclock', 'base_alarmclock_text')
 
 	*nl
 	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor. The windows are closed with faded, heavy curtains.'
@@ -27,11 +27,7 @@ else
 	*nl
 	'A bright and beautiful room, with a large, kingsized <a href="exec:gt ''bed'', ''start''">double bed</a>.'
 	*nl
-	if alarmOn = 0:
-		'There is an <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> on the bedside table, and it is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> and is currently turned <a href="exec: alarmVars[''alarmOn''] = 1 & gt ''<<$loc>>''">off</a>.'
-	else
-		'There is an <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> on the bedside table, and it is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> and is currently turned <a href="exec: alarmVars[''alarmOn''] = 0 & gt ''<<$loc>>''">on</a>.'
-	end
+	'There is an <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> on the bedside table, and it is set to <<func(''alarmclock'', ''get_week_display'')>> during the week and <<func(''alarmclock'', ''get_weekend_display'')>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
 	*nl
 	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor. Against the wall stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
 end
@@ -203,7 +199,7 @@ if pcs_horny >= 50: act 'Masturbate': gt 'selfplay', 'start'
 
 if mc_inventory['mag_porn'] > 0:
 	'You hide a porn magazine under your mattress.'
-	gs 'events', 'read_porn'
+	gs 'library_functions', 'set_read_porn_act'
 end
 gs 'subkid'
 

+ 2 - 2
locations/bedr2x.qsrc

@@ -23,7 +23,7 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt 'tobiQW', 'start'
 'A bright and beautiful bedroom, with modern and stylish furniture.'
 *nl
 'The room is dominated by <a href="exec:gt ''bed'',''start''">full sized bed</a>'
-'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+func('alarmclock', 'base_alarmclock_text')
 *nl
 'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 *nl
@@ -193,7 +193,7 @@ if pcs_horny >= 50: act 'Masturbate': gt 'selfplay', 'start'
 
 if mc_inventory['mag_porn'] > 0:
 	'You have hidden a porn magazine under your mattress.'
-	gs 'events', 'read_porn'
+	gs 'library_functions', 'set_read_porn_act'
 end
 
 gs 'subkid'

+ 28 - 93
locations/bedrPar.qsrc

@@ -4,7 +4,7 @@
 fromoutside = iif($loc = 'bedrPar',0,1)
 menu_off = 0
 minut += 1
-!!day check so mom doesn''t think you have been out all night if you get up very early 
+!!day check so mom doesn''t think you have been out all night if you get up very early
 motherworry[1] = daystart
 gs 'shortgs', 'setloc', 'bedrPar', $ARGS[0]
 $location_type = 'private'
@@ -43,7 +43,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		'As soon as you enter the room, you rush over to <<$ParrotQW[''Name'']>>''s cage and pour the contents of the vial into his water bowl. You hope this will work and keep him from spilling you and your sister''s bedroom secrets.'
 		ParrotQW['Level'] = 3
 		ParrotQW['Day'] = 3
-		
+
 		act 'Continue':gt $loc, $loc_arg
 	elseif ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1 and func('homes_properties', 'is_current_home'):
 		*clr & cla
@@ -55,14 +55,14 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		ParrotQW['Day'] = 2
 		ParrotQW['Failed'] = 0
 		gs 'stat'
-		
+
 		act 'Continue':gt $loc, $loc_arg
 	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and locat['Anya_inroom'] = 0 and func('homes_properties', 'can_live_here'):
 		gt 'tobiQW', 'start'
-		
-	elseif locat['Anya'] = 11 and func('homes_properties', 'can_live_here'): 
+
+	elseif locat['Anya'] = 11 and func('homes_properties', 'can_live_here'):
 		gt 'sisterQW', 'sisboyQW_expel'
-		
+
 	elseif locat['Anya_inroom'] = 1 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0 and func('homes_properties', 'is_current_home'):
 		*clr & cla
 		menu_off = 1
@@ -103,22 +103,22 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		if ParrotQW['Owned2'] = 1 and func('homes_properties', 'is_current_home'):
 			'<a href="exec:gt ''popu'',''start2''"><<$ParrotQW[''Name2'']>></a> is sitting in his cage'
-			if daystart - ParrotQW['BuyDate'] <= 10: 
+			if daystart - ParrotQW['BuyDate'] <= 10:
 				'<<$ParrotQW[''Name2'']>> starts squawking at you when you enter the room.'
-			elseif daystart - ParrotQW['BuyDate'] <= 20: 
+			elseif daystart - ParrotQW['BuyDate'] <= 20:
 				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. It sounds almost like he is saying "<b>Hello <<$pcs_nickname>>!</b>"'
-			elseif daystart - ParrotQW['BuyDate'] <= 30: 
+			elseif daystart - ParrotQW['BuyDate'] <= 30:
 				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is clearly saying "<b>Hello <<$pcs_nickname>>!</b>"'
-			elseif daystart - ParrotQW['BuyDate'] <= 35: 
+			elseif daystart - ParrotQW['BuyDate'] <= 35:
 				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty!</b>"'
-			elseif daystart - ParrotQW['BuyDate'] <= 40: 
+			elseif daystart - ParrotQW['BuyDate'] <= 40:
 				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Great body, <<$pcs_nickname>>!</b>"'
-			elseif daystart - ParrotQW['BuyDate'] <= 50: 
+			elseif daystart - ParrotQW['BuyDate'] <= 50:
 				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>You''re the best, Anya!</b>"'
-			elseif daystart - ParrotQW['BuyDate'] <= 55: 
+			elseif daystart - ParrotQW['BuyDate'] <= 55:
 				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah, that''s it Anya! Swallow it all!</b>"'
 			else
-				if ParrotQW['Level'] < 3: 
+				if ParrotQW['Level'] < 3:
 					'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Your pussy tastes great, Anya!</b>"'
 				else
 					parfixrand = rand(0,9)
@@ -128,7 +128,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 					if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Here kitty, kitty!</b>"'
 					if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>I just met you, and this is crazy!</b>"'
 					if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Bow before me!</b>"'
-					if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Hes just a friend, honest!</b>"'
+					if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>He''s just a friend, honest!</b>"'
 					if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you do to my socks?</b>"'
 					if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>That''s what she said!</b>"'
 					if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Help! They''ve turned me into a parrot!</b>"'
@@ -139,7 +139,8 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		end
 
 		if func('homes_properties', 'can_live_here'):
-			'<table><tr><td valign="top">Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+			'<table><tr><td valign="top">'
+			func('alarmclock', 'base_alarmclock_text')
 
 			if mc_inventory['contraceptive_pill'] > 0 and mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 				'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
@@ -148,7 +149,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			elseif mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 				'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
 			end
-			
+
 			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and detention_warning ! daystart:
 				detention_warning = daystart
 				msg 'You have detention this morning and must be at school before 09:00.'
@@ -188,10 +189,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 						gt 'sister_chat', 'sex_room_talk1'
 					end
 					'<a href="exec:gt ''sister_chat'', ''talking''">Anya</a> is sitting on her bed, reading a book.'
-				elseif locat['Anya'] = 26 or (locat['Anya'] = 1 and locat['Anya_party_day'] >= daystart - 1):
-					if sisboypartyQW = 1: sisboypartyQW = 2
-					if sisboyparty = -1: sisboyparty = 1
-					'A drunken <a href="exec:gt ''sistersleep'', ''drunk_after_party''">Anya</a> is sound asleep in her bed.'
 				end
 			end
 		end
@@ -201,17 +198,20 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			gt 'korrPar'
 		end
 
+		!!allows quick change to and from default school and sports clothing
+		gs 'wardrobe', 'default_clothing_options'
+
 		if func('homes_properties', 'can_live_here'):
 			act 'Relax on your bed': gt 'bed', 'start'
 			act 'Open wardrobe': gt 'wardrobe', 'start'
 			gs 'prostitution_functions', 'prostitute_outfit_at_home'
-			
+
 			if mc_inventory['mag_porn'] > 0:'You have hidden your porn magazines under the mattress of your bed.'
 			!!Masturbation, allowed after sister threesome (when sis_watch is used for a message) or sister not here.
 			sis_watch = 0
 
 			if locat['Anya_inroom'] = 0 or sisboytrio > 0:
-				if mc_inventory['mag_porn'] > 0:gs 'events', 'read_porn'
+				gs 'library_functions', 'set_read_porn_act'
 				if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
 					act 'Send Rex a text message': gt 'rex_events','sms'
 				end
@@ -223,14 +223,14 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 				 if mc_inventory['card'] > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
 			end
 
-			gs 'events', 'read'
+			gs 'library_functions', 'set_home_read_acts'
 
 			if mc_inventory['trinkets_home'] > 0:'You currently have <<mc_inventory[''trinkets_home'']>> trinkets to sell at the station. The maximum you can carry is 30.'
 
 			if locat['Anya_inroom'] = 0: dynamic $palelady
-			
+
 			gs 'wardrobe', 'default_sport_options'
-			
+
 			gs 'exercise', 'start'
 
 			if mc_inventory['sewing_kit'] = 1:
@@ -238,7 +238,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 				*nl
 				if mc_inventory['sewing_fabric'] <= 0:'You do not have any fabric.'
 				if pcs_sewng >= 80:
-					if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0: 
+					if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0:
 						act 'Start a new tapestry': gt 'sewing', 'tapestry'
 					elseif newgobelen >= 1:
 						'Your tapestry is <<newgobelen/10>> percent finished.'
@@ -275,74 +275,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		if func('homes_properties', 'is_current_home'): gs 'subkid'
 		'</td></tr></table>'
 
-		!! NOTE: This has to go here, otherwise gs 'subkid' removes the icon. 
+		!! NOTE: This has to go here, otherwise gs 'subkid' removes the icon.
 		gs 'music_actions', 'start'
 	end
 end
 
-if $ARGS[0] = 'intro':
-	CLOSE ALL
-	grandmaQW['last_month_paid'] = month
-	menu_off = 1
-	hour = 6
-	gs 'stat'
-	music_loop = 0
-	'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-	'You sudenly hear a familiar voice yelling out. "<<$pcs_nickname>>, time to get up! You can''t spend the whole day laying around!"'
-	wait 1000
-	$temp_nickname = input('<center>What name do you address your mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
-	if $temp_nickname ! '':$npc_nickname['A29'] = '<<$temp_nickname>>'
-	killvar '$temp_nickname'
-	act 'Continue':
-		cla & *clr
-		minut += 2
-		gs 'stat'
-		'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-		'You tiredly open your eyes and see your mother standing over you. "Fifteen more minutes..." you mumble.'
-		'Your mother lets out a loud sigh. "No, up now!" she says as she yanks the covers off.'
-		'"<<$npc_nickname[''A29'']>>!" you exclaim as you feel a slightly cold breeze hit your body.'
-		'"No excuses, <<$pcs_nickname>>! The summer holidays will be over before you know it and you mustn''t get used to sleeping in, otherwise you won''t be able to get up early when school starts again. From now on, set your alarm to wake up at a reasonable time." your <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
-		act 'Get up':
-			cla & *clr
-			minut += 2
-			gs 'stat'
-			'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-			'As soon as you get off your now coverless bed, your mother is quick to resume her nagging, repeating what you already heard from her a few moments ago. "Summer is no excuse to laze around all day. You can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
-			'"What are you going to do when school starts, or when you get a job? You better get into the habit of setting your alarm so you can wake up bright and early."'
-			act 'Continue':
-				cla & *clr
-				minut += 2
-				gs 'stat'
-				'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-				'You let out an exasperated sigh. "Yeah yeah I know, you told me that already. So how early are we talking?"'
-				'Your mother shoots you a sharp look and you know to fix your attitude or else. "Well, that depends on what you plan to do in the morning. There''s breakfast, showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right... Anya used to wake up at 06:00 for school."'
-				act 'Continue':
-					cla & *clr
-					minut += 2
-					gs 'stat'
-					'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-					'"You want me to wake up that early?!" you huff. "Can''t I wake up at like... 07:00?"'
-					'Your mother shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns before making her way towards the kitchen.'
-					if stat['think_virgin'] = 1: '"Oh, don''t forget; you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month!" she adds quickly.'
-					act 'But why do I--':
-						cla & *clr
-						minut += 2
-						gs 'stat'
-						'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" she says before she storms out of the room without giving you a chance to respond.'
-						act 'I understand...': $menu_loc = 'bedrPar' & $menu_arg = 'start' & gt 'alarmclock', 'start'
-					end
-				end
-			end
-		end
-	end
-end
-
 --- bedrPar ---------------------------------
-

+ 8 - 16
locations/bedrPar2.qsrc

@@ -2,14 +2,9 @@
 !2021/04/26
 if $ARGS[0] = '':
 	CLOSE ALL
-	*clr & cla
-	$loc = 'bedrPar2'
-	$loc_arg = ''
-	$locclass = 'bedr'
-	$location_type = 'private'
-	$menu_loc = 'bedrPar2'
-	$menu_arg = ''
 	menu_off = 0
+	gs 'shortgs', 'setloc', 'bedrPar2', ''
+	$location_type = 'private'
 	minut += 1
 	gs 'stat'
 	gs 'themes', 'indoors'
@@ -80,7 +75,6 @@ end
 
 ! parent''s wardrobe
 if $ARGS[0] = 'parents_wardrobe':
-	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/wardrobe.jpg"></center>'
 	'An old looking wardrobe, probably from the Soviet times.'
 	act 'Leave ': gt $loc, $loc_arg
@@ -88,7 +82,6 @@ if $ARGS[0] = 'parents_wardrobe':
 end
 
 if $ARGS[0] = 'wardrobe_search':
-	*clr & cla
 	if locat['Fam_inGad'] = 0 and (locat['Mother'] = 1 or locat['Mother'] = 3 or locat['Stepdad'] = 1 or locat['Stepdad'] = 2):
 		'What are you thinking? You can''t go through the wardrobe while your parents are in the room!'
 		act 'Leave ': gt $loc, $loc_arg
@@ -113,7 +106,6 @@ if $ARGS[0] = 'wardrobe_search':
 end
 
 if $ARGS[0] = 'momtoy_play':
-	*clr & cla
 	menu_off = 1
 	mc_inventory['dildo_small'] = 1
 	dildohand = 10
@@ -127,7 +119,7 @@ if $ARGS[0] = 'momtoy_play':
 end
 
 if $ARGS[0] = 'peek':
-	cla & *clr
+	menu_off = 1
 	parentsexday = daystart
 	minut += 2
 	gs 'stat'
@@ -137,7 +129,7 @@ if $ARGS[0] = 'peek':
 	act 'Leave': gt 'korrPar'
 
 	act 'Keep peeking':
-		cla & *clr
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad2.jpg"></center>'
 		'You mother seems to be loving the attention and doesn''t put up much of a fight as he starts to undress her. Once she''s mostly naked, he pushes her down on the bed so she''s sitting on it in front of him, her head about crotch height to him. Knowing what he wants, she opens the fly on his pants and pulls out his cock, stroking it a few times in her hand until he gets hard. She then takes his dick into her mouth and starts sucking it. He moans softly as she does. "Fuck, you''re the best cocksucker ever, Natasha."'
@@ -147,7 +139,7 @@ if $ARGS[0] = 'peek':
 		act 'Leave': gt 'korrPar'
 
 		act 'Keep peeking':
-			cla & *clr
+			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad3.jpg"></center>'
 			'After spending several minutes sucking Vlad''s cock, she helps him strip while continuing to suck his dick. Once he''s naked, he lies down on the bed and she straddles him and quickly starts riding his dick reverse cowgirl style.'
@@ -158,7 +150,7 @@ if $ARGS[0] = 'peek':
 			act 'Leave': gt 'korrPar'
 
 			act 'Keep peeking':
-				cla & *clr
+				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad4.jpg"></center>'
 				'Vlad suddenly grabs her and throws her on her side on the bed. He turns on his side, lifting up her leg with one hand while using the other to guide his cock. He feels around until he places the head of his dick against her anus, then pushes it in, using only her pussy juices for lubrication. It slides in surprisingly easy and you can only guess that this is far from the first time your mother has had a dick in her ass. They both moan in pleasure and she rubs her clit as Vlad fucks her ass.'
@@ -167,7 +159,7 @@ if $ARGS[0] = 'peek':
 				act 'Leave':gt 'korrPar'
 
 				act 'Keep peeking':
-					cla & *clr
+					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad5.jpg"></center>'
 					'They keep going for several more minutes until Vlad starts to pant and buries his dick balls deep in your mother''s ass and lets out a loud moan as he twitches. After a few seconds, he pulls out of her and rolls off the bed as she gets on her back and spreads her ass, giving both you and Vlad a good view of her asshole as his cum starts leaking out of it.'
@@ -182,5 +174,5 @@ if $ARGS[0] = 'peek':
 	end
 end
 
---- bedrPar2 ---------------------------------
 
+--- bedrPar2 ---------------------------------

+ 0 - 49
locations/beg.qsrc

@@ -1,49 +0,0 @@
-# beg
-if $ARGS[0] = 'start':
-	cla
-	*clr
-	menu_off = 1
-	minut += 5
-	'<center><img <<$set_imgh>> src="images/pc/activities/exercises/gym/fit1.jpg"></center>'
-	'You are stretching and warming up before your practice run. From where you are you can see your coach, Igor Yurisovich, talking to other athletes.'
-
-	act 'Do a couple of practice races':
-		cla
-		*clr
-		abonement -= 1
-		pcs_mood += 2
-		gs 'exercise', 'tier2', 30, 'run'
-		'<center><img <<$set_imgh>> src="images/pc/activities/exercises/gym/fit5.jpg"></center>'
-		'You spend half an hour practicing 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.'
-
-		! WD: Argument is 'dressing_room'
-		act 'Go to the dressing room':gt 'fit', 'dressing_room'
-	end
-end
-
-if runnerQW['joined_team'] > 0:
-	act 'Go to your coach':
-		cla
-		'Igor Yurisovich is your coach, a man with a rough voice who never seems to gets tired of motivational one-liners. "The only one who can keep you from winning is you" is his current favorite.'
-
-		if pcs_run < 50:
-			'Despite looking occupied with the other trainees, Igor Yurisovich not only watched your practice runs but timed them as well. He doesn''t look too happy, though - not that he ever does.'
-			'"You have to train harder, girl. With a time like this, you would come in dead last. Hell, you wouldn''t even qualify for the main race! If you want to be better, you have to watch your diet, maybe go to the banya after training, but most importantly: Practice, practice, practice!"'
-
-			act 'Leave':gt 'beg', 'start'
-		elseif pcs_run >= 50 and runnerQW['champ_gold'] = 0:
-			'Despite looking occupied with the other trainees, Igor Yurisovich not only watched your practice runs but timed them as well. And while you''re pretty sure he is physically incapable of looking excited or even content, you think that he looks a little less grim than usual as he looks at you.'
-			'"You''re doing fine, girl. Better than fine; you could have a great future in athletics if you play your cards right. If you keep working hard, you might even have it in you to become European champion, perhaps more. But remember, girl, the key to victory is your spirit: If you have the right mindset, you can do anything."'
-			
-			act 'Leave':gt 'beg', 'start'
-		else
-			'Igor Yurisovich eagerly watches your practice runs and times them as well. Despite his grim demeanour, he nods approvingly at your times and even gives you a hug when you set a PB.'
-			'"You''re doing great, <<$pcs_nickname>>. We''re all so proud of you here and I really can''t give you much more advice except to tell you to keep pushing and making us proud."'
-			
-			act 'Leave':gt 'beg', 'start'
-		end
-	end
-end
-
---- beg ---------------------------------
-

+ 9 - 8
locations/begin.qsrc

@@ -1,4 +1,5 @@
 # begin
+!! SKIP_QSRC2TW
 !!2021/04/01
 if $ARGS[0] = 'start':
 	$loc_arg = 'start'
@@ -24,8 +25,8 @@ if $ARGS[0] = 'start':
 	*nl
 	'<center>There are three main start types:'
 	'Last year of school (before or after summer holidays);'
-	'In the city post graduation from school;'
-	'First year of university.'
+	'First year of university;'
+	'In the city post graduation from school.'
 	*nl
 	'For each start type there are 3 options:'
 	'Standard;'
@@ -44,18 +45,18 @@ if $ARGS[0] = 'start':
 	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'sg', 'magic')
 	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'sg', 'tg')
 
-	$start_text += '<TR><TD><p align="center">City</p></TD>'
-
-	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'nomagic')
-	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'magic')
-	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'tg')
-
 	$start_text += '<TR><TD><p align="center">University</p></TD>'
 
 	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'uni', 'nomagic')
 	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'uni', 'magic')
 	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'uni', 'tg')
 
+	$start_text += '<TR><TD><p align="center">City</p></TD>'
+
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'nomagic')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'magic')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'tg')
+
 	$start_text
 
 	'</table></center>'

+ 186 - 0
locations/beta_journal_quests.qsrc

@@ -0,0 +1,186 @@
+# beta_journal_quests
+!! 12/09/22 - Hooded Silence
+
+!! Game Character Quest section. This is the container file for all quest roles in game. Used to provide player feedback on how to proceed in quests.
+!! All quest information should be in a guidance or hint style fashion to encourage exploration.
+
+!! Beta 1 - New module design template for integration
+
+!! Section icons
+!! 🧭 Quest
+!! 💕 Relationship
+!! 📌 Location
+!! ✨ Magic
+!! Quest progress icons:
+!! <font color = "green">✓</font> - green tick
+!! <font color = "red">🗴</font> Red cross
+
+if $ARGS[0] = 'init':
+	*clr & cla
+	$loc_id = beta_journal_quests
+	act 'Put your journal down': gt $menu_loc, $menu_arg
+	act 'Return to top journal page': gt 'journal', 'records'
+	$jumploc = 'questtab'
+	!! gs 'journal', 'journalmenu'
+	'<center><h2>Quests and Relationships</h2></center>'
+	if $debug['journal'] ! '':
+		'<h2><font color = "red">Error with:</font> <<$debug[''journal'']>></h2>'
+		$debug['journal'] = ''
+	end
+	if journal['alert'] = 1:
+		'<div>'
+		'<center><h3><font color = "orange">⚠ Todays Quests and Tasks</font></h3></center>'
+		'<ul style="margin:0; padding:0;">🧭 You have to attend starlets</ul>'
+		'<ul style="margin:0; padding:0;">💕 You have a date with {npc} today at {time}, {location}</ul>'
+		'</div>'
+	else
+		!! Pull randomly from a journal[''gametips''] array
+		'<div>'
+		'<center><h3>Todays Random Tips</h3></center>'
+
+		'<ul style="margin:0; padding:0;">🧭 Visit the school sports field to meet your brother, and maybe other jocks.</ul>'
+		'</div>'
+	end
+end
+
+if $ARGS[0] = 'rel_pavlovsk':
+end
+if $ARGS[0] = 'rel_city':
+end
+if $ARGS[0] = 'rel_gad':
+end
+if $ARGS[0] = 'rel_pushkin':
+	!! Ballet Maya
+end
+
+if $ARGS[0] = 'geo_pavlovsk':
+end
+if $ARGS[0] = 'geo_city':
+end
+if $ARGS[0] = 'geo_pushkin':
+	!! Ballet school content
+	!! Ballet Secrets content
+end
+if $ARGS[0] = 'geo_gad':
+end
+if $ARGS[0] = 'geo_village':
+end
+if $ARGS[0] = 'vcard':
+	*clr & cla
+	!! Section used to generate the user quests and other pertinent information
+	if $firstname['A<<ARGS[1]>>'] = '':
+		gs $loc_id, 'failure',  'id'
+	end
+	!! Initiate NPC data.
+	gs 'quest_data_a<<ARGS[1]>>', 'init'
+	$display_dob = func('shortgs', 'convert_dob', ARGS[1])
+
+	!! Start vcard construction
+	$vard = ''
+	$vcard += '<center><h3>Ballet Quests - Characters</h3></center>'
+	$vcard += '<br>'
+	$vcard += '<div width="80%">'
+	$vcard += '<div style="width: 120px; padding: 0; float:left"><img style="height:100px;"  src="<<$npc_img_path[''A<<ARGS[1]>>'']>>/<<ARGS[1]>>_profile.jpg"></div>'
+	$vcard += '<div style="padding: 0;">'
+	$vcard += '<p><ul style="margin:0; padding:0;">Name: <<$npc_firstname[''A<<ARGS[1]>>'']>> "<<$npc_nickname[''A<<ARGS[1]>>'']>>" <<$npc_lastname[''A<<ARGS[1]>>'']>></ul>'
+	$vcard += '<ul style="margin:0; padding:0;">Date of Birth: <<$display_dob>> </ul>'
+	$vcard += '<ul style="margin:0; padding:0;">Home: <<$npc_home[''A<<ARGS[1]>>'']>></ul>'
+	$vcard += '<ul style="margin:0; padding:0;">Location: Unknown</ul>'
+
+	!! if debug is enabled show pop up msg:
+	if debug['code']  = 1:
+		gs 'quest_data_a<<ARGS[1]>>', 'debug'
+		$vcard += '<ul style="margin:0; padding:0;">Debug Vars:<a href="exec:msg <<$npc_quest[''debug_data'']>>">Quest Vars (pop up)</a></ul>'
+	end
+	$vcard += '</p></div>'
+	$vcard += '</div>'
+	$vcard += '<br>'
+
+	!! Output
+	$vcard
+
+	!! Ensure quest data fields are populated
+	if $npc_quest['q_body'] ='':
+		gs $loc_id, 'Failure', 'quest_body'
+	end
+	if $npc_quest['q_next'] = '':
+		gs $loc_id, 'Failure', 'nav_forward'
+	end
+	if $npc_quest['q_back'] = '':
+		gs $loc_id, 'Failure', 'nav_back'
+	end
+
+	!! Start quest body construction
+	$qsteps +=	'<div width = "80%">'
+	$qsteps +=	'<div style="padding: 10px;">'
+	$qsteps +=	'<h4>💕 Relationship Quest hints:</h4>'
+	$qsteps +=	$npc_quest['q_body']
+	$qsteps +=	'<br>'
+	$qsteps +=	'<h4>Quest requisites:</h4>'
+	$qsteps +=	'<p><<$npc_[''quest_body'']>></p>'
+	$qsteps +=	'<br>'
+	$qsteps +=	'</div>'
+	$qsteps +=	'<div style="padding:5px; align: center;">'
+	$qsteps += 	'<center><h5>Quest History</h5></center>'
+
+	if $npc_quest['q_next'] ! 'null':
+		$next_nav = 'Current Stage'
+	else
+		$next_nav = '<a href="gs ''quest_data_a<<ARGS[1]>>'', ''<<$npc_quest[''q_next'']>>''" >Next Stage</a> '
+	end
+	if $npc_quest['q_back'] ! 'null':
+		$back_nav = 'Quest Start'
+	else
+		$back_nav = '<a href="gs ''quest_data_a<<ARGS[1]>>'', ''<<$npc_quest[''q_next'']>>''" >Previous Stage</a> '
+	end
+	$qsteps +=	'<center><b>←</b> <<$back_nav>> |  <<$next_nav>> <b>→</b></center>'
+	$qsteps +=	'</div>'
+	$qsteps +=	'</div>'
+	$qsteps +=	'<br>'
+	$qsteps +=	'<br>'
+
+	!! Output
+	$qsteps
+
+	!! Clean up
+	killvar '$vcard'
+	killvar '$qsteps'
+	killvar 'birthday'
+	killvar '$birthday'
+	killvar 'birthmonth'
+	killvar '$birthmonth'
+	killvar 'birthyear'
+	killvar '$evt_suffix'
+end
+
+if $ARGS[0] = 'failure':
+	!! Debug sections
+	if $ARGS[1] = 'id':
+		$debug['journal'] = 'NPC ID not set, vcard not generated.'
+		gt $loc_id, 'start'
+	elseif $ARGS[1] = 'quest_body':
+		$debug['journal'] = 'Quest body not set, quests details was not display.'
+	elseif $ARGS[1] = 'nav_forward':
+		$debug['journal'] = 'No forward navigation set - please ensure you have set the var in quest_data'
+	elseif $ARGS[1] = 'nav_back':
+		$debug['journal'] = 'No back navigation set - please ensure you have set the var in quest_data'
+	end
+end
+
+if $ARGS[0] = 'gametips':
+
+	if ARGS[1] = 1:
+		'If you have 50 skill in modern dance and Albina likes you might get a chance to join Starlets.'
+	elseif ARGS[1] = 2:
+		'Mon Cheri is the most prestigious clothing store in St. Petersburg, with a price tag to match.'
+	elseif ARGS[1] = 3:
+		'There is some parts of the game restricted to over-18s such as doing driving lessons, gambling at the casino and other areas. There is rumours that there is studios who are less fussy about sticking to the law.'
+	elseif ARGS[1] = 4:
+	elseif ARGS[1] = 5:
+	elseif ARGS[1] = 6:
+	elseif ARGS[1] = 7:
+	elseif ARGS[1] = 8:
+	elseif ARGS[1] = 9:
+	end
+end
+--- beta_journal_quests ---------------------------------

+ 7 - 7
locations/billiard.qsrc

@@ -11,7 +11,7 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pool/bil.jpg"></center>'
 'Quite a large billiard room, there are plenty of tables in the main hall, but there are some tables in individual cubicles.'
 
-act 'Leave':gt 'torgcentr'
+act 'Leave': gt 'city_mall'
 
 if hour >= 8 and hour <= 20:
 	if money >= 125:
@@ -23,7 +23,7 @@ if hour >= 8 and hour <= 20:
 			gs 'exp_gain', 'pool', rand(0,3)
 			billrand = rand(0,5)
 			gs 'stat'
-			
+
 			if billrand = 0:
 				cla
 				'You play one of the guys here and he asks if you want to make it more interesting.'
@@ -31,7 +31,7 @@ if hour >= 8 and hour <= 20:
 				if money >= 1000:act 'Bet on the game (1000 <b>₽</b>)':billvar = 0 & gt 'billiard', 'randwin'
 
 				if mc_inventory['strapon'] = 1:act 'Play for his ass, sex if you lose':billvar = 1 & gt 'billiard', 'randwin'
-				
+
 				gs 'willpower', 'anal', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Stick to practice games (<<will_cost>> Willpower)':
@@ -43,7 +43,7 @@ if hour >= 8 and hour <= 20:
 				else
 					act 'Stick to practice games (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				
+
 				act 'Let him have the table instead':
 					money += 125
 					gs 'exp_gain', 'pool', rand(0, 1)
@@ -69,7 +69,7 @@ if hour >= 8 and hour <= 20:
 				else
 					act 'Stick to practice games (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				
+
 				act 'Let him have the table instead':
 					money += 125
 					gs 'exp_gain', 'pool', rand(0, 1)
@@ -120,7 +120,7 @@ if $ARGS[0] = 'randwin':
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pool/sex/strapon.jpg"></center>'
 		'You win, put your strapon, and look at the guy, "Well bend over, today you''re my bitch."'
 		'The guy drops his pants and bends over, you peg that butt.'
-		
+
 		gs 'arousal', 'anal_strap_give', 10, 'dom'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -134,7 +134,7 @@ if $ARGS[0] = 'randwin':
 		gs 'arousal', 'anal_strap_give', 10, 'dom'
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		act 'Leave':gt 'billiard'
 	elseif billwin > 10 and billvar = 3:
 		money += 250

+ 16 - 16
locations/billsvid.qsrc

@@ -48,9 +48,9 @@ if $ARGS[0] = '':
 				gt 'billsvid', '3'
 			end
 		elseif $telsob = $loverdesc[lover_number]:
-			!! date with girlfriend	
+			!! date with girlfriend
 			loverrelation[lover_number] += 1
-			
+
 			if loverrelation[lover_number] >= 20:
 				bilrand = rand(0, 10)
 				if bilrand > 0 and bilrand < 3:gt 'billsvid', '1'
@@ -70,7 +70,7 @@ if $ARGS[0] = '1':
 
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'stat'
-	
+
 	gs 'willpower', 'cuni', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Not now <<$telsob>> (<<will_cost>> Willpower)':
@@ -91,7 +91,7 @@ if $ARGS[0] = '1':
 
 		gs 'arousal', 'kiss', 5, 'lesbian'
 		gs 'stat'
-	
+
 		act 'Lick her':gt 'billsvid', '10'
 		gs 'willpower', 'cuni', 'force'
 		if will_cost <= pcs_willpwr:
@@ -114,7 +114,7 @@ if $ARGS[0] = '10':
 
 	gs 'arousal', 'cuni_give', 5, 'lesbian'
 	gs 'stat'
-		
+
 	gs 'willpower', 'cuni', 'force'
 	if will_cost <= pcs_willpwr:
 		act 'Get licked (<<will_cost>> Willpower)':
@@ -138,7 +138,7 @@ if $ARGS[0] = '11':
 
 	gs 'arousal', 'cuni', 5, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Lick her':gt 'billsvid', '10'
 
 	if bilsvidkiy = 0:act 'Play with a cue':gt 'billsvid', '12'
@@ -165,7 +165,7 @@ if $ARGS[0] = '12':
 
 	gs 'arousal', 'vaginal_dildo_give', 5, 'lesbian'
 	gs 'stat'
-	
+
 	if bilsvidukiy = 0:
 		gs 'willpower', 'sex', 'force'
 		if will_cost <= pcs_willpwr:
@@ -206,7 +206,7 @@ if $ARGS[0] = '2':
 
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'stat'
-	
+
 	gs 'willpower', 'cuni', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Continue to play <<$telsob>> (<<will_cost>> Willpower)':
@@ -226,7 +226,7 @@ if $ARGS[0] = '2':
 
 		gs 'arousal', 'kiss', 5, 'lesbian'
 		gs 'stat'
-	
+
 		act 'Proceed':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pool/sex/12.jpg"></center>'
@@ -234,7 +234,7 @@ if $ARGS[0] = '2':
 
 			gs 'arousal', 'foreplay', 5, 'lesbian'
 			gs 'stat'
-	
+
 			act 'Lick her':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pool/sex/13.jpg"></center>'
@@ -242,7 +242,7 @@ if $ARGS[0] = '2':
 
 				gs 'arousal', 'cuni_give', 5, 'lesbian'
 				gs 'stat'
-	
+
 				act 'Proceed':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pool/sex/14.jpg"></center>'
@@ -250,7 +250,7 @@ if $ARGS[0] = '2':
 
 					gs 'arousal', 'cuni_give', 5, 'lesbian'
 					gs 'stat'
-	
+
 					act 'Your turn':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pool/sex/15.jpg"></center>'
@@ -258,7 +258,7 @@ if $ARGS[0] = '2':
 
 						gs 'arousal', 'cuni', 5, 'lesbian'
 						gs 'stat'
-	
+
 						act 'Lick her':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pool/sex/16.jpg"></center>'
@@ -267,7 +267,7 @@ if $ARGS[0] = '2':
 							$orgasm_or = 'yes'
 							gs 'arousal', 'cuni', 5, 'lesbian'
 							gs 'stat'
-							
+
 							act 'Finish':gt 'billsvid', '3'
 						end
 					end
@@ -285,11 +285,11 @@ if $ARGS[0] = '3':
 
 	if $telsob = $loverdesc[lover_number]:
 		'When you have finished playing, <<$telsob>> looks at you and waits for your next move.'
-		act 'Say goodbye': gt 'torgcentr'
+		act 'Say goodbye': gt 'city_mall'
 		act 'Invite her to your home': gt 'lezbsex', 'startloverhome'
 	else
 		'When you have finished playing, <<$telsob>> says that she needs to run and leaves.'
-		act 'Leave': gt 'torgcentr'
+		act 'Leave': gt 'city_mall'
 	end
 end
 

+ 33 - 18
locations/blackmailer.qsrc

@@ -5,6 +5,7 @@ if $ARGS[0] = 'init_check':
 	if ($ARGS[2] = 'inside' or $ARGS[2] = 'indoors'):
 		if strpos($loc, 'church') <= 0: exit
 	end
+	if $flash_image = '': exit
 
 
 	temp_prob_chance = 300
@@ -47,29 +48,32 @@ if $ARGS[0] = 'init_blackmail':
 		$blackmailQW['init_flashaction'] = $ARGS[1]
 	end
 
-	$blackmailQW['init_flashimage'] = $flash_image + '.jpg'
+	$blackmailQW['init_flashimage'] = $flash_image
 	$blackmailQW['init_flashloc'] = $loc
 	$blackmailQW['init_flashloc_arg'] = $loc_arg
 	$blackmailQW['init_flashregion'] = $region
 	blackmailQW['total_material'] = 1
 
+	*nl
 	if strpos($loc, 'park') > 0:
 		$blackmailQW['init_flashloc_desc'] = 'in a park'
-		'A flash of light briefly brightens the surrounding trees and you see a shadow darting between the trees. The light of the camera flash prickling on your exposed skin.'
+		'<b>A flash of light</b> briefly brightens the surrounding trees and you see a shadow darting between the trees. The light of the camera flash prickling on your exposed skin.'
 	elseif strpos($loc, 'church') > 0:
 		$blackmailQW['init_flashloc_desc'] = 'in a church'
-		'The flash of a camera illuminates the inside of the church, but the source eludes you.'
-	elseif strpos($loc, 'zaprF') > 0:
+		'<b>The flash of a camera</b> illuminates the inside of the church, but the source eludes you.'
+	elseif strpos($loc, 'fuelstation') > 0:
 		$blackmailQW['init_flashloc_desc'] = 'while washing cars'
-		'You briefly think a car turned on its headlights before you realize it was the flash of a camera, the source of which is already gone.'
+		'You briefly think a <b>car turned on its headlights</b> before you realize it was the flash of a camera, the source of which is already gone.'
 	else
 		$blackmailQW['init_flashloc_desc'] = ''
-		'You think you notice the flash of a camera from the corner of your eye, but its source is already out of view.'
+		'You think you notice the <b>flash of a camera</b> from the corner of your eye, but its source is already out of view.'
 	end
+	*nl
 	if exhibitionist_lvl > 0:
 		gs 'arousal', 'flashlite', -5
 		gs 'arousal', 'end'
 	end
+	wait 500
 end
 
 
@@ -237,6 +241,7 @@ if $ARGS[0] = 'photo_dream1':
 	end
 	gs 'arousal', 'end'
 
+	'<center><b><font color="maroon">Dream</font></b></center>'
 	'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>"></center>'
 	$temp_dream_text = 'You dream about getting caught while flashing your '
 	$temp_dream_text += $blackmailQW['init_flashaction']
@@ -259,17 +264,20 @@ elseif $ARGS[0] = 'photo_dream2':
 	gs 'arousal', 'end'
 
 	if motherKnowWhore = 0 and npc_rel['A29'] > 0:
+		'<center><b><font color="maroon">Dream</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'You dream that your <<$npc_nickname[''A29'']>> is sitting at the kitchen table, looking somber, almost defeated, reading what seems to be a letter.'
 
 		act 'Ask your <<$npc_nickname[''A29'']>> what''s wrong':
 			*clr & cla
+			'<center><b><font color="maroon">Dream</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mum_gyno2.jpg"></center>'
 			'You walk up to her and ask "What''s wrong <<$npc_nickname[''A29'']>>?"'
 			'She drops the letter and see that it is accompanied by a picture.'
 
 			act 'Look at the picture':
 				*clr & cla
+				'<center><b><font color="maroon">Dream</font></b></center>'
 				'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>"></center>'
 				$temp_dream_text = 'You get a clear look at the picture depicting you flashing your '
 				$temp_dream_text += $blackmailQW['init_flashaction']
@@ -282,6 +290,7 @@ elseif $ARGS[0] = 'photo_dream2':
 
 				act 'Listen to your mother':
 					*clr & cla
+					'<center><b><font color="maroon">Dream</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/spank.jpg"></center>'
 					'"Oh, you slut! Your father and I worked so hard to raise you as a decent person, hoping you would find a good husband some day and it turns out you''re a whore who gets off on showing her <<$blackmailQW[''init_flashaction'']>> to strangers!"'
 					'Suddenly her expression steels, her mind made up. "You can still be saved. I will turn you away from this errant path, you will not shame this family even if I have to beat the sin out of you."'
@@ -292,15 +301,17 @@ elseif $ARGS[0] = 'photo_dream2':
 
 					act 'Brace yourself':
 						*clr & cla
+						'<center><b><font color="maroon">Dream</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/hug_sad1.jpg"></center>'
 						'Bracing yourself for the pain that never comes, the dream shifts. You are left on the outside looking in, the house a mess, your <<$npc_nickname[''A29'']>> crying, <<$npc_nickname[''A34'']>> and your <<$npc_nickname[''A28'']>> nowhere to be seen.'
 						'The lingering feelings of a happy family quickly fading.'
-						gs 'dream_events', 'event_end'
+						act 'Continue': gs 'dream_events', 'event_end'
 					end
 				end
 			end
 		end
 	elseif $start_type['loc'] = 'sg' and gruptipe ! 5:
+		'<center><b><font color="maroon">Dream</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/locker.jpg"></center>'
 		'You dream that it''s the end of a long school day, a tired track back to your lockers, the drab hallways, the monotonous marching of time.'
 		'Opening your locker to take your stuff, ready for the same walk home, you yelp in surprise as hundreds of polaroids flow out of your opened locker. Similar shouts of surprise happen all around you as even more polaroids burst from their lockers too.'
@@ -308,6 +319,7 @@ elseif $ARGS[0] = 'photo_dream2':
 
 		act 'Grab a polaroid':
 			*clr & cla
+			'<center><b><font color="maroon">Dream</font></b></center>'
 			'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>"></center>'
 			$temp_dream_text = 'You grab one of the pictures and see yourself flashing your '
 			$temp_dream_text += $blackmailQW['init_flashaction']
@@ -317,10 +329,10 @@ elseif $ARGS[0] = 'photo_dream2':
 			killvar '$temp_dream_text'
 			'The laughter around you grows, you are surrounded by a sea of people holding your picture and laughing at you.'
 			'Wading through the ocean of polaroids, you are ever confronted with the fact that you have lost the respect of your former friends.'
-			
-			gs 'dream_events', 'event_end'
+			act 'Continue': gs 'dream_events', 'event_end'
 		end
 	else
+		'<center><b><font color="maroon">Dream</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
 		'You dream that you''re walking through Pavlovsk on a beautiful, windless, cloudless, sunny afternoon, the soft hum of cars, people, wind, and birds fills your ears as the simmering heat of the sun caresses your skin.'
 		'Snippets of conversations happening around you press against the edges of your mind.'
@@ -328,11 +340,13 @@ elseif $ARGS[0] = 'photo_dream2':
 		'You can''t really under stand what''s being said as the harsh wind rips the words from the air, but from the way that they''re looking at the newspaper you guess that''s what they''re talking about.'
 
 		act 'Head to the post office to satiate your curriosity':
+			'<center><b><font color="maroon">Dream</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavresn.jpg"></center>'
 			'You hurry to the post office to get a copy of your own, the wind howling in your ears. The cold sends shivers down you spine as the rain beats relentless in your face.'
 			'When you finally arive you see the postmaster, an older man, look at you strangly. Deafening thunder shakes the building, rain drums loudly against the windows as lightning flashes outside.'
 
 			act 'Buy a newspaper':
+				'<center><b><font color="maroon">Dream</font></b></center>'
 				'<center><img <<$set_imgh>> src="<<$blackmailQW[''init_flashimage'']>>"></center>'
 				$temp_dream_text = 'The postmaster distandly hands you a newspaper, and on the front cover you see a picture of yourself flashing your '
 				$temp_dream_text += $blackmailQW['init_flashaction']
@@ -342,7 +356,7 @@ elseif $ARGS[0] = 'photo_dream2':
 				killvar '$temp_dream_text'
 				'"I didn''t know that you were such a whore!", "That''s really her, what a slut!", "Maybe she''ll let us fuck her too!"'
 				'You run outside into the raging storm, the insults piercing through, chasing you.'
-				gs 'dream_events', 'event_end'
+				act 'Continue': gs 'dream_events', 'event_end'
 			end
 		end
 	end
@@ -522,7 +536,7 @@ end
 
 
 if $ARGS[0] = 'set_police_act':
-	if blackmailQW['stage'] >= 3 and blackmailQW['escape'] = 0:
+	if blackmailQW['stage'] >= 4 and blackmailQW['escape'] = 0:
 		act 'Report that you''re being blackmailed':
 			menu_off = 1
 			minut += 5
@@ -573,7 +587,7 @@ if $ARGS[0] = 'police1':
 				'"Hmm, how did this person contact you?"'
 				'"He texted me."'
 				'You see a stark of hope flash through the officers eyes, if you could show us the texts we might be able to locate him."'
-				
+
 				if arrpos('$SMSContact', 'Blackmailer') >= 0:
 					act 'Show them the messages':
 						*clr & cla
@@ -664,6 +678,7 @@ end
 
 if $ARGS[0] = 'post_office1':
 	blackmailQW['stage'] = 10
+	blackmailQW['package'] = 1
 	mail['city'] -= 1
 
 	'<center><img src="images/locations/shared/postoffice/worker.jpg"></center>'
@@ -726,7 +741,7 @@ if $ARGS[0] = 'set_SMSTree':
 						else
 							$SMSTree['b4'] = 'How much do you want before it stops?'
 						end
-	
+
 	$SMSTree['5'] = 'Just drop off the money'
 		$SMSTree['6'] = 'or else'
 
@@ -789,7 +804,7 @@ if $ARGS[0] = 'Add_SMS_repeat':
 		gs 'SMStext_builder', 'receive', $SMSTree['2']
 		gs 'SMStext_builder', 'receive', $SMSTree['3']
 		if blackmailQW['next_payment'] < 2000 and blackmailQW['total_payment'] < 5000:
-			gs 'SMStext_builder', 'add_reply', $SMSTree['a4'], 'blackmailer', 'sms_repeat_end1', $SMSTree['a4']
+			gs 'SMStext_builder', 'add_reply', $SMSTree['a4'], 'blackmailer', 'sms_repeat_end1', 'a4'
 		elseif blackmailQW['stage'] < 8 and blackmailQW['next_payment'] < 3000:
 			gs 'SMStext_builder', 'add_reply', $SMSTree['b4'], 'blackmailer', 'sms_repeat_switch1', 'a', $SMSTree['b4']
 		elseif blackmailQW['stage'] = 7:
@@ -842,7 +857,7 @@ if $ARGS[0] = 'sms_repeat_switch1':
 		else
 			gs 'SMStext_builder', 'send_selfie', $SMSTree['c12'], 'c|sw|u|n|b|sh|ft|fa|fp', 'blackmailer', 'sms_repeat_switch2'
 		end
-		if $ARGS[1] = 'b': 
+		if $ARGS[1] = 'b':
 			gs 'SMStext_builder', 'add_reply', $SMSTree['d12'], 'blackmailer', 'sms_repeat_switch3', 'd12'
 		elseif $ARGS[1] = 'c':
 			gs 'SMStext_builder', 'add_reply', $SMSTree['e12'], 'blackmailer', 'sms_repeat_switch5', 'e12'
@@ -899,7 +914,7 @@ if $ARGS[0] = 'sms_repeat_switch2':
 		gs 'SMStext_builder', 'show_sms', ARGS[1]
 
 		wait 250
-	
+
 		if blackmailQW['next_payment'] > 0:
 			gs 'SMStext_builder', 'receive', $SMSTree[$temp_path + '22']
 		else
@@ -986,7 +1001,7 @@ end
 
 
 
-
+	!!    ----- PARK -----    !!
 
 if $ARGS[0] = 'park_repeat':
 	'<center><img src="images/locations/shared/park/bench_6.jpg"></center>'
@@ -1019,4 +1034,4 @@ end
 
 if $ARGS[0] ! 'set_SMSTree' and $ARGS[0] ! 'add_blackmail_selfie': killvar 'SMSTree'
 
---- blackmailer ---------------------------------
+--- blackmailer ---------------------------------

+ 74 - 105
locations/body.qsrc

@@ -15,22 +15,15 @@
 !!bodyVars['bust_magic'] = set in body_shape for the fat moved to bust
 !!bodyVars['bust_other'] = other additions to bust-size, including breast creams
 !!
-!!salocatnow = the current category of pcs_mass['body']
-!!salocatlast = the previous category of pcs_mass['body']
 !!magf2bdo = flag for magic bust increase; 0, ready; 1, do it; 2, ask; 3, no
 !!mgf2bnocnt = used to count the number of times a bust increase was turned down and stop asking after 3
-!!magtarcup = set in the dream code as the target cup size 
+!!magtarcup = set in the dream code as the target cup size
 !!bodyVars['weight_warning'] = used to flag if to display the gaining/losing weight message when bathing
-!!salolast = used when doing a soft rest to control the cycling of the main code
 !!bodyresetflag = used to prevent a code chunk from firing on a soft or hard reset
 !!Image set variables
-!! bodset = body image and descriptor control variable, used to indicate which image and descriptor set is in use
-!! $bodimgsets[x] = body shape descriptors, tens place is the set (using bodset), 0 - 7 the descriptors (using salocatnow), 8 filler, 9 is the folder name
-!! bdsetlock = flag to indicate set control override, 0 is use the formula to pick a set, 1 is use a fixed set
-!! fixbodset = the identification number of the fixed image set
-!! bodsetcnt = the number of sets present
-!! imgset6ovr[x] and imgset7ovr[x] = a flag to indicate that an image set (x) has its own image 6 and/or 7
-!! extended lash functionality; pcs_lashes = n are: {2, largest natural size}, {3, with temporary false lashes on or basic 2D lash extensions}, {4, with ornate false lashes on or lavish 4D extensions}, {5, with extremely ornate, 6D-style extensions} - xerya
+!!	cheatVars['fix_bodyimg'] = flag to indicate set control override, 0 is use the formula to pick a set, 1 is use a fixed set
+!!	cheatVars['fix_bi_set'] = the identification number of the fixed image set
+!!	extended lash functionality; pcs_lashes = n are: {2, largest natural size}, {3, with temporary false lashes on or basic 2D lash extensions}, {4, with ornate false lashes on or lavish 4D extensions}, {5, with extremely ornate, 6D-style extensions} - xerya
 
 
 !! Pregnancy weight gain:
@@ -65,15 +58,16 @@ if $ARGS[0] = 'UpdateBodyMeasurement':
 	pcs_hips  = (pcs_hgt   * bodyVars['hratio']) / 100 + bodyVars['vhips']
 	pcs_waist = (pcs_hips  * bodyVars['wratio']) / 100 + bodyVars['vofat']
 	pcs_band  = (pcs_waist * bodyVars['bratio']) / 100 + bodyVars['vofat']
-	pcs_bust  = (pcs_waist * bodyVars['bratio']) / 100 + pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] + max(-10, min(bodyVars['bust_other'], 10)) + pcs_mass['preg'] / 5 + bodyVars['bust_lact']
-	pcs_butt  = min(pcs_mass['butt'], 50) + bodyVars['butt_bonus'] + bodyVars['butt_silicone'] + bodyVars['butt_cheat'] + pcs_butt_tr + max(-10, min(bodyVars['butt_other'], 10))
+	pcs_bust  = (pcs_waist * bodyVars['bratio']) / 100 + pcs_mass['bust']			+ bodyVars['bust_bonus'] + bodyVars['bust_silicone'] + max(-10, min(bodyVars['bust_other'], 10)) + bodyVars['bust_magic'] + pcs_mass['preg'] / 5 + bodyVars['bust_lact']
+	pcs_butt  = (pcs_hgt   * bodyVars['hratio']) / 100 + min(pcs_mass['butt'], 50)	+ bodyVars['butt_bonus'] + bodyVars['butt_silicone'] + max(-10, min(bodyVars['butt_other'], 10)) + pcs_butt_tr
 
 	!! pcs_cupsize = pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] - bodyVars['vofat']
 	pcs_cupsize = pcs_bust - pcs_band
+	pcs_buttsize = pcs_butt - pcs_hips
 end
 
 if $ARGS[0] = 'CalcWeight':
-	!{pcs_weight: Svetas weight in kg 
+	!{pcs_weight: Svetas weight in kg
 	Optimal Weight (170cm): 60kg, 60 pcs_mass['body']
 	This is an approximation, so that a sveta with a different height has the same BMI for the same pcs_mass['body'] values.
 	The default height of 170 cm is used as a starting point. The bmi deviates by 0.06 for a deviation of 10cm and 0.4 for a deviation of 20cm.}
@@ -155,33 +149,32 @@ if $ARGS[0] = 'DailyUpdate':
 
 
 	if pcs_skin <= 300:
-		pcs_skin += min(skinDailyGain * 2, 20) - skinDailyPenalty - 1
+		pcs_skin += min(skinDailyGain * 2, 20)	- skinDailyPenalty - 1
 	elseif pcs_skin <= 600:
-		pcs_skin += min(skinDailyGain, 10) - skinDailyPenalty - 1
+		pcs_skin += min(skinDailyGain, 10)		- skinDailyPenalty - 1
 	elseif pcs_skin <= 800:
-		pcs_skin += min(skinDailyGain / 2, 5) - skinDailyPenalty - 1
+		pcs_skin += min(skinDailyGain / 2, 5)	- skinDailyPenalty - 1
 	elseif pcs_skin <= 900:
-		pcs_skin += min(skinDailyGain / 3, 3) - skinDailyPenalty - 1
+		pcs_skin += min(skinDailyGain / 3, 3)	- skinDailyPenalty - 1
 	elseif pcs_skin <= 1000:
-		pcs_skin += min(skinDailyGain / 5, 2) - skinDailyPenalty - 1
+		pcs_skin += min(skinDailyGain / 5, 2)	- skinDailyPenalty - 1
 	end
 
 	gs 'body', 'Update_Teeth'
 
 	gs 'AppearanceSystem', 'UpdateBaseAppearance'
 	gs 'body', 'Update_Appearance'
+	gs 'body', 'UpdateBodyImage'
 
 	!skin variable reset
 	killvar 'moisturizerDailyCount'
 	killvar 'skinDailyGain'
 	killvar 'skinDailyPenalty'
-	
 end
 
 if $ARGS[0] = 'Update_Appearance':
 	gs 'AppearanceSystem'
 	gs 'body_desc'
-	gs 'body', 'UpdateBodyImage'
 end
 
 
@@ -189,13 +182,10 @@ end
 
 if $ARGS[0] = 'UpdateBodyImage':
 	!Update body image set
-	if dounspell = 1:
-		salocatnow = (pcs_hips / 10) - 5
-	end
 
 	$bodyVars['desc']     = func('body_structure', 'body_desc')
-	$bodyVars['img']      = func('body_structure', 'body_img')
 	$bodyVars['bmi_desc'] = func('body_structure', 'bmi_desc')
+	$bodyVars['img']      = func('body_structure', 'body_img')
 end
 
 
@@ -239,7 +229,7 @@ if $ARGS[0] = 'Update_Hair':
 	if pcs_haircol ! nathcol and dyefade > 0:
 		dyefade -= 1
 	end
-	
+
 	!! daily reduction of braids
 	if hbraids > 0: hbraids -= 1
 
@@ -324,6 +314,7 @@ end
 
 if $ARGS[0] = 'Update_Body':
 	gs 'body', 'Update_StatBuffs'
+	pcs_mass['body_last'] = pcs_mass['body']
 
 	!!pcs_mass['body'] Handling; the first part is because during a reset fat is not used and should be cleared
 	if bodyresetflag = 1 or cheatVars['fat'] = 1:
@@ -382,7 +373,6 @@ if $ARGS[0] = 'Update_Body':
 	gs 'body', 'Find_band_to_waist_ratio'
 	gs 'body', 'Find_hip_to_height_ratio'
 
-	salocatnow = func('body', 'Calc_salocat')
 	gs 'body', 'Redistribute_Mass'
 
 	!!This is if a Succubus has pcs_mass['body'] < 1
@@ -409,30 +399,27 @@ if $ARGS[0] = 'Update_Body':
 
 	gs 'body', 'Update_vhips'
 
-	salocatnow = func('body', 'Calc_salocat')
-
 	!!This will trigger the warning notices in the bathing code (the +/- 12 should always be +/- 11 + the max change to pcs_mass['body'] w/ fat)
-
-!	if salolast > pcs_mass['body'] + pcs_mass['butt'] and pcs_mass['body'] + pcs_mass['butt'] <= (20 * (salocatnow - 1)) + 12:
-!		bodyVars['weight_warning'] = 1
-!	elseif salolast < pcs_mass['body'] + pcs_mass['butt'] and pcs_mass['body'] + pcs_mass['butt'] >= (20 * (salocatnow + 1)) - 12:
-!		bodyVars['weight_warning'] = 2
-!	end
-
-	if pcs_mass['body'] < pcs_mass['body_message'] - 5:
+	temp_total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
+	if temp_total_mass <= pcs_mass['body_message'] - 6:
 		bodyVars['weight_warning'] = 1
-		pcs_mass['body_message'] = pcs_mass['body']
-	elseif pcs_mass['body'] > pcs_mass['body_message'] + 5:
+		pcs_mass['body_message'] = temp_total_mass
+	elseif temp_total_mass => pcs_mass['body_message'] + 6:
 		bodyVars['weight_warning'] = 2
-		pcs_mass['body_message'] = pcs_mass['body']
+		pcs_mass['body_message'] = temp_total_mass
 	end
+	killvar 'temp_total_mass'
 
-
+	!!Setting the pcs_apprnc bonus based on fat and strength
+	temp_bmi = func('body', 'CalcBMI2')
+	pcs_bmi[0] = temp_bmi / 10
+	pcs_bmi[1] = temp_bmi mod 10
+	killvar 'temp_bmi'
 
 	!!This will trigger the dream for the option to use magic to increase bust
 	!!Three nos at the dream will lock it out (1 yes resets the count)
 	if pcs_magik >= 5 and MagikDostup = 0 and magf2bdo = 0:
-		if tits < 10 and salolast < pcs_mass['body'] + pcs_mass['butt'] and pcs_mass['body'] + pcs_mass['butt'] >= (20 * (salocatnow + 1)) - 11:
+		if tits < 10 and pcs_mass['body'] > pcs_mass['body_last'] and pcs_bmi > 17:
 			if mgf2bnocnt < 3:
 				magf2bdo = 2
 			else
@@ -441,20 +428,6 @@ if $ARGS[0] = 'Update_Body':
 		end
 	end
 
-	!!This is to deal with the possibility that salocatnow changed by more than 1 (fat burners, vitamins, plastic surgery, etc.)
-	if salocatnow < salocatlast: salocatlast -= 1
-	if salocatnow > salocatlast: salocatlast += 1
-
-	!!This is for use in the warning code and as part of the reset routines
-	if salolast > pcs_mass['body'] + pcs_mass['butt']: salolast -= 1
-	if salolast < pcs_mass['body'] + pcs_mass['butt']: salolast += 1
-
-	!!Setting the pcs_apprnc bonus based on fat and strength
-	temp_bmi = func('body', 'CalcBMI2')
-	pcs_bmi[0] = temp_bmi / 10
-	pcs_bmi[1] = temp_bmi mod 10
-	killvar 'temp_bmi'
-
 	!!This is to clean up unused variables
 	killvar 'normbuffpick'
 	killvar 'nrmbfpckct'
@@ -584,6 +557,7 @@ elseif $ARGS[0] = 'Find_hip_to_height_ratio':
 	killvar 'temp_hratio'
 end
 
+!! Depricated
 if $ARGS[0] = 'Calc_salocat':
 	!!This calculates the current pcs_mass['body'] category; ranges are 20 points, seemed to balance best if the range is x10 the hip devisor
 	if pcs_mass['body'] + pcs_mass['butt'] < 10:
@@ -625,18 +599,8 @@ if $ARGS[0] = 'Redistribute_Mass':
 
 			if bodyVars['bust_magic'] >= 2 + magtarcup * 5: magf2bdo = 0
 			pcs_mana -= max(100, 2000 / pcs_magik)
-		
-		!! Old content
-		!{
-		elseif salocatnow < salocatlast:
-			if magikDostup = 0 and bodyVars['bust_magic'] > 0 and salocatnow < 2:
-				bodyVars['bust_magic'] -= 1
-				pcs_mass['body'] += 3
-				magf2bdo = 1
-			end
-		}
 		end
-		
+
 		!!===============    Low Weight    ===============!!
 		if pcs_mass['body'] < 10:
 			temp_diff = min(pcs_mass['bust'], 3)
@@ -659,7 +623,7 @@ if $ARGS[0] = 'Redistribute_Mass':
 				temp_diff = min(pcs_mass['bust_gen'] - pcs_mass['bust'], 2)
 				pcs_mass['bust'] += temp_diff
 				pcs_mass['body'] -= temp_diff
-			
+
 			elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['bust'] = pcs_mass['bust_gen']:
 				!Keep bust at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
 
@@ -683,7 +647,7 @@ if $ARGS[0] = 'Redistribute_Mass':
 				temp_diff = min(pcs_mass['butt_gen'] - pcs_mass['butt'], 2)
 				pcs_mass['butt'] += temp_diff
 				pcs_mass['body'] -= temp_diff
-			
+
 			elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['butt'] = pcs_mass['butt_gen']:
 				!Keep butt at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
 
@@ -761,27 +725,27 @@ end
 
 
 if $ARGS[0] = 'Reset_mass_distribution':
-	total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
-	total_gen_mass = 60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']
+	temp_total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
+	temp_total_gen_mass = 60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']
 
-	if total_mass >= total_gen_mass - 10 and total_mass <= total_gen_mass:
+	if temp_total_mass >= temp_total_gen_mass - 10 and temp_total_mass <= temp_total_gen_mass:
 		pcs_mass['bust'] = pcs_mass['bust_gen']
 		pcs_mass['butt'] = pcs_mass['butt_gen']
 	else
-		pcs_mass['bust'] = (pcs_mass['bust_gen'] * total_mass) / total_gen_mass
-		pcs_mass['butt'] = (pcs_mass['butt_gen'] * total_mass) / total_gen_mass
+		pcs_mass['bust'] = (pcs_mass['bust_gen'] * temp_total_mass) / temp_total_gen_mass
+		pcs_mass['butt'] = (pcs_mass['butt_gen'] * temp_total_mass) / temp_total_gen_mass
 	end
 
-	pcs_mass['body'] = total_mass - pcs_mass['bust'] - pcs_mass['butt']
+	pcs_mass['body'] = temp_total_mass - pcs_mass['bust'] - pcs_mass['butt']
 
+	pcs_mass['body_message'] = temp_total_mass
 	pcs_mass['bust_message'] = pcs_mass['bust']
 	pcs_mass['butt_message'] = pcs_mass['butt']
-	pcs_mass['body_message'] = pcs_mass['body']
 
-	killvar 'total_mass'
-	killvar 'total_gen_mass'
+	bodyVars['vhips'] = (pcs_mass['body'] + pcs_mass['butt'] - 80) / 2
 
-	gs 'body', 'Update_vhips'
+	killvar 'temp_total_mass'
+	killvar 'temp_total_gen_mass'
 end
 
 if $ARGS[0] = 'Reset_preg_mass':
@@ -802,14 +766,32 @@ if $ARGS[0] = 'Set_mass_distribution_using_body':
 		pcs_mass['bust'] = pcs_mass['bust_gen']
 		pcs_mass['butt'] = pcs_mass['butt_gen']
 	else
-		pcs_mass['bust'] = (pcs_mass['bust_gen'] * ARGS[1]) / 60
-		pcs_mass['butt'] = (pcs_mass['butt_gen'] * ARGS[1]) / 60
+		pcs_mass['bust'] = (pcs_mass['bust_gen'] * pcs_mass['body']) / 60
+		pcs_mass['butt'] = (pcs_mass['butt_gen'] * pcs_mass['body']) / 60
 	end
 	bodyVars['vhips'] = (pcs_mass['body'] + pcs_mass['butt'] - 80) / 2
 
+	pcs_mass['body_message'] = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
 	pcs_mass['bust_message'] = pcs_mass['bust']
 	pcs_mass['butt_message'] = pcs_mass['butt']
-	pcs_mass['body_message'] = pcs_mass['body']
+
+	if dounspell = 0:
+		temp_weight = func('body', 'CalcWeight2')
+		pcs_weight[0] = temp_weight / 10
+		pcs_weight[1] = temp_weight mod 10
+
+		temp_bmi = func('body', 'CalcBMI2')
+		pcs_bmi[0] = temp_bmi / 10
+		pcs_bmi[1] = temp_bmi mod 10
+
+		killvar 'temp_weight'
+		killvar 'temp_bmi'
+	end
+
+	gs 'body', 'Update_vhips'
+	gs 'AppearanceSystem', 'UpdateBaseAppearance'
+	gs 'body', 'Update_Appearance'
+	gs 'body', 'UpdateBodyImage'
 end
 
 
@@ -831,18 +813,14 @@ if $ARGS[0] = 'Update_vhips':
 	end
 	killvar 'vhtmp'
 
-	!! Varies between 0 and 25 to 30 ish range
-	!bodyVars['butt_bonus'] = max(0, pcs_mass['butt'] - max(0, bodyVars['vhips']))
-	bodyVars['butt_bonus'] = (pcs_mass['butt'] - 20) / 3
-	
-	!! temp_vhips2 = vhips + (pcs_hgt * bodyVars['hratio'])/100 - (pcs_hgt * 72)/100
-	!! temp_vhips2 = pcs_hips - (pcs_hgt * 72) / 1000
-	temp_vhips2 = vhips - (pcs_hgt * (72 - bodyVars['hratio'])) / 100
+
+	!! temp_vhips2 = bodyVars['vhips'] + (pcs_hgt * bodyVars['hratio'])/100 - (pcs_hgt * 72)/100
+	!! temp_vhips2 = pcs_hips - (pcs_hgt * 72) / 100
+	temp_vhips2 = bodyVars['vhips'] - (pcs_hgt * (72 - bodyVars['hratio'])) / 100
 	bodyVars['vofat'] = max(0, temp_vhips2 / 2)
 	bodyVars['vhips'] -= 2 * bodyVars['vofat']
-	
-	!! vhips = vhips - max(0, temp_vhips2)
-	!! vhips = vhips || vhips = (pcs_hgt * (72 - bodyVars['hratio'])) / 100
+
+	!! vhips = max(bodyVars['vhips'], (pcs_hgt * (72 - bodyVars['hratio'])) / 100)
 
 	killvar 'temp_vhips2'
 end
@@ -891,8 +869,9 @@ end
 if $ARGS[0] = 'softreset':
 	!!This is for use in immediately updating shape if something has caused a large change in pcs_mass['body'], primarily fat burners and plastic surgery
 	bodyresetflag = 1
+	body_sr_counter = 0
 	:resetloop
-	if pcs_mass['body'] + pcs_mass['butt'] ! salolast:
+	if body_sr_counter < 10 and pcs_mass['body'] ! pcs_mass['body_last']:
 		if gamestartflag = 1:
 			salobustdo = 1
 		end
@@ -929,14 +908,6 @@ if $ARGS[0] = 'hardreset':
 		gs 'body', 'Update_Body'
 
 		pcs_mass['body'] = 60 + (2 * pcs_hips) - (pcs_hgt * bodyVars['hratio']) / 50
-		if pcs_mass['body'] + pcs_mass['butt'] < 10:
-			salocatnow = 0
-		else
-			salocatnow = 1 + (pcs_mass['body'] + pcs_mass['butt'] - 10) / 20
-		end
-
-		salocatlast = salocatnow
-		salolast = pcs_mass['body'] + pcs_mass['butt']
 
 		if pcs_mass['butt_gen'] = 0:
 			pcs_mass['butt_gen'] = 20
@@ -958,7 +929,7 @@ if $ARGS[0] = 'hardreset':
 			end
 		end
 
-		pcs_mass['body_message'] = pcs_mass['body']
+		pcs_mass['body_message'] = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
 		pcs_mass['bust_message'] = pcs_mass['bust']
 		pcs_mass['butt_message'] = pcs_mass['butt']
 
@@ -1011,8 +982,6 @@ if $ARGS[0] = 'initial':
 	gs 'body', 'softreset'
 
 	!!	This sets/resets the controler variables
-	salocatnow = func('body', 'Calc_salocat')
-	salocatlast = salocatlast
 	normbuffpick = 0
 	magf2bdo = 0
 	killvar 'gamestartflag'
@@ -1024,8 +993,8 @@ if $ARGS[0] = 'initial':
 	pcs_bmi[1] = temp_bmi mod 10
 	killvar 'temp_bmi'
 
-	gs 'body', 'UpdateBodyImage'
 	gs 'body', 'Update_Appearance'
+	gs 'body', 'UpdateBodyImage'
 end
 
 

+ 113 - 106
locations/body_desc.qsrc

@@ -13,7 +13,11 @@ if $ARGS[0] = '':
 	gs 'body_desc', 'throat'
 	gs 'body_desc', 'pussy'
 	gs 'body_desc', 'anus'
-	if dounspell = 0: gs 'body_desc', 'butt' & gs 'body_desc', 'breasts' & gs 'body_desc', 'BMI'
+	if dounspell = 0:
+		gs 'body_desc', 'butt'
+		gs 'body_desc', 'breasts'
+		gs 'body_desc', 'BMI'
+	end
 	gs 'body_desc', 'lips'
 	gs 'body_desc', 'hair'
 	gs 'body_desc', 'tan'
@@ -41,43 +45,43 @@ end
 
 if $ARGS[0] = 'throat':
 	if pcs_throat = 0:
-		$pcs_throat = 'You have a chaste <a href="exec:view''images/pc/body/throat/th0.jpg''">mouth</a>.'
+		$pc_descFull['throat'] = 'You have a chaste <a href="exec:view''images/pc/body/throat/th0.jpg''">mouth</a>.'
 		$pc_desc['throat'] = 'virgin'
 		$pc_descWordy['throat'] = 'virginal, unused'
 		$throattipe = 'virgin'
 	elseif pcs_throat <= 5:
-		$pcs_throat = 'You have an extremely inexperienced <a href="exec:view''images/pc/body/throat/th1.jpg''">mouth</a>.'
+		$pc_descFull['throat'] = 'You have an extremely inexperienced <a href="exec:view''images/pc/body/throat/th1.jpg''">mouth</a>.'
 		$pc_desc['throat'] = 'narrow'
 		$pc_descWordy['throat'] = 'reluctant, gag-prone'
 		$throattipe = 'narrow'
 	elseif pcs_throat <= 10:
-		$pcs_throat = 'Your slightly-experienced mouth leads to a sensitive <a href="exec:view''images/pc/body/throat/th2.jpg''">throat</a> with an easily-triggered gag reflex.'
+		$pc_descFull['throat'] = 'Your slightly-experienced mouth leads to a sensitive <a href="exec:view''images/pc/body/throat/th2.jpg''">throat</a> with an easily-triggered gag reflex.'
 		$pc_desc['throat'] = 'delicate'
 		$pc_descWordy['throat'] = 'delicate, barely-experienced'
 		$throattipe = 'delicate'
 	elseif pcs_throat <= 15:
-		$pcs_throat = 'You have an experienced mouth and fairly practiced <a href="exec:view''images/pc/body/throat/th3.jpg''">throat</a>.'
+		$pc_descFull['throat'] = 'You have an experienced mouth and fairly practiced <a href="exec:view''images/pc/body/throat/th3.jpg''">throat</a>.'
 		$pc_desc['throat'] = 'fairly practiced'
 		$pc_descWordy['throat'] = 'fairly practiced'
 		$throattipe = 'fairly practiced'
 	elseif pcs_throat <= 25:
-		$pcs_throat = 'You have a willing mouth and trained <a href="exec:view''images/pc/body/throat/th4.jpg''">throat</a>.'
+		$pc_descFull['throat'] = 'You have a willing mouth and trained <a href="exec:view''images/pc/body/throat/th4.jpg''">throat</a>.'
 		$pc_desc['throat'] = 'well-trained'
 		$pc_descWordy['throat'] = 'experienced, well-trained and eager'
 		$throattipe = 'well-trained'
 	elseif pcs_throat <= 35:
-		$pcs_throat = 'Your deep tunnel of a <a href="exec:view''images/pc/body/throat/th5.jpg''">throat</a> may adopt any member.'
+		$pc_descFull['throat'] = 'Your deep tunnel of a <a href="exec:view''images/pc/body/throat/th5.jpg''">throat</a> may adopt any member.'
 		$pc_desc['throat'] = 'capacious'
 		$pc_descWordy['throat'] = 'seasoned, effortlessly-plumbed'
 		$throattipe = 'capacious'
 	else
-		$pcs_throat = 'Your gag reflex is completely absent and your <a href="exec:view''images/pc/body/throat/th6.jpg''">throat</a> has seen nearly as much cock as it has food.'
+		$pc_descFull['throat'] = 'Your gag reflex is completely absent and your <a href="exec:view''images/pc/body/throat/th6.jpg''">throat</a> has seen nearly as much cock as it has food.'
 		$pc_desc['throat'] = 'bottomless'
 		$pc_descWordy['throat'] = 'elastic, oft-fucked'
 		$throattipe = 'bottomless'
 	end
 
-	if pcs_breath = 1:$pcs_throat += ' Last you checked, your breath smelled fresh and minty.'
+	if pcs_breath = 1: $pc_descFull['throat'] += ' Last you checked, your breath smelled fresh and minty.'
 end
 
 if $ARGS[0] = 'pussy':
@@ -194,57 +198,44 @@ if $ARGS[0] = 'breasts':
 	!! more noticeable on a thinner body than a heavier one. I have experimented with moving where the silicone is factored in to the body shape calculations, but ultimately there is just no better way to do it than how it is now, given the things that increase the amount
 	!! of silicone in the PC body. The best kludge I can make is working off of stored fat (pcs_weight does actually not do the job at all, as a fat PC and thin PC are almost the same, oddly, in my tests) and making an approximation from there. The amount of the silicone
 	!! variable does not really equate to any particular real-life cc calculation for implant size, so we cannot go off of that. This will have to do for now.
-	pcs_bustdisparity = (bodyVars['bust_silicone']/10) - salocatnow
+	pcs_bustdisparity = (bodyVars['bust_silicone'] - pcs_mass['bust']) / 10
 
-	if pcs_bustdisparity >=1 and pcs_bustdisparity < 2:
-		$pcdesc_breastsqualifierinsertive = ''
-		$pcdesc_breastsword = 'bolt-ons'
-		pcdesc_breastimplantcheck = 1
-	elseif pcs_bustdisparity >= 2 and pcs_bustdisparity < 3:
-		$pcdesc_breastsqualifierinsertive = ', semi-spherical'
-		$pcdesc_breastsword = 'bolt-ons'
-		pcdesc_breastimplantcheck = 1
-	elseif pcs_bustdisparity >= 3 and pcs_bustdisparity < 4:
-		$pcdesc_breastsqualifierinsertive = ', firm and round'
-		$pcdesc_breastsword = 'bolt-ons'
-		pcdesc_breastimplantcheck = 1
-	!! Already we are about as far as a normal, non-fetishistic human being would get -- the maximum size of implant, the XXL, results in 40 silicone, and an extremely thin and well-kept PC will have a minimum salocatnow of 1.
-	!! That means that anything below this line means it was a very intentional move toward sexual objectification, as it could only come from fillable or string implants (and on a thin frame, no less), so we can take some liberties.
-	elseif pcs_bustdisparity >= 4 and pcs_bustdisparity < 5:
-		$pcdesc_breastsqualifierinsertive = ', clearly man-made'
-		$pcdesc_breastsword = 'bolt-ons'
-		pcdesc_breastimplantcheck = 1
-	elseif pcs_bustdisparity >= 5 and pcs_bustdisparity < 6:
-		$pcdesc_breastsqualifierinsertive = ', plastic fuckdoll'
-		$pcdesc_breastsword = 'bolt-ons'
-		pcdesc_breastimplantcheck = 1
-	elseif pcs_bustdisparity >= 6 and pcs_bustdisparity < 7:
-		$pcdesc_breastsqualifierinsertive = ', walking fucktoy'
-		$pcdesc_breastsword = 'bolt-ons'
-		pcdesc_breastimplantcheck = 1
-	elseif pcs_bustdisparity >= 7 and pcs_bustdisparity < 8:
-		$pcdesc_breastsqualifierinsertive = ', laughably overdone fuckdoll'
-		$pcdesc_breastsword = 'bolt-ons'
-		pcdesc_breastimplantcheck = 1
-	elseif pcs_bustdisparity >= 8:
-		$pcdesc_breastsqualifierinsertive = ', <<$pc_descWordy[''hair colour'']>> overdone fuckdoll'
-		$pcdesc_breastsword = 'bolt-ons'
+	$pcdesc_breastsqualifierinsertive = ''
+	!! For all-natural PCs.
+	if bodyVars['bust_silicone'] <= 0:
+		pcdesc_breastimplantcheck = 0
+	else
 		pcdesc_breastimplantcheck = 1
-	!! This triggers if they have fake breasts, but they are not obviously, blatantly fake breasts. In fact, this should be what triggers most of the time with a PC who has implants, given average cases.
-	elseif pcs_bustdisparity < 1 and bodyVars['bust_silicone'] > 0:
+	end
+
+
+	if pcs_bustdisparity <= 0:
+		!! This triggers if they have natural breasts, or fake breasts but they are not obviously, blatantly fake breasts.
+		!! In fact, this should be what triggers most of the time with a PC who has implants, given average cases.
 		if pcs_cupsize <= 30:
 			$pcdesc_breastsword = 'breasts'
 		else
 			$pcdesc_breastsword = 'tits'
 		end
-		$pcdesc_breastsqualifierinsertive = ''
-		pcdesc_breastimplantcheck = 1
-	!! For all-natural PCs.
 	else
-		if pcs_cupsize <= 30:$pcdesc_breastsword = 'breasts'
-		if pcs_cupsize > 30:$pcdesc_breastsword = 'tits'
-		$pcdesc_breastsqualifierinsertive = ''
-		pcdesc_breastimplantcheck = 0
+		$pcdesc_breastsword = 'bolt-ons'
+		if pcs_bustdisparity = 2:
+			$pcdesc_breastsqualifierinsertive = ', semi-spherical'
+		elseif pcs_bustdisparity = 3:
+			$pcdesc_breastsqualifierinsertive = ', firm and round'
+		!! Already we are about as far as a normal, non-fetishistic human being would get -- the maximum size of implant, the XXL, results in 40 silicone, and an extremely thin and well-kept PC will have a minimum pcs_mass['bust'] of 1.
+		!! That means that anything below this line means it was a very intentional move toward sexual objectification, as it could only come from fillable or string implants (and on a thin frame, no less), so we can take some liberties.
+		elseif pcs_bustdisparity = 4:
+			$pcdesc_breastsqualifierinsertive = ', clearly man-made'
+		elseif pcs_bustdisparity = 5:
+			$pcdesc_breastsqualifierinsertive = ', plastic fuckdoll'
+		elseif pcs_bustdisparity = 6:
+			$pcdesc_breastsqualifierinsertive = ', walking fucktoy'
+		elseif pcs_bustdisparity = 7:
+			$pcdesc_breastsqualifierinsertive = ', laughably overdone fuckdoll'
+		elseif pcs_bustdisparity >= 8:
+			$pcdesc_breastsqualifierinsertive = ', <<$pc_descWordy[''hair colour'']>> overdone fuckdoll'
+		end
 	end
 
 	!! These will not be used below, but can be referenced by descriptive writers in case they want to be able to quickly reference whether or not the PC has implants, as in "He reaches up and cups your<<$pcdesc_breastsfakeinsertive>> breasts."
@@ -389,31 +380,41 @@ end
 
 if $ARGS[0] = 'butt':
 	!have butt implant
+	$temp_img = func('$body_image', 'butt')
 	if bodyVars['butt_silicone'] > 0:
-		$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''images/pc/body/ass/9s.jpg''">butt</a>.'
+		$pc_desc['butt'] = 'jiggly bubble'
+		$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec: view ''<<$temp_img>>''">butt</a>.'
 
 	!natural butt
+	elseif pcs_buttsize <= 7:
+		$pc_desc['butt'] = 'square and flat'
+		$pc_descFull['butt'] = 'Your <a href="exec: view ''<<$temp_img>>'' ">ass</a> is square and as flat as a plank.'
+	elseif pcs_buttsize <= 14:
+		$pc_desc['butt'] = 'square'
+		$pc_descFull['butt'] = 'Your <a href="exec: view ''<<$temp_img>>'' ">ass</a> is square but not completely flat.'
+	elseif pcs_buttsize <= 21:
+		$pc_desc['butt'] = 'average'
+		$pc_descFull['butt'] = 'You have an average, feminine looking <a href="exec: view ''<<$temp_img>>'' ">ass</a>.'
+	elseif pcs_buttsize <= 29:
+		$pc_desc['butt'] = 'above average'
+		$pc_descFull['butt'] = 'You have an above-average, feminine looking <a href="exec: view ''<<$temp_img>>'' ">ass</a>.'
+	elseif pcs_buttsize <= 36:
+		$pc_desc['butt'] = 'big'
+		$pc_descFull['butt'] = 'Your <a href="exec:view''<<$temp_img>>'' ">ass</a> is bigger, rounder and firmer than average.'
+	elseif pcs_buttsize <= 44:
+		$pc_desc['butt'] = 'ample'
+		$pc_descFull['butt'] = 'Your ample <a href="exec: view ''<<$temp_img>>'' ">ass</a> is bigger, rounder and firmer than most.'
+	elseif pcs_buttsize <= 51:
+		$pc_desc['butt'] = 'heart-shaped'
+		$pc_descFull['butt'] = 'You have a heart-shaped <a href="exec: view ''<<$temp_img>>'' ">butt</a> that jiggles as you walk.'
+	elseif pcs_buttsize <= 59:
+		$pc_desc['butt'] = 'large heart-shaped'
+		$pc_descFull['butt'] = 'You have a large heart-shaped <a href="exec: view ''<<$temp_img>>'' ">butt</a> that jiggles and sways as you walk.'
 	else
-		if pcs_butt <= 7:
-			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank.'
-		elseif pcs_butt <= 14:
-			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a> is square but not completely flat.'
-		elseif pcs_butt <= 21:
-			$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a>.'
-		elseif pcs_butt <= 29:
-			$pcs_butt = 'You have an above-average, feminine looking <a href="exec:view''images/pc/body/ass/4.jpg''">ass</a>.'
-		elseif pcs_butt <= 36:
-			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/5.jpg''">ass</a> is bigger, rounder and firmer than average.'
-		elseif pcs_butt <= 44:
-			$pcs_butt = 'Your ample <a href="exec:view''images/pc/body/ass/6.jpg''">ass</a> is bigger, rounder and firmer than most.'
-		elseif pcs_butt <= 51:
-			$pcs_butt = 'You have a heart-shaped <a href="exec:view''images/pc/body/ass/7.jpg''">butt</a> that jiggles as you walk.'
-		elseif pcs_butt <= 59:
-			$pcs_butt = 'You have a large heart-shaped <a href="exec:view''images/pc/body/ass/8.jpg''">butt</a> that jiggles and sways as you walk.'
-		else
-			$pcs_butt = 'You have a large bubble <a href="exec:view''images/pc/body/ass/9.jpg''">butt</a> that jiggles and sways as you walk.'
-		end
+		$pc_desc['butt'] = 'large bubble'
+		$pc_descFull['butt'] = 'You have a large bubble <a href="exec: view ''<<$temp_img>>'' ">butt</a> that jiggles and sways as you walk.'
 	end
+	killvar '$temp_img'
 end
 
 if $ARGS[0] = 'lips':
@@ -470,7 +471,7 @@ if $ARGS[0] = 'lips':
 		$pc_desc['lip glossed'] = 'softened'
 	end
 
-	$lip = 'You have <<$pcs_lipSize>>, <<$pc_desc[''lip gloss'']>> ' + iif(pcs_lip = 4, 'suggestively full ', '') +  'lips. <<$pirsB>> <<$pirsA>>'
+	$pc_descFull['lip'] = 'You have <<$pcs_lipSize>>, <<$pc_desc[''lip gloss'']>> ' + iif(pcs_lip = 4, 'suggestively full ', '') +  'lips. <<$pirsB>> <<$pirsA>>'
 
 	!! A pair of ready-made lip strings for writers to use if they are unsure how to construct them themselves. Again, these are not great and should preferably not be relied on, but they are here.
 	$pc_desc['lips'] = '<<$pc_desc[''lip size'']>> <<$pc_desc[''lip gloss'']>>'
@@ -511,23 +512,23 @@ if $ARGS[0] = 'skin':
 	if pcs_skin < 200:
 		$pc_desc['skin'] = func('body_desc', 'ChooseDescWord', 'terrible', 'awful', 'greasy', 'pimple-strewn')
 		$pc_descWordy['skin'] = 'awful, greasy and pimply'
-		$skin = 'Your <<$pcs_tan>> skin is rough and covered with pimples and moles. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
+		$pc_descFull['skin'] = 'Your <<$pcs_tan>> skin is rough and covered with pimples and moles. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
 	elseif pcs_skin < 400:
 		$pc_desc['skin'] = func('body_desc', 'ChooseDescWord', 'bad', 'greasy', 'rough', 'unappealing')
 		$pc_descWordy['skin'] = 'poorly-kept, unappealing'
-		$skin = 'Your <<$pcs_tan>> skin is rough and has a few pimples. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
+		$pc_descFull['skin'] = 'Your <<$pcs_tan>> skin is rough and has a few pimples. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
 	elseif pcs_skin < 600:
 		$pc_desc['skin'] = func('body_desc', 'ChooseDescWord', 'average', 'normal', 'clear')
 		$pc_descWordy['skin'] = 'normal, slightly rough'
-		$skin = 'Your <<$pcs_tan>> skin is clear of acne but still slightly rough. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
+		$pc_descFull['skin'] = 'Your <<$pcs_tan>> skin is clear of acne but still slightly rough. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
 	elseif pcs_skin < 800:
 		$pc_desc['skin'] = func('body_desc', 'ChooseDescWord', 'good', 'nice', 'smooth', 'great', 'well-kept')
 		$pc_descWordy['skin'] = 'smooth, well-kept'
-		$skin = 'You have <<$pcs_tan>>, smooth and well-groomed skin. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
+		$pc_descFull['skin'] = 'You have <<$pcs_tan>>, smooth and well-groomed skin. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
 	else
 		$pc_desc['skin'] = func('body_desc', 'ChooseDescWord', 'excellent', 'silken', 'soft', 'silky', 'immaculate')
 		$pc_descWordy['skin'] = 'immaculate, silky-soft'
-		$skin = 'You have <<$pcs_tan>> and very smooth skin which almost feels like silk to the touch. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
+		$pc_descFull['skin'] = 'You have <<$pcs_tan>> and very smooth skin which almost feels like silk to the touch. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
 	end
 end
 
@@ -630,20 +631,20 @@ if $ARGS[0] = 'eye_size':
 	if pcs_eyesize = 0:
 		$pc_desc['eye size'] = ''
 		$pc_descWordy['eye size'] = 'little'
-		$glaza = 'You have little <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
+		$pc_descFull['eyes'] = 'You have little <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 	elseif pcs_eyesize = 1:
 		$pc_desc['eye size'] = ''
 		$pc_descWordy['eye size'] = 'medium-sized'
-		$glaza = 'You have medium-sized <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
+		$pc_descFull['eyes'] = 'You have medium-sized <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 	elseif pcs_eyesize = 2:
 		$pc_desc['eye size'] = 'large'
 		$pc_descWordy['eye size'] = 'large, expressive'
-		$glaza = 'You have large <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
+		$pc_descFull['eyes'] = 'You have large <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 	else
 		pcs_eyesize = 3
 		$pc_desc['eye size'] = 'huge'
 		$pc_descWordy['eye size'] = 'huge'
-		$glaza = 'You have huge <<$pcs_eyecol>> eyes that almost look like they''re out of an anime, <<$pcs_lashes>>.<<$glass>>'
+		$pc_descFull['eyes'] = 'You have huge <<$pcs_eyecol>> eyes that almost look like they''re out of an anime, <<$pcs_lashes>>.<<$glass>>'
 	end
 end
 
@@ -754,45 +755,51 @@ if $ARGS[0] = 'makeup':
 	if pcs_makeup = 0:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'makeup-ruined', 'makeup-smeared', 'makeup-trashed')
 		$pc_descWordy['makeup'] = 'clownishly makeup-smeared'
-		$pcs_makeup = '<b><font color="red">Your makeup is smeared all over your face</font></b>'
+		$pc_descFull['makeup'] = '<b><font color="red">Your makeup is smeared all over your face</font></b>'
 		$pcs_makeup_msg = 'Your makeup is smeared all over your face.'
 		$pcs_makeup_tooltip = 'Your makeup is ruined.'
 	elseif pcs_makeup = 1:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'natural', 'bare')
 		$pc_descWordy['makeup'] = 'bare, natural'
-		$pcs_makeup = 'You''re not wearing any kind of makeup'
+		$pc_descFull['makeup'] = 'You''re not wearing any kind of makeup'
 		$pcs_makeup_msg = 'You''re not wearing any kind of makeup.'
 		$pcs_makeup_tooltip = 'You''re not wearing makeup.'
 	elseif pcs_makeup = 2:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'lightly-accented', 'subtly-highlighted')
 		$pc_descWordy['makeup'] = 'almost natural, subtly-accented'
-		$pcs_makeup = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty'
+		$pc_descFull['makeup'] = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty'
 		$pcs_makeup_msg = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty.'
 		$pcs_makeup_tooltip = 'Your makeup is light and subtle.'
 	elseif pcs_makeup = 3:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'colourfully done-up', 'vibrantly done-up')
 		$pc_descWordy['makeup'] = 'colourful, tastefully done-up'
-		$pcs_makeup = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features'
+		$pc_descFull['makeup'] = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features'
 		$pcs_makeup_msg = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features.'
 		$pcs_makeup_tooltip = 'Your makeup has some mildly vibrant tones.'
 	elseif pcs_makeup = 4:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'painted-on', 'makeup-caked', 'dolled-up', 'sultry, dramatically done-up')
 		$pc_descWordy['makeup'] = 'heavily dolled-up and painted'
-		$pcs_makeup = 'Your makeup is thick enough to cover most imperfections, with rich shades drawing attention to your eyes and lips'
+		$pc_descFull['makeup'] = 'Your makeup is thick enough to cover most imperfections, with rich shades drawing attention to your eyes and lips'
 		$pcs_makeup_msg = 'Your makeup is thick enough to cover most imperfections, with rich shades drawing attention to your eyes and lips.'
 		$pcs_makeup_tooltip = 'Your makeup is thick enough to cover most imperfections.'
 	elseif pcs_makeup = 5:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'painted-on', 'makeup-caked', 'dolled-up', 'sultry, dramatically done-up')
 		$pc_descWordy['makeup'] = 'heavily dolled-up and painted'
-		$pcs_makeup = 'Your makeup is professional grade, covering up any and all imperfections and flawlessly complimenting the natural hues of your eyes, face, and hair'
+		$pc_descFull['makeup'] = 'Your makeup is professional grade, covering up any and all imperfections and flawlessly complimenting the natural hues of your eyes, face, and hair'
 		$pcs_makeup_msg = 'Your makeup is professional grade, covering up any and all imperfections and flawlessly complimenting the natural hues of your eyes, face, and hair.'
 		$pcs_makeup_tooltip = 'Your makeup is professional grade.'
 	elseif pcs_makeup = 6:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'bimbo', 'hawt', 'O M G', 'just, the best')
 		$pc_descWordy['makeup'] = 'really fucking bimbo-y'
-		$pcs_makeup = 'You look, like super hawt and everyone is so jelly because their makeup is boring and ugly.'
+		$pc_descFull['makeup'] = 'You look, like super hawt and everyone is so jelly because their makeup is boring and ugly.'
 		$pcs_makeup_msg = 'You look, like super hawt and everyone is so jelly because their makeup is boring and ugly.'
 		$pcs_makeup_tooltip = 'OMG! your makeup is sooo bimbo fine.'
+	elseif pcs_makeup = 7:
+		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'goth', 'dark', 'heavy')
+		$pc_descWordy['makeup'] = 'completely obscured and goth'
+		$pc_descFull['makeup'] = 'Your makeup is goth style, covering up any and all imperfections and fully obscures your natural features.'
+		$pcs_makeup_msg = 'Your makeup is goth style, covering up any and all imperfections and fully obscures your natural features.'
+		$pcs_makeup_tooltip = 'Your makeup is goth style.'
 	end
 end
 
@@ -851,19 +858,19 @@ if $ARGS[0] = 'pubes':
 		$pube_style['shape'] = ''
 		if pcs_pubes <= 3:
 			lobkoef = 3
-			$pcs_pubes = 'You have a smoothly <a href="exec:view''<<FUNC(''$pube_image'')>>''">shaved pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have a smoothly <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shaved pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 			$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'silky', 'hairless', 'smooth-shaven', 'freshly-shaven')
 			$pc_descWordy['pubes'] = 'silky, freshly-shaven'
 			$pube_style['word'] = 'shaved'
 		elseif pcs_pubes <= 10:
 			lobkoef = 0
-			$pcs_pubes = 'You have stubble growing around your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have stubble growing around your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 			$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'stubbly', 'scratchy', 'roughly-stubbled')
 			$pc_descWordy['pubes'] = 'scratchy, roughly-stubbled'
 			$pube_style['word'] = 'stubble'
 		elseif pcs_pubes <= 15:
 			lobkoef = 0
-			$pcs_pubes = 'You have a tidy patch of hair growing above your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have a tidy patch of hair growing above your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 			$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'almost bare', 'barely-haired', 'well-kept')
 			$pc_descWordy['pubes'] = 'scratchy, roughly-stubbled'
 			$pube_style['word'] = 'patch'
@@ -872,51 +879,51 @@ if $ARGS[0] = 'pubes':
 			$pube_style['word'] = 'trimmed'
 			if pubestyle = 9:
 				$pube_style['shape'] = 'bush'
-				$pcs_pubes = 'You have neatly trimmed section of hair around your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+				$pcs_pubes = 'You have neatly trimmed section of hair around your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 			elseif pubestyle = 12:
 				$pube_style['word'] = 'patch'
-				$pcs_pubes = 'You have cute little patch of bush at the top of your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+				$pcs_pubes = 'You have cute little patch of bush at the top of your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 			elseif pubestyle = 13:
 				$pube_style['shape'] = 'strip'
-				$pcs_pubes = 'You have tidy strip of bush covering your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+				$pcs_pubes = 'You have tidy strip of bush covering your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 			elseif pubestyle = 14:
 				$pube_style['shape'] = 'rectangle'
-				$pcs_pubes = 'You have neatly trimmed rectangle of hair just above your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+				$pcs_pubes = 'You have neatly trimmed rectangle of hair just above your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 			else
 				if pubestyle = 2:
 					$pube_style['shape'] = 'V'
-					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<FUNC(''$pube_image'')>>''">shape of a V</a>. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shape of a V</a>. <<$pirspiz>><br><<$clitsize>>'
 				elseif pubestyle = 3:
 					$pube_style['shape'] = 'triangle'
-					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<FUNC(''$pube_image'')>>''">shape of a triangle</a>. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shape of a triangle</a>. <<$pirspiz>><br><<$clitsize>>'
 				elseif pubestyle = 4:
 					$pube_style['shape'] = 'landing strip'
-					$pcs_pubes = 'You have a cleanly trimmed <a href="exec:view''<<FUNC(''$pube_image'')>>''">landing strip</a> between your legs. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a cleanly trimmed <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">landing strip</a> between your legs. <<$pirspiz>><br><<$clitsize>>'
 				elseif pubestyle = 5:
 					$pube_style['shape'] = 'heart'
-					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<FUNC(''$pube_image'')>>''">shape of a heart</a>. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shape of a heart</a>. <<$pirspiz>><br><<$clitsize>>'
 				elseif pubestyle = 6:
 					$pube_style['shape'] = 'flame'
-					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<FUNC(''$pube_image'')>>''">shape of a flame</a>. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shape of a flame</a>. <<$pirspiz>><br><<$clitsize>>'
 				elseif pubestyle = 7:
 					$pube_style['shape'] = 'cross'
-					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<FUNC(''$pube_image'')>>''">shape of a cross</a>. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shape of a cross</a>. <<$pirspiz>><br><<$clitsize>>'
 				elseif pubestyle = 8:
 					$pube_style['shape'] = 'bush'
-					$pcs_pubes = 'You have a close-cropped lawn of pubic hair covering your <a href="exec:view''<<FUNC(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a close-cropped lawn of pubic hair covering your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 				end
 			end
 			$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'wispy-haired', 'lightly-furred', 'trimmed', 'well-maintained')
 			$pc_descWordy['pubes'] = 'trimmed, well-kept'
 		elseif pcs_pubes <= 30:
 			lobkoef = 0
-			$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''<<FUNC(''$pube_image'')>>''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 			$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'furred', 'bushy', 'partially-maintained')
 			$pc_descWordy['pubes'] = 'bushy, thick'
 			$pube_style['word'] = 'bush'
 		elseif pcs_pubes >= 40:
 			lobkoef = 0
-			$pcs_pubes = 'You have a wild and unkempt jungle of <a href="exec:view''<<FUNC(''$pube_image'')>>''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have a wild and unkempt jungle of <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 			$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'thickly-furred', 'very hairy', 'ill-maintained')
 			$pc_descWordy['pubes'] = 'hairy, wild-maned'
 			$pube_style['word'] = 'untrimmed'
@@ -924,7 +931,7 @@ if $ARGS[0] = 'pubes':
 	elseif lashair = 1:
 		$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'hairless', 'smooth', 'bald', 'silky-smooth')
 		$pc_descWordy['pubes'] = 'eternally silky-smooth'
-		$pcs_pubes = 'You have a smooth, <a href="exec:view''<<FUNC(''$pube_image'')>>''">bald pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have a smooth, <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">bald pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 		$pube_style['word'] = 'shaved'
 	end
 	gs 'body_desc', 'pube_desc_update'

+ 369 - 236
locations/body_structure.qsrc

@@ -66,136 +66,136 @@ if $ARGS[0] = 'get_class':
 end
 
 
-!	Get the bmi description:
-!	$bodyVars['bmi_desc'] = func('body_structure', pcs_bmi)
-if $ARGS[0] = 'bmi_desc':
-	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
 
-	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], 30)
+if $ARGS[0] = 'body_img_totals':
+	if ARGS[0] = 000:
+		result = 2
+	elseif ARGS[0] = 006:
+		result = 2
+
+	elseif ARGS[0] = 100:
+		result = 4
+	elseif ARGS[0] = 106:
+		result = 3
+
+	elseif ARGS[0] = 200:
+		result = 2
+	elseif ARGS[0] = 206:
+		result = 4
+	elseif ARGS[0] = 207:
+		result = 3
+	elseif ARGS[0] = 208:
+		result = 1
+	elseif ARGS[0] = 210:
+		result = 1
+	elseif ARGS[0] = 213:
+		result = 1
+	elseif ARGS[0] = 215:
+		result = 1
+
+	elseif ARGS[0] = 300:
+		result = 3
+	elseif ARGS[0] = 306:
+		result = 3
+	elseif ARGS[0] = 307:
+		result = 1
+	elseif ARGS[0] = 308:
+		result = 1
+
+	elseif ARGS[0] = 400:
+		result = 2
+	elseif ARGS[0] = 406:
+		result = 2
+
+	elseif ARGS[0] = 500:
+		result = 3
+	elseif ARGS[0] = 506:
+		result = 2
+
+	elseif ARGS[0] = 600:
+		result = 1
+
+	elseif ARGS[0] = 700:
+		result = 2
+
+	elseif ARGS[0] = 800:
+		result = 1
 
-	if bs_temp_bs_class < 100:
-		$result = 'You are severely underweight.'
-	elseif bs_temp_bs_class < 200:
-		$result = 'You are underweight'
-	elseif bs_temp_bs_class < 300:
-		$result = 'You have a normal, healthy weight.'
-	elseif bs_temp_bs_class < 400:
-		$result = 'You have a normal, healthy weight.'
-	elseif bs_temp_bs_class < 500:
-		$result = 'You are overweight.'
-	elseif bs_temp_bs_class < 600:
-		$result = 'You are moderately obese.'
-	elseif bs_temp_bs_class < 700:
-		$result = 'You are severely obese.'
-	elseif bs_temp_bs_class < 800:
-		$result = 'You are very severely obese.'
-	else
-		$result = 'You are morbidly obese.'
 	end
-
-	killvar 'bs_temp_bs_class'
 end
 
-
-!	Get the appearance bonus
-!	Appearance_bonus = func('body_structure', 'appearance_bonus', pcs_bmi, strenbuf)
-if $ARGS[0] = 'appearance_bonus':
-	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
-	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
-
-	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
-
-	if bs_temp_bs_class < 100:
-		!	starving: bmi < 16
-		result = -10
-	elseif bs_temp_bs_class < 200:
-		!	underweight: 16 <= bmi < 16
-		result = 25
-	elseif bs_temp_bs_class < 300:
-		!	slender: 19 <= bmi < 21
-		result = 50
-	elseif bs_temp_bs_class < 400:
-		!	healthy: 21 <= bmi < 25
-		result = 50
-	elseif bs_temp_bs_class < 500:
-		!	overweight: 26 <= bmi < 30
-		result = 25
-	elseif bs_temp_bs_class < 600:
-		!	moderately obese: 30 <= bmi < 35
-		result = 10
-	elseif bs_temp_bs_class < 700:
-		!	severely obese: 35 <= bmi < 40
-		result = -15
-	elseif bs_temp_bs_class < 800:
-		!	very severely obese: 40 <= bmi < 45
-		result = -40
+if $ARGS[0] = 'Body_img_transform':
+	if ARGS[1] < 006:
+		result = 000
+	elseif ARGS[1] < 100:
+		result = 006
+	elseif ARGS[1] < 106:
+		result = 100
+	elseif ARGS[1] < 200:
+		result = 106
+	elseif ARGS[1] < 206:
+		result = 200
+	elseif ARGS[1] = 206:
+		result = 206
+	elseif ARGS[1] = 207:
+		result = 207
+	elseif ARGS[1] < 210:
+		result = 208
+	elseif ARGS[1] < 213:
+		result = 210
+	elseif ARGS[1] < 215:
+		result = 213
+	elseif ARGS[1] < 300:
+		result = 215
+	elseif ARGS[1] < 306:
+		result = 300
+	elseif ARGS[1] = 306:
+		result = 306
+	elseif ARGS[1] = 307:
+		result = 307
+	elseif ARGS[1] < 310:
+		result = 308
+	elseif ARGS[1] < 313:
+		result = 210
+	elseif ARGS[1] < 315:
+		result = 213
+	elseif ARGS[1] < 400:
+		result = 215
+	elseif ARGS[1] < 406:
+		result = 400
+	elseif ARGS[1] < 500:
+		result = 406
+	elseif ARGS[1] < 506:
+		result = 500
+	elseif ARGS[1] < 600:
+		result = 506
+	elseif ARGS[1] < 700:
+		result = 600
+	elseif ARGS[1] < 800:
+		result = 700
 	else
-		!	morbidly obese: 45 <= bmi
-		result = -80
+		result = 800
 	end
+end
 
-	bs_temp_bs_class = bs_temp_bs_class mod 100
-
-	if bs_temp_bs_class = 0:
-		!	0 <= strenbuf <= 5
-		result -= 30
-	elseif bs_temp_bs_class = 1:
-		!	5 < strenbuf <= 10
-		result -= 20
-	elseif bs_temp_bs_class = 2:
-		!	10 < strenbuf <= 15
-		result -= 15
-	elseif bs_temp_bs_class = 3:
-		!	15 < strenbuf <= 25
-		result -= 10
-	elseif bs_temp_bs_class = 4:
-		!	25 < strenbuf <= 35
-		result -= 5
-	elseif bs_temp_bs_class = 5:
-		!	35 < strenbuf <= 50
-		result += 0
-	elseif bs_temp_bs_class = 6:
-		!	50 < strenbuf <= 70
-		result += 5
-	elseif bs_temp_bs_class = 7:
-		!	70 < strenbuf <= 100
-		result += 10
-	elseif bs_temp_bs_class = 8:
-		!	100 < strenbuf <= 110
-		result += 5
-	elseif bs_temp_bs_class = 9:
-		!	110 < strenbuf <= 120
-		result += 0
-	elseif bs_temp_bs_class = 10:
-		!	120 < strenbuf <= 130
-		result -= 5
-	elseif bs_temp_bs_class = 11:
-		!	130 < strenbuf <= 140
-		result -= 15
-	elseif bs_temp_bs_class = 12:
-		!	140 < strenbuf <= 150
-		result -= 30
-	elseif bs_temp_bs_class = 13:
-		!	150 < strenbuf <= 160
-		result -= 45
-	elseif bs_temp_bs_class = 14:
-		!	160 < strenbuf <= 170
-		result -= 60
-	elseif bs_temp_bs_class = 15:
-		!	170 < strenbuf <= 180
-		result -= 75
-	elseif bs_temp_bs_class = 16:
-		!	180 < strenbuf <= 190
-		result -= 100
-	else
-		!	190 < strenbuf <= 200
-		result -= 130
+!	ARGS[1] = bs_class
+if $ARGS[0] = 'default_set_class_transform':
+	result = ARGS[1]
+	if cheatVars['fix_bi_set'] mod 10 = 0:
+		result = 100 * (result / 100) + 2
+	elseif cheatVars['fix_bi_set'] mod 10 = 1:
+		result = 100 * (result / 100) + 6
+	elseif cheatVars['fix_bi_set'] mod 10 = 2:
+		result = 100 * (result / 100) + 8
 	end
 
-	killvar 'bs_temp_bs_class'
+	if cheatVars['fix_bi_set'] / 10 mod 10 ! 9:
+		result = (cheatVars['fix_bi_set'] / 10 mod 10) * 100 + result mod 100
+	end
 end
 
 
+
 !	Get the body shape image
 !	$bodyVars['img'] = func('body_structure', 'body_img', pcs_bmi, strenbuf, PregChem)
 if $ARGS[0] = 'body_img':
@@ -203,134 +203,108 @@ if $ARGS[0] = 'body_img':
 	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
 	if arrsize('ARGS') = 3: ARGS[3] = PregChem
 
+
+
 	! =======      Pregnant       ======= !
-	if bdsetlock = 0 and (knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or ARGS[3] > 3600))):
+	if cheatVars['fix_bodyimg'] = 0 and (knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or ARGS[3] > 3600))):
 		if ARGS[3] <= 2687:
-			$result = 'images/pc/body/shape/default_preg/0.jpg'
+			$result = 'images/pc/body/shape/preg/0/0.jpg'
 		elseif ARGS[3] <= 6215:
-			$result = 'images/pc/body/shape/default_preg/<<((ARGS[3] - 2184)/504)>>.jpg'
+			$result = 'images/pc/body/shape/preg/0/<<((ARGS[3] - 2184)/504)>>.jpg'
 		else
-			$result = 'images/pc/body/shape/default_preg/8.jpg'
+			$result = 'images/pc/body/shape/preg/0/8.jpg'
 		end
 		exit
 	end
 
-
 	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
 
-	if bdsetlock = 1:
-		if fixbodset = 0:
-			bs_temp_bs_class = 100 * (bs_temp_bs_class / 100) + 4
-		elseif fixbodset = 1:
-			bs_temp_bs_class = 100 * (bs_temp_bs_class / 100) + 6
-		elseif fixbodset = 2:
-			bs_temp_bs_class = 100 * (bs_temp_bs_class / 100) + 8
-		else
+	if cheatVars['fix_bodyimg'] = 1:
+		if cheatVars['fix_bi_set'] < 10:
 			$result = func('body_structure', 'custom_body_img', bs_temp_bs_class)
 			killvar 'bs_temp_bs_class'
 			exit
+		else
+			bs_temp_bs_class = func('body_structure', 'default_set_class_transform', bs_temp_bs_class)
 		end
 	end
 
+	$result = func('body_structure', 'body_img_from_class', bs_temp_bs_class)
+	killvar 'bs_temp_bs_class'
+end
 
-	! =======      starving       ======= !
-	! -----           bmi < 16      ----- !
-	if bs_temp_bs_class <= 17:
-		!	0 <= strenbuf <= 200
-		$result = 'images/pc/body/shape/0.jpg'
-
-	! =======     underweight     ======= !
-	! -----     16 <= bmi < 19      ----- !
-	elseif bs_temp_bs_class <= 105:
-		!	0 <= strenbuf <= 50
-		$result = 'images/pc/body/shape/default_low/1.jpg'
-	elseif bs_temp_bs_class <= 107:
-		!	51 <= strenbuf <= 100
-		$result = 'images/pc/body/shape/default_mid/1.jpg'
-	elseif bs_temp_bs_class <= 117:
-		!	101 <= strenbuf <= 200
-		$result = 'images/pc/body/shape/default_high/1.jpg'
-
-	! =======       slender       ======= !
-	! -----     19 <= bmi < 21      ----- !
-	elseif bs_temp_bs_class <= 205:
-		!	0 <= strenbuf <= 50
-		$result = 'images/pc/body/shape/default_low/2.jpg'
-	elseif bs_temp_bs_class <= 207:
-		!	51 <= strenbuf <= 100
-		$result = 'images/pc/body/shape/default_mid/2.jpg'
-	elseif bs_temp_bs_class <= 217:
-		!	101 <= strenbuf <= 200
-		$result = 'images/pc/body/shape/default_high/2.jpg'
-
-	! =======       healthy       ======= !
-	! -----     21 <= bmi < 25      ----- !
-	elseif bs_temp_bs_class <= 305:
-		!	0 <= strenbuf <= 50
-		$result = 'images/pc/body/shape/default_low/3.jpg'
-	elseif bs_temp_bs_class <= 307:
-		!	51 <= strenbuf <= 100
-		$result = 'images/pc/body/shape/default_mid/3.jpg'
-	elseif bs_temp_bs_class <= 317:
-		!	101 <= strenbuf <= 200
-		$result = 'images/pc/body/shape/default_high/3.jpg'
-
-	! =======     overweight      ======= !
-	! -----     26 <= bmi < 30      ----- !
-	elseif bs_temp_bs_class <= 405:
-		!	0 <= strenbuf <= 50
-		$result = 'images/pc/body/shape/default_low/4.jpg'
-	elseif bs_temp_bs_class <= 407:
-		!	51 <= strenbuf <= 100
-		$result = 'images/pc/body/shape/default_mid/4.jpg'
-	elseif bs_temp_bs_class <= 417:
-		!	101 <= strenbuf <= 200
-		$result = 'images/pc/body/shape/default_high/4.jpg'
-
-	! =======  moderately obese   ======= !
-	! -----     30 <= bmi < 35      ----- !
-	elseif bs_temp_bs_class <= 505:
-		!	0 <= strenbuf <= 50
-		$result = 'images/pc/body/shape/default_low/5.jpg'
-	elseif bs_temp_bs_class <= 507:
-		!	51 <= strenbuf <= 100
-		$result = 'images/pc/body/shape/default_mid/5.jpg'
-	elseif bs_temp_bs_class <= 517:
-		!	101 <= strenbuf <= 200
-		$result = 'images/pc/body/shape/default_high/5.jpg'
 
-	! =======   severely obese    ======= !
-	! -----     35 <= bmi < 40      ----- !
-	elseif bs_temp_bs_class <= 617:
-		!	0 <= strenbuf <= 200
-		$result = 'images/pc/body/shape/6.jpg'
+if $ARGS[0] = 'body_img_from_class':
+	$result = 'images/pc/body/shape/'
+
+	ARGS[1] = func('body_structure', 'Body_img_transform', ARGS[1])
+	if ARGS[1] < 100:
+		$result += '0_starving/'
+	elseif ARGS[1] < 200:
+		$result += '1_underweight/'
+	elseif ARGS[1] < 300:
+		$result += '2_slender/'
+	elseif ARGS[1] < 400:
+		$result += '3_healthy/'
+	elseif ARGS[1] < 500:
+		$result += '4_overweight/'
+	elseif ARGS[1] < 600:
+		$result += '5_modobese/'
+	elseif ARGS[1] < 700:
+		$result += '6_sevobese/'
+	elseif ARGS[1] < 800:
+		$result += '7_vsevobese/'
+	else
+		$result += '8_morobese/'
+	end
 
-	! ======= very severely obese ======= !
-	! -----     40 <= bmi < 45      ----- !
-	elseif bs_temp_bs_class <= 717:
-		!	0 <= strenbuf <= 200
-		$result = 'images/pc/body/shape/7.jpg'
+	if ARGS[1] mod 100 = 0:
+		$result += '0_low_'
+	elseif ARGS[1] mod 100 = 6:
+		$result += '6_mid_'
+	elseif ARGS[1] mod 100 = 7:
+		$result += '7_high_'
+	elseif ARGS[1] mod 100 = 8:
+		$result += '8_strong_'
+	elseif ARGS[1] mod 100 = 10:
+		$result += '10_vstrong_'
+	elseif ARGS[1] mod 100 = 13:
+		$result += '13_bbuilder_'
+	elseif ARGS[1] mod 100 = 15:
+		$result += '15_hulk_'
+	end
 
-	! =======   morbidly obese    ======= !
-	! -----     45 <= bmi           ----- !
+	temp_img_totals = func('body_structure', 'body_img_totals', ARGS[1])
+	if arrsize('ARGS') <= 2:
+		temp_img_chosen = rand(0, temp_img_totals-1)
+	elseif ARGS[2] < 0:
+		temp_img_chosen = 0
+	elseif ARGS[2] < temp_img_totals:
+		temp_img_chosen = ARGS[2]
 	else
-		!	0 <= strenbuf <= 200
-		!$result = 'images/pc/body/shape/8.jpg'
-		$result = 'images/pc/body/shape/7.jpg'
+		temp_img_chosen = temp_img_totals - 1
 	end
 
+	$result += '<<temp_img_chosen>>.jpg'
+
+	killvar 'temp_img_totals'
 	killvar 'bs_temp_bs_class'
 end
 
 if $ARGS[0] = 'custom_body_img':
 	ARGS[1] = ARGS[1] / 100
-	if ARGS[1] = 0 or ARGS[1] >= 6:
-		if dyneval('result = imset<<ARGS[1]>>ovr[<<fixbodset>>]') = 0:
-			$result = 'images/pc/body/shape/<<ARGS[1]>>.jpg'
-			exit
-		end
+
+	$temp_img_name = $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_img_<<ARGS[1]>>']
+	if $temp_img_name = '':
+		$result = func('body_structure', 'body_img_from_class', ARGS[1] * 100)
+		killvar '$temp_img_name'
+		exit
 	end
-	$result = 'images/pc/body/shape/<<$bodimgsets[((fixbodset * 10) + 9)]>>/<<ARGS[1]>>.jpg'
+
+	$temp_base_folder = 'images/pc/body/shape/' + $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_folder']
+	$result = '<<$temp_base_folder>>/<<$temp_img_name>>.jpg'
+	killvar '$temp_base_folder'
+	killvar '$temp_img_name'
 end
 
 
@@ -364,80 +338,92 @@ if $ARGS[0] = 'body_desc':
 		exit
 	end
 
-
-
 	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
 
+	if cheatVars['fix_bodyimg'] = 1:
+		if cheatVars['fix_bi_set'] < 10:
+			$result = func('body_structure', 'custom_body_desc', bs_temp_bs_class)
+			killvar 'bs_temp_bs_class'
+			exit
+		else
+			bs_temp_bs_class = func('body_structure', 'default_set_class_transform', bs_temp_bs_class)
+		end
+	end
+
+	$result = func('body_structure', 'body_desc_from_class', bs_temp_bs_class)
+	killvar 'bs_temp_bs_class'
+end
 
+if $ARGS[0] = 'body_desc_from_class':
 	! =======      starving       ======= !
 	! -----           bmi < 16      ----- !
-	if bs_temp_bs_class <= 17:
+	if ARGS[1] <= 17:
 		!	0 <= strenbuf <= 200
 		$result = 'starving'
 
 	! =======     underweight     ======= !
 	! -----     16 <= bmi < 19      ----- !
-	elseif bs_temp_bs_class <= 105:
+	elseif ARGS[1] <= 105:
 		!	0 <= strenbuf <= 50
 		$result = 'underweight'
-	elseif bs_temp_bs_class <= 107:
+	elseif ARGS[1] <= 107:
 		!	51 <= strenbuf <= 100
 		$result = 'slight'
-	elseif bs_temp_bs_class <= 117:
+	elseif ARGS[1] <= 117:
 		!	101 <= strenbuf <= 200
 		$result = 'wiry'
 
 	! =======       slender       ======= !
-	! -----     19 <= bmi < 21      ----- !
-	elseif bs_temp_bs_class <= 205:
+	! -----     19 <= bmi < 22      ----- !
+	elseif ARGS[1] <= 205:
 		!	0 <= strenbuf <= 50
 		$result = 'slender'
-	elseif bs_temp_bs_class <= 207:
+	elseif ARGS[1] <= 207:
 		!	51 <= strenbuf <= 100
 		$result = 'skinny'
-	elseif bs_temp_bs_class <= 217:
+	elseif ARGS[1] <= 217:
 		!	101 <= strenbuf <= 200
 		$result = 'lean'
 
 	! =======       healthy       ======= !
-	! -----     21 <= bmi < 25      ----- !
-	elseif bs_temp_bs_class <= 305:
+	! -----     22 <= bmi < 25      ----- !
+	elseif ARGS[1] <= 305:
 		!	0 <= strenbuf <= 50
 		$result = 'healthy'
-	elseif bs_temp_bs_class <= 307:
+	elseif ARGS[1] <= 307:
 	!		51 <= strenbuf <= 100
 		$result = 'toned'
-	elseif bs_temp_bs_class <= 317:
+	elseif ARGS[1] <= 317:
 		!	101 <= strenbuf <= 200
 		$result = 'ripped'
 
 	! =======     overweight      ======= !
 	! -----     26 <= bmi < 30      ----- !
-	elseif bs_temp_bs_class <= 405:
+	elseif ARGS[1] <= 405:
 		!	0 <= strenbuf <= 50
 		$result = 'overweight'
-	elseif bs_temp_bs_class <= 407:
+	elseif ARGS[1] <= 407:
 	!		51 <= strenbuf <= 100
 		$result = 'curvy'
-	elseif bs_temp_bs_class <= 417:
+	elseif ARGS[1] <= 417:
 		!	101 <= strenbuf <= 200
 		$result = 'heavy set'
 
 	! =======  moderately obese   ======= !
 	! -----     30 <= bmi < 35      ----- !
-	elseif bs_temp_bs_class <= 517:
+	elseif ARGS[1] <= 517:
 		!	0 <= strenbuf <= 200
 		$result = 'moderately obese'
 
 	! =======   severely obese    ======= !
 	! -----     35 <= bmi < 40      ----- !
-	elseif bs_temp_bs_class <= 617:
+	elseif ARGS[1] <= 617:
 		!	0 <= strenbuf <= 200
 		$result = 'severely obese'
 
 	! ======= very severely obese ======= !
 	! -----     40 <= bmi < 45      ----- !
-	elseif bs_temp_bs_class <= 717:
+	elseif ARGS[1] <= 717:
 		!	0 <= strenbuf <= 200
 		$result = 'very severely obese'
 
@@ -447,9 +433,156 @@ if $ARGS[0] = 'body_desc':
 		!	0 <= strenbuf <= 200
 		$result = 'morbidly obese'
 	end
+end
+
+
+if $ARGS[0] = 'custom_body_desc':
+	ARGS[1] = ARGS[1] / 100
+
+	$temp_bs_body_desc = $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_desc_<<ARGS[1]>>']
+	if $temp_bs_body_desc = '':
+		$temp_bs_body_desc = func('body_structure', 'body_desc_from_class', ARGS[1] * 100)
+	end
+
+	$result = $temp_bs_body_desc
+	killvar '$temp_bs_body_desc'
+end
+
+
 
+!	Get the bmi description:
+!	$bodyVars['bmi_desc'] = func('body_structure', pcs_bmi)
+if $ARGS[0] = 'bmi_desc':
+	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
+
+	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], 30)
+	$result = func('body_structure', 'bmi_desc_from_class', bs_temp_bs_class)
 	killvar 'bs_temp_bs_class'
 end
 
 
+if $ARGS[0] = 'bmi_desc_from_class':
+	if ARGS[1] < 100:
+		$result = 'You are severely underweight.'
+	elseif ARGS[1] < 200:
+		$result = 'You are underweight'
+	elseif ARGS[1] < 300:
+		$result = 'You have a normal, healthy weight.'
+	elseif ARGS[1] < 400:
+		$result = 'You have a normal, healthy weight.'
+	elseif ARGS[1] < 500:
+		$result = 'You are overweight.'
+	elseif ARGS[1] < 600:
+		$result = 'You are moderately obese.'
+	elseif ARGS[1] < 700:
+		$result = 'You are severely obese.'
+	elseif ARGS[1] < 800:
+		$result = 'You are very severely obese.'
+	else
+		$result = 'You are morbidly obese.'
+	end
+end
+
+
+!	Get the appearance bonus
+!	Appearance_bonus = func('body_structure', 'appearance_bonus', pcs_bmi, strenbuf)
+if $ARGS[0] = 'appearance_bonus':
+	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
+	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
+
+	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
+	result = func('body_structure', 'appearance_bonus_from_class', bs_temp_bs_class)
+	killvar 'bs_temp_bs_class'
+end
+
+if $ARGS[0] = 'appearance_bonus_from_class':
+	if ARGS[1] < 100:
+		!	starving: bmi < 16
+		result = -10
+	elseif ARGS[1] < 200:
+		!	underweight: 16 <= bmi < 16
+		result = 25
+	elseif ARGS[1] < 300:
+		!	slender: 19 <= bmi < 21
+		result = 50
+	elseif ARGS[1] < 400:
+		!	healthy: 21 <= bmi < 25
+		result = 50
+	elseif ARGS[1] < 500:
+		!	overweight: 26 <= bmi < 30
+		result = 25
+	elseif ARGS[1] < 600:
+		!	moderately obese: 30 <= bmi < 35
+		result = 10
+	elseif ARGS[1] < 700:
+		!	severely obese: 35 <= bmi < 40
+		result = -15
+	elseif ARGS[1] < 800:
+		!	very severely obese: 40 <= bmi < 45
+		result = -40
+	else
+		!	morbidly obese: 45 <= bmi
+		result = -80
+	end
+
+	ARGS[1] = ARGS[1] mod 100
+
+	if ARGS[1] = 0:
+		!	0 <= strenbuf <= 5
+		result -= 30
+	elseif ARGS[1] = 1:
+		!	5 < strenbuf <= 10
+		result -= 20
+	elseif ARGS[1] = 2:
+		!	10 < strenbuf <= 15
+		result -= 15
+	elseif ARGS[1] = 3:
+		!	15 < strenbuf <= 25
+		result -= 10
+	elseif ARGS[1] = 4:
+		!	25 < strenbuf <= 35
+		result -= 5
+	elseif ARGS[1] = 5:
+		!	35 < strenbuf <= 50
+		result += 0
+	elseif ARGS[1] = 6:
+		!	50 < strenbuf <= 70
+		result += 5
+	elseif ARGS[1] = 7:
+		!	70 < strenbuf <= 100
+		result += 10
+	elseif ARGS[1] = 8:
+		!	100 < strenbuf <= 110
+		result += 5
+	elseif ARGS[1] = 9:
+		!	110 < strenbuf <= 120
+		result += 0
+	elseif ARGS[1] = 10:
+		!	120 < strenbuf <= 130
+		result -= 5
+	elseif ARGS[1] = 11:
+		!	130 < strenbuf <= 140
+		result -= 15
+	elseif ARGS[1] = 12:
+		!	140 < strenbuf <= 150
+		result -= 30
+	elseif ARGS[1] = 13:
+		!	150 < strenbuf <= 160
+		result -= 45
+	elseif ARGS[1] = 14:
+		!	160 < strenbuf <= 170
+		result -= 60
+	elseif ARGS[1] = 15:
+		!	170 < strenbuf <= 180
+		result -= 75
+	elseif ARGS[1] = 16:
+		!	180 < strenbuf <= 190
+		result -= 100
+	else
+		!	190 < strenbuf <= 200
+		result -= 130
+	end
+end
+
+
 --- body_structure ---------------------------------

+ 200 - 216
locations/booty_call.qsrc

@@ -1,95 +1,141 @@
 # booty_call
+
 if $ARGS[0] = 'scheduler':
 	!! clear SMS
 	!! clear schedule
 	killvar 'booty_call_time'
+	killvar 'sugar_daddy_call'
 	killvar 'npc_booty_call'
 	killvar 'npc_booty_call_time'
-	i = 0
-	gs 'booty_call', 'fuckbuddy_scheduler2'
+	gs 'booty_call', 'booty_call_scheduler'
 end
 
-if $ARGS[0] = 'fuckbuddy_scheduler2':
-	if i < arrsize('$fuckbuddy'):
-		$temp = 'FuckBuddy'
-		gs 'booty_call', 'fb_npc_stat_update'
-!!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_rel[$FuckBuddy[i]] > 0 and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
+if $ARGS[0] = 'booty_call_scheduler':
+	temp_bc_i = 0
+	:bc_fb_sched_loop
+	if temp_bc_i < arrsize('$fuckbuddy'):
+		$temp_bc_id = $FuckBuddy[temp_bc_i]
+		gs 'telefon', 'ClearSMSSchedule', $temp_bc_id
+		gs 'booty_call', 'bc_npc_stat_update', $temp_bc_id
+!!		if (rand(1, 10) <= npc_sexdrive[$temp_bc_id] or npc_booty_call[$temp_bc_id] = daystart) and npc_rel[$temp_bc_id] > 0 and npc_no_booty_call[$temp_bc_id] ! daystart and npc_big_fight[$temp_bc_id] < daystart - 7:
 
 !!		temporary removal of npc_rel requirement until boy initiated breakups can occur
 
-!!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and (npc_big_fight[$FuckBuddy[i]] < daystart - 7 and daystart > 7):
+!!		if (rand(1, 10) <= npc_sexdrive[$temp_bc_id] or npc_booty_call[$temp_bc_id] = daystart) and npc_no_booty_call[$temp_bc_id] ! daystart and (npc_big_fight[$temp_bc_id] < daystart - 7 and daystart > 7):
 
-		if (npc_booty_call_date[$FuckBuddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or rand(1,100) <= npc_rel[$FuckBuddy[i]]) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
-			gs 'booty_call', 'fuckbuddy_scheduler3'
-		else
-			npc_no_booty_call[$FuckBuddy[i]] = daystart
+		if daystart > npc_no_booty_call[$temp_bc_id] and (npc_booty_call_date[$temp_bc_id] = daystart or rand(1, 10) <= npc_sexdrive[$temp_bc_id] or rand(1, 100) <= npc_rel[$temp_bc_id]):
+			gs 'booty_call', 'schedule_sms', $temp_bc_id
 		end
-		i += 1
-		gs 'booty_call', 'fuckbuddy_scheduler2'
-	else
-		i = 0
-		gs 'booty_call', 'sugar_daddy_scheduler2'
+		temp_bc_i += 1
+		jump 'bc_fb_sched_loop'
 	end
-end
 
 
-if $ARGS[0] = 'sugar_daddy_scheduler2':
-	if i < arrsize('$sugar_daddy'):
-		gs 'booty_call', 'sd_npc_stat_update'
-!!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_rel[$FuckBuddy[i]] > 0 and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
+	temp_bc_i = 0
+	:bc_sd_sched_loop
+	if temp_bc_i < arrsize('$sugar_daddy'):
+		$temp_bc_id = $sugar_daddy[temp_bc_i]
+		gs 'telefon', 'ClearSMSSchedule', $temp_bc_id
+		gs 'booty_call', 'bc_npc_stat_update', $temp_bc_id
+!!		if (rand(1, 10) <= npc_sexdrive[$temp_bc_id] or npc_booty_call[$temp_bc_id] = daystart) and npc_rel[$temp_bc_id] > 0 and npc_no_booty_call[$temp_bc_id] ! daystart and npc_big_fight[$temp_bc_id] < daystart - 7:
 
 !!		temporary removal of npc_rel requirement until boy initiated breakups can occur
 
-!!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$sugar_daddy[i]] = daystart) and npc_no_booty_call[$sugar_daddy[i]] ! daystart and (npc_big_fight[$sugar_daddy[i]] < daystart - 7 and daystart > 7):
-		if npc_sugar_daddy_timer[$sugar_daddy[i]] - (npc_rel[$sugar_daddy[i]] / 10) > daystart:
-			npc_no_booty_call[$sugar_daddy[i]] = daystart
+!!		if (rand(1, 10) <= npc_sexdrive[$temp_bc_id] or npc_booty_call[$temp_bc_id] = daystart) and npc_no_booty_call[$temp_bc_id] ! daystart and (npc_big_fight[$temp_bc_id] < daystart - 7 and daystart > 7):
 
-		elseif (npc_booty_call_date[$sugar_daddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$sugar_daddy[i]] or rand(1,100) <= npc_rel[$sugar_daddy[i]]) and npc_no_booty_call[$sugar_daddy[i]] ! daystart:
-			sugar_daddy_call[$sugar_daddy[i]] = 1
-			gs 'booty_call', 'sugar_daddy_scheduler3'
-		else
-			npc_no_booty_call[$sugar_daddy[i]] = daystart
+		if daystart > npc_no_booty_call[$temp_bc_id] and (daystart + npc_rel[$temp_bc_id] / 10 >= npc_sugar_daddy_timer[$temp_bc_id]) and (npc_booty_call_date[$temp_bc_id] = daystart or rand(1, 10) <= npc_sexdrive[$temp_bc_id] or rand(1, 100) <= npc_rel[$temp_bc_id]):
+			sugar_daddy_call[$sugar_daddy[temp_bc_i]] = 1
+			gs 'booty_call', 'schedule_sms', $temp_bc_id
 		end
-		i += 1
-		gs 'booty_call', 'sugar_daddy_scheduler2'
+		temp_bc_i += 1
+		jump 'bc_sd_sched_loop'
 	end
-end
 
-if $ARGS[0] = 'fuckbuddy_scheduler3':
-	if npc_booty_call[$FuckBuddy[i]] = daystart:
-		booty_call_time[$FuckBuddy[i]] = ((npc_booty_call_time[$FuckBuddy[i]] * 60) + rand(0,180))
-	elseif week = npc_day_off[$FuckBuddy[i]]:
-		booty_call_time[$FuckBuddy[i]] = (600 + rand(0,720))
-	elseif week ! npc_day_off[$FuckBuddy[i]]:
-		booty_call_time[$FuckBuddy[i]] = (rand(npc_start_free_time[$FuckBuddy[i]],(npc_end_free_time[$FuckBuddy[i]] - 1)) * 60) + rand(0,180)
-	else
-		booty_call_time[$FuckBuddy[i]] = 2000
-	end
+	killvar 'temp_bc_i'
+	killvar '$temp_bc_id'
 end
 
-if $ARGS[0] = 'sugar_daddy_scheduler3':
-	if npc_booty_call[$sugar_daddy[i]] = daystart:
-		booty_call_time[$sugar_daddy[i]] = ((npc_booty_call_time[$sugar_daddy[i]] * 60) + rand(0,180))
-	elseif week = npc_day_off[$sugar_daddy[i]]:
-		booty_call_time[$sugar_daddy[i]] = (600 + rand(0,720))
-	elseif week ! npc_day_off[$sugar_daddy[i]]:
-		booty_call_time[$sugar_daddy[i]] = (rand(npc_start_free_time[$sugar_daddy[i]],(npc_end_free_time[$sugar_daddy[i]] - 1)) * 60) + rand(0,180)
+!! $ARGS[1] = $npc_id
+if $ARGS[0] = 'schedule_sms':
+	if npc_booty_call[$ARGS[1]] = daystart:
+		gs 'telefon', 'SetSMSSchedule', $ARGS[1], "", "0", "gs 'booty_call_sms', 'start', '<<$ARGS[1]>>'", "totminut > <<totminut + 60 * (npc_booty_call_time[$ARGS[1]] - hour) + rand(0, 180) - minut>>"
+		!booty_call_time[$ARGS[1]] = 60 * npc_booty_call_time[$ARGS[1]] + rand(0, 180)
+	elseif week = npc_day_off[$ARGS[1]]:
+		gs 'telefon', 'SetSMSSchedule', $ARGS[1], "", "0", "gs 'booty_call_sms', 'start', '<<$ARGS[1]>>'", "totminut > <<totminut + 60 * (10 - hour) + rand(0, 240) + rand(0, 240) + rand(0, 240) - minut>>"
+		!booty_call_time[$ARGS[1]] = 600 + rand(0, 720)
+	elseif week ! npc_day_off[$ARGS[1]]:
+		gs 'telefon', 'SetSMSSchedule', $ARGS[1], "", "0", "gs 'booty_call_sms', 'start', '<<$ARGS[1]>>'", "totminut > <<totminut + 60 * (rand(npc_start_free_time[$ARGS[1]], npc_end_free_time[$ARGS[1]] - 1) - hour) + rand(0, 180) - minut>>"
+		!booty_call_time[$ARGS[1]] = 60 * rand(npc_start_free_time[$ARGS[1]], (npc_end_free_time[$ARGS[1]] - 1)) + rand(0, 180)
 	else
-		booty_call_time[$sugar_daddy[i]] = 2000
+		!booty_call_time[$ARGS[1]] = 2000
 	end
 end
 
+
 !!	if npc_start_free_time[$FuckBuddy[i]] = 0 or npc_day_off[$FuckBuddy[i]] = 0 or npc_end_free_time[$FuckBuddy[i]] = 0:
 !!		$boy = $FuckBuddy[i]
 
 !!	end
 
-!!		if ((rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and (rand(1,npc_rel[$FuckBuddy[i]]) > 0)) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
+!!		if ((rand(1, 10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and (rand(1, npc_rel[$FuckBuddy[i]]) > 0)) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
 
 !!			elseif week < 6:
-!!				booty_call_time[$FuckBuddy[i]] = 900 + rand(0,210)
+!!				booty_call_time[$FuckBuddy[i]] = 900 + rand(0, 210)
 !!			else
-!!				booty_call_time[$FuckBuddy[i]] = 600 + rand(0,720)
+!!				booty_call_time[$FuckBuddy[i]] = 600 + rand(0, 720)
+
+
+!! ------------ NPC Stat Updater ------------------------
+
+!! $ARGS[1] = $npc_id
+if $ARGS[0] = 'bc_npc_stat_update':
+	if npc_start_free_time[$ARGS[1]] = 0 or npc_day_off[$ARGS[1]] = 0:
+		if npc_finance[$ARGS[1]] = 0:
+			temp_bc_rand = rand(1, 3)
+			if temp_bc_rand = 1:
+				npc_start_free_time[$ARGS[1]] = 9
+				npc_end_free_time[$ARGS[1]] = 12
+			elseif temp_bc_rand = 2:
+				npc_start_free_time[$ARGS[1]] = 16
+				npc_end_free_time[$ARGS[1]] = 20
+			else
+				npc_start_free_time[$ARGS[1]] = 20
+				npc_end_free_time[$ARGS[1]] = 23
+			end
+			killvar 'temp_bc_rand'
+		elseif npc_finance[$ARGS[1]] = 1:
+			if rand(1,2) = 1:
+				npc_start_free_time[$ARGS[1]] = 9
+				npc_end_free_time[$ARGS[1]] = 12
+			else
+				npc_start_free_time[$ARGS[1]] = 20
+				npc_end_free_time[$ARGS[1]] = 23
+			end
+		elseif npc_finance[$ARGS[1]] = 2:
+			if rand(1, 2) = 1:
+				npc_start_free_time[$ARGS[1]] = 8
+				npc_end_free_time[$ARGS[1]] = 12
+
+				npc_work_start[$ARGS[1]] = 13
+				npc_work_end[$ARGS[1]] = 21
+			else
+				npc_start_free_time[$ARGS[1]] = 18
+				npc_end_free_time[$ARGS[1]] = 22
+
+				npc_work_start[$ARGS[1]] = 9
+				npc_work_end[$ARGS[1]] = 17
+			end
+			npc_apt_type[$ARGS[1]] = 5
+			!!npc_apt_type[$npclastgenerated] = rand(5, 6)
+			!! apt_type 6 is disabled until pictures are added
+			npc_occupation[$ARGS[1]] = rand(14, 18)
+			npc_car[$ARGS[1]] = rand(0, 1)
+		end
+		npc_day_off[$ARGS[1]] = rand(1, 7)
+	end
+end
+!! ------------------------------------------------------
+
 
 if $ARGS[0] = 'set_booty_call_date':
 	sex_ev['set_date'] = 1
@@ -114,88 +160,76 @@ if $ARGS[0] = 'block_booty_calls':
 	end
 end
 
-if $ARGS[0] = 'SMS raiser':
-	i = 0
-	:fuckbuddy_sms_raiser_loop
-	if i < arrsize('$FuckBuddy'):
-		if booty_call_time[$FuckBuddy[i]] < ((hour * 60) + minut) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_last_booty_call[$FuckBuddy[i]] ! daystart:
-			gs 'booty_call_sms', 'start', $FuckBuddy[i]
-			booty_call_time[$FuckBuddy[i]] = 2399
-			!! this is a bit superfluous, but it makes the code run faster.
-			booty_call_invite[$FuckBuddy[i]] = daystart
-		end
-		i += 1
-		jump 'fuckbuddy_sms_raiser_loop'
-	end
-
-	i = 0
-	:sugar_daddy_sms_raiser_loop
-	if i < arrsize('$sugar_daddy'):
-		if booty_call_time[$sugar_daddy[i]] < ((hour * 60) + minut) and npc_no_booty_call[$sugar_daddy[i]] ! daystart and npc_last_booty_call[$sugar_daddy[i]] ! daystart:
-			gs 'booty_call_sms', 'start', $sugar_daddy[i]
-			booty_call_time[$sugar_daddy[i]] = 2399
-			!! this is a bit superfluous, but it makes the code run faster.
-			booty_call_invite[$sugar_daddy[i]] = daystart
-		end
-		i += 1
-		jump 'sugar_daddy_sms_raiser_loop'
-	end
-end
-
 if $ARGS[0] = 'home_links':
-	i = 0
+	temp_bc_i = 0
 	:loopFB_homes
-	if i < arrsize('$Fuckbuddy'):
-		*nl
-		if (npc_residence[$Fuckbuddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$Fuckbuddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$Fuckbuddy[i]] = 4 and $loc = 'city_center'):
-			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
-			!! ''''
-		end
-		!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
-		i += 1
+	if temp_bc_i < arrsize('$Fuckbuddy'):
+		gs 'booty_call', 'generate_home_link', $Fuckbuddy[temp_bc_i]
+		temp_bc_i += 1
 		jump 'loopFB_homes'
 	end
 
-	i = 0
+	temp_bc_i = 0
 	:loopSD_homes
-	if i < arrsize('$sugar_daddy'):
-		*nl
-		if (npc_residence[$sugar_daddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$sugar_daddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$sugar_daddy[i]] = 4 and $loc = 'city_center'):
-			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>>''''s</a> apartment is nearby.'' ')
-			!! ''''
-		end
-		!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>>''''s</a> apartment is nearby.'' ')
-		i += 1
+	if temp_bc_i < arrsize('$sugar_daddy'):
+		gs 'booty_call', 'generate_home_link', $sugar_daddy[temp_bc_i]
+		temp_bc_i += 1
 		jump 'loopSD_homes'
 	end
+
+	killvar 'temp_bc_i'
+end
+
+! $ARGS[1] = $npc_id
+if $ARGS[0] = 'generate_home_link':
+	if (npc_residence[$ARGS[1]] = 1 and $loc = 'pav_residential') or (npc_residence[$ARGS[1]] = 3 and $loc = 'city_residential') or (npc_residence[$ARGS[1]] = 4 and $loc = 'city_center'):
+		*nl
+		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$ARGS[1]>>'''' "><<$npc_firstname[$ARGS[1]]>>''''s</a> apartment is nearby.'' ')
+		!! ''''
+	end
+	!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$ARGS[1]>>'''' "><<$npc_firstname[$ARGS[1]]>>''''s</a> apartment is nearby.'' ')
+
 end
 
+
 if $ARGS[0] = 'hotel_links':
-	i = 0
+	temp_bc_i = 0
 	:loopFB_hotel
-	if i < arrsize('$Fuckbuddy'):
-		*nl
-		if $booty_call_hotel[$Fuckbuddy[i]] = $region and booty_call_invite[$FuckBuddy[i]] = daystart:
-			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>></a> booked a hotel room to meet you in.'' ')
-			!! ''''
-		end
-		i += 1
+	if temp_bc_i < arrsize('$Fuckbuddy'):
+		gs 'booty_call', 'generate_hotel_link', $Fuckbuddy[temp_bc_i]
+		temp_bc_i += 1
 		jump 'loopFB_hotel'
 	end
 
-	i = 0
+	temp_bc_i = 0
 	:loopSD_hotel
-	if i < arrsize('$sugar_daddy'):
-		*nl
-		if $booty_call_hotel[$sugar_daddy[i]] = $region and booty_call_invite[$sugar_daddy[i]] = daystart:
-			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>></a> booked a hotel room to meet you in.'' ')
-			!! ''''
-		end
-		i += 1
+	if temp_bc_i < arrsize('$sugar_daddy'):
+		gs 'booty_call', 'generate_hotel_link', $sugar_daddy[temp_bc_i]
+		temp_bc_i += 1
 		jump 'loopSD_hotel'
 	end
+
+	killvar 'temp_bc_i'
+end
+
+if $ARGS[0] = 'generate_hotel_link':
+	if $booty_call_hotel[$ARGS[1]] = $region and booty_call_invite[$ARGS[1]] = daystart:
+		*nl
+		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$ARGS[1]>>'''' "><<$npc_firstname[$ARGS[1]]>></a> booked a hotel room to meet you in.'' ')
+		!! ''''
+	end
 end
 
+
+
+
+	!!========================================================!!
+	!!                                                        !!
+	!!                         LEGACY                         !!
+	!!                                                        !!
+	!!========================================================!!
+
+
 !! booty_call_invite['B0']
 
 if $ARGS[0] = 'text':
@@ -214,7 +248,7 @@ if $ARGS[0] = 'text':
 		!! IMAGE HERE
 		'	<b><font color="blue">i was thinking about you today</font></b>'
 		'<b><font color="pink">what were you thinking about?</font></b>'
-		booty_call['text'] = rand(1,3)
+		booty_call['text'] = rand(1, 3)
 		if booty_call['text'] = 1:
 			'	<b><font color="blue">wanted to know if you wanted to come over to my place</font></b>'
 			'	<b><font color="blue">have some fun?</font></b>'
@@ -249,7 +283,7 @@ if $ARGS[0] = 'invite_yourself':
 end
 
 if $ARGS[0] = 'get_invited':
-	if rand(0,1) = 1:
+	if rand(0, 1) = 1:
 		'"Why don''t you come over to my place right now and we can have some fun?"'
 
 	else
@@ -277,7 +311,7 @@ if $ARGS[0] = 'text1':
 		!! IMAGE HERE
 		'	<b><font color="blue">i was thinking about you today</font></b>'
 		'<b><font color="pink">what were you thinking about?</font></b>'
-		booty_call['text'] = rand(1,3)
+		booty_call['text'] = rand(1, 3)
 		if booty_call['text'] = 1:
 			'	<b><font color="blue">wanted to know if you wanted to come over to my place</font></b>'
 			'	<b><font color="blue">have some fun?</font></b>'
@@ -297,7 +331,7 @@ if $ARGS[0] = 'text1':
 		'	<b><font color="blue">i was thinking about you today</font></b>'
 		'<b><font color="pink">me too</font></b>'
 		'	<b><font color="blue">come over</font></b>'
-!!		booty_call['text'] = rand(1,3)
+!!		booty_call['text'] = rand(1, 3)
 !!		if booty_call['text'] = 1:
 		'	<b><font color="blue">lets fuck like bunnies</font></b>'
 	end
@@ -365,10 +399,11 @@ if $ARGS[0] = 'invite_yourself1':
 	*nl
 	!! missing code
 	!! better way of randomizing this? personality based?
-	if rand(1,3) = 3:
+	temp_bc_rand = rand(1, 3)
+	if temp_bc_rand = 1:
 		'You don''t receive a response. He must be busy.'
 		act 'Put away your phone': gt $loc, $loc_arg
-	elseif rand(1,2) = 2 and hour < 18:
+	elseif temp_bc_rand = 2 and hour < 18:
 		'	<b><font color="blue">im at work</font></b>'
 		act'Sorry, never mind':
 			cla & *nl
@@ -441,6 +476,7 @@ if $ARGS[0] = 'invite_yourself1':
 			end
 		end
 	end
+	killvar 'temp_bc_rand'
 end
 
 if $ARGS[0] = 'invite_yourself2':
@@ -465,97 +501,6 @@ if $ARGS[0] = 'invite_yourself2':
 	end
 end
 
-!! ------------ NPC Stat Updater ------------------------
-
-if $ARGS[0] = 'fb_npc_stat_update':
-	if npc_start_free_time[$FuckBuddy[i]] = 0 or npc_day_off[$FuckBuddy[i]] = 0:
-		if npc_finance[$FuckBuddy[i]] = 0:
-			if rand(1,3) = 1:
-				npc_start_free_time[$FuckBuddy[i]] = 9
-				npc_end_free_time[$FuckBuddy[i]] = 12
-			elseif rand(1,2) = 1:
-				npc_start_free_time[$FuckBuddy[i]] = 16
-				npc_end_free_time[$FuckBuddy[i]] = 20
-			else
-				npc_start_free_time[$FuckBuddy[i]] = 20
-				npc_end_free_time[$FuckBuddy[i]] = 23
-			end
-		elseif npc_finance[$FuckBuddy[i]] = 1:
-			if rand(1,2) = 1:
-				npc_start_free_time[$FuckBuddy[i]] = 9
-				npc_end_free_time[$FuckBuddy[i]] = 12
-			else
-				npc_start_free_time[$FuckBuddy[i]] = 20
-				npc_end_free_time[$FuckBuddy[i]] = 23
-			end
-		elseif npc_finance[$FuckBuddy[i]] = 2:
-			if rand(1,2) = 1:
-				npc_start_free_time[$FuckBuddy[i]] = 8
-				npc_end_free_time[$FuckBuddy[i]] = 12
-				
-				npc_work_start[$FuckBuddy[i]] = 13
-				npc_work_end[$FuckBuddy[i]] = 21
-			else
-				npc_start_free_time[$FuckBuddy[i]] = 18
-				npc_end_free_time[$FuckBuddy[i]] = 22
-				
-				npc_work_start[$FuckBuddy[i]] = 9
-				npc_work_end[$FuckBuddy[i]] = 17
-			end
-			npc_apt_type[$FuckBuddy[i]] = 5
-			!!npc_apt_type[$FuckBuddy[i]] = rand(5,6)
-			!! apt_type 6 is disabled until pictures are added
-			npc_occupation[$FuckBuddy[i]] = rand(14,18)
-			npc_car[$FuckBuddy[i]] = rand(0,1)
-		end
-		npc_day_off[$FuckBuddy[i]] = rand(1,7)
-	end
-end
-
-if $ARGS[0] = 'sd_npc_stat_update':
-	if npc_start_free_time[$sugar_daddy[i]] = 0 or npc_day_off[$sugar_daddy[i]] = 0:
-		if npc_finance[$sugar_daddy[i]] = 0:
-			if rand(1,3) = 1:
-				npc_start_free_time[$sugar_daddy[i]] = 9
-				npc_end_free_time[$sugar_daddy[i]] = 12
-			elseif rand(1,2) = 1:
-				npc_start_free_time[$sugar_daddy[i]] = 16
-				npc_end_free_time[$sugar_daddy[i]] = 20
-			else
-				npc_start_free_time[$sugar_daddy[i]] = 20
-				npc_end_free_time[$sugar_daddy[i]] = 23
-			end
-		elseif npc_finance[$sugar_daddy[i]] = 1:
-			if rand(1,2) = 1:
-				npc_start_free_time[$sugar_daddy[i]] = 9
-				npc_end_free_time[$sugar_daddy[i]] = 12
-			else
-				npc_start_free_time[$sugar_daddy[i]] = 20
-				npc_end_free_time[$sugar_daddy[i]] = 23
-			end
-		elseif npc_finance[$sugar_daddy[i]] = 2:
-			if rand(1,2) = 1:
-				npc_start_free_time[$npclastgenerated] = 8
-				npc_end_free_time[$npclastgenerated] = 12
-
-				npc_work_start[$npclastgenerated] = 13
-				npc_work_end[$npclastgenerated] = 21
-			else
-				npc_start_free_time[$npclastgenerated] = 18
-				npc_end_free_time[$npclastgenerated] = 22
-
-				npc_work_start[$npclastgenerated] = 9
-				npc_work_end[$npclastgenerated] = 17
-			end
-			npc_apt_type[$sugar_daddy[i]] = 5
-			!!npc_apt_type[$npclastgenerated] = rand(5,6)
-			!! apt_type 6 is disabled until pictures are added
-			npc_occupation[$sugar_daddy[i]] = rand(14,18)
-			npc_car[$sugar_daddy[i]] = rand(0,1)
-		end
-		npc_day_off[$sugar_daddy[i]] = rand(1,7)
-	end
-end
 
 !! ------------ Legacy Backup ------------------------
 
@@ -564,11 +509,50 @@ if $ARGS[0] = 'draw':
 	! 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
+		temp_bc_i = rand(0, arrsize('$fuckbuddy')-1)
+		$lover_drawn = $fuckbuddy[temp_bc_i]
+		!$booty_call_daily_id[temp_bc_i] = $lover_drawn
+		gs 'booty_call_sms', 'start', $lover_drawn
 		booty_call['A0'] = daystart
 	end
+	killvar 'temp_bc_i'
+end
+
+
+if $ARGS[0] = 'SMS raiser':
+	temp_bc_i = 0
+	:fuckbuddy_sms_raiser_loop
+	if temp_bc_i < arrsize('$FuckBuddy'):
+		$temp_bc_id = $FuckBuddy[temp_bc_i]
+		if booty_call_time[$temp_bc_id] < ((hour * 60) + minut) and npc_no_booty_call[$temp_bc_id] ! daystart and npc_last_booty_call[$temp_bc_id] ! daystart:
+			!$booty_call_daily_id[temp_bc_i] = $temp_bc_id
+			gs 'booty_call_sms', 'start', $temp_bc_id
+			booty_call_time[$temp_bc_id] = 2399
+			!! this is a bit superfluous, but it makes the code run faster.
+			booty_call_invite[$temp_bc_id] = daystart
+		end
+		temp_bc_i += 1
+		jump 'fuckbuddy_sms_raiser_loop'
+	end
+
+
+	temp_bc_i = 0
+	:sugar_daddy_sms_raiser_loop
+	if temp_bc_i < arrsize('$sugar_daddy'):
+		$temp_bc_id = $sugar_daddy[temp_bc_i]
+		if booty_call_time[$temp_bc_id] < ((hour * 60) + minut) and npc_no_booty_call[$temp_bc_id] ! daystart and npc_last_booty_call[$temp_bc_id] ! daystart:
+			!$booty_call_daily_id[i] = $temp_bc_id
+			gs 'booty_call_sms', 'start', $temp_bc_id
+			booty_call_time[$temp_bc_id] = 2399
+			!! this is a bit superfluous, but it makes the code run faster.
+			booty_call_invite[$temp_bc_id] = daystart
+		end
+		temp_bc_i += 1
+		jump 'sugar_daddy_sms_raiser_loop'
+	end
+
+	killvar 'temp_bc_i'
+	killvar '$temp_bc_id'
 end
 
 

Some files were not shown because too many files changed in this diff