Browse Source

Merge remote-tracking branch 'upstream/master' into minor-fixes

Spackled Lanturn 3 years ago
parent
commit
e0257a2342
61 changed files with 1341 additions and 1423 deletions
  1. 8 8
      build.sh
  2. 38 29
      locations/HotelHole.qsrc
  3. 1 0
      locations/_attributes_coco_outfits.qsrc
  4. 7 7
      locations/_attributes_fetish.qsrc
  5. 1 1
      locations/_attributes_moncheri.qsrc
  6. 2 3
      locations/_attributes_swimwear.qsrc
  7. 0 2
      locations/_attributes_uniform.qsrc
  8. 55 55
      locations/_clothing_name.qsrc
  9. 10 10
      locations/alexandriaEv.qsrc
  10. 8 8
      locations/andreihunter.qsrc
  11. 3 2
      locations/andrey.qsrc
  12. 2 2
      locations/backwater.qsrc
  13. 4 4
      locations/changingroom.qsrc
  14. 1 1
      locations/cikl.qsrc
  15. 8 8
      locations/cloakroom.qsrc
  16. 3 3
      locations/clothing.qsrc
  17. 1 1
      locations/clothing_QV.qsrc
  18. 2 2
      locations/dorm.qsrc
  19. 1 1
      locations/fame.qsrc
  20. 5 5
      locations/gadforest_event.qsrc
  21. 36 36
      locations/gschool_cheerleading.qsrc
  22. 1 1
      locations/hunter_ambient.qsrc
  23. 2 2
      locations/hunter_favors.qsrc
  24. 13 13
      locations/hunter_interactions.qsrc
  25. 12 12
      locations/igorhunter.qsrc
  26. 1 1
      locations/journal_quests.qsrc
  27. 0 93
      locations/loadg.qsrc
  28. 1 0
      locations/moncheri.qsrc
  29. 4 2
      locations/pav_park.qsrc
  30. 2 2
      locations/podval_rape.qsrc
  31. 15 27
      locations/portnoi.qsrc
  32. 10 16
      locations/portnoi2.qsrc
  33. 12 12
      locations/preCUST.qsrc
  34. 4 4
      locations/psiklin.qsrc
  35. 4 1
      locations/saveg.qsrc
  36. 824 893
      locations/saveupdater.qsrc
  37. 10 10
      locations/sergeihunter.qsrc
  38. 2 2
      locations/sexshop.qsrc
  39. 3 3
      locations/shop.qsrc
  40. 2 2
      locations/shop_fashionista.qsrc
  41. 2 2
      locations/shop_pussycats.qsrc
  42. 17 17
      locations/sister.qsrc
  43. 131 1
      locations/sister_chat.qsrc
  44. 2 2
      locations/sister_party.qsrc
  45. 1 1
      locations/soniadisco.qsrc
  46. 2 2
      locations/sportShop.qsrc
  47. 1 1
      locations/start.qsrc
  48. 7 7
      locations/swamp_woods.qsrc
  49. 1 1
      locations/tatiana_missions.qsrc
  50. 1 8
      locations/torgcentr.qsrc
  51. 27 2
      locations/tour_guide.qsrc
  52. 8 1
      locations/version.qsrc
  53. 1 1
      locations/yesgorslut.qsrc
  54. 10 85
      locations/ykuh.qsrc
  55. 1 1
      locations/zsoft_gopskverGorSlut.qsrc
  56. BIN
      tools/qsp-analyser/QSP_Analyser.exe
  57. 3 3
      tools/qsp-analyser/QSP_Analyser/Common.cs
  58. 2 2
      tools/qsp-analyser/QSP_Analyser/Properties/AssemblyInfo.cs
  59. 5 1
      tools/qsp-analyser/QSP_Analyser/QSPGameCode.cs
  60. 1 1
      tools/qsp-analyser/QSP_Analyser/QSP_Analyser.csproj
  61. 0 0
      tools/txt2gam.exe

+ 8 - 8
build.sh

@@ -10,26 +10,26 @@ QSPFILE=glife.qsp
 
 #######################################################################
 
-./txtmerge.py locations glife.txt
+python tools/txtmerge.py locations glife.txt
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
-	./txt2gam.linux glife.txt "${QSPFILE}" 1> /dev/null
+	./tools/txt2gam.linux glife.txt "${QSPFILE}" 1> /dev/null
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-	./txt2gam.mac glife.txt "${QSPFILE}" 1> /dev/null
+	./tools/txt2gam.mac glife.txt "${QSPFILE}" 1> /dev/null
 elif [[ "$OSTYPE" == "msys" ]]; then
 	if [[ "$MSYSTEM_CARCH" == "x86_64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
 	else
-		./txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
 	fi
 elif [[ "$OSTYPE" == "cygwin" ]]; then
 	# Unsure if non-AMD CPUs give this or AMD64, tested on an actual AMD brand chip
 	# requires a python install visible to cygwin (for the txtmerge above)
 	if [[ "$PROCESSOR_ARCHITECTURE" == "x86_64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
 	elif [[ "$PROCESSOR_ARCHITECTURE" == "AMD64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
 	else
-		./txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
 	fi
 fi
 if [ -d "${DESTDIR}" ]; then

+ 38 - 29
locations/HotelHole.qsrc

@@ -349,30 +349,35 @@ if $ARGS[0] = 'Pavlin' :
 			act 'Move away':gt'HotelHole','skip_resepevent'
 		end
 	end
-	if npc_rel['A217'] > 19 and proshotelday ! daystart and storyline = 1 and TwinQW ! 3:
-		act 'Fake Twins Request':
-			*clr & cla
-			minut += 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/pavlin/pavlin.jpg"></center>'
-			'"<<$pcs_firstname>>, I got a guy who is willing to pay a LOT of money for a threesome with a set of twins. Do you happen to know a pair of twins who''d be down to make some quick cash?" <<$npc_nickname[''A217'']>> asks, looking hopeful.'
-			'You think for a moment before responding. "No I don''t. However, a lot of people say my sister and I look alike. Maybe if I wear my hair like hers and we put on enough make up we could pass as twins."'
-			'"That''s a great idea! Do you think she would be willing to do this?" <<$npc_nickname[''A217'']>> asks, suddenly very excited at the prospect.'
-			if sisterLesb < 5:
-				'"What? No, I was just saying we look alike, I wouldn''t dare propose an idea like this to her."'
-				'"THEN WHY BRING HER UP, YOU STUPID CUNT?" <<$npc_nickname[''A217'']>>''s excitement quickly dissolves to rage as he raises his hand up, ready to strike.'
-				'You brace for the hit, closing your eyes tightly. The slap never comes however, and you open your eyes to see <<$npc_nickname[''A217'']>> has backed off. You''re confused at first, but notice that the people in the lobby are looking at the two of your after his little outburst.'
-				'You quickly stand up and leave him be.'
-				*nl
-				'You probably shouldn''t bring up this topic anymore... unless you have a more positive response to this request.'
-				TwinJourQW = 1
-				act 'Back to lobby': gt 'HotelHole'
-			elseif sisterLesb => 5:
-				'You feel a tingling in your loins just thinking about your sister and, without thinking, you blurt out: "Of course she will!"'
-				'"That''s fantastic <<$pcs_firstname>>, Once you are ready bring her over and I''ll introduce you to the client."'
-				'Realizing the commitment you just made, worry begins to seep into you. You hope your sister is really up for it, because you fear how <<$npc_nickname[''A217'']>> will react if you can''t deliver.'
-				TwinQW = 1
-				TwinJourQW = 2
+	if npc_rel['A217'] > 19 and proshotelday ! daystart and storyline = 1 and TwinQW < 0:
+		!!! TwinQW: 0 quest not started; > 0: quest started; < 5: talking with sis; 5: sis agreed; 6: finished
+		!!! changing 'TwinQW < 0' in the above if statement to 'TwinQW < 1' reenables the quest line
+		!!! Kevin Smarts:
+		!!! The twin event is meant to be disabled as it doesn't fit Anya's personality. It is waiting to be redone with a more suitable "twin".
+		if tmp_TwinQW_AskedToday < daystart: 
+			act 'Fake Twins Request':
+				*clr & cla
+				tmp_TwinQW_AskedToday = daystart
+				minut += 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/pavlin/pavlin.jpg"></center>'
+				'"<<$pcs_firstname>>, I got a guy who is willing to pay a LOT of money for a threesome with a set of twins. Do you happen to know a pair of twins who''d be down to make some quick cash?" <<$npc_nickname[''A217'']>> asks, looking hopeful.'
+				'You think for a moment before responding. "No I don''t. However, a lot of people say my sister and I look alike. Maybe if I wear my hair like hers and we put on enough make up we could pass as twins."'
+				'"That''s a great idea! Do you think she would be willing to do this?" <<$npc_nickname[''A217'']>> asks, suddenly very excited at the prospect.'
+				if sisterLesb < 5:
+					'"What? No, I was just saying we look alike, I wouldn''t dare propose an idea like this to her."'
+					'"THEN WHY BRING HER UP, YOU STUPID CUNT?" <<$npc_nickname[''A217'']>>''s excitement quickly dissolves to rage as he raises his hand up, ready to strike.'
+					'You brace for the hit, closing your eyes tightly. The slap never comes however, and you open your eyes to see <<$npc_nickname[''A217'']>> has backed off. You''re confused at first, but notice that the people in the lobby are looking at the two of your after his little outburst.'
+					'You quickly stand up and leave him be.'
+					*nl
+					'You probably shouldn''t bring up this topic anymore... unless you have a more positive response to this request.'
+				else
+					'You feel a tingling in your loins just thinking about your sister and, without thinking, you blurt out: "Of course she will!"'
+					'"That''s fantastic <<$pcs_firstname>>, Once you are ready bring her over and I''ll introduce you to the client."'
+					'Realizing the commitment you just made, worry begins to seep into you. You hope your sister is really up for it, because you fear how <<$npc_nickname[''A217'']>> will react if you can''t deliver.'
+					TwinQW = 1
+					killvar 'tmp_TwinQW_AskedToday'
+				end
 				act 'Back to lobby': gt 'HotelHole'
 			end
 		end
@@ -438,7 +443,9 @@ if $ARGS[0] = 'Pavlin' :
 	end
 end
 
-if $ARGS[0] = 'Twins' :
+if $ARGS[0] = 'Twins':
+	!!! <summary>meet pavlin and have some twin fun with the client</summary>
+	!!! <continues>with 'twinhome'</continues>
 	*clr & cla
 	minut += 20
 	gs 'stat'
@@ -598,7 +605,7 @@ if $ARGS[0] = 'Twins' :
 								'Anya tries to protest but it''s too late; the dick enters her mouth before any words leave it. She resigns herself to the task and uses her tongue to thoroughly clean the cock, whimpering in disapproval. You can''t help but snicker at the idea of her being forced to taste your ass on this stranger''s rod. Anya shoots you an angry look from the side.'
 								'Suddenly you hear someone honking a horn outside. You look at the clock and realize the whole hour has passed and <<$npc_nickname[''A217'']>> has arrived.'
 								'Not wanting to keep <<$npc_nickname[''A217'']>> waiting, you and your sister quickly put on your clothes, say goodbye to <<$boydesc>>, and leave the house.'
-								act 'Pavlin drives you home':gt 'HotelHole','twinhome'
+								act 'Pavlin drives you home': gt 'HotelHole','twinhome'
 							end
 						end
 						gs 'willpower', 'anal', 'force', 'hard'
@@ -638,7 +645,7 @@ if $ARGS[0] = 'Twins' :
 									*nl
 									'Suddenly, you hear someone honking a horn outside. You look at the clock and realize the whole hour has passed and <<$npc_nickname[''A217'']>> has arrived.'
 									'Not wanting to keep <<$npc_nickname[''A217'']>> waiting, you and your sister quickly put on your clothes, say goodbye to <<$boydesc>>, and leave the house.'
-									act 'Pavlin drives you home':gt 'HotelHole','twinhome'
+									act 'Pavlin drives you home': gt 'HotelHole','twinhome'
 								end
 							end
 						else
@@ -652,6 +659,8 @@ if $ARGS[0] = 'Twins' :
 end
 
 if $ARGS[0] = 'twinhome':
+	!!! <summary>pavlin drives you and your sis home</summary>
+	!!! <continues>gt 'korrPar'</continues>
 	*clr & cla
 	gs 'cum_call','face', $npclastgenerated
 	'You both jump in the car and <<$npc_nickname[''A217'']>> drives away.'
@@ -664,14 +673,14 @@ if $ARGS[0] = 'twinhome':
 	'You leave the car, face burning red in embarrassment, and go inside to your room.'
 	'You were planning to divide the money evenly with your sister, but now that you know what she really thinks of you, you hand her 1,000 <b>₽</b>. "Well, since you''re not a whore, I guess you don''t deserve a whore''s pay." you say snidely. You head back out of the room quickly before Anya has a chance to respond.'
 	gs 'arousal','end'
-	TwinQW = 3
+	TwinQW = 6
 	guy += 1
 	slutty += 1
 	gs 'fame', 'pav', 'prostitute', rand(2,4)
 	npc_rel['A217'] += 10
 	money += 9000
 	gs 'stat'
-	act 'Back to the corridor':gt 'korrPar'
+	act 'Back to the corridor': gt 'korrPar'
 end
 
 if $ARGS[0] = 'clown':

+ 1 - 0
locations/_attributes_coco_outfits.qsrc

@@ -297,6 +297,7 @@ elseif ARGS[1] = 59:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
+	CloPantsShortness = 1
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 5

+ 7 - 7
locations/_attributes_fetish.qsrc

@@ -270,27 +270,27 @@ elseif ARGS[1] = 44:
 elseif ARGS[1] = 45:
 	CloQuality = 5
 	CloThinness = 4
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 46:
 	CloQuality = 5
 	CloThinness = 4
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 47:
 	CloQuality = 4
 	CloThinness = 4
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 48:
 	CloQuality = 5
 	CloThinness = 5
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 49:
 	CloQuality = 5
 	CloThinness = 4
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 50:
 	CloQuality = 5
@@ -305,13 +305,13 @@ elseif ARGS[1] = 51:
 elseif ARGS[1] = 52:
 	CloQuality = 3
 	CloThinness = 6
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 4
 elseif ARGS[1] = 53:
 	CloQuality = 5
 	CloThinness = 4
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 54:
 	CloQuality = 4

+ 1 - 1
locations/_attributes_moncheri.qsrc

@@ -930,7 +930,7 @@ elseif ARGS[1] = 151:
 elseif ARGS[1] = 152:
 	CloQuality = 5
 	CloThinness = 4
-	CloTopCut =12
+	CloTopCut = 2
 	CloSkirtShortness = 1
 	CloDress = 1
 elseif ARGS[1] = 153:

+ 2 - 3
locations/_attributes_swimwear.qsrc

@@ -296,7 +296,7 @@ elseif ARGS[1] = 44:
 elseif ARGS[1] = 45:
 	CloQuality = 6
 	CloThinness = 4
-	CloTopCut = 4
+	CloTopCut = 1
 	CloPanties = 1
 	CloOnePiece = 1
 	CloInhibit = 0
@@ -306,13 +306,12 @@ elseif ARGS[1] = 46:
 	CloQuality = 2
 	CloThinness = 3
 	CloTopCut = 2
-	CloTopCut = 3
 elseif ARGS[1] = 47:
 	CloOnePiece = 1
 	CloInhibit = 0
 	CloQuality = 2
 	CloThinness = 3
-	CloTopCut = 1
+	CloTopCut = 2
 	CloPanties = 1
 elseif ARGS[1] = 48:
 	CloOnePiece = 1

+ 0 - 2
locations/_attributes_uniform.qsrc

@@ -413,9 +413,7 @@ elseif ARGS[1] = 59:
 elseif ARGS[1] = 60:
 	CloQuality = 5
 	CloThinness = 5
-	CloStyle2 = 1
 	CloStyle2 = 2
-	CloStyle2 = 3	
 	CloBra = 1
 	CloSkirtShortness = 5
 	CloBimbo = 1

+ 55 - 55
locations/_clothing_name.qsrc

@@ -162,61 +162,61 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 156:$RESULT = 'A bikini set with a bralette top and a cheeky Brazilian bottom, it''s blue if worn normally but black if worn reversed.'
 	if ARGS[1] = 157:$RESULT = 'A bikini set with a twist Bandeau top and a string bikini bottom, it has decorative gold stripes.'
 	if ARGS[1] = 158:$RESULT = 'A bikini set with a small triangle top and a g-string bottom that leaves very little to the imagination.' 
-	if ARGS[1] = 160:$RESULT = 'A black bikini set with a triangle top and a little thong bottom that shows off your booty quite nicely.'
-	if ARGS[1] = 161:$RESULT = 'A bikini set in black, it has a cross-string top and a Brazilian bottom. It hugs your curves quite nicely.' 
-	if ARGS[1] = 162:$RESULT = 'A bikini set in purple, it has a v plunge bralette top and a thong bottom. It shows your booty nicely.'
-	if ARGS[1] = 163:$RESULT = 'A bikini set in azure, it has a Bandeau top and a string bikini bottom.'
-	if ARGS[1] = 164:$RESULT = 'A bikini set in the color fuchsia, it has a triangle top and a tiny thong bottom that provide little back coverage.'
-	if ARGS[1] = 165:$RESULT = 'A bikini set with a triangle top and a thong bottom in color fuchsia with floral prints.' 
-	if ARGS[1] = 166:$RESULT = 'A blue bikini set with a triangle top and a thong bottom, it has white floral print and looks fun and flirty.' 
-	if ARGS[1] = 167:$RESULT = 'A bikini set with a triangle top and a Brazilian bottom in Tiffany Blue, it''s both functional and fashionable.'
-	if ARGS[1] = 168:$RESULT = 'A red bikini set with a triangle top and a Brazilian bottom that gives plenty of coverage yet remains flirty!'
-	if ARGS[1] = 169:$RESULT = 'A bikini set with a triangle tie-back top and a Brazilian bottom in the color Taffy, it looks fun and flirty.'
-	if ARGS[1] = 170:$RESULT = 'A bikini set that has a rather revealing halter top and a small string bottom in the color Thunder.'
-	if ARGS[1] = 171:$RESULT = 'A bikini set in the color scarlet, it has a triangle tie-back top and a side-string bottom, classy and flirty.'
-	if ARGS[1] = 172:$RESULT = 'A black bikini set with a bralette top and a full bottom, it has supportive-cup, highly comfortable yet still classy.'
-	if ARGS[1] = 173:$RESULT = 'A black bikini set with a bralette top and a full bottom, it has the classy vibe to it.' 
-	if ARGS[1] = 174:$RESULT = 'A bikini set in the Cerulean color, it has a classic bottom as well as a tie-back top that reveal part of the cleavage.' 
-	if ARGS[1] = 175:$RESULT = 'A bikini in Sky blue color, it has a fashionable halter-top top and a classic bikini bottom.' 
-	if ARGS[1] = 176:$RESULT = 'A black bikini set with a strapless Bandeau top and a Brazilian bottom, it''s fun and flirty.'
-	if ARGS[1] = 177:$RESULT = 'A bikini in the color Laure, it has a front-tie top and a multi-string bikini bottom.'
-	if ARGS[1] = 178:$RESULT = 'A Triangle grey bikini top with rings and a scrunch Brazilian bottom, it''s both fashionable and functional.'
-	if ARGS[1] = 179:$RESULT = 'A Triangle bikini top with a Brazilian bottom in multi-floral print.'
-	if ARGS[1] = 180:$RESULT = 'A pink ruffled bikini with a triangle top and a thong bottom, it''s both playful and flirty'
-	if ARGS[1] = 181:$RESULT = 'A black bikini set with a triangle top and a g-string bottom.' 
-	if ARGS[1] = 182:$RESULT = 'A red bikini set with a triangle top and a sexy thong bottom.'
-	if ARGS[1] = 183:$RESULT = 'A bikini set with a triangle top and a g-string bottom, its design reveals much of your body.'
-	if ARGS[1] = 184:$RESULT = 'A red bikini with a tie-back top and a cheeky bottom, it''s sassy with class.'
-	if ARGS[1] = 185:$RESULT = 'A black bikini with a a multi-colored top and a classic bikini bottom.'
-	if ARGS[1] = 186:$RESULT = 'A red bikini top with a deep plunge that shows off your cleavage and a small classic bottom.' 
-	if ARGS[1] = 187:$RESULT = 'A black bikini with a deep-plunge top and a thong that shows your body off with minimum decency.'
-	if ARGS[1] = 188:$RESULT = 'A Navy blue bikini with a tie-back top and a classic bikini bottom.' 
-	if ARGS[1] = 189:$RESULT = 'A bikini with a banded halter-top and a classic bikini bottom, it has stripes of shimmery gold.' 
-	if ARGS[1] = 190:$RESULT = 'A blue bikini with a medium-size triangle top and a string bikini bottom that provides coverage.'
-	if ARGS[1] = 191:$RESULT = 'A green bikini with snake-skin print, with a triangle top and a classic g-string.' 
-	if ARGS[1] = 192:$RESULT = 'A red bikini set with a deep-plunge top and a thong bottom, it has two Navy blue stripes.' 
-	if ARGS[1] = 193:$RESULT = 'A white bikini with blue hen, it has a bralette top and a Brazilian bottom.'
-	if ARGS[1] = 194:$RESULT = 'A black bikini with a tie-back triangle top and a classic bikini bottom.'
-	if ARGS[1] = 195:$RESULT = 'A bikini with a tie-back triangle top and a side-tie classic bikini bottom, it has floral print.'
-	if ARGS[1] = 196:$RESULT = 'A two-piece swimsuit in Indian red, it has a wrap front-tie top and a classic full bottom.'
-	if ARGS[1] = 197:$RESULT = 'A bikini set in assorted pink color, it has a fashionable halter top and a g-string bottom.'
-	if ARGS[1] = 198:$RESULT = 'A red bikini with a triangle top and g-string bottom.'
-	if ARGS[1] = 199:$RESULT = 'A coral bikini set with a fashionable small triangle top and a thong bottom.' 
-	if ARGS[1] = 200:$RESULT = 'A red ruffled bikini with a small triangle top and a thong bikini bottom.' 
-	if ARGS[1] = 201:$RESULT = 'A yellow bikini with white polka dots, it has a small triangle top with a deep plunge and a side-string thong bottom.'
-	if ARGS[1] = 202:$RESULT = 'A blue bikini set with decorative black flourishing, it has a triangle top and a side-string bottom.' 
-	if ARGS[1] = 203:$RESULT = 'A pink bikini set with white polka dots, it has a plunged triangle top and a side-tie bikini bottom.'
-	if ARGS[1] = 204:$RESULT = 'A micro monochrome stripes bikini with a bralette top and a thong bottom.'
-	if ARGS[1] = 205:$RESULT = 'A coral bikini set with a deep-plunge bralette top and a thong bottom.'
-	if ARGS[1] = 206:$RESULT = 'A bikini set in medium Pearwood color, it has a scoop plunge top and a classic full bikini bottom.'
-	if ARGS[1] = 207:$RESULT = 'A bikini set with blush tone print, it has a bralette top and a classic full bikini bottom.'
-	if ARGS[1] = 208:$RESULT = 'A bikini set with a smocked triangle top and a cheeky bikini bottom.'
-	if ARGS[1] = 209:$RESULT = 'A string bikini set with red palette print, it has a small triangle top and a cheeky string bikini.' 
-	if ARGS[1] = 210:$RESULT = 'A bikini in baby blue color, it has a wrap top and a classic bikini bottom.'
-	if ARGS[1] = 211:$RESULT = 'A bikini set with floral print, it has a triangle top and a Brazilian bottom.'
-	if ARGS[1] = 212:$RESULT = 'A two-piece swimsuit in the color pine green, it has a full coverage top and a thong bikini bottom.'
-	if ARGS[1] = 213:$RESULT = 'A two-piece swimsuit in the color black, it has a halter top with transparent mesh and a double-strap thong bottom.'
-	if ARGS[1] = 214:$RESULT = 'A two-piece swimsuit that looks like one-piece. It has a tankini top and a classic full bikini bottom.' 
+	if ARGS[1] = 159:$RESULT = 'A black bikini set with a triangle top and a little thong bottom that shows off your booty quite nicely.'
+	if ARGS[1] = 160:$RESULT = 'A bikini set in black, it has a cross-string top and a Brazilian bottom. It hugs your curves quite nicely.' 
+	if ARGS[1] = 161:$RESULT = 'A bikini set in purple, it has a v plunge bralette top and a thong bottom. It shows your booty nicely.'
+	if ARGS[1] = 162:$RESULT = 'A bikini set in azure, it has a Bandeau top and a string bikini bottom.'
+	if ARGS[1] = 163:$RESULT = 'A bikini set in the color fuchsia, it has a triangle top and a tiny thong bottom that provide little back coverage.'
+	if ARGS[1] = 164:$RESULT = 'A bikini set with a triangle top and a thong bottom in color fuchsia with floral prints.' 
+	if ARGS[1] = 165:$RESULT = 'A blue bikini set with a triangle top and a thong bottom, it has white floral print and looks fun and flirty.' 
+	if ARGS[1] = 166:$RESULT = 'A bikini set with a triangle top and a Brazilian bottom in Tiffany Blue, it''s both functional and fashionable.'
+	if ARGS[1] = 167:$RESULT = 'A red bikini set with a triangle top and a Brazilian bottom that gives plenty of coverage yet remains flirty!'
+	if ARGS[1] = 168:$RESULT = 'A bikini set with a triangle tie-back top and a Brazilian bottom in the color Taffy, it looks fun and flirty.'
+	if ARGS[1] = 169:$RESULT = 'A bikini set that has a rather revealing halter top and a small string bottom in the color Thunder.'
+	if ARGS[1] = 170:$RESULT = 'A bikini set in the color scarlet, it has a triangle tie-back top and a side-string bottom, classy and flirty.'
+	if ARGS[1] = 171:$RESULT = 'A black bikini set with a bralette top and a full bottom, it has supportive-cup, highly comfortable yet still classy.'
+	if ARGS[1] = 172:$RESULT = 'A black bikini set with a bralette top and a full bottom, it has the classy vibe to it.' 
+	if ARGS[1] = 173:$RESULT = 'A bikini set in the Cerulean color, it has a classic bottom as well as a tie-back top that reveal part of the cleavage.' 
+	if ARGS[1] = 174:$RESULT = 'A bikini in Sky blue color, it has a fashionable halter-top top and a classic bikini bottom.' 
+	if ARGS[1] = 175:$RESULT = 'A black bikini set with a strapless Bandeau top and a Brazilian bottom, it''s fun and flirty.'
+	if ARGS[1] = 176:$RESULT = 'A bikini in the color Laure, it has a front-tie top and a multi-string bikini bottom.'
+	if ARGS[1] = 177:$RESULT = 'A Triangle grey bikini top with rings and a scrunch Brazilian bottom, it''s both fashionable and functional.'
+	if ARGS[1] = 178:$RESULT = 'A Triangle bikini top with a Brazilian bottom in multi-floral print.'
+	if ARGS[1] = 179:$RESULT = 'A pink ruffled bikini with a triangle top and a thong bottom, it''s both playful and flirty'
+	if ARGS[1] = 180:$RESULT = 'A black bikini set with a triangle top and a g-string bottom.' 
+	if ARGS[1] = 181:$RESULT = 'A red bikini set with a triangle top and a sexy thong bottom.'
+	if ARGS[1] = 182:$RESULT = 'A bikini set with a triangle top and a g-string bottom, its design reveals much of your body.'
+	if ARGS[1] = 183:$RESULT = 'A red bikini with a tie-back top and a cheeky bottom, it''s sassy with class.'
+	if ARGS[1] = 184:$RESULT = 'A black bikini with a a multi-colored top and a classic bikini bottom.'
+	if ARGS[1] = 185:$RESULT = 'A red bikini top with a deep plunge that shows off your cleavage and a small classic bottom.' 
+	if ARGS[1] = 186:$RESULT = 'A black bikini with a deep-plunge top and a thong that shows your body off with minimum decency.'
+	if ARGS[1] = 187:$RESULT = 'A Navy blue bikini with a tie-back top and a classic bikini bottom.' 
+	if ARGS[1] = 188:$RESULT = 'A bikini with a banded halter-top and a classic bikini bottom, it has stripes of shimmery gold.' 
+	if ARGS[1] = 189:$RESULT = 'A blue bikini with a medium-size triangle top and a string bikini bottom that provides coverage.'
+	if ARGS[1] = 190:$RESULT = 'A green bikini with snake-skin print, with a triangle top and a classic g-string.' 
+	if ARGS[1] = 191:$RESULT = 'A red bikini set with a deep-plunge top and a thong bottom, it has two Navy blue stripes.' 
+	if ARGS[1] = 192:$RESULT = 'A white bikini with blue hen, it has a bralette top and a Brazilian bottom.'
+	if ARGS[1] = 193:$RESULT = 'A black bikini with a tie-back triangle top and a classic bikini bottom.'
+	if ARGS[1] = 194:$RESULT = 'A bikini with a tie-back triangle top and a side-tie classic bikini bottom, it has floral print.'
+	if ARGS[1] = 195:$RESULT = 'A two-piece swimsuit in Indian red, it has a wrap front-tie top and a classic full bottom.'
+	if ARGS[1] = 196:$RESULT = 'A bikini set in assorted pink color, it has a fashionable halter top and a g-string bottom.'
+	if ARGS[1] = 197:$RESULT = 'A red bikini with a triangle top and g-string bottom.'
+	if ARGS[1] = 198:$RESULT = 'A coral bikini set with a fashionable small triangle top and a thong bottom.' 
+	if ARGS[1] = 199:$RESULT = 'A red ruffled bikini with a small triangle top and a thong bikini bottom.' 
+	if ARGS[1] = 200:$RESULT = 'A yellow bikini with white polka dots, it has a small triangle top with a deep plunge and a side-string thong bottom.'
+	if ARGS[1] = 201:$RESULT = 'A blue bikini set with decorative black flourishing, it has a triangle top and a side-string bottom.' 
+	if ARGS[1] = 202:$RESULT = 'A pink bikini set with white polka dots, it has a plunged triangle top and a side-tie bikini bottom.'
+	if ARGS[1] = 203:$RESULT = 'A micro monochrome stripes bikini with a bralette top and a thong bottom.'
+	if ARGS[1] = 204:$RESULT = 'A coral bikini set with a deep-plunge bralette top and a thong bottom.'
+	if ARGS[1] = 205:$RESULT = 'A bikini set in medium Pearwood color, it has a scoop plunge top and a classic full bikini bottom.'
+	if ARGS[1] = 206:$RESULT = 'A bikini set with blush tone print, it has a bralette top and a classic full bikini bottom.'
+	if ARGS[1] = 207:$RESULT = 'A bikini set with a smocked triangle top and a cheeky bikini bottom.'
+	if ARGS[1] = 208:$RESULT = 'A string bikini set with red palette print, it has a small triangle top and a cheeky string bikini.' 
+	if ARGS[1] = 209:$RESULT = 'A bikini in baby blue color, it has a wrap top and a classic bikini bottom.'
+	if ARGS[1] = 210:$RESULT = 'A bikini set with floral print, it has a triangle top and a Brazilian bottom.'
+	if ARGS[1] = 211:$RESULT = 'A two-piece swimsuit in the color pine green, it has a full coverage top and a thong bikini bottom.'
+	if ARGS[1] = 212:$RESULT = 'A two-piece swimsuit in the color black, it has a halter top with transparent mesh and a double-strap thong bottom.'
+	if ARGS[1] = 213:$RESULT = 'A two-piece swimsuit that looks like one-piece. It has a tankini top and a classic full bikini bottom.' 
 
 
 elseif $ARGS[0] = 'beach':

+ 10 - 10
locations/alexandriaEv.qsrc

@@ -160,7 +160,7 @@ if $ARGS[0] = 'interview2':
 				'"Well... basically she told me that your magic was somewhat altered on your quest for the Talisman''s power and that a simple scare turned your hair white, but if you ask me, it suits your style, I can''t blame the photographer for thinking that you... were... a model?"'
 				'Is like looking a train wreck, as Alexandria''s face goes darker at your dialogue. Finally, you shut up as she grit her teeth and with words full of contempt.'
 				'"I can assure you, that I have total control over my magic, hmpf... More importantly than that, my hair didn''t turned white because like some simpleton, I was scared by a toad in the dark. I''m a natural blonde, and I take good care of my hair, it''s one of the few things that Rikudo''s curse hasn''t altered, because... surprise! that trickster seemed to have forgotten to say you something important... I am a man!'
-			end if
+			end
 			minut += 2
 			gs 'stat'
 
@@ -202,7 +202,7 @@ if $ARGS[0] = 'interview2':
 			act '"A man?"':gt'alexandriaEv','interview3'
 		end
 	end
-end if
+end
 
 if $ARGS[0] = 'interview3':
 	'<center><b><font color="maroon">Aleksei?</font></b></center>'
@@ -217,8 +217,8 @@ if $ARGS[0] = 'interview3':
 			'"Yes Mr. Ivanov... I am another victim of Rikudo''s games, that is the reason for my interest in you."'
 		else
 			'"Yes... Cursed by Rikudo, the being that created The Talisman of Power, and the reason for my interest in you."'
-		end if
-	end if
+		end
+	end
 	'After this little revelation, he exhales a big puff of smoke, and continue with his explanation.'
 	'"As I remember telling you the last time we meet, my name is Aleksei, and the hows and whys of my curse it''s better to leave them for another time, suffice is to say, that is my understanding, that you and your relation with the powers that have been transferred to your persona, holds the key to break my current predicament. As you can see from our early confrontation, the powers that be, wanted the monopoly over your attention, so I looked for an alternative, that is the reason after the... convoluted way we meet in Aphrodite, hm... as an afterthought, if you want to know, I took care of that little parasite, banishing it."'
 	'As he gives you this explanation, the pieces of the puzzle click in your head, and begin to explain his conduct, but there is a thing to explain.'
@@ -292,7 +292,7 @@ if $ARGS[0] = 'interview3':
 					'"<<$pcs_lastname>>, is that your answer? Do you question my decision without knowing if it was the only solution?" He exhales another puff and you can see how he clenches his teeth "let''s be clear <<$pcs_lastname>>, Reinhold and I did oaths to protect the inhabitants of this world from beings like <i>It</i>, and at-risk to offend your morality, this was necessary."'
 					'Aleksei say this as a matter of fact, before tilting his head like he was hearing something.'
 					'"Hm... Interesting. <<$pcs_lastname>> we have company."'
-				end if
+				end
 				minut += 2
 				gs 'stat'
 
@@ -312,9 +312,9 @@ if $ARGS[0] = 'interview3':
 
 				act 'End the interview':gt'alexandriaEv','interview4'
 			end
-		end if
-	end if
-end if
+		end
+	end
+end
 
 if $ARGS[0] = 'interview4':
 	AlexandriaQW = 7
@@ -339,7 +339,7 @@ if $ARGS[0] = 'interview4':
 		'"I must admit, that this has ended better than I expected <<$pcs_lastname>>, is my impression that you have the potential to master the high arts, and... even taking into consideration, my personal interest on you, I''m tempted to offer you something."'
 		'Aleksei put out the cigarette in an ashtray, the next words exiting somewhat excited from his mouth.'
 		'"I offer you the possibility of an apprenticeship under my wing. This will protect you, partially from The Council and Reinhold interests, but, I expect respect and diligence, so... until the next time and remember, my door is open only on daily hours."'
-	end if
+	end
 	minut += 4
 	gs 'stat'
 
@@ -359,7 +359,7 @@ if $ARGS[0] = 'interview4':
 
 		act 'Continue':gt'psiklin','start'
 	end
-end if
+end
 
 --- alexandriaEv ---------------------------------
 

+ 8 - 8
locations/andreihunter.qsrc

@@ -133,7 +133,7 @@ else
 
 										act'Continue':gt $loc, $loc_arg
 									end
-								end if
+								end
 							end
 							act 'Push away':
 								*clr & cla
@@ -147,7 +147,7 @@ else
 								act'Leave':gt $loc, $loc_arg
 							end
 						end
-					end if
+					end
 					act'Leave':gt $loc, $loc_arg
 				end
 			else
@@ -178,7 +178,7 @@ else
 
 						act 'Go':gt 'hunterLoveSex','Andrei'
 					end
-				end if
+				end
 				if rand(0,9) = 0:
 					act 'Break up with Andrei':
 						*clr & cla
@@ -191,11 +191,11 @@ else
 
 						act 'Leave':gt $loc, $loc_arg
 					end
-				end if
-			end if
-		end if
+				end
+			end
+		end
 		act'Leave':gt $loc, $loc_arg
-	end if
-end if
+	end
+end
 
 --- andreihunter ---------------------------------

+ 3 - 2
locations/andrey.qsrc

@@ -65,6 +65,7 @@ if $ARGS[0] = 'apply':
 			end
 			act 'Take the weekend job':
 				cla
+				work = 1
 				young_shop_work1 = 1
 				minut += 5
 				*nl
@@ -362,7 +363,7 @@ if $ARGS[0] = 'beg':
 			!!if it is possible Sveta never even gave the manager a blowjob previously
 			if young_shop_fired <= 1:
 				'"That''s not fair! You know how much I need this job, just let me give you a blowjob or something like that." You say trying to convince Mr. Sobulyagin to let you have your job back without doing this.'
-			else:
+			else
 				'"That''s not fair! You know how much I need this job, just let me give you a blowjob like usual." You say trying to convince Mr. Sobulyagin to let you have your job back without doing this.'
 			end
 			'"Listen I''m doing you a favor here. It''s well within my rights not to hire back someone who missed work, but I''m not a bad guy. I can see you really want this job," he says while standing up from his chair. "So I''m willing to help you, but you need to prove to me how much you want this job."'
@@ -376,7 +377,7 @@ if $ARGS[0] = 'beg':
 				*nl
 				if young_shop_fired <= 6:
 					'Your face immediately turns beet-red as you try to comprehend what you''ve just heard. "You want me to give you a blowjob... then have anal sex?" You don''t understand what the hell he''s thinking. "There''s no way I''ll do that!"'
-				else:
+				else
 					'"I know I let you do that when I worked for you before" you tell him, "but I''m not going to start doing that again.'
 				end
 				'"Fine then there''s the door," Mr. Sobulyagin snaps clearly upset with your answer.'

+ 2 - 2
locations/backwater.qsrc

@@ -22,8 +22,8 @@ if $ARGS[0] = '':
 		act 'Further':gt 'hunters', 'start'
 	else
 		if $clothingworntype = 'nude' and igor_away = 'no' or (hunters_outside = 1 and hunters_available = 1) and rand(1,10) = 1: gt 'backwater','hunter' else gt 'backwater','alone'
-	end if
-end if
+	end
+end
 
 if $ARGS[0] = 'alone':
 	'<center><B>Backwater</B></center>'

+ 4 - 4
locations/changingroom.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'view_swim_list':
 		i = 1
 		h = 0
 		:loopswimwear
-			if swimwear[i] = 1 and swimwearS[i] = 0 and ($clothingworntype ! 'swimwear' or clothingwornnumber ! i):h += 1 & *p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''swimwear'', <<i>>"><img <<$set_imgh>> src="images/pc/clothing/12swimwear/<<i>>.jpg" 	height="250" /></a>'
+			if swimwear[i] = 1 and swimwear_s[i] = 0 and ($clothingworntype ! 'swimwear' or clothingwornnumber ! i):h += 1 & *p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''swimwear'', <<i>>"><img <<$set_imgh>> src="images/pc/clothing/12swimwear/<<i>>.jpg" 	height="250" /></a>'
 			i += 1
 		if i <= ARRSIZE('swimwear'):jump 'loopswimwear'
 
@@ -30,7 +30,7 @@ if $ARGS[0] = 'view_swim_list':
 		i = 1
 		h = 0
 		:loopbeach
-			if beach[i] = 1 and beachS[i] = 0 and ($clothingworntype ! 'beach' or clothingwornnumber ! i):h += 1 & *p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''beach'', <<i>>"><img <<$set_imgh>> src="images/pc/clothing/15beachbabe/<<i>>.jpg" 	height="250" /></a>'
+			if beach[i] = 1 and beach_s[i] = 0 and ($clothingworntype ! 'beach' or clothingwornnumber ! i):h += 1 & *p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''beach'', <<i>>"><img <<$set_imgh>> src="images/pc/clothing/15beachbabe/<<i>>.jpg" 	height="250" /></a>'
 			i += 1
 		if i <= ARRSIZE('beach'):jump 'loopbeach'
 
@@ -104,7 +104,7 @@ if $ARGS[0] = 'count_swim_item':
 	if $ARGS[1] = 'swim' or $ARGS[1] = '':
 		i = 1
 		:loopcountswimwear
-			if swimwear[i] = 1 and swimwearS[i] = 0 :h += 1
+			if swimwear[i] = 1 and swimwear_s[i] = 0 :h += 1
 			i += 1
 		if i <= ARRSIZE('swimwear'):jump 'loopcountswimwear'
 	end
@@ -112,7 +112,7 @@ if $ARGS[0] = 'count_swim_item':
 	if $ARGS[1] = 'beach' or $ARGS[1] = '':
 		i = 1
 		:loopcountbeach
-			if beach[i] = 1 and beachS[i] = 0 :h += 1
+			if beach[i] = 1 and beach_s[i] = 0 :h += 1
 			i += 1
 		if i <= ARRSIZE('beach'):jump 'loopcountbeach'
 	end

+ 1 - 1
locations/cikl.qsrc

@@ -159,7 +159,7 @@ Clothingstock[i] = rand (0,500)
 i += 1
 if i <= 147:jump 'loopprice'
 
-if coatH[defaultcoat] <= 0: defaultcoat = 0
+if coat_h[defaultcoat] <= 0: defaultcoat = 0
 
 !! Abortion and pregnancy recovery resets if finished
 

+ 8 - 8
locations/cloakroom.qsrc

@@ -18,13 +18,13 @@ $coat_list_line = {
 
 	$RESULT +='<TD><a href="exec:gt ''cloakroom'', ''view_coat_item'', <<ARGS[0]>>"><img src="<<FUNC(''$clothing_image'', ''coat'', ARGS[0])>>" width="<<clothing_temp>>"></a></TD>'
 
-	$RESULT += '<TD>Coat # <<ARGS[0]>><br>strength: ' + dyneval '$RESULT += coatH[<<ARGS[0]>>]'+'</TD>'
+	$RESULT += '<TD>Coat # <<ARGS[0]>><br>strength: ' + dyneval '$RESULT += coat_h[<<ARGS[0]>>]'+'</TD>'
 
 	$RESULT += '<TD>' + FUNC('$clothing_name', 'coat', ARGS[0]) + '</TD>'
 
 	$RESULT += '<TD><a href="exec:gt ''cloakroom'', ''view_coat_item'', <<ARGS[0]>>">View</a></TD>'
 
-	if coatH[i] > 0:
+	if coat_h[i] > 0:
 		$RESULT += '<TD><a href="exec:defaultcoat = ''<<i>>'' & gt ''cloakroom'', ''view_coat_list''">Wear</a></TD>'
 	end
 
@@ -35,19 +35,19 @@ $coat_list_line = {
 	$RESULT += '</TD>'
 
 	$RESULT += '<TD>'
-	if dyneval('RESULT = coatS[<<ARGS[0]>>]') = 0:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest'', <<ARGS[0]>>">Keep</a>'
-	if dyneval('RESULT = coatS[<<ARGS[0]>>]') = 2:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest1'', <<ARGS[0]>>">Unwanted</a>'
+	if dyneval('RESULT = coat_s[<<ARGS[0]>>]') = 0:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest'', <<ARGS[0]>>">Keep</a>'
+	if dyneval('RESULT = coat_s[<<ARGS[0]>>]') = 2:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest1'', <<ARGS[0]>>">Unwanted</a>'
 	$RESULT += '</TD>'}
 
 if $ARGS[0] = 'dest':
 	*clr
-	dynamic 'coatS[<<ARGS[1]>>] = 2'
+	dynamic 'coat_s[<<ARGS[1]>>] = 2'
 	gt 'cloakroom', 'view_coat_list'
 end
 
 if $ARGS[0] = 'dest1':
 	*clr
-	dynamic 'coatS[<<ARGS[1]>>] = 0'
+	dynamic 'coat_s[<<ARGS[1]>>] = 0'
 	gt 'cloakroom', 'view_coat_list'
 end
 
@@ -113,12 +113,12 @@ if $ARGS[0] = 'view_coat_item':
 
 
 	$RESULT = '(strength '
-	dynamic '$RESULT += coatH[<<ARGS[1]>>]'
+	dynamic '$RESULT += coat_h[<<ARGS[1]>>]'
 	$RESULT += ')'
 	'<<$RESULT>>'
 
 	!! if the clothing is worn out
-	if dyneval('RESULT = coatH[<<ARGS[1]>>]') <= 0:
+	if dyneval('RESULT = coat_h[<<ARGS[1]>>]') <= 0:
 		'This item is worn and is not suitable for further wear.'
 		act 'Throw it away':
 			dynamic 'coat[<<ARGS[1]>>] = 0'

+ 3 - 3
locations/clothing.qsrc

@@ -403,7 +403,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopbeach
-				if beach[i] = 1 and beachS[i] = cloc and ($clothingworntype ! 'beach' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'beach', i)
+				if beach[i] = 1 and beach_s[i] = cloc and ($clothingworntype ! 'beach' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'beach', i)
 				i += 1
 			if i <= ARRSIZE('beach'):jump 'loopbeach'
 
@@ -496,7 +496,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 			i = 1
 			:loopswimwear
-				if swimwear[i] = 1 and swimwearS[i] = cloc :*P dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
+				if swimwear[i] = 1 and swimwear_s[i] = cloc :*P dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
 				i += 1
 			if i <= ARRSIZE('swimwear'):jump 'loopswimwear'
 
@@ -773,7 +773,7 @@ if $ARGS[0] = 'view_clothing_item':
 
 		if $ARGS[2] ! 'coat':
 			act 'Move back to wardrobe':
-				dynamic $ARGS[2] + 'S[<<ARGS[3]>>] = 0'
+				dynamic $ARGS[2] + '_s[<<ARGS[3]>>] = 0'
 				gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 			end
 		end

+ 1 - 1
locations/clothing_QV.qsrc

@@ -626,7 +626,7 @@ if $ARGS[0] = 'cloak':
 	i = 1
 	:loopcoat
 	if coat[i] = 1:
-		if coatH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coat'', <<i>>"><img src="images/pc/clothing/11coat/<<i>>.jpg" 	height="250" /></a>'
+		if coat_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coat'', <<i>>"><img src="images/pc/clothing/11coat/<<i>>.jpg" 	height="250" /></a>'
 	end
 	i += 1
 	if i <= ARRSIZE('coat'):jump 'loopcoat'

+ 2 - 2
locations/dorm.qsrc

@@ -223,7 +223,7 @@ if $ARGS[0] = 'kendraroom':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/kendraroom/room.jpg"></center>'
 	'There are two beds, one on each side of the window. There are various pictures and posters hanging on both sides of the room. One side also has a string of large lights hanging up as well. Just down from the beds on each side are two desks, against each wall. Both are decorated with slight differences. Near the door is a small couch and two wardrobes.'
-	if kendraslave = 6:
+	if kendraslave >= 6:
 		'Kendra opens the door and invites you in. It doesn''t take long before you are both naked and excitedly touching each other.'
 		act 'Have sex':
 			*clr & cla
@@ -378,7 +378,7 @@ if $ARGS[0] = 'kendraroom':
 				act 'Leave':gt 'dorm', 'korr'
 			end
 		end
-	elseif kendraslave = 1:
+	elseif kendraslave <= 1:
 		'A pretty ebony woman opens the door, she introduces herself as Kendra and says that she knows you love black cocks. She tells you to get a proper tattoo if you want to get it on with her.'
 		act 'Leave':gt 'dorm', 'korr'
 		act 'Get a tattoo':

+ 1 - 1
locations/fame.qsrc

@@ -184,7 +184,7 @@ else
         $gnikname = 'whore'
     elseif pav_slut < 300 :
         $gnikname = 'town bicycle'
-    else :
+    else
         $gnikname = 'cum dumpster'
 	end
 end

+ 5 - 5
locations/gadforest_event.qsrc

@@ -268,16 +268,16 @@ if $ARGS[0] = 'mushroom_pickers3':
 						else
 							'"Pretty well today." you answer happily, showing him your full basket.'
 							'You spend ten minutes talking about the forest and the best places to find mushrooms and berries, before getting up to continue on with your day.'
-						end if
-					end if
+						end
+					end
 					act 'Leave':gt 'gadforest','forest_outskirts'
 				end
 				gs 'stat'
 
 				act 'Leave':gt $loc, $loc_arg
-			end if
+			end
 		end
-	end if
+	end
 	gs 'stat'
 
 	act 'Leave them be':gt 'gadforest','forest_outskirts'
@@ -378,7 +378,7 @@ if $ARGS[0] = 'basket':
 		else
 			'Unfortunately your basket is already full and you cannot carry any more berries.'
 		end
-	end if
+	end
 	gs 'stat'
 
 	act 'Leave the basket alone':gt 'gadforest','forest_center'

+ 36 - 36
locations/gschool_cheerleading.qsrc

@@ -224,10 +224,10 @@ if $ARGS[0] = 'afterschool_practice':
 		end
 	else
 		act 'Skip practice (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end if
+	end
 	if cheerleadingQW['skipped'] > 1:
 		act 'Quit cheerleading squad': gt 'gschool_cheerleading', 'Quit'
-	end if
+	end
 end
 
 if $ARGS[0] = 'afterschool_game':
@@ -303,11 +303,11 @@ if $ARGS[0] = 'practice':
 						cheerleadingQW['quest_stage'] = 3
 					else 
 						'The squad is already out practicing when you arrive at the locker room and change. You don''t have the privelege of owning a uniform and instead train in your sports clothing.'
-					end if
-				end if
+					end
+				end
 			else
 				'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their outfits while chatting to each other. You head to your locker and and strip down. You pull your uniform out and start getting dressed. You just finish tying your shoes when Albina gives the order to head out into the PE hall.'
-			end if
+			end
 		end
 
 		act 'Follow the others into the hall':
@@ -337,7 +337,7 @@ if $ARGS[0] = 'practice':
 					'Albina heads over to you and cheerfully greets you. "Don''t you just look delightful!" She then explains what your role in the squad will be and leads you over to the group.'
 					'"It''s all really simple. Just follow our lead and you''ll be fine. From the top girls!"'
 					'You take your place and Albina begins. You practice tumbling and flips and manage not only to impress Albina, but the rest of the squad too. "Not bad for your first time <<$pcs_nickname>>. I expect great things from you."'
-				end if
+				end
 			else
 				if cheerleadingQW['quest_stage'] = 2:
 					!! Backup variant
@@ -351,7 +351,7 @@ if $ARGS[0] = 'practice':
 							'You finish practicing the last of your moves as Albina heads your way. "<<$pcs_firstname>>, one of the girls has just gone and busted her ankle. I need you to stand in for her at the game tomorrow. Don''t get ahead of yourself, you''re only serving your purpose. So be here tomorrow after school."'
 							'Albina walks away, but your excited eagerness is suddenly shattered when she turns and glares directly at you. "Don''t make me regret choosing you!"'
 							'You are left with a slight feeling of dread within you.'
-						end if
+						end
 					elseif rand(0,8) = 0:
 						if cheerleadingQW['practice_count'] > 4 and week = 4:
 							*nl
@@ -360,7 +360,7 @@ if $ARGS[0] = 'practice':
 							You stare at her and she quickly reassures you. "Don''t worry, this isn''t a prank. I have... other things that need my attention tomorrow and Albina is fine with you covering for me. It''s your job after all!" she giggles.
 							You laugh and agree. She smiles and thanks you before whispering in your ear. "I''m going out with Vanya tomorrow, but Albina wouldn''t like that, so I told her I had to go to the doctor."
 							She then taps her nose at you, silently asking you to keep her secret, before she cheerfully bounces off to get changed.'
-						end if
+						end
 					elseif rand(0,7) = 0: 
 						if (cheerleadingQW['backup_game'] ! 1) and (npc_grupTipe['A18'] ! 5):
 							*clr & cla
@@ -368,7 +368,7 @@ if $ARGS[0] = 'practice':
 							gs 'stat'
 							
 							act 'Go take a shower': gt 'gschool_cheerleading', 'shower'
-						end if 
+						end
 					elseif rand(0,6) = 0:
 						*nl
 						'As you are practicing in the corner, you notice a boy with a phone run up to one of the girls and pull her skirt up to take a panty shot. He and his group of friends flee before anyone can stop them. After fixing her clothing, the girl assures everyone she is fine and the session continues.'
@@ -389,8 +389,8 @@ if $ARGS[0] = 'practice':
 						if npc_grupTipe['A18'] ! 5:
 							*nl
 							'As Lina practices a move that involves holding another girl, Christina decides to amuse herself and pulls Lina''s skirt up, causing her to squeal as her panties are exposed to everyone. She is blushing heavily, forced to endure the humilation since she can''t let go of the girl. Christina eventually lets her skirt go and Albina chews her out for being so reckless and childish while praising Lina for not losing her focus. Christina just laughs and calls her for being a bossy spoilsport while giving a mocking smirk to Lina. Christina just laughs and mocks Albina, comparing her to a yapping little dog.'
-						end if
-					end if
+						end
+					end
 				else
 					!! Regular variant
 					if pcs_cheer < 20:
@@ -411,14 +411,14 @@ if $ARGS[0] = 'practice':
 					else
 						gs 'npc_relationship', 'modify', 'A23', 'love'
 						'Once in the hall, you take your place as Albina explains what you will be practicing and has you begin. Your skill having drastically improved, Albina now considers you one of her best girls and uses you as an example to the others.'
-					end if
+					end
 
 					if rand(0,9) = 0:
 						if npc_grupTipe['A18'] ! 5:
 							*nl
 							'As you are practicing, Lariska goes over on her ankle and falls to the ground. Albina has the group stop and she and Vicky go to check on her. She meekly insists that she is fine, but Albina disagrees and has her stay on the ground as Vicky checks her over. Christina then walks over and chimes in, a worried looking Lina silently standing behind her. "She said she''s fine, so stop fussing and get back to bossing us around!" Albina narrows her gaze. "Does she look fine to you? No, she''s going to sit this one out and we''ll see how ''fine'' she is later!" In response, Lariska tries to get back on her feet, but whimpers slightly in pain. "Stop faking it and get off your lazy ass!" Christina shouts. Lariska looks at her meekly and tries to stand, but Vicky has her sit back down.' 
 							'"She isn''t in any shape to continue. <<$pcs_nickname>>, help Vicky take her over there to sit out and rest. We''ll have to make do without her for the rest of the session." Christina doesn''t seem happy, but doesn''t stop you and Vicky from carrying Lariska over to the benches to rest her injured foot. Albina then has the group finish the practice session without her. When you finish, Lariska seems well enough to walk to the changing room with a slight limp, which annoys Christina and causes her to again accuse her of faking it.'
-						end if
+						end
 					elseif rand(0,8) = 0:
 						*nl
 						'As you practice, you notice a group of boys watching you and whispering among themselves, one of them holding a phone in his hand. You ignore them and continue practicing when, in the corner of your eye, you see the boy with the phone run up to you. Before you can react, he pulls your skirt up and holds the phone underneath you. You hear the click of the camera before he lets go and the group flees before anyone can stop them. You fix your clothing and assure everyone that you''re fine before the session continues.'
@@ -441,10 +441,10 @@ if $ARGS[0] = 'practice':
 						if npc_grupTipe['A18'] ! 5:
 							*nl
 							'As Lina practices a move that involves holding another girl, Christina decides to amuse herself and pulls Lina''s skirt up, causing her to squeal as her panties are exposed to everyone. She is blushing heavily, forced to endure the humilation since she can''t let go of the girl. Christina eventually lets her skirt go and Albina chews her out for being so reckless and childish while praising Lina for not losing her focus. Christina just laughs and calls her for being a bossy spoilsport while giving a mocking smirk to Lina. Christina just laughs and mocks Albina, comparing her to a yapping little dog.'
-						end if
-					end if
-				end if
-			end if
+						end
+					end
+				end
+			end
 			gs 'stat'
 			
 			act 'Go take a shower': gt 'gschool_cheerleading', 'shower'
@@ -470,26 +470,26 @@ if $ARGS[0] = 'game':
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/opening.mp4"></video></center>'
 			!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
 			!! the events could differ according to the season
-			if month =>10:
+			if month >= 10:
 				if first_time_outside_in_cold_weather=0:
 					'There is a chill in the air and you shudder as you step outside in your thin outfit that does little to protect you from the elements. Despite the girls'' pleas, the football teams prefer the outdoor field to playing indoors and you are forced to perform outside, even during cold weather. Thankfully, performing your routine and then cheering from the sidelines helps keep you somewhat warm as you persevere with the vicious cold.'
 					first_time_outside_in_cold_weather=1
 				else
 					'The cold chill in the air stings with a bitter fury as you step outside. For whatever reason, a few of your fellow cheerleaders have chosen not to wear a bra and their solid nipples are poking through the thin fabric of their outfits. You soldier through the biting cold and perform your routine before cheering from the sidelines for the rest of the game, which helps keep you somewhat warm.'
-				end if
+				end
 			elseif month <=3:
 				if first_time_doing_basketball=0:
 					'Thankfully, the football team is now on its winter break and you are now safely in the warm indoors performing for the basketball team. While performing your opening routine, you notice some of the players and spectators checking you and the other girls out. Some of them are just appreciating the show while others are hungrily undressing you with their eyes. They continue eying you up for the rest of the game as you cheer from the sidelines. You ignore them as best as you can, thankful that you are indoors and warm at least.'
 					first_time_doing_basketball=1
 				else
 					'You head out into the hall and perform your opening routine for the crowd before the game starts and you cheer from the sidelines. You notice a few guys checking you and the other girls out, some of them undressing you with their eyes. You try your best to ignore them as the game continues.'
-				end if
+				end
 			elseif month = 4:
 				if first_time_spring_football_match=0:
 					'Football has started back up and you''re thankful that the weather has improved somewhat. You are no longer chilled to the bone, but the temperature picking up means you sweat a little more doing your routines. You''re grateful for the bottles of refreshing cold water being passed out and relish as you quench your thirst.'
 					first_time_spring_football_match=1
-				end if
-			end if
+				end
+			end
 
 			gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
 			'Out on the field, you and the girls perform your opening routine flawlessly under Albina''s direction and spend the rest of the game chanting and cheering your team. You see some guys in the crowd appreciating the view of your ass as you are performing right in front of them.'
@@ -505,7 +505,7 @@ if $ARGS[0] = 'game':
 					'You let out a sigh of relief when the game ends and after performing your closing routine, you all huddle together and make a dash for the warmth of the locker room.'
 				else
 					'The game ends and you perform your closing routine to the crowd as the players leave the field. You soon join them in returning to the locker room.'
-				end if
+				end
 				'Once in the locker room, you strip from your uniform and head into the showers.'
 
 				!! Resets the flag letting backups attend games
@@ -609,7 +609,7 @@ if $ARGS[0] = 'shower':
 					end
 				end
 			end
-		end if
+		end
 	elseif rand(0,4) = 0:
 		if (cheerleadingQW['practice_count'] < 3) and (npc_grupTipe['A18'] ! 5):
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/events/christina_ambush.jpg"></center>'
@@ -648,7 +648,7 @@ if $ARGS[0] = 'shower':
 					gs 'stat'
 
 					act 'Leave school': gt 'gschool_grounds', 'main'
-				end if
+				end
 			end
 
 			act 'Refuse':
@@ -683,9 +683,9 @@ if $ARGS[0] = 'shower':
 					gs 'stat'
 
 					act 'Leave school': gt 'gschool_grounds', 'main'
-				end if
+				end
 			end
-		end if
+		end
 	elseif rand(0,4) = 0 and cheerleadingQW['quest_stage'] = 3 :
 		if First_time_3some_with_Lazar = 0:
 			First_time_3some_with_Lazar = 1
@@ -867,8 +867,8 @@ if $ARGS[0] = 'shower':
 					end
 				end
 			end
-		end if
-	end if
+		end
+	end
 	if $CURACTS = '':
 		'You get dressed, place your uniform back in your locker and get ready to leave.'
 		gs 'stat'
@@ -877,8 +877,8 @@ if $ARGS[0] = 'shower':
 			if rand(0,5) = 0: gt 'gschool_cheerleading', 'Bella'
 			gt 'gschool_grounds', 'main'
 		end
-	end if
-end if
+	end
+end
 
 if $ARGS[0] = 'Bella':
 	*clr & cla
@@ -979,7 +979,7 @@ if $ARGS[0] = 'Bella':
 
 				act 'Leave':gt 'gschool_grounds', 'main'
 			end
-		end if
+		end
 	elseif bellawatch = 2:
 		'As you walk past the boys'' locker room, you can hear Bella and her friend going at it again.'
 		gs 'stat'
@@ -1050,7 +1050,7 @@ if $ARGS[0] = 'Bella':
 						gs 'stat'
 
 						act 'Leave':gt 'gschool_grounds', 'main'
-					end if
+					end
 				end
 			end
 
@@ -1062,8 +1062,8 @@ if $ARGS[0] = 'Bella':
 				act 'Leave':gt 'gschool_grounds', 'main'
 			end
 		end
-	end if
-end if
+	end
+end
 
 
 
@@ -1151,7 +1151,7 @@ if $ARGS[0] = 'Quit':
 	else
 		!!IF cheerleader- 
 		'Albina gives you an even bigger puzzled stare. "What? Why? Never mind. If you want to leave, then I won''t stop you. Just know that I thought you had some real potential here <<$pcs_nickname>>. And thanks for telling me and not just disappearing like <i>some other people</i> have." she adds. You breathe a sigh of relief as she gathers the girls and leaves, letting you go on your way.'
-	end if
+	end
 	minut += 2
 	gs 'stat'
 

+ 1 - 1
locations/hunter_ambient.qsrc

@@ -295,7 +295,7 @@ if $ARGS[0] = 'bring_food':
 		act 'Further': gt 'swamp_yard', 'start'
 	else
 		gt 'swamp_yard', 'start'
-	end if
+	end
 end
 
 

+ 2 - 2
locations/hunter_favors.qsrc

@@ -86,7 +86,7 @@ if $ARGS[0] = 'housekeeping_request':
 		end
 	else
 		gt 'swamp_yard', 'start'
-	end if
+	end
 end
 
 if $ARGS[0] = 'yard_cleanup':
@@ -126,7 +126,7 @@ if $ARGS[0] = 'dirty_swamphouse':
 	else
 		minut += 180
 		gs 'sweat', 'add', 30
-	end if
+	end
 	if huntersAndreiQw < 15:huntersAndreiQw += 1
 	if huntersIgorQw < 15:huntersIgorQw += 1
 	if huntersSergeiQw < 15:huntersSergeiQw += 1

+ 13 - 13
locations/hunter_interactions.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 
 								act 'Return to the table': gs 'swamphouse', 'meal_table'
 							end
-						end if
+						end
 					else
 						'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 						*nl
@@ -120,8 +120,8 @@ if $ARGS[0] = 'smoke_with_hunters':
 
 								act 'Return to the table': gs 'swamphouse', 'meal_table'
 							end
-						end if
-					end if
+						end
+					end
 				else
 					'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 					*nl
@@ -132,8 +132,8 @@ if $ARGS[0] = 'smoke_with_hunters':
 					gs 'stat'
 
 					act 'Go': gs 'swamphouse', 'huntersmokBJ'
-				end if
-			end if
+				end
+			end
 		end
 	elseif temp_sh = 3:
 		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big174.jpg"></center>'
@@ -170,7 +170,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 
 			act 'Return to the table': gs 'swamphouse', 'meal_table'
 		end
-	end if
+	end
 	act 'Refuse': gs 'swamphouse', 'meal_table'
 end
 
@@ -192,7 +192,7 @@ if $ARGS[0] = 'chat_with_hunters':
 		end
 	end
 
-end if
+end
 
 if $ARGS[0] = 'chat_with_hunters_theme':
 	*clr & cla
@@ -218,7 +218,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 		else
 			hunter_collective_opinion -= 2
 			hunter_sexual_comfort += 5
-		end if
+		end
 		gs 'arousal', -5, 'flashlite'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -249,11 +249,11 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 					end
 				else
 					act 'Maybe another time boys (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end if
+				end
 				gs 'stat'
 
 				act 'Approach the hunters to find out': gt 'hunter_favors', 'nighttime_entertainment'
-			end if
+			end
 		end
 		act 'No, not really':
 			cla
@@ -289,7 +289,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 				!if hunter_collective_opinion > 30 and alko < 4: act 'Maybe another time boys, not feeling it now': gt 'swamp_yard', 'start'
 				!act 'You get up and start getting into rhythm with some imaginary music': gt 'hunter_interactions', 'dance_show', 'nude'
 				act 'Maybe another time boys, not feeling it now': gt 'swamp_yard', 'start'
-			end if
+			end
 		end
 		act 'Uhh... kinda...':
 			cla
@@ -306,7 +306,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 				!end
 
 				!act 'You oblige, feeling your pussy already getting wet': gs 'hunter_interactions', 'nighttime_entertainment'
-			end if
+			end
 		end
 	elseif $ARGS[1] = 'nude':
 		*clr & cla
@@ -1429,7 +1429,7 @@ if $ARGS[0] = 'naked_encounter':
 		end
 	else
 		gt 'swamp_yard', 'start'
-	end if
+	end
 end
 
 ! if $ARGS[0] = 'dance_show':

+ 12 - 12
locations/igorhunter.qsrc

@@ -133,7 +133,7 @@ else
 
 						act'Further':gt $loc, $loc_arg
 					end
-				end if
+				end
 			end
 			act 'No':
 				*clr & cla
@@ -171,8 +171,8 @@ else
 					'<<$boydesc>> is your boyfriend.'
 				else
 					'<<$boydesc>> is your husband.'
-				end if
-			end if
+				end
+			end
 			gs 'stat'
 
 			act 'Chat (0:30)':
@@ -240,7 +240,7 @@ else
 
 											act'Continue':gt $loc, $loc_arg
 										end
-									end if
+									end
 								end
 								act 'To remove the face':
 									*clr & cla
@@ -253,7 +253,7 @@ else
 									act'Leave':gt $loc, $loc_arg
 								end
 							end
-						end if
+						end
 						act'Leave':gt $loc, $loc_arg
 					end
 				else
@@ -287,7 +287,7 @@ else
 
 							act 'Go':gt 'hunterLoveSex','Igor'
 						end
-					end if
+					end
 					if rand(0,6) = 0:
 						act 'Break up with Igor':
 							*clr & cla
@@ -302,13 +302,13 @@ else
 
 							act 'Leave':gt $loc, $loc_arg
 						end
-					end if
-				end if
-			end if
+					end
+				end
+			end
 			act'Depart':gt $loc, $loc_arg
-		end if
-	end if
-end if
+		end
+	end
+end
 
 --- igorhunter ---------------------------------
 

+ 1 - 1
locations/journal_quests.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'start':
 	'<center><h1>Quests</h1></center>'
 
 !!to check Sveta is at school. All school quests must pass this and it should become a category as we expand
-	if SchoolAtestat = 0 and SchoolBlock = 0:
+	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
 		!! This might need a note about debt required for most actions to be available, was not sure how to handle that part though.
 		if NatbelQW['QWstage'] >= 11:
 			'This is the end of Natasha''s quest line, for now.'

+ 0 - 93
locations/loadg.qsrc

@@ -1,99 +1,6 @@
 # loadg
 
 gs 'saveupdater'
-gs 'din_npc'
-
-!!-------------------Above this line to be kept-------------------
-
-clrbelo += suhbelo
-clrbelo += suhbelo2
-killvar'suhbelo'
-killvar'suhbelo2'
-
-
-!!-------------------------- above this line can be removed for 0.7.1 ---------------------------------
-
-if dounspell = 1: dounsplkil = 2 & gs 'body_shape', 'hardreset'
-
-!!adding default shoes and assigning them
-
-sgandm[6] = 1
-strainers[21] = 1
-
-if $cheapshoetype ! '':
-	killvar '$cheapshoetype'
-	killvar '$averageshoetype'
-	killvar '$expensiveshoetype'
-	killvar '$formalshoetype'
-	killvar '$officeshoetype'
-	killvar '$schoolshoetype'
-	killvar '$exerciseshoetype'
-	killvar '$fetishshoetype'
-	killvar '$exhibitshoetype'
-	killvar '$uniformshoetype'
-	killvar '$burlesqueshoetype'
-	killvar '$alternativeshoetype'
-end
-
-if pavlin > 0:
-	npc_rel['A217'] = npc_rel['A217'] + pavlin
-	pavlin = 0
-end
-
-if bag = 1 and $currentpursetype = '':
-	gm_purses[1] = 1
-	$currentpursetype = 'gm'
-	currentpursenumber = 1
-end
-
-if cheap_purse[1] = 1:gm_purses[1] = 1
-
-if npc_dick['A55'] = 23: npc_dick['A55'] = 30
-
-!!Fixes for changes to clothing system and removal of dirty underwear
-if $pantyworntype = '':
-	if tanga = 1: $pantyworntype = 'cheap'
-	if tanga = 0: $pantyworntype = 'none'
-end
-
-if $braworntype = '': $braworntype = 'cheap'
-
-if clrbelo > 0:
-	cheap_panties[37] = 1
-	cheap_bras[11] = 1
-	clrbelo = 0
-	if $pantyworntype = 'cheap':
-		pantywornnumber = 37
-	end
-	if $braworntype = 'cheap':
-		brawornnumber = 11
-	end
-	killvar 'clrbelo'
-	killvar 'clrbra'
-	killvar 'washingbelo'
-	killvar 'washingbra'
-	killvar 'dirtbelo'
-	killvar 'dirtbra'
-end
-
-if arrsize('$phonetheme_name') = 0: gs 'telefon', 'setup'
-
-if housr = 1:
-	home_owned[1] = 1
-elseif housr = 2:
-	home_owned[4] = 1
-end
-if BuyHous = 1: home_owned[1] = 2
-if placeMansion > 0: home_owned[5] = placeMansion
-if dachaest > 0: home_owned[3] = dachaest
-killvar 'placemansion'
-killvar 'dachaest'
-killvar 'housr'
-killvar 'BuyHous'
-
-if alko < 0: alko = 0
-if pranik < 0: pranik = 0
-if poroshok < 0: poroshok = 0
 
 gs 'nichUtil','onLoad'
 

+ 1 - 0
locations/moncheri.qsrc

@@ -60,6 +60,7 @@ if $ARGS[0] = 'start':
 		if coat[11] < 1:
 			if coat[11] = 0:dynamic 'act ''Look at designer coat 11'':gt ''clothing'', ''view_clothing_item'', ''shop'', ''coat'', 11, 50000'
 		end
+		if coat[9] = 1 and coat[11] = 1: *nl & 'You already own both available coats from this boutique.'
 	end
 
 end

+ 4 - 2
locations/pav_park.qsrc

@@ -209,7 +209,7 @@ if $ARGS[0] = 'start':
 		end		
 	end
 
-	if month >= 6 and month <=8 and TourGuide = 0 and work = 0:
+	if month >= 6 and month <=8 and TourGuide = 0 and (work = 0 or cheatWork = 1):
 		if hour >= 8 and hour <= 18:
 			act 'Apply for the Tour Guide job (0:30)':gt 'tour_guide', 'tourstart'
 		end
@@ -217,9 +217,11 @@ if $ARGS[0] = 'start':
 		if hour >= 8 and hour <= 12:
 			act 'Work as Tour Guide (6:00)':gt 'tour_guide', 'tourstart'
 		end
-	elseif month >= 9 and month <= 5 and TourGuide = 1 and work = 1:
+	elseif month >= 9 and month <= 5 and TourGuide = 1:
 		TourGuide = 0
 		work = 0
+	elseif month >= 9 and month <= 5 and TourGuide = 3:
+		TourGuide = 0
 	end
 
 	if mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:

+ 2 - 2
locations/podval_rape.qsrc

@@ -100,8 +100,8 @@ elseif podvalrape = 1:
 
 				act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pav_residential'
 			end  	
-		end if 
-	end if
+		end
+	end
 end
 
 --- podval_rape ---------------------------------

+ 15 - 27
locations/portnoi.qsrc

@@ -69,6 +69,18 @@ selltot = 0
 		i += 1
 	if i <= ARRSIZE('bomba_dress'):jump 'bomba_dressmet'
 
+	i = 1
+	:cats_outfitsmet
+		if cats_outfits[i] = 1 and cats_outfits_s[i] = 2:dynamic($batch_sell, 'cats_outfits', i)
+		i += 1
+	if i <= ARRSIZE('cats_outfits'):jump 'cats_outfitsmet'
+
+	i = 1
+	:cats_dressmet
+		if cats_dress[i] = 1 and cats_dress_s[i] = 2:dynamic($batch_sell, 'cats_dress', i)
+		i += 1
+	if i <= ARRSIZE('cats_dress'):jump 'cats_dressmet'
+
 	i = 1
 	:coco_outfitsmet
 		if coco_outfits[i] = 1 and coco_outfits_s[i] = 2:dynamic($batch_sell, 'coco_outfits', i)
@@ -143,19 +155,19 @@ selltot = 0
 
 	i = 1
 	:coatmet
-		if coat[i] = 1 and coatS[i] = 2:dynamic($batch_sell, 'coat', i)
+		if coat[i] = 1 and coat_s[i] = 2:dynamic($batch_sell, 'coat', i)
 		i += 1
 	if i <= ARRSIZE('coat'):jump 'coatmet'
 
 	i = 1
 	:swimwearmet
-		if swimwear[i] = 1 and swimwearS[i] = 2:dynamic($batch_sell, 'swimwear', i)
+		if swimwear[i] = 1 and swimwear_s[i] = 2:dynamic($batch_sell, 'swimwear', i)
 		i += 1
 	if i <= ARRSIZE('swimwear'):jump 'swimwearmet'
 
 	i = 1
 	:beachmet
-		if beach[i] = 1 and beachS[i] = 2:dynamic($batch_sell, 'beach', i)
+		if beach[i] = 1 and beach_s[i] = 2:dynamic($batch_sell, 'beach', i)
 		i += 1
 	if i <= ARRSIZE('beach'):jump 'beachmet'
 
@@ -165,30 +177,6 @@ selltot = 0
 		i += 1
 	if i <= ARRSIZE('fancy_burlesque'):jump 'fancy_burlesquemet'
 
-	i = 1
-	:dolls_outfitsmet
-		if dolls_outfits[i] = 1 and dolls_outfits_s[i] = 2:dynamic($batch_sell, 'dolls_outfits', i)
-		i += 1
-	if i <= ARRSIZE('dolls_outfits'):jump 'dolls_outfitsmet'
-
-	i = 1
-	:dolls_dressmet
-		if dolls_dress[i] = 1 and dolls_dress_s[i] = 2:dynamic($batch_sell, 'dolls_dress', i)
-		i += 1
-	if i <= ARRSIZE('dolls_dress'):jump 'dolls_dressmet'
-
-	i = 1
-	:bomba_outfitsmet
-		if bomba_outfits[i] = 1 and bomba_outfits_s[i] = 2:dynamic($batch_sell, 'bomba_outfits', i)
-		i += 1
-	if i <= ARRSIZE('bomba_outfits'):jump 'bomba_outfitsmet'
-
-	i = 1
-	:bomba_dressmet
-		if bomba_dress[i] = 1 and bomba_dress_s[i] = 2:dynamic($batch_sell, 'bomba_dress', i)
-		i += 1
-	if i <= ARRSIZE('bomba_dress'):jump 'bomba_dressmet'
-
 killvar 'batch_sell'
 
 'You sold <<poshvalldrop>> items of unwanted clothing for a total of <<selltot>> <b>₽</b>.'

+ 10 - 16
locations/portnoi2.qsrc

@@ -59,14 +59,14 @@ i = 1
 :yofficemet
 	if gm_office[i] = 1 and ((gm_office_b[i] > pcs_hips + 8) or (gm_office_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('office'):jump 'yofficemet'
+if i <= ARRSIZE('gm_office'):jump 'yofficemet'
 
 i = 1
 :yschoolmet
 	if gm_school[i] = 1 and ((gm_school_b[i] > pcs_hips + 8) or (gm_school_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 	if i = 6: i = 7
-if i <= ARRSIZE('school'):jump 'yschoolmet'
+if i <= ARRSIZE('gm_school'):jump 'yschoolmet'
 
 i = 1
 :yfetishmet
@@ -84,17 +84,17 @@ i = 1
 :yuniformmet
 	if gm_uniform[i] = 1 and ((gm_uniform_b[i] > pcs_hips + 8) or (gm_uniform_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('uniform'):jump 'yuniformmet'
+if i <= ARRSIZE('gm_uniform'):jump 'yuniformmet'
 
 i = 1
 :yswimwearmet
-	if swimwear[i] = 1 and ((swimwearB[i] > pcs_hips + 8) or (swimwearB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if swimwear[i] = 1 and ((swimwear_b[i] > pcs_hips + 8) or (swimwear_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('swimwear'):jump 'yswimwearmet'
 
 i = 1
 :ybeachmet
-	if beach[i] = 1 and ((beachB[i] > pcs_hips + 8) or (beachB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if beach[i] = 1 and ((beach_b[i] > pcs_hips + 8) or (beach_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('beach'):jump 'ybeachmet'
 
@@ -155,12 +155,6 @@ elseif money >= poshvalldrop:
 		i += 1
 	if i <= ARRSIZE('cats_dress'):jump 'xcats_dressmet'
 
-	i = 1
-	:xcats_dressmet
-		if cats_dress[i] = 1 and ((cats_dress_b[i] > pcs_hips + 8) or (cats_dress_b[i] < pcs_hips - 8)):cats_dress_b[i] = pcs_hips
-		i += 1
-	if i <= ARRSIZE('cats_dress'):jump 'xcats_dressmet'
-
 	i = 1
 	:xcats_outfitsmet
 		if cats_outfits[i] = 1 and ((cats_outfits_b[i] > pcs_hips + 8) or (cats_outfits_b[i] < pcs_hips - 8)):cats_outfits_b[i] = pcs_hips
@@ -207,14 +201,14 @@ elseif money >= poshvalldrop:
 	:xofficemet
 		if gm_office[i] = 1 and ((gm_office_b[i] > pcs_hips + 8) or (gm_office_b[i] < pcs_hips - 8)):gm_office_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('office'):jump 'xofficemet'
+	if i <= ARRSIZE('gm_office'):jump 'xofficemet'
 
 	i = 1
 	:xschoolmet
 		if gm_school[i] = 1 and ((gm_school_b[i] > pcs_hips + 8) or (gm_school_b[i] < pcs_hips - 8)):gm_school_b[i] = pcs_hips
 		i += 1
 		if i = 6: i = 7
-	if i <= ARRSIZE('school'):jump 'xschoolmet'
+	if i <= ARRSIZE('gm_school'):jump 'xschoolmet'
 
 	i = 1
 	:xfetishmet
@@ -232,17 +226,17 @@ elseif money >= poshvalldrop:
 	:xuniformmet
 		if gm_uniform[i] = 1 and ((gm_uniform_b[i] > pcs_hips + 8) or (gm_uniform_b[i] < pcs_hips - 8)):gm_uniform_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('uniform'):jump 'xuniformmet'
+	if i <= ARRSIZE('gm_uniform'):jump 'xuniformmet'
 
 	i = 1
 	:xswimwearmet
-		if swimwear[i] = 1 and ((swimwearB[i] > pcs_hips + 8) or (swimwearB[i] < pcs_hips - 8)):swimwearB[i] = pcs_hips
+		if swimwear[i] = 1 and ((swimwear_b[i] > pcs_hips + 8) or (swimwear_b[i] < pcs_hips - 8)):swimwear_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('swimwear'):jump 'xswimwearmet'
 
 	i = 1
 	:xbeachmet
-		if beach[i] = 1 and ((beachB[i] > pcs_hips + 8) or (beachB[i] < pcs_hips - 8)):beachB[i] = pcs_hips
+		if beach[i] = 1 and ((beach_b[i] > pcs_hips + 8) or (beach_b[i] < pcs_hips - 8)):beach_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('beach'):jump 'xbeachmet'
 

+ 12 - 12
locations/preCUST.qsrc

@@ -394,8 +394,8 @@ if $ARGS[0] = 'Done':
 		gm_dress_h[11] = 100
 		gm_dress_b[11] = pcs_hips
 		swimwear[3] = 1
-		swimwearH[3] = 60
-		swimwearB[3] = pcs_hips
+		swimwear_h[3] = 60
+		swimwear_b[3] = pcs_hips
 		sportsclothingnumber = 29
 		gs 'clothing', 'wear', 'gm_dress', 370
 	elseif goth_clothing = 1:
@@ -560,23 +560,23 @@ if $ARGS[0] = 'Done':
 		gm_dress_h[149] = 100
 		gm_dress_b[149] = pcs_hips
 		swimwear[24] = 1
-		swimwearH[24] = 60
-		swimwearB[24] = pcs_hips
+		swimwear_h[24] = 60
+		swimwear_b[24] = pcs_hips
 		sportsclothingnumber = 58
 		gs 'clothing', 'wear', 'gm_dress', 149
 	end
 	if swim_start = 58:
 		swimwear[58] = 1
-		swimwearH[58] = 60
-		swimwearB[58] = pcs_hips
+		swimwear_h[58] = 60
+		swimwear_b[58] = pcs_hips
 	elseif swim_start = 98:
 		swimwear[98] = 1
-		swimwearH[98] = 60
-		swimwearB[98] = pcs_hips
+		swimwear_h[98] = 60
+		swimwear_b[98] = pcs_hips
 	elseif swim_start = 69:
 		swimwear[69] = 1
-		swimwearH[69] = 60
-		swimwearB[69] = pcs_hips
+		swimwear_h[69] = 60
+		swimwear_b[69] = pcs_hips
 	end
 	
 !!setting default exercise outfit and setting coats
@@ -590,7 +590,7 @@ if $ARGS[0] = 'Done':
 		$sportsbratype = 'kats'
 		$sportspantytype = 'kats'
 		coat[14] = 1
-		coatH[14] = 200
+		coat_h[14] = 200
 		defaultcoat = 14
 		sportscoat = 14
 	else
@@ -604,7 +604,7 @@ if $ARGS[0] = 'Done':
 		$sportsbratype = 'cheap'
 		$sportspantytype = 'cheap'
 		coat[5] = 1
-		coatH[5] = 200
+		coat_h[5] = 200
 		defaultcoat = 5
 		sportscoat = 5
 		if school_clothing = 2:

+ 4 - 4
locations/psiklin.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0]='start':
 	else
 		'One of the most impressive buildings is your newly built mansion.'
 		act 'Visit your mansion': gt 'youplace'
-	end if
+	end
 	act 'View the insane asylum': minut += 2 & gt 'psiklin', 'ps1'
 	act 'View the creepy old building': minut += 2 & gt 'psiklin', 'ps2'
 
@@ -42,9 +42,9 @@ if $ARGS[0]='start':
 			end
 		else
 			act 'Look for Alexandria''s direction (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end if
-	end if
-end if
+		end
+	end
+end
 
 if $ARGS[0]='ps1':
 	cla

+ 4 - 1
locations/saveg.qsrc

@@ -1,4 +1,7 @@
 # saveg
-
+version_major = 0
+version_minor = 8
+version_revision = 2
+version_patch = 2
 --- saveg ---------------------------------
 

+ 824 - 893
locations/saveupdater.qsrc

@@ -1,943 +1,874 @@
 # saveupdater
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080202:
 
-!!{if $pcs_dna = '':
-	$npc_dna['A1'] = '1594378993 1607632682 1428796224 1448474566 1775134737 1909315069 1882255348'
-	$npc_dna['A2'] = '1993665716 1616738815 1589755494 1229942753 1120816404 1371564141 1910586302'
-	$npc_dna['A3'] = '1580777525 1747887345 8321006077 1970922187 1029352130 7921283143 7765736018'
-	$npc_dna['A4'] = '1438762189 1855175944 1123617000 1817906848 1390916310 1459640815 1436321833'
-	$npc_dna['A5'] = '1379973003 1196687437 1136761140 2107449234 1973361988 1939869341 1786180096'
-	$npc_dna['A6'] = '1490744069 1013739636 1009283243 1951857582 1559659111 1792925326 1086487692'
-	$npc_dna['A7'] = '1689930319 1973226357 2129134392 2090450913 1513523102 2063456541 1533040976'
-	$npc_dna['A8'] = '1004746288 1743479356 1890053138 1336365224 1893621358 1730538237 1325162654'
-	$npc_dna['A9'] = '1851794364 1224420951 1300723572 1628306107 1809003038 1301990921 1253822208'
-	$npc_dna['A10'] = '2049084127 1470960834 1280333156 1706598464 1268389504 1227431573 2132916352'
-	$npc_dna['A11'] = '2092485270 1750615492 1357552191 1799649757 1558588590 1808035750 1644370082'
-	$npc_dna['A12'] = '1898622449 1904538322 8321006077 1825474042 1063577851 7921283143 7765736018'
-	$npc_dna['A13'] = '1731087833 1604487809 1464859113 1561062144 1440871037 1347904523 1150306572'
-	$npc_dna['A14'] = '1743820731 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976'
-	$npc_dna['A15'] = '1743820731 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976'
-	$npc_dna['A16'] = '1119464721 1614037462 1646642112 1959746313 1085890273 1009333823 1238937878'
-	$npc_dna['A17'] = '1736016429 1462897715 2010810526 1845581584 1266092607 1950870951 1153689245'
-	$npc_dna['A18'] = '1695885007 2098494473 1893236781 1197776866 1613803510 1095093401 1877459340'
-	$npc_dna['A19'] = '1868882449 1367396730 1179635869 1781589830 2141637715 1988698459 1710383168'
-	$npc_dna['A20'] = '1851794365 1224420951 1300723572 1628306107 1809003038 1301990921 1253822208'
-	$npc_dna['A21'] = '1027294118 1526664895 1047167563 1146573782 1562782691 2063456541 1533040976'
-	$npc_dna['A22'] = '2099547924 1046564078 1433794796 1591674416 1440637551 1386979191 1773169648'
-	$npc_dna['A23'] = '1410862429 1854775733 1705291842 1147504758 1609009238 1203561941 1602837590'
-	$npc_dna['A24'] = '1989757424 1370351107 1337196420 1362464918 1383218762 1045638336 1960389781'
-	$npc_dna['A25'] = '1633731691 1389436996 1448312616 1738900889 1051507305 1144473144 1251857548'
-	$npc_dna['A26'] = '1047167563 2063456541 1533040976 1303801542 1620497680 1042269021 1659592524'
-	$npc_dna['A27'] = '1526664895 1146573782 1562782691 1262684992 1354837515 1727531312 2004326261'
-	$npc_dna['A28'] = '1085730943 1931034853 1979821791 1720869809 1405982728 2119519439 2110201703'
-	$npc_dna['A29'] = '1545843327 1962976090 1780199176 1930957336 1888703623 1843607237 1675779774'
-	$npc_dna['A30'] = '1545843328 1962976090 1780199176 1930957336 1888703623 1843607237 1675779774'
-	$npc_dna['A31'] = '1843607237 1942499229 1221585640 1038127602 1700766678 1100784200 1819267918'
-	$npc_dna['A32'] = '1675779774 1167755546 1500737294 1443097159 1423316671 1056299351 1530143067'
-	$npc_dna['A33'] = '1429755064 1545843327 1198040660 1962976090 1780199176 1936146603 2049979334'
-	$npc_dna['A34'] = '1588599246 1545843327 1085730943 1962976090 1780199176 1931034853 1979821791'
-	$npc_dna['A35'] = '1198040660 1936146603 2049979334 1276791698 1325847789 1379325296 1029736884'
-	$npc_dna['A36'] = '1902637322 1870968508 1231095894 1330096941 1541087381 1973617911 1386337081'
-	$npc_dna['A37'] = '1389808807 1404442169 1642165848 1673620649 1531597159 1430968975 1536241074'
-	$npc_dna['A38'] = '1226305314 1430928850 1144576786 1435600997 1537092669 1301461802 1167005269'
-	$npc_dna['A39'] = '1792509661 1994108013 1588492806 1200642788 1785136518 1482855645 1903324752'
-	$npc_dna['A40'] = '1378982990 1311934118 1904514436 1282506111 1725049043 1341280625 1250233099'
-	$npc_dna['A41'] = '1331452063 2012109105 1708557162 1857346873 1496187449 1611414481 1133537624'
-	$npc_dna['A42'] = '1684075531 1825751910 1655527813 1683610108 1813375771 2012109105 1708557162'
-	$npc_dna['A43'] = '1707750779 1605673218 1243222430 1619197534 1698231949 1043436410 1967334561'
-	$npc_dna['A44'] = '1313155229 1195459649 1517554507 1714940250 1195812044 1410182720 1106787557'
-	$npc_dna['A45'] = '2120036389 1608902916 1608360250 1348006946 1295114181 1691995142 1058262054'
-	$npc_dna['A46'] = '1730012364 1640374953 1450067760 1963836408 1594339112 1081934143 1987109342'
-	$npc_dna['A47'] = '1093558586 1874182199 1860051813 1894735696 2013967885 1566236664 1861552325'
-	$npc_dna['A48'] = '1399171137 1247493113 1072511322 1204732676 1430581863 1194553758 1926427252'
-	$npc_dna['A49'] = '1801121147 1596587819 1688642091 1202650974 1577509272 1059659374 1678770230'
-	$npc_dna['A50'] = '1435367511 1891990398 1521901210 1459906326 1825460937 1413691134 1744017772'
-	$npc_dna['A51'] = '1852796600 2106532432 1184050637 1847025401 1606707948 1039681085 1957750328'
-	$npc_dna['A52'] = '1571713339 1381421911 1129274296 1580593240 1693511984 1798824352 1655802955'
-	$npc_dna['A53'] = '1987201506 1646392419 1036777300 1820041031 1625967645 1373112497 1790005211'
-	$npc_dna['A54'] = '2134980269 1704535752 1434251081 1076620970 1443727294 1838260118 1205245791'
-	$npc_dna['A55'] = '1160422782 1599231242 1170518020 1844217422 1970929518 1568598475 1217564731'
-	$npc_dna['A56'] = '1731740316 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976'
-	$npc_dna['A57'] = '1173276062 1427985989 1736266892 1028816280 1824359669 1132882533 1134471109'
-	$npc_dna['A58'] = '1443401856 1151112047 8321006077 1153217734 1305220298 7921283143 7765736018'
-	$npc_dna['A59'] = '1670044870 1746541889 1939734844 1792989216 1320934850 1111430962 2142228809'
-	$npc_dna['A60'] = '1277459319 1572128651 2011848683 1766614432 1751115695 2053109941 2123319868'
-	$npc_dna['A61'] = '1674740055 1616332471 1238320018 1885547841 1948804143 1271878978 1383881679'
-	$npc_dna['A62'] = '1461313531 1705318453 1315320361 1648677747 1742189125 1337017581 1188201934'
-	$npc_dna['A63'] = '1262037798 1489580076 1482201365 1230199953 1331830585 1923429750 1570327975'
-	$npc_dna['A64'] = '2011848683 2053109941 2123319868 1126381092 1930867160 1481040265 1607304091'
-	$npc_dna['A65'] = '1407717462 1572128651 2011848683 1766614432 1751115695 2053109941 2123319868'
-	$npc_dna['A66'] = '3769808989 3791424895 3388660888 3670612592 3668879713 3274794097 3877226585'
-	$npc_dna['A67'] = '1770994710 1045056456 1630291439 1823144512 2022969490 1003713468 1769557695'
-	$npc_dna['A68'] = '1180829350 1861722783 1533731343 2060083553 1474192936 1030861215 1441974536'
-	$npc_dna['A69'] = '1497408906 2062794580 1954918340 1284438971 1189615485 1330569260 1356806209'
-	$npc_dna['A70'] = '1625103852 1058929809 1950538836 1778016905 1380420827 1079863842 1745265049'
-	$npc_dna['A71'] = '2132719934 1311181050 1171683829 1946919542 1528886114 2035827969 1077439399'
-	$npc_dna['A72'] = '1416935739 1965395103 1375203982 1925522281 1102922011 2030344556 1049774393'
-	$npc_dna['A73'] = '2012922376 1037502234 1553944791 1481530732 1811451079 1396452842 1984210226'
-	$npc_dna['A74'] = '1770755490 1681513008 1124194992 1296486173 1065745146 1634914638 1526211903'
-	$npc_dna['A75'] = '2039225506 1786885929 1179834057 1525285053 1729741476 1870377171 1879004056'
-	$npc_dna['A76'] = '1008510370 1518299135 1584717411 1093601930 1547392081 1332335506 1589745960'
-	$npc_dna['A77'] = '1971687970 1162271469 1942122372 1675574199 1926720739 1720477118 2120304425'
-	$npc_dna['A78'] = '1129198910 2123899265 2070826103 1263408683 1266342598 1852602642 1659580757'
-	$npc_dna['A79'] = '1493775493 1711020559 1913087213 1896156768 1664736488 1487004190 1687464440'
-	$npc_dna['A80'] = '1043237462 1787303410 2015535291 1536406969 1119401804 1423821092 1202659815'
-	$npc_dna['A81'] = '1781969758 1233736852 1968991800 1271757488 1003619294 1186735786 1089618370'
-	$npc_dna['A82'] = '1518919857 1263522764 1853362558 1903972455 1560042249 1858587108 1920541253'
-	$npc_dna['A83'] = '1473539500 1300272748 1849153490 1148245338 1587757384 1435094984 1944660918'
-	$npc_dna['A84'] = '2106927598 1295208699 1791495642 1377661124 2006483992 1113518034 1579903219'
-	$npc_dna['A85'] = '1938942779 2106314839 1289521515 1217866816 2023591880 1519928587 1939169723'
-	$npc_dna['A86'] = '1292901057 1445078354 1576836749 1579962358 1713996320 2046365622 1579166032'
-	$npc_dna['A87'] = '1847378236 1162293273 1556619643 1329175895 1349109199 1613614049 1534225588'
-	$npc_dna['A88'] = '1072747711 1893613779 1095190471 1168304377 1119586478 1317838894 1161492926'
-	$npc_dna['A89'] = '1686681956 1037303803 1438812408 1000615186 1838310950 1945611800 1031199730'
-	$npc_dna['A90'] = '1551794736 1037303803 1438812408 1000615186 1838310950 1945611800 1031199730'
-	$npc_dna['A91'] = '1091682576 2037714665 1534661263 1602294938 1206288726 1612990215 1456060861'
-	$npc_dna['A92'] = '1215179226 1132967920 1233565533 2074043785 1042603573 1361029355 2138150185'
-	$npc_dna['A93'] = '1419539166 1635112879 1449039561 1653076316 1282274667 1815783068 1891294665'
-	$npc_dna['A94'] = '1867223522 1532675696 1762275784 1308084289 2089817449 1807718763 1325197727'
-	$npc_dna['A95'] = '1665716568 1089177521 1951416857 1629130965 1139147327 1335392254 1729246241'
-	$npc_dna['A96'] = '1460502649 1673367532 1417003328 1868999426 1609397406 1943603327 1181997081'
-	$npc_dna['A97'] = '1094943856 1353290235 1572450107 1956501688 1542692525 1988448865 1619643443'
-	$npc_dna['A98'] = '1236168432 1165329555 1245952733 1661287661 1117236841 1677164094 1151987548'
-	$npc_dna['A99'] = '1510466089 1004233017 1279999730 1803351444 1641046743 1766586587 1960434703'
-	
-	$npc_dna['A101'] = '1316262053 1139860599 1054558181 1564591207 1897612229 1770085065 1904973185'
-	$npc_dna['A102'] = '1543553151 1178430341 1325302453 1973698959 1957668534 1742596417 1164209202'
-	$npc_dna['A103'] = '1067395578 2076484645 1105399915 1907879678 1427565612 1490215506 1150379156'
-	$npc_dna['A104'] = '1043823602 2024518232 1177653510 1378276310 1952592877 1519571965 1344291245'
-	$npc_dna['A105'] = '1142923155 1109221512 1878952508 1385940310 1720623901 2002904662 1060291391'
-	$npc_dna['A106'] = '1417673067 1028156270 1577447008 1963640062 1937710404 1257008617 1439724726'
-	$npc_dna['A107'] = '1844078701 1752959121 1178966198 1524261234 1583340322 1917049302 1492514745'
-	$npc_dna['A108'] = '1643991188 1952232493 1071028063 2074038111 1147795375 2118341095 1847972590'
-	$npc_dna['A109'] = '1746569371 1346237388 1813218844 1467700105 1086609823 1654865621 1715437717'
-	$npc_dna['A110'] = '1382385133 2015745814 1777689033 1679307387 1776217771 1917449428 2071160465'
-	$npc_dna['A111'] = '1089725928 1899475061 1329520737 1102315698 1749072929 1621723771 1753154554'
-	$npc_dna['A112'] = '1357552191 1808035750 1644370082 1970842460 1776176573 1211917555 1776040163'
-	$npc_dna['A113'] = '1774396206 1848301631 1697225452 1143268439 1252055647 2110725762 1260967419'
-	$npc_dna['A114'] = '1774396205 1848301631 1697225452 1143268439 1252055647 2110725762 1260967419'
-	$npc_dna['A115'] = '1074209213 1187173282 1211031753 1535474248 1134590256 1026540873 1721369948'
-	$npc_dna['A116'] = '1542399937 1905241817 1701426477 1002823534 1464267474 1011697976 1988839911'
-	$npc_dna['A117'] = '4542399937 4905241817 4701426477 4002823534 4464267474 4011697976 4988839911'
-	$npc_dna['A118'] = '1705291842 1203561941 1602837590 1811774530 1215541632 1893678025 1991423109'
-	$npc_dna['A119'] = '2031631571 1995569440 1450381571 1372658726 1715345534 1718505125 1736791711'
-	$npc_dna['A120'] = '1288672090 1312650625 1126852365 1579537441 1050383706 1530771556 1757833025'
-	$npc_dna['A121'] = '1145156791 1748081183 1137690401 1121192373 1440194064 1029860550 1346974726'
-	$npc_dna['A122'] = '2130577244 1640932093 1191659262 1340043332 1009313498 1205807037 1759548391'
-	$npc_dna['A123'] = '1213144477 1393767889 1853481730 1216131062 1625069235 1446669832 1709998708'
-	$npc_dna['A124'] = '1665174694 1988944116 1807917594 1254176734 2064239242 1643819573 1392786112'
-	$npc_dna['A125'] = '1782310214 1854425806 1138563924 1277981120 1771674321 1225102514 1034678700'
-	$npc_dna['A126'] = '1464522854 1308604424 1705249327 1562011617 1043225628 1849417361 1015855202'
-	$npc_dna['A127'] = '1797467433 2003489967 1798597247 1058757155 1598996372 1954728943 1657496532'
-	$npc_dna['A128'] = '1329445270 1353015030 1000782701 1036165668 1639583614 1529658078 1975679453'
-	$npc_dna['A129'] = '1440577620 1404493595 1159165013 1229533074 1597914660 1301026307 1275667543'
-	$npc_dna['A130'] = '1726870149 1624130023 1044618711 1429525298 1800638929 1340956737 1405979189'
-	$npc_dna['A131'] = '1290761368 1731705745 1556198951 1402252861 1318878286 1783536035 1235327987'
-	$npc_dna['A132'] = '1845705457 1671776475 1432615990 2143340423 1777183626 1122316963 1021792548'
-	$npc_dna['A133'] = '1771221536 2027750396 2089544713 1734369517 1759135620 1433377965 1088177703'
-	$npc_dna['A134'] = '1837796316 1436860618 1699933821 1423519204 1271493655 1566380915 1482989416'
-	$npc_dna['A135'] = '1482962188 1063482733 1488899248 1806709653 1901966276 1373982700 1143695253'
-	$npc_dna['A136'] = '1323009327 1170828061 1350671739 1453635383 1122377435 1922441585 1637692781'
-	$npc_dna['A137'] = '1366158823 1463494144 1620282105 1806630761 1949066883 1679902075 1297964182'
-	$npc_dna['A138'] = '1041262937 1103319358 1212009691 1617547174 1655867289 1930930487 1952353548'
-	$npc_dna['A139'] = '1194676974 1594146631 1238391630 1274433221 1950748802 1727312584 8321006077'
-	$npc_dna['A140'] = '1388957981 1104285969 1184925418 1994156965 1456422790 2095370094 1430302038'
-	$npc_dna['A141'] = '2132183395 1401313649 8321006077 1434417039 2321026077 7921283143 7765736018'
-	$npc_dna['A142'] = '1972767054 1454786801 1222281674 1247981358 1828806656 1613393781 2115243730'
-	$npc_dna['A143'] = '1483702075 1521949936 1508959207 1971565483 1258438946 1771252769 1861114888'
-	$npc_dna['A144'] = '1273241012 2077038465 1275739884 1535053248 1434891447 1879708703 1237809681'
-	$npc_dna['A145'] = '1353721655 1926973992 1103624951 1850596792 1430454682 1886117868 1618747491'
-	$npc_dna['A146'] = '1970425464 1559405118 2117548142 1930104143 1673957846 1166458305 1888536480'
-	$npc_dna['A147'] = '1457300123 1918120099 1967335170 1056889039 1290544338 1170828061 1350671739'
-	$npc_dna['A148'] = '1110871039 1215316528 1439574498 1881549627 1043257862 2062098828 1713844818'
-	$npc_dna['A149'] = '1299436863 1261698091 1686799294 1465620552 1949917866 1150154188 1072586683'
-	$npc_dna['A150'] = '1912077115 1054317172 1216715520 1272636005 1666248718 2044828734 1577551516'
-	$npc_dna['A151'] = '1668638992 1214865459 1808776698 1612495094 1514793001 1654481226 1823327274'
-	$npc_dna['A152'] = '1786501093 1834879963 1390361698 1051572151 1608736325 1790512075 1070782218'
-	$npc_dna['A153'] = '1907002748 2085207351 1100129632 1342689598 1745456331 1873513432 1485648419'
-	$npc_dna['A154'] = '1942572074 1700154733 1692821756 1194715785 1803063877 2081935270 2014274394'
-	$npc_dna['A155'] = '1153126939 1063403218 1979820912 1002904260 1380666059 1009730022 1657156801'
-	$npc_dna['A156'] = '1108429212 1130146285 1800931785 1571774683 1841942137 1677995681 1796981560'
-	$npc_dna['A157'] = '1663800525 1510572542 1424729633 1976950271 1830743114 1783648027 1763271904'
-	$npc_dna['A158'] = '1776510699 1586206108 1731953841 1110012478 1584998429 1767532419 1060614101'
-	$npc_dna['A159'] = '1426757610 1675195614 1268203516 1506174629 1153117090 1007713575 1605966541'
-	$npc_dna['A160'] = '1428796224 1909315069 1882255348 1835514071 1201593987 2123583560 1823246593'
-	$npc_dna['A161'] = '1259280312 1641879774 1467473525 1487343721 1544500481 1151521798 1048594742'
-	$npc_dna['A162'] = '1582727702 1056494408 1939172326 1376797215 1875600726 1724112980 1453206350'
-	$npc_dna['A163'] = '1748187802 2032789191 1711627574 1292957633 1111654803 1788616009 1772047830'
-	$npc_dna['A164'] = '1034557513 1185767528 1251220411 1486489711 1093403292 1015320258 1011612550'
-	$npc_dna['A165'] = '1081104871 1359076800 1939413889 1911496040 1098487725 1546780075 1860974284'
-	$npc_dna['A166'] = '3081104871 3359076800 3939413889 3911496040 3098487725 3546780075 3860974284'
-	$npc_dna['A167'] = '1784699091 1203401906 1216561919 1916388994 1239904750 1929086392 1148871462'
-	$npc_dna['A168'] = '4784699091 4203401906 4216561919 4916388994 4239904750 4929086392 4148871462'
-	$npc_dna['A169'] = '1772564507 1547200105 1796704229 1583509569 1596894846 1745220169 1973652650'
-	$npc_dna['A170'] = '1526522684 1795996217 1368402599 1642220203 1021143397 1273163614 1531835829'
-	$npc_dna['A171'] = '1014091374 1918559552 1896341252 1052968279 1674912040 1758379740 1721466153'
-	$npc_dna['A172'] = '2035042362 1045516320 1994842543 1052417530 1977000071 1331823092 1986866420'
-	$npc_dna['A173'] = '1140758667 1773455079 2123382286 1650309847 1391480172 1829299044 1187608522'
-	$npc_dna['A174'] = '1008006962 1236637588 1489896373 1580273620 1293163913 1709107929 1173381311'
-	$npc_dna['A175'] = '1762171071 1281651668 1794224566 1962137201 1525806840 1010897683 1463472358'
-	$npc_dna['A176'] = '1006991833 1781290821 1894478819 1893358116 2127290034 1137830776 1241388413'
-	$npc_dna['A177'] = '2002591333 1925818575 1969997487 1060579504 1586877100 1553666549 1966601880'
-	$npc_dna['A178'] = '1144646462 1823244872 1843355586 1217893778 1897895542 1393527413 1969377528'
-	$npc_dna['A179'] = '1346361049 1328639709 1291363881 1317513795 1888589910 1014862870 1205798028'
-	$npc_dna['A180'] = '4346361049 4328639709 4291363881 4317513795 4888589910 4014862870 4205798028'
-	$npc_dna['A181'] = '1546478363 1040873558 1970652586 1531682310 1996463487 1293805943 1036689614'
-	$npc_dna['A182'] = '1020750214 1760012487 1196272894 1622978428 1628391634 2022138491 2071033872'
-	$npc_dna['A183'] = '1372778085 1912011495 1743459319 1874701039 1361625511 1281898844 1820485903'
-	$npc_dna['A184'] = '1102236119 1140436145 1903631040 1307987303 1672604281 1932459933 1381024294'
-	$npc_dna['A185'] = '1688667877 1444143245 1971085394 1614262160 1304657108 2094208929 1374312201'
-	$npc_dna['A186'] = '8321006077 7921283143 7765736018 1382438126 1034093203 1265299630 1118945982'
-	$npc_dna['A187'] = '1828318755 1912110768 1763625475 1700953844 1635556809 1788400335 1891647424'
-	$npc_dna['A188'] = '1437373624 1498180021 1914707319 1923163911 1520364264 2110725762 1260967419'
-	$npc_dna['A189'] = '1492342621 1736208516 1680470700 1919367231 1804680320 1756178566 1187568265'
-	$npc_dna['A190'] = '1492342626 1736208516 1680470700 1919367231 1804680320 1756178566 1187568265'
-
-	$npc_dna['A192'] = '1893727481 1167237604 1303192980 1478078827 1870699157 1379809405 1569436993'
-	$npc_dna['A193'] = '7140667332 7978651826 7440682263 1631105202 2145357995 1540785413 1172036362'
-	$npc_dna['A194'] = '7008670756 7958693370 7059741341 1566986214 1732880506 1281239619 1634169768'
-	$npc_dna['A195'] = '1086487692 7476661390 7698010724 1870038241 1870978496 1236988759 1677200479'
-	$npc_dna['A196'] = '7955917440 7472108604 7013900784 1016721320 1968096832 1240781467 1387541183'
-	$npc_dna['A197'] = '7169919752 7587835065 7871488903 1779229534 1159101193 1247015884 1571810481'
-	
-	if StoryLine = 1:
-		$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
-	else
-		$pcs_dna = func('dna','create')
+	Msg 'Your save comes from some of previous versions of the game.<br>If it comes from ver. 0.8.1 or older, be prepare to buy new clothes.'
+	if housr = 1:
+		home_owned[1] = 1
+	elseif housr = 2:
+		home_owned[4] = 1
 	end
-	
-	a = arrsize('npc_dob')
-	w = 0
-	:NpcDnaLoop
-		if $npc_pic['B<<w>>'] ! '':$npc_dna['B<<w>>'] = func('DNA','create')
-		if $npc_pic['C<<w>>'] ! '':$npc_dna['C<<w>>'] = func('DNA','create')
-	if w < a:w += 1 & jump 'NpcDnaLoop'
-	killvar 'w'
-	killvar 'a'
-	
-	if arrsize('$ChildFath') > 0:
-		i = 0
-		x = 0
-		j = arrsize('$ChildFath')-1
-		:kidDNAloop
-			$ChildFathDNA[i] = $npc_dna[$ChildFath[i]]
-			if $childtype[i] ! 'identical twin':
-				$kid_dna[i] = func('dna','generate',$pcs_dna,$ChildFathDNA[i])
-			elseif x = 0:
-				x = 1
-				$kid_dna[i] = func('dna','generate',$pcs_dna,$ChildFathDNA[i])
-			else
-				$kid_dna[i] = $kid_dna[i-1]
-				x = 0
-			end
-		if i < j: i += 1 & jump 'kidDNAloop'
-		killvar 'i'
-		killvar 'j'
-		killvar 'x'
+	if BuyHous = 1: home_owned[1] = 2
+	if placeMansion > 0: home_owned[5] = placeMansion
+	if dachaest > 0: home_owned[3] = dachaest
+	killvar 'placemansion'
+	killvar 'dachaest'
+	killvar 'housr'
+	killvar 'BuyHous'
+
+	if alko < 0: alko = 0
+	if pranik < 0: pranik = 0
+	if poroshok < 0: poroshok = 0
+
+
+	!! set $home_town variable and remove consequential obsolete variables
+	if $home_town = '':
+		gs 'set_home', curr_home
+		killvar 'svidboykino'
+		killvar 'svidboypark'
+		killvar 'svidboypark1'
+		killvar 'svidboypark2'
+		killvar 'svidboykafe'
 	end
-end
-}
-
-!! set $home_town variable and remove consequential obsolete variables
-if $home_town = '':
-	gs 'set_home', curr_home
-	killvar 'svidboykino'
-	killvar 'svidboypark'
-	killvar 'svidboypark1'
-	killvar 'svidboypark2'
-	killvar 'svidboykafe'
-end
 
-!! exhibition to inhib
-if pcs_exhibition ! 0:
-	pcs_inhib = pcs_exhibition
-	inhib_exp = exhibition_exp
-	inhib_lvlst = pcs_exhibition
-	inhib_lvl = pcs_exhibition
-	killvar 'pcs_exhibition'
-	killvar 'exhibition_exp'
-end
+	!! exhibition to inhib
+	if pcs_exhibition ! 0:
+		pcs_inhib = pcs_exhibition
+		inhib_exp = exhibition_exp
+		inhib_lvlst = pcs_exhibition
+		inhib_lvl = pcs_exhibition
+		killvar 'pcs_exhibition'
+		killvar 'exhibition_exp'
+	end
 
-!! adds pregnancy progression images to saves that did not have them previously.
-if arrsize('$bodimgsets') = 30:
-	$bodimgsets[30] = 'pregnant, but not showing'
-	$bodimgsets[31] = 'glowing'
-	$bodimgsets[32] = 'starting to show'
-	$bodimgsets[33] = 'clearly showing'
-	$bodimgsets[34] = 'fairly pregnant'
-	$bodimgsets[35] = 'quite pregnant'
-	$bodimgsets[36] = 'very pregnant'
-	$bodimgsets[37] = 'extremely pregnant'
-	$bodimgsets[38] = 'ready to pop'
-	$bodimgsets[39] = 'default_preg'
-end
+	!! adds pregnancy progression images to saves that did not have them previously.
+	if arrsize('$bodimgsets') = 30:
+		$bodimgsets[30] = 'pregnant, but not showing'
+		$bodimgsets[31] = 'glowing'
+		$bodimgsets[32] = 'starting to show'
+		$bodimgsets[33] = 'clearly showing'
+		$bodimgsets[34] = 'fairly pregnant'
+		$bodimgsets[35] = 'quite pregnant'
+		$bodimgsets[36] = 'very pregnant'
+		$bodimgsets[37] = 'extremely pregnant'
+		$bodimgsets[38] = 'ready to pop'
+		$bodimgsets[39] = 'default_preg'
+	end
 
-!! reorganizes old spell variables into new arrrays
-if spell_update = 0:
-	spell_update = 1
-
-	if spelltuman = 1:spellKnown['fog'] = 1
-	if spellklon = 1:spellKnown['clone'] = 1
-	if spellstun = 1:spellKnown['stun'] = 1
-	if spellweap = 1:spellKnown['weapon'] = 1
-	if spellwind = 1:spellKnown['wind'] = 1
-	if spellklon2 = 1:spellKnown['multiclone'] = 1
-	if spellinit = 1:spellKnown['haste'] = 1
-	if spellhel = 1:spellKnown['heal'] = 1
-	if spellfire0 = 1:spellKnown['scaldingtouch'] = 1
-	if spellfire2 = 1:spellKnown['burninghands'] = 1
-	if spellfire3 = 1:spellKnown['firebarrier'] = 1
-	if spellfire4 = 1:spellKnown['firestorm'] = 1
-	if spellfire5 = 1:spellKnown['flameshield'] = 1
-	if spellele0 = 1:spellKnown['shock'] = 1
-	if spellele2 = 1:spellKnown['lightning'] = 1
-	if spellele3 = 1:spellKnown['electricbarrier'] = 1
-	if spellele4 = 1:spellKnown['1000birds'] = 1
-	if spellele5 = 1:spellKnown['dancingsphere'] = 1
-	if spellert0 = 1:spellKnown['quicksand'] = 1
-	if spellert2 = 1:spellKnown['earthshield'] = 1
-	if spellert3 = 1:spellKnown['abyss'] = 1
-	if spellert4 = 1:spellKnown['earthguardian'] = 1
-	if spellert5 = 1:spellKnown['sando'] = 1
-	if spellwind0 = 1:spellKnown['windgust'] = 1
-	if spellwind2 = 1:spellKnown['pressure'] = 1
-	if spellwind3 = 1:spellKnown['vacuum'] = 1
-	if spellwind4 = 1:spellKnown['vacuumshells'] = 1
-	if spellwind5 = 1:spellKnown['devouringvacuum'] = 1
-	if spellwater0 = 1:spellKnown['leechmana'] = 1
-	if spellwater2 = 1:spellKnown['flood'] = 1
-	if spellwater3 = 1:spellKnown['blister'] = 1
-	if spellwater4 = 1:spellKnown['sharkrockets'] = 1
-	if spellwater5 = 1:spellKnown['greatflood'] = 1
-end
+	!! reorganizes old spell variables into new arrrays
+	if spell_update = 0:
+		spell_update = 1
+
+		if spelltuman = 1:spellKnown['fog'] = 1
+		if spellklon = 1:spellKnown['clone'] = 1
+		if spellstun = 1:spellKnown['stun'] = 1
+		if spellweap = 1:spellKnown['weapon'] = 1
+		if spellwind = 1:spellKnown['wind'] = 1
+		if spellklon2 = 1:spellKnown['multiclone'] = 1
+		if spellinit = 1:spellKnown['haste'] = 1
+		if spellhel = 1:spellKnown['heal'] = 1
+		if spellfire0 = 1:spellKnown['scaldingtouch'] = 1
+		if spellfire2 = 1:spellKnown['burninghands'] = 1
+		if spellfire3 = 1:spellKnown['firebarrier'] = 1
+		if spellfire4 = 1:spellKnown['firestorm'] = 1
+		if spellfire5 = 1:spellKnown['flameshield'] = 1
+		if spellele0 = 1:spellKnown['shock'] = 1
+		if spellele2 = 1:spellKnown['lightning'] = 1
+		if spellele3 = 1:spellKnown['electricbarrier'] = 1
+		if spellele4 = 1:spellKnown['1000birds'] = 1
+		if spellele5 = 1:spellKnown['dancingsphere'] = 1
+		if spellert0 = 1:spellKnown['quicksand'] = 1
+		if spellert2 = 1:spellKnown['earthshield'] = 1
+		if spellert3 = 1:spellKnown['abyss'] = 1
+		if spellert4 = 1:spellKnown['earthguardian'] = 1
+		if spellert5 = 1:spellKnown['sando'] = 1
+		if spellwind0 = 1:spellKnown['windgust'] = 1
+		if spellwind2 = 1:spellKnown['pressure'] = 1
+		if spellwind3 = 1:spellKnown['vacuum'] = 1
+		if spellwind4 = 1:spellKnown['vacuumshells'] = 1
+		if spellwind5 = 1:spellKnown['devouringvacuum'] = 1
+		if spellwater0 = 1:spellKnown['leechmana'] = 1
+		if spellwater2 = 1:spellKnown['flood'] = 1
+		if spellwater3 = 1:spellKnown['blister'] = 1
+		if spellwater4 = 1:spellKnown['sharkrockets'] = 1
+		if spellwater5 = 1:spellKnown['greatflood'] = 1
+	end
 
-if spell_update < 2:
-	spell_update = 2
-	killvar '$basicSpells'
-end
-gs 'spellList'
-
-if spell_update < 3:
-	spell_update = 3
-	! Fix Spell learn avaiability for Kakuzu if needed
-	if tobiQW = 3:
-		if stihia = 1:
-			gs 'spellList','addAvailableSpells','fireSpells', 20
-		end
-		if stihia = 2:
-			gs 'spellList','addAvailableSpells','electSpells', 20
-		end
-		if stihia = 3:
-			gs 'spellList','addAvailableSpells','earthSpells', 20
-		end
-		if stihia = 4:
-			gs 'spellList','addAvailableSpells','airSpells', 20
+	if spell_update < 2:
+		spell_update = 2
+		killvar '$basicSpells'
+	end
+	gs 'spellList'
+
+	if spell_update < 3:
+		spell_update = 3
+		! Fix Spell learn avaiability for Kakuzu if needed
+		if tobiQW = 3:
+			if stihia = 1:
+				gs 'spellList','addAvailableSpells','fireSpells', 20
+			end
+			if stihia = 2:
+				gs 'spellList','addAvailableSpells','electSpells', 20
+			end
+			if stihia = 3:
+				gs 'spellList','addAvailableSpells','earthSpells', 20
+			end
+			if stihia = 4:
+				gs 'spellList','addAvailableSpells','airSpells', 20
+			end
+			if stihia = 5:
+				gs 'spellList','addAvailableSpells','waterSpells', 20
+			end
 		end
-		if stihia = 5:
-			gs 'spellList','addAvailableSpells','waterSpells', 20
+		! Fix Library spells found if needed
+		if arrsize('$ResearchingSP')>0:
+			gs 'spellList','addAvailableSpells','librarySpells', arrsize('$ResearchingSP')
 		end
 	end
-	! Fix Library spells found if needed
-	if arrsize('$ResearchingSP')>0:
-		gs 'spellList','addAvailableSpells','librarySpells', arrsize('$ResearchingSP')
-	end
-end
-gs 'spellList'
-
-
-if array_updater = 0:
-	array_updater = 1
-	$oldnpcvars[0] = 'npc_app'
-	$oldnpcvars[1] = 'npc_hair'
-	$oldnpcvars[2] = 'npc_int'
-	$oldnpcvars[3] = 'npc_lipstick'
-	$oldnpcvars[4] = 'npc_mag'
-	$oldnpcvars[5] = 'npc_undies'
-	$oldnpcvars[6] = 'npc_Qstlvl'
-	$oldnpcvars[7] = 'npc_spirit'
-	$oldnpcvars[8] = 'npc_str'
-	$oldnpcvars[9] = 'npc_vit'
-	
-	$newnpcvars[0] = 'npc_apprnc'
-	$newnpcvars[1] = 'npc_hairbsh'
-	$newnpcvars[2] = 'npc_intel'
-	$newnpcvars[3] = 'npc_lipbalm'
-	$newnpcvars[4] = 'npc_magik'
-	$newnpcvars[5] = 'npc_pantys'
-	$newnpcvars[6] = 'npc_QW'
-	$newnpcvars[7] = 'npc_sprt'
-	$newnpcvars[8] = 'npc_stren'
-	$newnpcvars[9] = 'npc_vital'
-
-	i = 0
-	:npcvarloop
-	$oldnpcvar = $oldnpcvars[i]
-	if i < arrsize($oldnpcvars):
-		if 1 > arrsize('oldnpcvar'):i += 1 & jump 'npcvarloop'
-		$newnpcvar = $newnpcvars[i]
-		COPYARR 'newnpcvar', 'oldnpcvar'
-		i += 1
-		jump 'npcvarloop'
-	end
-	killvar 'npc_app'
-	killvar 'npc_hair'
-	killvar 'npc_int'
-	killvar 'npc_lipstick'
-	killvar 'npc_mag'
-	killvar 'npc_undies'
-	killvar 'npc_Qstlvl'
-	killvar 'npc_spirit'
-	killvar 'npc_str'
-	killvar 'npc_vit'
-	killvar 'oldnpcvar'
-	killvar 'newnpcvar'
-	killvar '$oldnpcsvars'
-	killvar '$newnpcvars'
-end
+	gs 'spellList'
+
+
+	if array_updater = 0:
+		array_updater = 1
+		$oldnpcvars[0] = 'npc_app'
+		$oldnpcvars[1] = 'npc_hair'
+		$oldnpcvars[2] = 'npc_int'
+		$oldnpcvars[3] = 'npc_lipstick'
+		$oldnpcvars[4] = 'npc_mag'
+		$oldnpcvars[5] = 'npc_undies'
+		$oldnpcvars[6] = 'npc_Qstlvl'
+		$oldnpcvars[7] = 'npc_spirit'
+		$oldnpcvars[8] = 'npc_str'
+		$oldnpcvars[9] = 'npc_vit'
+		
+		$newnpcvars[0] = 'npc_apprnc'
+		$newnpcvars[1] = 'npc_hairbsh'
+		$newnpcvars[2] = 'npc_intel'
+		$newnpcvars[3] = 'npc_lipbalm'
+		$newnpcvars[4] = 'npc_magik'
+		$newnpcvars[5] = 'npc_pantys'
+		$newnpcvars[6] = 'npc_QW'
+		$newnpcvars[7] = 'npc_sprt'
+		$newnpcvars[8] = 'npc_stren'
+		$newnpcvars[9] = 'npc_vital'
 
-!!Updates for the old school code
-if NatBelLernQW > 0 and NatbelQW['QWstage'] = 0: NatbelQW['QWstage'] = NatBelLernQW & NatBelLernQW = 0
+		i = 0
+		:npcvarloop
+		$oldnpcvar = $oldnpcvars[i]
+		if i < arrsize($oldnpcvars):
+			if 1 > arrsize('oldnpcvar'):i += 1 & jump 'npcvarloop'
+			$newnpcvar = $newnpcvars[i]
+			COPYARR 'newnpcvar', 'oldnpcvar'
+			i += 1
+			jump 'npcvarloop'
+		end
+		killvar 'npc_app'
+		killvar 'npc_hair'
+		killvar 'npc_int'
+		killvar 'npc_lipstick'
+		killvar 'npc_mag'
+		killvar 'npc_undies'
+		killvar 'npc_Qstlvl'
+		killvar 'npc_spirit'
+		killvar 'npc_str'
+		killvar 'npc_vit'
+		killvar 'oldnpcvar'
+		killvar 'newnpcvar'
+		killvar '$oldnpcsvars'
+		killvar '$newnpcvars'
+	end
 
+	!!Updates for the old school code
+	if NatBelLernQW > 0 and NatbelQW['QWstage'] = 0: NatbelQW['QWstage'] = NatBelLernQW & NatBelLernQW = 0
 
-if npc_grupTipe['A133'] = 0: npc_grupTipe['A133'] = 6
-if grupTipe[25] ! 0: 
-	if npc_grupTipe['A25'] = 0: npc_grupTipe['A25'] = grupTipe[25]
-	grupTipe[25] = 0
-end
-if grupTipe[5] ! 0: 
-	if npc_grupTipe['A5'] = 0: npc_grupTipe['A5'] = grupTipe[5]
-	grupTipe[5] = 0
-end
-if grupTipe[61] ! 0: 
-	if npc_grupTipe['A189'] = 0: npc_grupTipe['A189'] = grupTipe[61]
-	grupTipe[61] = 0
-end
 
-if npcSex[1] > 0: npcSex[1] = 0 & npc_sex['A1'] = 1
-if npcSex[2] > 0: npcSex[2] = 0 & npc_sex['A2'] = 1
-if npcSex[3] > 0: npcSex[3] = 0 & npc_sex['A3'] = 1
-if npcSex[4] > 0: npcSex[4] = 0 & npc_sex['A4'] = 1
-if npcSex[6] > 0: npcSex[6] = 0 & npc_sex['A6'] = 1
-if npcSex[9] > 0: npcSex[10] = 0 & npc_sex['A9'] = 1
-if npcSex[10] > 0: npcSex[10] = 0 & npc_sex['A10'] = 1
-if npcSex[11] > 0: npcSex[11] = 0 & npc_sex['A11'] = 1
-if npcSex[14] > 0: npcSex[14] = 0 & npc_sex['A14'] = 1
-if npcSex[16] > 0: npcSex[16] = 0 & npc_sex['A16'] = 1
-if npcSex[23] > 0: npcSex[23] = 0 & npc_sex['A23'] = 1
-
-if telefon_rev < 2:
-	killvar '$contact'
-	killvar '$contactIcon'
-	killvar '$contactOCode'
-	killvar '$contactOSche'
-	killvar '$contactICode'
-	killvar '$contactISche'
-	gs 'telefon', 'AddContact', 'A29', 'icon_npc1',"gs 'telefon', 'Phone_call'","hour >= 8 and hour <= 20"
-	if telkat > 0:
-		gs 'telefon', 'AddContact', 'A219', 'icon_kat',"$telsob = 'Kate' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20"
+	if npc_grupTipe['A133'] = 0: npc_grupTipe['A133'] = 6
+	if grupTipe[25] ! 0: 
+		if npc_grupTipe['A25'] = 0: npc_grupTipe['A25'] = grupTipe[25]
+		grupTipe[25] = 0
 	end
-	if npc_QW['A192'] > 0:
-		gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'","hour >= 8 and hour <= 20"
+	if grupTipe[5] ! 0: 
+		if npc_grupTipe['A5'] = 0: npc_grupTipe['A5'] = grupTipe[5]
+		grupTipe[5] = 0
 	end
-	telefon_rev = 2
-end
-
-if pee > 0: stat['pee'] += pee & killvar 'pee'
-! Since the arousal calls are seeded in all the scenes where these two variables occur, once they''ve been added to the stat, they should always be less or equal to it.
-if NatbelQW['pee'] > stat['pee_give']: stat['pee_give'] += NatbelQW['pee']
-if mistpiss > stat['pee_give'] - NatbelQW['pee']: stat['pee_give'] += mistpiss
-
-if thpic ! 0: killvar 'thpic'
-if puspic ! 0: killvar 'puspic'
-
-if $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''christina''"><<$npc_usedname[''A18'']>></a>': $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''christina''"><<$npc_usedname[''A18'']>></a>'
-
-
-!! Replacing some of the natasha variables with NatbelQW['QWstage'] levels.
-killvar 'natsub'
-killvar 'natotrab'
-killvar 'natfuck'
-
-
-if StoryLine = 1:
-
-	if fuckornot_update = 0:
-		fuckornot_update = 1
-		hotcat_rating['A22'] = 9
-		hotcat_rating['A17'] = 9
-		hotcat_rating['A23'] = 8
-		hotcat_rating['A144'] = 8
-		hotcat_rating['A19'] = 7
-		hotcat_rating['A18'] = 7
-		hotcat_rating['A14'] = 7
-		hotcat_rating['A12'] = 7
-		hotcat_rating['A140'] = 7
-		hotcat_rating['A141'] = 7
-		hotcat_rating['A15'] = 7
-		hotcat_rating['A143'] = 6
-		hotcat_rating['A13'] = 6
-		hotcat_rating['A16'] = 6
-		hotcat_rating['A25'] = 6
-		hotcat_rating['A139'] = 6
-		hotcat_rating['A20'] = 6
-		hotcat_rating['A21'] = 6
-		hotcat_rating['A24'] = 5
-		hotcat_rating['A142'] = 5
-		hotcat_rating['A145'] = 4
-	elseif fuckornot_update = 1:
-		fuckornot_update = 2
-		hotcat_rating['A145'] = 4
-		hotcat_movement['A145'] = 0
-	elseif fuckornot_update = 2:
-		fuckornot_update = 3
-		hotcat_rating['A1'] = 8
-		hotcat_rating['A2'] = 6
-		hotcat_rating['A3'] = 7
-		hotcat_rating['A4'] = 5
-		hotcat_rating['A5'] = 7
-		hotcat_rating['A6'] = 4
-		hotcat_rating['A7'] = 1
-		hotcat_rating['A8'] = 7
-		hotcat_rating['A9'] = 5
-		hotcat_rating['A10'] = 6
-		hotcat_rating['A11'] = 4
-		hotcat_rating['A34'] = 7
-		hotcat_rating['A58'] = 4
-		hotcat_rating['A59'] = 6
-		hotcat_rating['A146'] = 8
-		hotcat_rating['A147'] = 8
-		hotcat_rating['A148'] = 6
-		hotcat_rating['A149'] = 7
-		hotcat_rating['A152'] = 6
-		hotcat_rating['A153'] = 4
-		hotcat_rating['A154'] = 7
-		hotcat_rating['A155'] = 7
-		hotcat_rating['A156'] = 5
-		hotcat_rating['A157'] = 5
-		hotcat_rating['A158'] = 6
-		hotcat_rating['A159'] = 1
+	if grupTipe[61] ! 0: 
+		if npc_grupTipe['A189'] = 0: npc_grupTipe['A189'] = grupTipe[61]
+		grupTipe[61] = 0
 	end
 
-	if grigoryEV ! 0:
-		npc_qw['A221'] = grigoryEV
-		killvar 'grigoryEV'
+	if npcSex[1] > 0: npcSex[1] = 0 & npc_sex['A1'] = 1
+	if npcSex[2] > 0: npcSex[2] = 0 & npc_sex['A2'] = 1
+	if npcSex[3] > 0: npcSex[3] = 0 & npc_sex['A3'] = 1
+	if npcSex[4] > 0: npcSex[4] = 0 & npc_sex['A4'] = 1
+	if npcSex[6] > 0: npcSex[6] = 0 & npc_sex['A6'] = 1
+	if npcSex[9] > 0: npcSex[10] = 0 & npc_sex['A9'] = 1
+	if npcSex[10] > 0: npcSex[10] = 0 & npc_sex['A10'] = 1
+	if npcSex[11] > 0: npcSex[11] = 0 & npc_sex['A11'] = 1
+	if npcSex[14] > 0: npcSex[14] = 0 & npc_sex['A14'] = 1
+	if npcSex[16] > 0: npcSex[16] = 0 & npc_sex['A16'] = 1
+	if npcSex[23] > 0: npcSex[23] = 0 & npc_sex['A23'] = 1
+
+	if telefon_rev < 2:
+		killvar '$contact'
+		killvar '$contactIcon'
+		killvar '$contactOCode'
+		killvar '$contactOSche'
+		killvar '$contactICode'
+		killvar '$contactISche'
+		gs 'telefon', 'AddContact', 'A29', 'icon_npc1',"gs 'telefon', 'Phone_call'","hour >= 8 and hour <= 20"
+		if telkat > 0:
+			gs 'telefon', 'AddContact', 'A219', 'icon_kat',"$telsob = 'Kate' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20"
+		end
+		if npc_QW['A192'] > 0:
+			gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'","hour >= 8 and hour <= 20"
+		end
+		telefon_rev = 2
 	end
 
-	if SchoolAtestat = 0 and SchoolBlock = 0 and $schbrand = '':$schbrand = 'school'
-end
+	if pee > 0: stat['pee'] += pee & killvar 'pee'
+	! Since the arousal calls are seeded in all the scenes where these two variables occur, once they''ve been added to the stat, they should always be less or equal to it.
+	if NatbelQW['pee'] > stat['pee_give']: stat['pee_give'] += NatbelQW['pee']
+	if mistpiss > stat['pee_give'] - NatbelQW['pee']: stat['pee_give'] += mistpiss
 
-if wombfather_update = 0: wombfather_update = 1 & gs 'din_bad'
-
-!! This will unlock the Anushka photos if a player has already done the event.
-if showerphotos = 1 and showerphotosupdater = 0:
-	showerphotosupdater = 1
-	anushkaphoto[1] = 1
-	anushkaphoto[2] = 1
-	anushkaphoto[3] = 1
-	anushkaphoto[4] = 1
-	anushkaphoto[5] = 1
-	anushkaphoto[6] = 1
-end
+	if thpic ! 0: killvar 'thpic'
+	if puspic ! 0: killvar 'puspic'
 
-!! Changes to the pregnancy due date dynamic format
-if pregdateupdate = 0:
-    gs 'din_bad'
-    pregdateupdate = 1
-end
+	if $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''christina''"><<$npc_usedname[''A18'']>></a>': $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''christina''"><<$npc_usedname[''A18'']>></a>'
 
-if $npc_usedname['A<<npctemp>>'] = 'Inna': $npc_usedname['A<<npctemp>>'] = 'Irina'
 
-!! Killing some useless variables used to trigger the Pavlin storyline
-if totalmon ! 0:
-	montake = totalmon
-	killvar 'totalmon'
-	killvar 'mongiveback'
-end
+	!! Replacing some of the natasha variables with NatbelQW['QWstage'] levels.
+	killvar 'natsub'
+	killvar 'natotrab'
+	killvar 'natfuck'
+
 
-if cyc_update = 0:
-	cyc_update = 1
-	daylastperiod = firstmens
-	if difficulty = 4:
-		cyccustom = 0
-	else
-		cyccustom = 1
+	if StoryLine = 1:
+
+		if fuckornot_update = 0:
+			fuckornot_update = 1
+			hotcat_rating['A22'] = 9
+			hotcat_rating['A17'] = 9
+			hotcat_rating['A23'] = 8
+			hotcat_rating['A144'] = 8
+			hotcat_rating['A19'] = 7
+			hotcat_rating['A18'] = 7
+			hotcat_rating['A14'] = 7
+			hotcat_rating['A12'] = 7
+			hotcat_rating['A140'] = 7
+			hotcat_rating['A141'] = 7
+			hotcat_rating['A15'] = 7
+			hotcat_rating['A143'] = 6
+			hotcat_rating['A13'] = 6
+			hotcat_rating['A16'] = 6
+			hotcat_rating['A25'] = 6
+			hotcat_rating['A139'] = 6
+			hotcat_rating['A20'] = 6
+			hotcat_rating['A21'] = 6
+			hotcat_rating['A24'] = 5
+			hotcat_rating['A142'] = 5
+			hotcat_rating['A145'] = 4
+		elseif fuckornot_update = 1:
+			fuckornot_update = 2
+			hotcat_rating['A145'] = 4
+			hotcat_movement['A145'] = 0
+		elseif fuckornot_update = 2:
+			fuckornot_update = 3
+			hotcat_rating['A1'] = 8
+			hotcat_rating['A2'] = 6
+			hotcat_rating['A3'] = 7
+			hotcat_rating['A4'] = 5
+			hotcat_rating['A5'] = 7
+			hotcat_rating['A6'] = 4
+			hotcat_rating['A7'] = 1
+			hotcat_rating['A8'] = 7
+			hotcat_rating['A9'] = 5
+			hotcat_rating['A10'] = 6
+			hotcat_rating['A11'] = 4
+			hotcat_rating['A34'] = 7
+			hotcat_rating['A58'] = 4
+			hotcat_rating['A59'] = 6
+			hotcat_rating['A146'] = 8
+			hotcat_rating['A147'] = 8
+			hotcat_rating['A148'] = 6
+			hotcat_rating['A149'] = 7
+			hotcat_rating['A152'] = 6
+			hotcat_rating['A153'] = 4
+			hotcat_rating['A154'] = 7
+			hotcat_rating['A155'] = 7
+			hotcat_rating['A156'] = 5
+			hotcat_rating['A157'] = 5
+			hotcat_rating['A158'] = 6
+			hotcat_rating['A159'] = 1
+		end
+
+		if grigoryEV ! 0:
+			npc_qw['A221'] = grigoryEV
+			killvar 'grigoryEV'
+		end
+
+		if SchoolAtestat = 0 and SchoolBlock = 0 and $schbrand = '':$schbrand = 'school'
 	end
-end
 
-! Switching from tracking relationship with Rex from rex to npc_rel['A57']
-if rex > 0 and rex > npc_rel['A57']: npc_rel['A57'] = rex & killvar 'rex'
-
-!!------------------------------village variable clean up/translation---------------------------------------
-if findvel > 0: BikeLoc = findvel & killvar 'findvel'
-!!------------------------------grandparent variable clean up---for 0.8.0 release---------------------------
-!!---Grandpa
-If grandpa_bilberry > 0: grandpaQW['chore_berry_quantity'] = grandpa_bilberry & killvar 'grandpa_bilberry'
-If grandpa_boletus > 0: grandpaQW['chore_mushroom_quantity'] = grandpa_boletus & killvar 'grandpa_boletus'
-If grandpahelpday > 0: grandpaQW['last_day_helped'] = grandpahelpday & killvar 'grandpahelpday'
-If grandpahelping > 0: grandpaQW['chore_type'] = grandpahelping & killvar 'grandpahelping'
-If grandpatalk > 0: grandpaQW['last_hour_talked'] = grandpatalk & killvar 'grandpatalk'
-If grandpatalkday > 0: grandpaQW['last_day_talked'] = grandpatalkday & killvar 'grandpatalkday'
-If grandpatalkforest > 0: grandpaQW['talked_about_forest'] = grandpatalkforest & killvar 'grandpatalkforest'
-If comb_horse > 0: grandpaQW['chore_brush_horse'] = comb_horse & killvar 'comb_horse'
-If cow_field > 0: grandpaQW['chore_lead_cow_to_field'] = cow_field & killvar 'cow_field'
-If feed_boar > 0: grandpaQW['chore_feed_boar'] = feed_boar & killvar 'feed_boar'
-If feed_cow > 0: grandpaQW['chore_feed_cow'] = feed_cow & killvar 'feed_cow'
-If feed_horse > 0: grandpaQW['chore_feed_horse'] = feed_horse & killvar 'feed_horse'
-If graze_cow > 0: grandpaQW['chore_herd_cattle'] = graze_cow & killvar 'graze_cow'
-If graze_cow_exp > 0: grandpaQW['chore_herd_cattle_experience'] = graze_cow_exp & killvar 'graze_cow_exp'
-If haying_time > 0: grandpaQW['chore_bale_hay'] = haying_time & killvar 'haying_time'
-If horse_field > 0: grandpaQW['chore_lead_horse_to_field'] = horse_field & killvar 'horse_field'
-If horse_river > 0: grandpaQW['chore_bathe_horse'] = horse_river & killvar 'horse_river'
-If go_in_bilberry > 0: grandpaQW['chore_gather_berries'] = go_in_bilberry & killvar 'go_in_bilberry'
-If go_in_boletus > 0: grandpaQW['chore_gather_mushrooms'] = go_in_boletus & killvar 'go_in_boletus'
-If go_in_boletus_bilberry > 0: grandpaQW['chore_gather_both'] = go_in_boletus_bilberry & killvar 'go_in_boletus_bilberry'
-!!---Grandma
-If grandma_trouble > 0: grandmaQW['nudity_trouble'] = grandma_trouble & killvar 'grandma_trouble'
-If grandmastory > 0: grandmaQW['last_day_asked_for_story'] = grandmastory & killvar 'grandmastory'
-If grandmatalk > 0: grandmaQW['last_hour_talked'] = grandmatalk & killvar 'grandmatalk'
-If grandmatalkday > 0: grandmaQW['last_day_talked'] = grandmatalkday & killvar 'grandmatalkday'
-If grandmatalkgad > 0: grandmaQW['talked_about_gadukino'] = grandmatalkgad & killvar 'grandmatalkgad'
-If monthbabkapay > 0: grandmaQW['last_month_paid'] = monthbabkapay & killvar 'monthbabkapay'
-If grandmahelpday > 0: grandmaQW['last_day_helped'] = grandmahelpday & killvar 'grandmahelpday'
-If grandmahelp > 0: grandmaQW['help_amount'] = grandmahelp & killvar 'grandmahelp'
-If grandmahelping > 0: grandmaQW['chore_type'] = grandmahelping & killvar 'grandmahelping'
-If collect_strawberries > 0: grandmaQW['chore_collect_strawberries'] = collect_strawberries & killvar 'collect_strawberries'
-If feed_chickens > 0: grandmaQW['chore_feed_chickens'] = feed_chickens & killvar 'feed_chickens'
-If fruit_collect > 0: grandmaQW['chore_collect_fruit'] = fruit_collect & killvar 'fruit_collect'
-If harvest_garden > 0: grandmaQW['chore_harvest_garden'] = harvest_garden & killvar 'harvest_garden'
-If milk_cow > 0: grandmaQW['chore_milk_cow'] = milk_cow & killvar 'milk_cow'
-If water_garden > 0: grandmaQW['chore_water_garden'] = water_garden & killvar 'water_garden'
-If work_garden > 0: grandmaQW['chore_work_in_garden'] = work_garden & killvar 'work_garden'
-!!---------------------------end of grandparent variable clean up---for 0.8.0 release-----------------------
-
-!! ----- Natasha story variables migrated to array ----- 0.8.0
-! Natasha''s mom NPC data for existing saves
-if $npc_firstname['A191'] ! 'Isabella':
-	npctemp = 191
-	$npc_dna['A<<npctemp>>'] = '1614037462 1959746313 1085890273 0326112989 0869737602 6676723523 3590292041'
-	$npc_firstname['A<<npctemp>>'] = 'Isabella'
-	$npc_nickname['A<<npctemp>>'] = 'Bella'
-	$npc_lastname['A<<npctemp>>'] = 'Belova'
-	$npc_usedname['A<<npctemp>>'] = 'Isabella'
-	$npc_notes['A<<npctemp>>'] = 'Your classmate Natasha''s mother, Isabella Belova.'
-	npc_dob['A<<npctemp>>'] = 19820922
-	npc_gender['A<<npctemp>>'] = 1
-	gs 'npcstaticdefaults', 'defaults'
-	npc_bust['A<<npctemp>>'] = 23
-end
-killvar '$NatashaMotherName' & killvar '$NatashaMotherNickname'
-
-if NatashaQW > 0: 				NatbelQW['QWstage'] = NatashaQW & killvar 'NatashaQW'
-if natbelXP > 0: 				NatbelQW['natbelXP'] = natbelXP & killvar 'natbelXP'
-if NatBelBestFrend > 0: 		NatbelQW['BestFriend'] = NatBelBestFrend & killvar 'NatBelBestFrend'
-if BeInNatBelHome > 0: 			NatbelQW['VisitedHome'] = BeInNatBelHome & killvar 'BeInNatBelHome'
-if natashaFirstvisit > 0: 		NatbelQW['FirstVisit'] = natashaFirstvisit & killvar 'natashaFirstvisit'
-if NatNoTV > 0: 				NatbelQW['NoTV'] = NatNoTV & killvar 'NatNoTV'
-if ShowRand > 0: 				NatbelQW['TVshow'] = ShowRand & killvar 'ShowRand'
-if $ShowMsg ! '': 				$NatbelQW['TVmsg'] = $ShowMsg & killvar '$ShowMsg'
-if NatashaWatchedYourPorn > 0: 	NatbelQW['WatchedYourPorn'] = NatashaWatchedYourPorn & killvar 'NatashaWatchedYourPorn'
-if NatDolg > 0: 				NatbelQW['Debt'] = NatDolg & killvar 'NatDolg'
-if NatDolgDay > 0: 				NatbelQW['DebtDay'] = NatDolgDay & killvar 'NatDolgDay'
-if nattimeleft > 0: 			NatbelQW['DebtTimeLeft'] = nattimeleft & killvar 'nattimeleft'
-if NatashaMoneyGivenTimes > 0: 	NatbelQW['MoneyGivenTimes'] = NatashaMoneyGivenTimes & killvar 'NatashaMoneyGivenTimes'
-if NatashaHW > 0: 				NatbelQW['homework'] = NatashaHW & killvar 'NatashaHW'
-if natdoingHW > 0: 				NatbelQW['doingHW'] = natdoingHW & killvar 'natdoingHW'
-if NatashaNakedHW > 0: 			NatbelQW['nakedHW'] = NatashaNakedHW & killvar 'NatashaNakedHW'
-if natunderwear > 0: 			NatbelQW['underwear'] = natunderwear & killvar 'natunderwear'
-if natund > 0: 					NatbelQW['underwearShop'] = natund & killvar 'natund'
-if natseethrough > 0: 			NatbelQW['seethrough'] = natseethrough & killvar 'natseethrough'
-if natseethroughwearing > 0: 	NatbelQW['seethroughwearing'] = natseethroughwearing & killvar 'natseethroughwearing'
-if natseethroughworn > 0: 		NatbelQW['seethroughworn'] = natseethroughworn & killvar 'natseethroughworn'
-if natseehtroughkitchen > 0: 	NatbelQW['seethroughkitchen'] = natseehtroughkitchen & killvar 'natseehtroughkitchen'
-if natmomrobe > 0: 				NatbelQW['momrobe'] = natmomrobe & killvar 'natmomrobe'
-if nattraining > 0:				NatbelQW['training'] = nattraining & killvar 'nattraining'
-if natlesb > 0:					NatbelQW['lesbian'] = natlesb & killvar 'natlesb'
-if natpee > 0:					NatbelQW['pee'] = natpee & killvar 'natpee'
-if HaveCucumber > 0:			NatbelQW['cucumber'] = HaveCucumber & killvar 'HaveCucumber'
-if natkolkatease > 0:			NatbelQW['KolkaTease'] = natkolkatease & killvar 'natkolkatease'
-if kolkawantsnat > 0:			NatbelQW['KolkaWantsNat'] = kolkawantsnat & killvar 'kolkawantsnat'
-if natfuckday > 0:				NatbelQW['KolkaFuckDay'] = natfuckday & killvar 'natfuckday'
-if NatKolkaSex > 0: 			NatbelQW['KolkaSex'] = NatKolkaSex & killvar 'NatKolkaSex'
-if natbj > 0: 					NatbelQW['bj'] = natbj & killvar 'natbj'
-if NatKolkaFootjob > 0: 		NatbelQW['KolkaFootjob'] = NatKolkaFootjob & killvar 'NatKolkaFootjob'
-if natcp > 0: 					NatbelQW['KolkaCP'] = natcp & killvar 'natcp'
-	! Adding all previous creampies to the new vaginal sex tracker so it can start above 0 if possible
-if NatbelQW['KolkaCP'] > 0 and NatbelQW['vaginal'] = 0: 	NatbelQW['vaginal'] += NatbelQW['KolkaCP']
-if natanal > 0: 				NatbelQW['anal'] = natanal & killvar 'natanal'
-if natpregday > 0: 				NatbelQW['pregday'] = natpregday & killvar 'natpregday'
-if nataskedbaby > 0: 			NatbelQW['askedbaby'] = nataskedbaby & killvar 'nataskedbaby'
-if natbabycount > 0: 			NatbelQW['babycount'] = natbabycount & killvar 'natbabycount'
-
-if MetNatMother > 0: 			NatbelQW['MetMother'] = MetNatMother & killvar 'MetNatMother'
-	! These can be set to 0, so wiping them in any case to get rid of them
-								NatbelQW['MotherHome'] = NatashaMotherHome & killvar 'NatashaMotherHome'
-								NatbelQW['MotherDoor'] = DoorOpenBy & killvar 'DoorOpenBy'
-								NatbelQW['MotherState'] = NatashaMotherState & killvar 'NatashaMotherState'
-								NatbelQW['MotherStateMsg'] = NatashaMotherStateMsg & killvar 'NatashaMotherStateMsg'
-								NatbelQW['MotherStateKeep'] = NatashaMotherStateKeep & killvar 'NatashaMotherStateKeep'
-if SeenNatMomHitachi > 0: 		NatbelQW['SeenNatMomHitachi'] = SeenNatMomHitachi & killvar 'SeenNatMomHitachi'
-if CaughtByNatMomHitachi > 0: 	NatbelQW['CaughtByNatMomHitachi'] = CaughtByNatMomHitachi & killvar 'CaughtByNatMomHitachi'
-if $NatMomVibName ! '': 		$NatbelQW['NatMomVibName'] = $NatMomVibName & killvar '$NatMomVibName'
-
-	! typos found in the natasha files & other cleaning up
-if nhib_exp > 0: inhib_exp += nhib_exp & killvar 'nhib_exp'
-killvar 'natsleeprand'
-killvar 'imgrand'
-
-!! ----- Natasha story variables migrated to array ----- 0.8.0
-
-! ----- Parrot story variables migrated to array
-if saveparQW > 0:       ParrotQW['Level'] = saveparQW & killvar 'saveparQW'
-if popugai > 0:         ParrotQW['Owned1'] = popugai & killvar 'popugai'
-if popugai2 > 0:        ParrotQW['Owned2'] = popugai2 & killvar 'popugai2'
-if saveparjourQW > 0:   ParrotQW['Day'] = saveparjourQW & killvar 'saveparjourQW'
-if parbuydate > 0:      ParrotQW['BuyDate'] = parbuydate & killvar 'parbuydate'
-if sisrelparday > 0:    ParrotQW['SisterReleaseParrotDay'] = sisrelparday & killvar 'sisrelparday'
-if saveparQWfailed > 0: ParrotQW['Failed'] = saveparQWfailed & killvar 'saveparQWfailed'
-If sispopconf > 0:      ParrotQW['SisKeepParrot'] = sispopconf & killvar 'sispopconf'
-if $namepopu ! '':      $ParrotQW['Name1'] = $namepopu & killvar '$namepopu'
-if $namepopu2 ! '':     $ParrotQW['Name2'] = $namepopu2 & killvar '$namepopu2'
-! ----- Parrot story variables migrated to array
-
-! ----- Diner Bystroeshka (burger) story variables migrated to array
-if BankPapper > 0:         BurgerQW['BankTask'] = BankPapper & killvar 'BankPapper'
-if BistroBoss > 0:         BurgerQW['BossSlut'] = BistroBoss & killvar 'BistroBoss'
-if BistroBossDay > 0:      BurgerQW['BossSlutLastServed'] = BistroBossDay & killvar 'BistroBossDay'
-if bistroQW > 0:           BurgerQW['Level'] = bistroQW & killvar 'bistroQW'
-if $burgerIvanText ! '':   $BurgerQW['IvanSecurityCamDesc'] = $burgerIvanText & killvar '$burgerIvanText'
-if BuSWworkEnd > 0:        BurgerQW['SaunaWhoreKnown'] = BuSWworkEnd & killvar 'BuSWworkEnd'
-if dayBankPapper > 0:      BurgerQW['BankTaskDay'] = dayBankPapper & killvar 'dayBankPapper'
-if DayTerminalPapper > 0:  BurgerQW['TerminalTaskDay'] = DayTerminalPapper & killvar 'DayTerminalPapper'
-if gossipBU > 0:           BurgerQW['SlutReputation'] = gossipBU & killvar 'gossipBU'
-if IvanEvidence > 0:       BurgerQW['IvanQWEvidence'] = IvanEvidence & killvar 'IvanEvidence'
-if ivanFilmBJ > 0:         BurgerQW['IvanQWBJFilmed'] = ivanFilmBJ & killvar 'ivanFilmBJ'
-if IvanKvartira > 0:       BurgerQW['IvanQWTatianaHelp'] = IvanKvartira & killvar 'IvanKvartira'
-if IvanPodstavaDay > 0:    BurgerQW['IvanQWDay'] = IvanPodstavaDay & killvar 'IvanPodstavaDay'
-if IvanPodstavaQW > 0:     BurgerQW['IvanQW'] = IvanPodstavaQW & killvar 'IvanPodstavaQW'
-if kompromatBlackMail > 0: BurgerQW['IvanQWBlackmail'] = kompromatBlackMail & killvar 'kompromatBlackMail'
-if $kompromatFoto ! '':    $BurgerQW['IvanQWBlackmailPhoto'] = $kompromatFoto & killvar '$kompromatFoto'
-if NoBistroWork > 0:       BurgerQW['WorkBlocked'] = NoBistroWork & killvar 'NoBistroWork'
-if PersSecWork > 0:        BurgerQW['Secretary'] = PersSecWork & killvar 'PersSecWork'
-if PersSecWorkTimes > 0:   BurgerQW['SecretaryTimesWorked'] = PersSecWorkTimes & killvar 'PersSecWorkTimes'
-if PodpiskaNeviezd > 0:    BurgerQW['IvanQWPoliceDayCount'] = PodpiskaNeviezd & killvar 'PodpiskaNeviezd'
-if posuda > 0:             BurgerQW['WashDishesCount'] = posuda & killvar 'posuda'
-if posudaA > 0:            BurgerQW['WashFloorCount'] = posudaA & killvar 'posudaA'
-if posudaday > 0:          BurgerQW['WashedDishesLastDay'] = posudaday & killvar 'posudaday'
-if posudaAday > 0:         BurgerQW['WashFloorLastDay'] = posudaAday & killvar 'posudaAday'
-if PSBBtimes > 0:          BurgerQW['WorkShift'] = PSBBtimes & killvar 'PSBBtimes'
-if sergeyPQW > 0:          BurgerQW['sergeyQW'] = sergeyPQW & killvar 'sergeyPQW'
-if soplakTimes > 0:        BurgerQW['sergeyQWServiced1'] = soplakTimes & killvar 'soplakTimes'
-if soplakTimes1 > 0:       BurgerQW['sergeyQWServiced2'] = soplakTimes1 & killvar 'soplakTimes1'
-if TerminalPapper > 0:     BurgerQW['TerminalTask'] = TerminalPapper & killvar 'TerminalPapper'
-! ----- Diner Bystroeshka (burger) story variables migrated to array
-
-! ----- Albina story variables migrated to array
-if AlbFather > 0:          AlbinaQW['AlbFatherQW'] = AlbFather & killvar 'AlbFather'
-if AlbFrend > 0:           AlbinaQW['Friends'] = AlbFrend & killvar 'AlbFrend'
-if ZvezdEnd > 0:           AlbinaQW['StarletsShutDown'] = ZvezdEnd & killvar 'ZvezdEnd'
-if DanceWhore > 0:         AlbinaQW['StarletsWhore'] = DanceWhore & killvar 'DanceWhore'
-if beinalbinahome > 0:     AlbinaQW['KnowsHouse'] = beinalbinahome & killvar 'beinalbinahome' 
-if albsportday > 0:        AlbinaQW['SportDay'] = albsportday & killvar 'albsportday' 
-if albsporthome > 0:       AlbinaQW['SportHome'] = albsporthome & killvar 'albsporthome' 
-if gamebet > 0:            AlbinaQW['gamebet'] = gamebet & killvar 'gamebet' 
-if stardance > 0:          AlbinaQW['ShowTriggerCount'] = stardance & killvar 'stardance' 
-if albrideday > 0:         AlbinaQW['albrideday'] = albrideday & killvar 'albrideday' 
-if albinaQWdance > 0:      AlbinaQW['StarletsJoined'] = albinaQWdance & killvar 'albinaQWdance' 
-if AlbZverHelp > 0:        AlbinaQW['ChristinaHelp'] = AlbZverHelp & killvar 'AlbZverHelp' 
-if alb_father_meeting > 0: AlbinaQW['ParkRally'] = alb_father_meeting & killvar 'alb_father_meeting' 
-if alb_father_day > 0:     AlbinaQW['ParkRallyDay'] = alb_father_day & killvar 'alb_father_day' 
-if AlbFaterBlackTime > 0:  AlbinaQW['ElectionCampaignTime'] = AlbFaterBlackTime & killvar 'AlbFaterBlackTime' 
-if startletsday > 0:       AlbinaQW['startletsday'] = startletsday & killvar 'startletsday' 
-! ----- Albina story variables migrated to array
-
-!! Updating npc_bust[] array to the new values ----- 0.8.0
-if npc_bust['A12'] = 9: npc_bust['A12'] = 23
-if npc_bust['A13'] = 9: npc_bust['A13'] = 8
-if npc_bust['A14'] = 9: npc_bust['A14'] = 20
-if npc_bust['A15'] = 9: npc_bust['A15'] = 18
-if npc_bust['A16'] = 9: npc_bust['A16'] = 26
-if npc_bust['A17'] = 9: npc_bust['A17'] = 34
-if npc_bust['A18'] = 9: npc_bust['A18'] = 21
-if npc_bust['A19'] = 9: npc_bust['A19'] = 14
-if npc_bust['A20'] = 9: npc_bust['A20'] = 22
-if npc_bust['A21'] = 9: npc_bust['A21'] = 18
-if npc_bust['A22'] = 9: npc_bust['A22'] = 27
-if npc_bust['A23'] = 9: npc_bust['A23'] = 14
-if npc_bust['A24'] = 9: npc_bust['A24'] = 20
-if npc_bust['A25'] = 9: npc_bust['A25'] = 21
-if npc_bust['A29'] = 9: npc_bust['A29'] = 25
-if npc_bust['A30'] = 9: npc_bust['A30'] = 18
-if npc_bust['A33'] = 9: npc_bust['A33'] = 19
-if npc_bust['A134'] = 9: npc_bust['A134'] = 20
-if npc_bust['A135'] = 9: npc_bust['A135'] = 13
-if npc_bust['A136'] = 9: npc_bust['A136'] = 30
-if npc_bust['A137'] = 9: npc_bust['A137'] = 34
-if npc_bust['A138'] = 9: npc_bust['A138'] = 18
-if npc_bust['A139'] = 9: npc_bust['A139'] = 22
-if npc_bust['A140'] = 9: npc_bust['A140'] = 13
-if npc_bust['A141'] = 9: npc_bust['A141'] = 20
-if npc_bust['A142'] = 9: npc_bust['A142'] = 13
-if npc_bust['A143'] = 9: npc_bust['A143'] = 7
-if npc_bust['A144'] = 9: npc_bust['A144'] = 24
-if npc_bust['A145'] = 9: npc_bust['A145'] = 31
-!! Updating npc_bust[] array to the new values ----- 0.8.0
-
-!!-----------Adding pube colours for 0.8.0-----------
-
-if pcs_pubecol[1] = 0: pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1 & pcs_pubecol[2] = pcs_haircol
-
-!!-----------Adding pube colours for 0.8.0-----------
-
-!! ----- Mom, Luda & Olu stuff ----- 0.8.0
-killvar 'olufirst'
-killvar 'tetyafirst'
-killvar 'oluuosegunday_count'
-killvar 'oluuosegunday_day'
-!! ----- Mom, Luda & Olu stuff ----- 0.8.0
-
-!!trait update
-if traits['update_1'] = 0:
-	traits['update_1'] = 1
-	
-	traits['alko_day'] = alko_trait_day 
-	traits['alko_points'] = alko_trait_counter
-	traits['alko_status'] = alko_trait
-	
-	killvar 'alko_trait_day'
-	killvar 'alko_trait_counter'
-	killvar 'alko_trait'
-end
+	if wombfather_update = 0: wombfather_update = 1 & gs 'din_bad'
+
+	!! This will unlock the Anushka photos if a player has already done the event.
+	if showerphotos = 1 and showerphotosupdater = 0:
+		showerphotosupdater = 1
+		anushkaphoto[1] = 1
+		anushkaphoto[2] = 1
+		anushkaphoto[3] = 1
+		anushkaphoto[4] = 1
+		anushkaphoto[5] = 1
+		anushkaphoto[6] = 1
+	end
 
-!! ----- Other bug fixes and cleanup ----- 0.8.0
-if pcs_gaming_exp > 0: gaming_exp += pcs_gaming_exp & killvar 'pcs_gaming_exp'
-if nerd_night_game ! 0: killvar 'nerd_night_game'
-if nerd_night_game_day ! 0: nerd_game['game_day'] = nerd_night_game_day & killvar 'nerd_night_game_day'
-
-!!Masturbation check wasn''t being cleared
-mastrOnce = 0
-!! ----- Other bug fixes and cleanup ----- 0.8.0
-
-!!--------0.8.0.1---school social group adjustment
-if gruptipe[9000] = 0:
-	gruptipe[9000] = 1
-	grupvalue[1] = grupvalue[1] * 10
-	grupvalue[2] = grupvalue[2] * 10
-	grupvalue[3] = grupvalue[3] * 10
-	grupvalue[4] = grupvalue[4] * 10
-end
-!!--------0.8.0.1---school social group adjustment
-
-
-!!--------0.8.1--- Music variable names changed
-if ml_update_1 = 0:
-	ml_guitar['hasguitar'] = ml_guitar
-	ml_guitar['carried'] = ml_guitarWithMe
-	ml_performance['performed_minutes'] = ml_performed_minutes
-	ml_performance['max_perform_minutes'] = ml_max_perform_minutes
-	ml_guitar['chordbook'] = ml_chordbook
-
-	ml_guitarlesson['lessoncount'] = ml_lessoncount
-	ml_guitarlesson['lessonday'] = ml_lessonday
-	$ml_guitarlesson['lessonday'] = $ml_lessonday
-	ml_guitarlesson['lessonhour'] = 15
-	ml_guitarlesson['nextlesson'] = daystart + (ml_guitarlesson['lessonday'] + 7 - week)
-	ml_guitarlesson['advertisement'] = ml_guitarlessonadv
-	ml_guitarlesson['enquired'] = ml_enquired
-
-	if age < 18: 
-		ml_guitarlesson['lessoncost'] = 300
-	else
-		ml_guitarlesson['lessoncost'] = 500
+	!! Changes to the pregnancy due date dynamic format
+	if pregdateupdate = 0:
+		gs 'din_bad'
+		pregdateupdate = 1
 	end
 
-	killvar 'ml_guitarWithMe'
-	killvar 'ml_performed_minutes'
-	killvar 'ml_max_perform_minutes'
-	killvar 'ml_guitarlessonadv'
-	killvar 'ml_enquired'
-	killvar 'ml_lessonday'
-	killvar '$ml_lessonday'
-	killvar 'ml_lessoncost'
+	if $npc_usedname['A<<npctemp>>'] = 'Inna': $npc_usedname['A<<npctemp>>'] = 'Irina'
+
+	!! Killing some useless variables used to trigger the Pavlin storyline
+	if totalmon ! 0:
+		montake = totalmon
+		killvar 'totalmon'
+		killvar 'mongiveback'
+	end
+
+	if cyc_update = 0:
+		cyc_update = 1
+		daylastperiod = firstmens
+		if difficulty = 4:
+			cyccustom = 0
+		else
+			cyccustom = 1
+		end
+	end
+
+	! Switching from tracking relationship with Rex from rex to npc_rel['A57']
+	if rex > 0 and rex > npc_rel['A57']: npc_rel['A57'] = rex & killvar 'rex'
+
+	!!------------------------------village variable clean up/translation---------------------------------------
+	if findvel > 0: BikeLoc = findvel & killvar 'findvel'
+	!!------------------------------grandparent variable clean up---for 0.8.0 release---------------------------
+	!!---Grandpa
+	If grandpa_bilberry > 0: grandpaQW['chore_berry_quantity'] = grandpa_bilberry & killvar 'grandpa_bilberry'
+	If grandpa_boletus > 0: grandpaQW['chore_mushroom_quantity'] = grandpa_boletus & killvar 'grandpa_boletus'
+	If grandpahelpday > 0: grandpaQW['last_day_helped'] = grandpahelpday & killvar 'grandpahelpday'
+	If grandpahelping > 0: grandpaQW['chore_type'] = grandpahelping & killvar 'grandpahelping'
+	If grandpatalk > 0: grandpaQW['last_hour_talked'] = grandpatalk & killvar 'grandpatalk'
+	If grandpatalkday > 0: grandpaQW['last_day_talked'] = grandpatalkday & killvar 'grandpatalkday'
+	If grandpatalkforest > 0: grandpaQW['talked_about_forest'] = grandpatalkforest & killvar 'grandpatalkforest'
+	If comb_horse > 0: grandpaQW['chore_brush_horse'] = comb_horse & killvar 'comb_horse'
+	If cow_field > 0: grandpaQW['chore_lead_cow_to_field'] = cow_field & killvar 'cow_field'
+	If feed_boar > 0: grandpaQW['chore_feed_boar'] = feed_boar & killvar 'feed_boar'
+	If feed_cow > 0: grandpaQW['chore_feed_cow'] = feed_cow & killvar 'feed_cow'
+	If feed_horse > 0: grandpaQW['chore_feed_horse'] = feed_horse & killvar 'feed_horse'
+	If graze_cow > 0: grandpaQW['chore_herd_cattle'] = graze_cow & killvar 'graze_cow'
+	If graze_cow_exp > 0: grandpaQW['chore_herd_cattle_experience'] = graze_cow_exp & killvar 'graze_cow_exp'
+	If haying_time > 0: grandpaQW['chore_bale_hay'] = haying_time & killvar 'haying_time'
+	If horse_field > 0: grandpaQW['chore_lead_horse_to_field'] = horse_field & killvar 'horse_field'
+	If horse_river > 0: grandpaQW['chore_bathe_horse'] = horse_river & killvar 'horse_river'
+	If go_in_bilberry > 0: grandpaQW['chore_gather_berries'] = go_in_bilberry & killvar 'go_in_bilberry'
+	If go_in_boletus > 0: grandpaQW['chore_gather_mushrooms'] = go_in_boletus & killvar 'go_in_boletus'
+	If go_in_boletus_bilberry > 0: grandpaQW['chore_gather_both'] = go_in_boletus_bilberry & killvar 'go_in_boletus_bilberry'
+	!!---Grandma
+	If grandma_trouble > 0: grandmaQW['nudity_trouble'] = grandma_trouble & killvar 'grandma_trouble'
+	If grandmastory > 0: grandmaQW['last_day_asked_for_story'] = grandmastory & killvar 'grandmastory'
+	If grandmatalk > 0: grandmaQW['last_hour_talked'] = grandmatalk & killvar 'grandmatalk'
+	If grandmatalkday > 0: grandmaQW['last_day_talked'] = grandmatalkday & killvar 'grandmatalkday'
+	If grandmatalkgad > 0: grandmaQW['talked_about_gadukino'] = grandmatalkgad & killvar 'grandmatalkgad'
+	If monthbabkapay > 0: grandmaQW['last_month_paid'] = monthbabkapay & killvar 'monthbabkapay'
+	If grandmahelpday > 0: grandmaQW['last_day_helped'] = grandmahelpday & killvar 'grandmahelpday'
+	If grandmahelp > 0: grandmaQW['help_amount'] = grandmahelp & killvar 'grandmahelp'
+	If grandmahelping > 0: grandmaQW['chore_type'] = grandmahelping & killvar 'grandmahelping'
+	If collect_strawberries > 0: grandmaQW['chore_collect_strawberries'] = collect_strawberries & killvar 'collect_strawberries'
+	If feed_chickens > 0: grandmaQW['chore_feed_chickens'] = feed_chickens & killvar 'feed_chickens'
+	If fruit_collect > 0: grandmaQW['chore_collect_fruit'] = fruit_collect & killvar 'fruit_collect'
+	If harvest_garden > 0: grandmaQW['chore_harvest_garden'] = harvest_garden & killvar 'harvest_garden'
+	If milk_cow > 0: grandmaQW['chore_milk_cow'] = milk_cow & killvar 'milk_cow'
+	If water_garden > 0: grandmaQW['chore_water_garden'] = water_garden & killvar 'water_garden'
+	If work_garden > 0: grandmaQW['chore_work_in_garden'] = work_garden & killvar 'work_garden'
+	!!---------------------------end of grandparent variable clean up---for 0.8.0 release-----------------------
+
+	!! ----- Natasha story variables migrated to array ----- 0.8.0
+	! Natasha''s mom NPC data for existing saves
+	if $npc_firstname['A191'] ! 'Isabella':
+		npctemp = 191
+		$npc_dna['A<<npctemp>>'] = '1614037462 1959746313 1085890273 0326112989 0869737602 6676723523 3590292041'
+		$npc_firstname['A<<npctemp>>'] = 'Isabella'
+		$npc_nickname['A<<npctemp>>'] = 'Bella'
+		$npc_lastname['A<<npctemp>>'] = 'Belova'
+		$npc_usedname['A<<npctemp>>'] = 'Isabella'
+		$npc_notes['A<<npctemp>>'] = 'Your classmate Natasha''s mother, Isabella Belova.'
+		npc_dob['A<<npctemp>>'] = 19820922
+		npc_gender['A<<npctemp>>'] = 1
+		gs 'npcstaticdefaults', 'defaults'
+		npc_bust['A<<npctemp>>'] = 23
+	end
+	killvar '$NatashaMotherName' & killvar '$NatashaMotherNickname'
+
+	if NatashaQW > 0: 				NatbelQW['QWstage'] = NatashaQW & killvar 'NatashaQW'
+	if natbelXP > 0: 				NatbelQW['natbelXP'] = natbelXP & killvar 'natbelXP'
+	if NatBelBestFrend > 0: 		NatbelQW['BestFriend'] = NatBelBestFrend & killvar 'NatBelBestFrend'
+	if BeInNatBelHome > 0: 			NatbelQW['VisitedHome'] = BeInNatBelHome & killvar 'BeInNatBelHome'
+	if natashaFirstvisit > 0: 		NatbelQW['FirstVisit'] = natashaFirstvisit & killvar 'natashaFirstvisit'
+	if NatNoTV > 0: 				NatbelQW['NoTV'] = NatNoTV & killvar 'NatNoTV'
+	if ShowRand > 0: 				NatbelQW['TVshow'] = ShowRand & killvar 'ShowRand'
+	if $ShowMsg ! '': 				$NatbelQW['TVmsg'] = $ShowMsg & killvar '$ShowMsg'
+	if NatashaWatchedYourPorn > 0: 	NatbelQW['WatchedYourPorn'] = NatashaWatchedYourPorn & killvar 'NatashaWatchedYourPorn'
+	if NatDolg > 0: 				NatbelQW['Debt'] = NatDolg & killvar 'NatDolg'
+	if NatDolgDay > 0: 				NatbelQW['DebtDay'] = NatDolgDay & killvar 'NatDolgDay'
+	if nattimeleft > 0: 			NatbelQW['DebtTimeLeft'] = nattimeleft & killvar 'nattimeleft'
+	if NatashaMoneyGivenTimes > 0: 	NatbelQW['MoneyGivenTimes'] = NatashaMoneyGivenTimes & killvar 'NatashaMoneyGivenTimes'
+	if NatashaHW > 0: 				NatbelQW['homework'] = NatashaHW & killvar 'NatashaHW'
+	if natdoingHW > 0: 				NatbelQW['doingHW'] = natdoingHW & killvar 'natdoingHW'
+	if NatashaNakedHW > 0: 			NatbelQW['nakedHW'] = NatashaNakedHW & killvar 'NatashaNakedHW'
+	if natunderwear > 0: 			NatbelQW['underwear'] = natunderwear & killvar 'natunderwear'
+	if natund > 0: 					NatbelQW['underwearShop'] = natund & killvar 'natund'
+	if natseethrough > 0: 			NatbelQW['seethrough'] = natseethrough & killvar 'natseethrough'
+	if natseethroughwearing > 0: 	NatbelQW['seethroughwearing'] = natseethroughwearing & killvar 'natseethroughwearing'
+	if natseethroughworn > 0: 		NatbelQW['seethroughworn'] = natseethroughworn & killvar 'natseethroughworn'
+	if natseehtroughkitchen > 0: 	NatbelQW['seethroughkitchen'] = natseehtroughkitchen & killvar 'natseehtroughkitchen'
+	if natmomrobe > 0: 				NatbelQW['momrobe'] = natmomrobe & killvar 'natmomrobe'
+	if nattraining > 0:				NatbelQW['training'] = nattraining & killvar 'nattraining'
+	if natlesb > 0:					NatbelQW['lesbian'] = natlesb & killvar 'natlesb'
+	if natpee > 0:					NatbelQW['pee'] = natpee & killvar 'natpee'
+	if HaveCucumber > 0:			NatbelQW['cucumber'] = HaveCucumber & killvar 'HaveCucumber'
+	if natkolkatease > 0:			NatbelQW['KolkaTease'] = natkolkatease & killvar 'natkolkatease'
+	if kolkawantsnat > 0:			NatbelQW['KolkaWantsNat'] = kolkawantsnat & killvar 'kolkawantsnat'
+	if natfuckday > 0:				NatbelQW['KolkaFuckDay'] = natfuckday & killvar 'natfuckday'
+	if NatKolkaSex > 0: 			NatbelQW['KolkaSex'] = NatKolkaSex & killvar 'NatKolkaSex'
+	if natbj > 0: 					NatbelQW['bj'] = natbj & killvar 'natbj'
+	if NatKolkaFootjob > 0: 		NatbelQW['KolkaFootjob'] = NatKolkaFootjob & killvar 'NatKolkaFootjob'
+	if natcp > 0: 					NatbelQW['KolkaCP'] = natcp & killvar 'natcp'
+		! Adding all previous creampies to the new vaginal sex tracker so it can start above 0 if possible
+	if NatbelQW['KolkaCP'] > 0 and NatbelQW['vaginal'] = 0: 	NatbelQW['vaginal'] += NatbelQW['KolkaCP']
+	if natanal > 0: 				NatbelQW['anal'] = natanal & killvar 'natanal'
+	if natpregday > 0: 				NatbelQW['pregday'] = natpregday & killvar 'natpregday'
+	if nataskedbaby > 0: 			NatbelQW['askedbaby'] = nataskedbaby & killvar 'nataskedbaby'
+	if natbabycount > 0: 			NatbelQW['babycount'] = natbabycount & killvar 'natbabycount'
+
+	if MetNatMother > 0: 			NatbelQW['MetMother'] = MetNatMother & killvar 'MetNatMother'
+		! These can be set to 0, so wiping them in any case to get rid of them
+									NatbelQW['MotherHome'] = NatashaMotherHome & killvar 'NatashaMotherHome'
+									NatbelQW['MotherDoor'] = DoorOpenBy & killvar 'DoorOpenBy'
+									NatbelQW['MotherState'] = NatashaMotherState & killvar 'NatashaMotherState'
+									NatbelQW['MotherStateMsg'] = NatashaMotherStateMsg & killvar 'NatashaMotherStateMsg'
+									NatbelQW['MotherStateKeep'] = NatashaMotherStateKeep & killvar 'NatashaMotherStateKeep'
+	if SeenNatMomHitachi > 0: 		NatbelQW['SeenNatMomHitachi'] = SeenNatMomHitachi & killvar 'SeenNatMomHitachi'
+	if CaughtByNatMomHitachi > 0: 	NatbelQW['CaughtByNatMomHitachi'] = CaughtByNatMomHitachi & killvar 'CaughtByNatMomHitachi'
+	if $NatMomVibName ! '': 		$NatbelQW['NatMomVibName'] = $NatMomVibName & killvar '$NatMomVibName'
+
+		! typos found in the natasha files & other cleaning up
+	if nhib_exp > 0: inhib_exp += nhib_exp & killvar 'nhib_exp'
+	killvar 'natsleeprand'
+	killvar 'imgrand'
+
+	!! ----- Natasha story variables migrated to array ----- 0.8.0
+
+	! ----- Parrot story variables migrated to array
+	if saveparQW > 0:       ParrotQW['Level'] = saveparQW & killvar 'saveparQW'
+	if popugai > 0:         ParrotQW['Owned1'] = popugai & killvar 'popugai'
+	if popugai2 > 0:        ParrotQW['Owned2'] = popugai2 & killvar 'popugai2'
+	if saveparjourQW > 0:   ParrotQW['Day'] = saveparjourQW & killvar 'saveparjourQW'
+	if parbuydate > 0:      ParrotQW['BuyDate'] = parbuydate & killvar 'parbuydate'
+	if sisrelparday > 0:    ParrotQW['SisterReleaseParrotDay'] = sisrelparday & killvar 'sisrelparday'
+	if saveparQWfailed > 0: ParrotQW['Failed'] = saveparQWfailed & killvar 'saveparQWfailed'
+	If sispopconf > 0:      ParrotQW['SisKeepParrot'] = sispopconf & killvar 'sispopconf'
+	if $namepopu ! '':      $ParrotQW['Name1'] = $namepopu & killvar '$namepopu'
+	if $namepopu2 ! '':     $ParrotQW['Name2'] = $namepopu2 & killvar '$namepopu2'
+	! ----- Parrot story variables migrated to array
+
+	! ----- Diner Bystroeshka (burger) story variables migrated to array
+	if BankPapper > 0:         BurgerQW['BankTask'] = BankPapper & killvar 'BankPapper'
+	if BistroBoss > 0:         BurgerQW['BossSlut'] = BistroBoss & killvar 'BistroBoss'
+	if BistroBossDay > 0:      BurgerQW['BossSlutLastServed'] = BistroBossDay & killvar 'BistroBossDay'
+	if bistroQW > 0:           BurgerQW['Level'] = bistroQW & killvar 'bistroQW'
+	if $burgerIvanText ! '':   $BurgerQW['IvanSecurityCamDesc'] = $burgerIvanText & killvar '$burgerIvanText'
+	if BuSWworkEnd > 0:        BurgerQW['SaunaWhoreKnown'] = BuSWworkEnd & killvar 'BuSWworkEnd'
+	if dayBankPapper > 0:      BurgerQW['BankTaskDay'] = dayBankPapper & killvar 'dayBankPapper'
+	if DayTerminalPapper > 0:  BurgerQW['TerminalTaskDay'] = DayTerminalPapper & killvar 'DayTerminalPapper'
+	if gossipBU > 0:           BurgerQW['SlutReputation'] = gossipBU & killvar 'gossipBU'
+	if IvanEvidence > 0:       BurgerQW['IvanQWEvidence'] = IvanEvidence & killvar 'IvanEvidence'
+	if ivanFilmBJ > 0:         BurgerQW['IvanQWBJFilmed'] = ivanFilmBJ & killvar 'ivanFilmBJ'
+	if IvanKvartira > 0:       BurgerQW['IvanQWTatianaHelp'] = IvanKvartira & killvar 'IvanKvartira'
+	if IvanPodstavaDay > 0:    BurgerQW['IvanQWDay'] = IvanPodstavaDay & killvar 'IvanPodstavaDay'
+	if IvanPodstavaQW > 0:     BurgerQW['IvanQW'] = IvanPodstavaQW & killvar 'IvanPodstavaQW'
+	if kompromatBlackMail > 0: BurgerQW['IvanQWBlackmail'] = kompromatBlackMail & killvar 'kompromatBlackMail'
+	if $kompromatFoto ! '':    $BurgerQW['IvanQWBlackmailPhoto'] = $kompromatFoto & killvar '$kompromatFoto'
+	if NoBistroWork > 0:       BurgerQW['WorkBlocked'] = NoBistroWork & killvar 'NoBistroWork'
+	if PersSecWork > 0:        BurgerQW['Secretary'] = PersSecWork & killvar 'PersSecWork'
+	if PersSecWorkTimes > 0:   BurgerQW['SecretaryTimesWorked'] = PersSecWorkTimes & killvar 'PersSecWorkTimes'
+	if PodpiskaNeviezd > 0:    BurgerQW['IvanQWPoliceDayCount'] = PodpiskaNeviezd & killvar 'PodpiskaNeviezd'
+	if posuda > 0:             BurgerQW['WashDishesCount'] = posuda & killvar 'posuda'
+	if posudaA > 0:            BurgerQW['WashFloorCount'] = posudaA & killvar 'posudaA'
+	if posudaday > 0:          BurgerQW['WashedDishesLastDay'] = posudaday & killvar 'posudaday'
+	if posudaAday > 0:         BurgerQW['WashFloorLastDay'] = posudaAday & killvar 'posudaAday'
+	if PSBBtimes > 0:          BurgerQW['WorkShift'] = PSBBtimes & killvar 'PSBBtimes'
+	if sergeyPQW > 0:          BurgerQW['sergeyQW'] = sergeyPQW & killvar 'sergeyPQW'
+	if soplakTimes > 0:        BurgerQW['sergeyQWServiced1'] = soplakTimes & killvar 'soplakTimes'
+	if soplakTimes1 > 0:       BurgerQW['sergeyQWServiced2'] = soplakTimes1 & killvar 'soplakTimes1'
+	if TerminalPapper > 0:     BurgerQW['TerminalTask'] = TerminalPapper & killvar 'TerminalPapper'
+	! ----- Diner Bystroeshka (burger) story variables migrated to array
+
+	! ----- Albina story variables migrated to array
+	if AlbFather > 0:          AlbinaQW['AlbFatherQW'] = AlbFather & killvar 'AlbFather'
+	if AlbFrend > 0:           AlbinaQW['Friends'] = AlbFrend & killvar 'AlbFrend'
+	if ZvezdEnd > 0:           AlbinaQW['StarletsShutDown'] = ZvezdEnd & killvar 'ZvezdEnd'
+	if DanceWhore > 0:         AlbinaQW['StarletsWhore'] = DanceWhore & killvar 'DanceWhore'
+	if beinalbinahome > 0:     AlbinaQW['KnowsHouse'] = beinalbinahome & killvar 'beinalbinahome' 
+	if albsportday > 0:        AlbinaQW['SportDay'] = albsportday & killvar 'albsportday' 
+	if albsporthome > 0:       AlbinaQW['SportHome'] = albsporthome & killvar 'albsporthome' 
+	if gamebet > 0:            AlbinaQW['gamebet'] = gamebet & killvar 'gamebet' 
+	if stardance > 0:          AlbinaQW['ShowTriggerCount'] = stardance & killvar 'stardance' 
+	if albrideday > 0:         AlbinaQW['albrideday'] = albrideday & killvar 'albrideday' 
+	if albinaQWdance > 0:      AlbinaQW['StarletsJoined'] = albinaQWdance & killvar 'albinaQWdance' 
+	if AlbZverHelp > 0:        AlbinaQW['ChristinaHelp'] = AlbZverHelp & killvar 'AlbZverHelp' 
+	if alb_father_meeting > 0: AlbinaQW['ParkRally'] = alb_father_meeting & killvar 'alb_father_meeting' 
+	if alb_father_day > 0:     AlbinaQW['ParkRallyDay'] = alb_father_day & killvar 'alb_father_day' 
+	if AlbFaterBlackTime > 0:  AlbinaQW['ElectionCampaignTime'] = AlbFaterBlackTime & killvar 'AlbFaterBlackTime' 
+	if startletsday > 0:       AlbinaQW['startletsday'] = startletsday & killvar 'startletsday' 
+	! ----- Albina story variables migrated to array
+
+	!! Updating npc_bust[] array to the new values ----- 0.8.0
+	if npc_bust['A12'] = 9: npc_bust['A12'] = 23
+	if npc_bust['A13'] = 9: npc_bust['A13'] = 8
+	if npc_bust['A14'] = 9: npc_bust['A14'] = 20
+	if npc_bust['A15'] = 9: npc_bust['A15'] = 18
+	if npc_bust['A16'] = 9: npc_bust['A16'] = 26
+	if npc_bust['A17'] = 9: npc_bust['A17'] = 34
+	if npc_bust['A18'] = 9: npc_bust['A18'] = 21
+	if npc_bust['A19'] = 9: npc_bust['A19'] = 14
+	if npc_bust['A20'] = 9: npc_bust['A20'] = 22
+	if npc_bust['A21'] = 9: npc_bust['A21'] = 18
+	if npc_bust['A22'] = 9: npc_bust['A22'] = 27
+	if npc_bust['A23'] = 9: npc_bust['A23'] = 14
+	if npc_bust['A24'] = 9: npc_bust['A24'] = 20
+	if npc_bust['A25'] = 9: npc_bust['A25'] = 21
+	if npc_bust['A29'] = 9: npc_bust['A29'] = 25
+	if npc_bust['A30'] = 9: npc_bust['A30'] = 18
+	if npc_bust['A33'] = 9: npc_bust['A33'] = 19
+	if npc_bust['A134'] = 9: npc_bust['A134'] = 20
+	if npc_bust['A135'] = 9: npc_bust['A135'] = 13
+	if npc_bust['A136'] = 9: npc_bust['A136'] = 30
+	if npc_bust['A137'] = 9: npc_bust['A137'] = 34
+	if npc_bust['A138'] = 9: npc_bust['A138'] = 18
+	if npc_bust['A139'] = 9: npc_bust['A139'] = 22
+	if npc_bust['A140'] = 9: npc_bust['A140'] = 13
+	if npc_bust['A141'] = 9: npc_bust['A141'] = 20
+	if npc_bust['A142'] = 9: npc_bust['A142'] = 13
+	if npc_bust['A143'] = 9: npc_bust['A143'] = 7
+	if npc_bust['A144'] = 9: npc_bust['A144'] = 24
+	if npc_bust['A145'] = 9: npc_bust['A145'] = 31
+	!! Updating npc_bust[] array to the new values ----- 0.8.0
+
+	!!-----------Adding pube colours for 0.8.0-----------
+
+	if pcs_pubecol[1] = 0: pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1 & pcs_pubecol[2] = pcs_haircol
+
+	!!-----------Adding pube colours for 0.8.0-----------
+
+	!! ----- Mom, Luda & Olu stuff ----- 0.8.0
+	killvar 'olufirst'
+	killvar 'tetyafirst'
+	killvar 'oluuosegunday_count'
+	killvar 'oluuosegunday_day'
+	!! ----- Mom, Luda & Olu stuff ----- 0.8.0
+
+	!!trait update
+	if traits['update_1'] = 0:
+		traits['update_1'] = 1
+		
+		traits['alko_day'] = alko_trait_day 
+		traits['alko_points'] = alko_trait_counter
+		traits['alko_status'] = alko_trait
+		
+		killvar 'alko_trait_day'
+		killvar 'alko_trait_counter'
+		killvar 'alko_trait'
+	end
+
+	!! ----- Other bug fixes and cleanup ----- 0.8.0
+	if pcs_gaming_exp > 0: gaming_exp += pcs_gaming_exp & killvar 'pcs_gaming_exp'
+	if nerd_night_game ! 0: killvar 'nerd_night_game'
+	if nerd_night_game_day ! 0: nerd_game['game_day'] = nerd_night_game_day & killvar 'nerd_night_game_day'
+
+	!!Masturbation check wasn''t being cleared
+	mastrOnce = 0
+	!! ----- Other bug fixes and cleanup ----- 0.8.0
+
+	!!--------0.8.0.1---school social group adjustment
+	if gruptipe[9000] = 0:
+		gruptipe[9000] = 1
+		grupvalue[1] = grupvalue[1] * 10
+		grupvalue[2] = grupvalue[2] * 10
+		grupvalue[3] = grupvalue[3] * 10
+		grupvalue[4] = grupvalue[4] * 10
+	end
+	!!--------0.8.0.1---school social group adjustment
+
+
 	!!--------0.8.1--- Music variable names changed
+	if ml_update_1 = 0:
+		ml_guitar['hasguitar'] = ml_guitar
+		ml_guitar['carried'] = ml_guitarWithMe
+		ml_performance['performed_minutes'] = ml_performed_minutes
+		ml_performance['max_perform_minutes'] = ml_max_perform_minutes
+		ml_guitar['chordbook'] = ml_chordbook
+
+		ml_guitarlesson['lessoncount'] = ml_lessoncount
+		ml_guitarlesson['lessonday'] = ml_lessonday
+		$ml_guitarlesson['lessonday'] = $ml_lessonday
+		ml_guitarlesson['lessonhour'] = 15
+		ml_guitarlesson['nextlesson'] = daystart + (ml_guitarlesson['lessonday'] + 7 - week)
+		ml_guitarlesson['advertisement'] = ml_guitarlessonadv
+		ml_guitarlesson['enquired'] = ml_enquired
+
+		if age < 18: 
+			ml_guitarlesson['lessoncost'] = 300
+		else
+			ml_guitarlesson['lessoncost'] = 500
+		end
 
-	ml_update_1 = 1
-end
+		killvar 'ml_guitarWithMe'
+		killvar 'ml_performed_minutes'
+		killvar 'ml_max_perform_minutes'
+		killvar 'ml_guitarlessonadv'
+		killvar 'ml_enquired'
+		killvar 'ml_lessonday'
+		killvar '$ml_lessonday'
+		killvar 'ml_lessoncost'
+		!!--------0.8.1--- Music variable names changed
+
+		ml_update_1 = 1
+	end
 
-!! changed $metkaM to $locM_arg and $metka to $loc_arg in the code - needed for correction saves saved prior to version 0.8.1
-if arrsize('$metkaM') > 0 or arrsize('$metka') > 0:
-	$locM_arg = $metkaM
-	$loc_arg = $metka
-	killvar '$metkaM'
-	killvar '$metka'
-end
-!!---------------------------------------------------------------
+	!! changed $metkaM to $locM_arg and $metka to $loc_arg in the code - needed for correction saves saved prior to version 0.8.1
+	if arrsize('$metkaM') > 0 or arrsize('$metka') > 0:
+		$locM_arg = $metkaM
+		$loc_arg = $metka
+		killvar '$metkaM'
+		killvar '$metka'
+	end
+	!!---------------------------------------------------------------
 
-!! fixes the variable for Christina getting outcasted, so she will show up in the journal correctly
+	!! fixes the variable for Christina getting outcasted, so she will show up in the journal correctly
 
-if zverSlutQW = 2:
-	npc_grupTipe['A18'] = 5
-end
+	if zverSlutQW = 2:
+		npc_grupTipe['A18'] = 5
+	end
 
-!!---------------------------------------------------------------
+	!!---------------------------------------------------------------
 
-!!model age addition
+	!!model age addition
 
-if model['age'] = 0 and model > 0:
-	model['status'] = 1
-	if age >= 18:
-		model['age'] = age
-	else
-		model['age'] = 18
+	if model['age'] = 0 and model > 0:
+		model['status'] = 1
+		if age >= 18:
+			model['age'] = age
+		else
+			model['age'] = 18
+		end
+		model = 0
 	end
-	model = 0
-end
 
-!! Fixing Katja and Natasha relationship
-if npc_sex['A14'] > 1: npc_sex['A14'] = 1
-if npc_sex['A16'] > 1: npc_sex['A16'] = 1
+	!! Fixing Katja and Natasha relationship
+	if npc_sex['A14'] > 1: npc_sex['A14'] = 1
+	if npc_sex['A16'] > 1: npc_sex['A16'] = 1
 
-!! University related vars update
-if student >= 0:
-	gs 'uniutil', 'transfer_legacy_vars'
-end
+	!! University related vars update
+	if student >= 0:
+		gs 'uniutil', 'transfer_legacy_vars'
+	end
 
-!!---------------------------------------------------------------
+	!!---------------------------------------------------------------
 
-!! Lariska story variables migrated to array
-if KotovZverHelp > 0:    LariskaQW['VitekHelp'] = KotovZverHelp & killvar 'KotovZverHelp'
-if IvanZverHelp > 0:     LariskaQW['IvanHelp'] = IvanZverHelp & killvar 'IvanZverHelp'
-if FyodorZverHelp > 0:   LariskaQW['FedorHelp'] = FyodorZverHelp & killvar 'FyodorZverHelp'
-if lariskaHelp > 0:      LariskaQW['LariskaHelp'] = lariskaHelp & killvar 'lariskaHelp'
-if lariskaHelp_end > 0:  LariskaQw['LariskaHelpEnd'] = lariskaHelp_end & killvar 'lariskaHelp_end'
-!!---------------------------------------------------------------
+	!! Lariska story variables migrated to array
+	if KotovZverHelp > 0:    LariskaQW['VitekHelp'] = KotovZverHelp & killvar 'KotovZverHelp'
+	if IvanZverHelp > 0:     LariskaQW['IvanHelp'] = IvanZverHelp & killvar 'IvanZverHelp'
+	if FyodorZverHelp > 0:   LariskaQW['FedorHelp'] = FyodorZverHelp & killvar 'FyodorZverHelp'
+	if lariskaHelp > 0:      LariskaQW['LariskaHelp'] = lariskaHelp & killvar 'lariskaHelp'
+	if lariskaHelp_end > 0:  LariskaQw['LariskaHelpEnd'] = lariskaHelp_end & killvar 'lariskaHelp_end'
+	!!---------------------------------------------------------------
 
-!! Lariska variables removed, no longer needed - 2020/11/30
-if beInLariskaHome = 1:
-	LariskaHomeIn = 2
-	killvar 'beInLariskaHome'
-end
-if doorlocked > 0: killvar 'doorlocked'
-if doorpeek > 0: killvar 'doorpeek'
-if lariskaBDSM > 0: killvar 'lariskaBDSM'
-!!---------------------------------------------------------------
-
-
-!! Shave updater
-if shave_update ! 1:
-	if pubestyle = 1:
-		shave_length = 2
-		shave_trigger = 4
-	elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
-		shave_length = 16
-		shave_trigger = 21
-	elseif pubestyle = 10:
-		shave_length = 26
-		shave_trigger = 31
-	elseif pubestyle = 11:
-		shave_length = 2
-		shave_trigger = 10
+	!! Lariska variables removed, no longer needed - 2020/11/30
+	if beInLariskaHome = 1:
+		LariskaHomeIn = 2
+		killvar 'beInLariskaHome'
+	end
+	if doorlocked > 0: killvar 'doorlocked'
+	if doorpeek > 0: killvar 'doorpeek'
+	if lariskaBDSM > 0: killvar 'lariskaBDSM'
+	!!---------------------------------------------------------------
+
+
+	!! Shave updater
+	if shave_update ! 1:
+		if pubestyle = 1:
+			shave_length = 2
+			shave_trigger = 4
+		elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
+			shave_length = 16
+			shave_trigger = 21
+		elseif pubestyle = 10:
+			shave_length = 26
+			shave_trigger = 31
+		elseif pubestyle = 11:
+			shave_length = 2
+			shave_trigger = 10
+		end
+		shave_update = 1
+	end
+
+	!! 0.8.2 clothing package for old saves ---------------------------------------
+
+	if ARRSIZE('cheapH') > 0 or ARRSIZE('averageH') > 0 or ARRSIZE('expensiveH') > 0 or ARRSIZE('formalH') > 0 or ARRSIZE('officeH') > 0 or ARRSIZE('schoolH') > 0 or ARRSIZE('exerciseH') > 0 or ARRSIZE('uniformH') > 0 or ARRSIZE('exhibitH') > 0 or ARRSIZE('alternativeH') > 0 or ARRSIZE('fetishH') > 0 or ARRSIZE('burlesqueH') > 0:
+
+
+		$batch_sell = {
+			poshvalldrop += 1
+			dynamic 'RESULT = <<$ARGS[0]>>H[<<ARGS[1]>>]'
+			if RESULT > 100:
+				dynamic '<<$ARGS[0]>>[<<ARGS[1]>>] = 0'
+				dynamic '<<$ARGS[0]>>S[<<ARGS[1]>>] = 0'
+				money += 750
+				selltot += 750
+			elseif RESULT > 45:
+				dynamic '<<$ARGS[0]>>[<<ARGS[1]>>] = 0'
+				dynamic '<<$ARGS[0]>>S[<<ARGS[1]>>] = 0'
+				money += 500
+				selltot += 500
+			elseif RESULT > 30:
+				dynamic '<<$ARGS[0]>>[<<ARGS[1]>>] = 0'
+				dynamic '<<$ARGS[0]>>S[<<ARGS[1]>>] = 0'
+				money += 300
+				selltot += 300
+			elseif RESULT > 0:
+				dynamic '<<$ARGS[0]>>[<<ARGS[1]>>] = 0'
+				dynamic '<<$ARGS[0]>>S[<<ARGS[1]>>] = 0'
+				money += 100
+				selltot += 100
+			else
+				dynamic '<<$ARGS[0]>>[<<ARGS[1]>>] = 0'
+				dynamic '<<$ARGS[0]>>S[<<ARGS[1]>>] = 0'
+			end
+			dynamic '<<$ARGS[0]>>H[<<ARGS[1]>>] = 0'
+		}
+
+
+		poshvalldrop = 0
+		selltot = 0
+
+		i = 1
+			:cheapmet
+			if cheap[i] = 1 and cheapH[i] > 0:dynamic($batch_sell, 'cheap', i)
+			i += 1
+			if i <= 419:jump 'cheapmet'
+
+			i = 1
+			:averagemet
+				if average[i] = 1 and averageH[i] > 0:dynamic($batch_sell, 'average', i)
+				i += 1
+			if i <= 541:jump 'averagemet'
+
+			i = 1
+			:expensivemet
+				if expensive[i] = 1 and expensiveH[i] > 0:dynamic($batch_sell, 'expensive', i)
+				i += 1
+			if i <= 442:jump 'expensivemet'
+
+			i = 1
+			:formalmet
+				if formal[i] = 1 and formalH[i] > 0:dynamic($batch_sell, 'formal', i)
+				i += 1
+			if i <= 185:jump 'formalmet'
+
+			i = 1
+			:officemet
+				if office[i] = 1 and officeH[i] > 0:dynamic($batch_sell, 'office', i)
+				i += 1
+			if i <= 140:jump 'officemet'
+
+			i = 1
+			:schoolmet
+				if school[i] = 1 and schoolH[i] > 0:dynamic($batch_sell, 'school', i)
+				i += 1
+			if i <= 80:jump 'schoolmet'
+
+			i = 1
+			:exercisemet
+				if exercise[i] = 1 and exerciseH[i] > 0:dynamic($batch_sell, 'exercise', i)
+				i += 1
+			if i <= 260:jump 'exercisemet'
+
+			i = 1
+			:fetishmet
+				if fetish[i] = 1 and fetishH[i] > 0:dynamic($batch_sell, 'fetish', i)
+				i += 1
+			if i <= 240:jump 'fetishmet'
+
+			i = 1
+			:burlesquemet
+				if burlesque[i] = 1 and burlesqueH[i] > 0:dynamic($batch_sell, 'burlesque', i)
+				i += 1
+			if i <= 22:jump 'burlesquemet'
+
+			i = 1
+			:exhibitmet
+				if exhibit[i] = 1 and exhibitH[i] > 0:dynamic($batch_sell, 'exhibit', i)
+				i += 1
+			if i <= 125:jump 'exhibitmet'
+
+			i = 1
+			:uniformmet
+				if uniform[i] = 1 and uniformH[i] > 0:dynamic($batch_sell, 'uniform', i)
+				i += 1
+			if i <= 60:jump 'uniformmet'
+
+			i = 1
+			:swimwearmet
+				if swimwear[i] = 1 and swimwearH[i] > 0:dynamic($batch_sell, 'swimwear', i)
+				i += 1
+			if i <= 213:jump 'swimwearmet'
+
+			i = 1
+			:beachmet
+				if beach[i] = 1 and beachH[i] > 0:dynamic($batch_sell, 'beach', i)
+				i += 1
+			if i <= 103:jump 'beachmet'
+
+			i = 1
+			:alternativemet
+				if alternative[i] = 1 and alternativeH[i] > 0:dynamic($batch_sell, 'alternativer', i)
+				i += 1
+			if i <= 129:jump 'alternativemet'
+
+		killvar 'batch_sell'
+
+		killvar 'alternativeH' & killvar 'alternativeS' & killvar 'alternative'
+		killvar 'averageH' & killvar 'averageS' & killvar 'average'
+		killvar 'burlesqueH' & killvar 'burlesqueS' & killvar 'burlesque'
+		killvar 'cheapH' & killvar 'cheapS' & killvar 'cheap'
+		killvar 'exerciseH' & killvar 'exerciseS'
+		killvar 'exhibitH' & killvar 'exhibitS'
+		killvar 'expensiveH' & killvar 'expensiveS' & killvar 'expensive'
+		killvar 'fetishH' & killvar 'fetishS'
+		killvar 'formalH' & killvar 'formalS' & killvar 'formal'
+		killvar 'officeH' & killvar 'officeS' & killvar 'office'
+		killvar 'schoolH' & killvar 'schoolS' & killvar 'school'
+		killvar 'uniformH' & killvar 'uniformS' & killvar 'uniform'
+		killvar 'beachS' & killvar 'beachH' & killvar 'beachB'
+		killvar 'swimwearS' & killvar 'swimwearH' & killvar 'swimwearB'
+		killvar 'coatS' & killvar 'coatH'
+
+		gm_outfits[50] = 1
+		gm_outfits_h[50] = 100
+		gm_outfits_b[50] = pcs_hips
+		gs 'clothing', 'wear', 'gm_outfits', 50
 	end
-	shave_update = 1
 end
 
 --- saveupdater ---------------------------------

+ 10 - 10
locations/sergeihunter.qsrc

@@ -53,7 +53,7 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 			'You have a mutual crush on each other.'
 		else
 			if huntersSergeiLove = 1:'You two love each other.' else 'You have an unrequited love for him.'
-		end if
+		end
 		gs 'stat'
 
 		act 'Chat (0:30)':
@@ -121,7 +121,7 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 
 										act'Continue':gt $loc, $loc_arg
 									end
-								end if
+								end
 							end
 							act 'Move away':
 								*clr & cla
@@ -134,7 +134,7 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 								act'Leave':gt $loc, $loc_arg
 							end
 						end
-					end if
+					end
 					act'Leave':gt $loc, $loc_arg
 				end
 			else
@@ -165,7 +165,7 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 
 						act 'Go':gt 'hunterLoveSex','Sergei'
 					end
-				end if
+				end
 				if rand(0,6) = 0:
 					act 'Break up with Sergei':
 						*clr & cla
@@ -178,11 +178,11 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 
 						act 'Leave':gt $loc, $loc_arg
 					end
-				end if
-			end if
-		end if
+				end
+			end
+		end
 		act'Depart':gt $loc, $loc_arg
-	end if
+	end
 else
 	if huntersSergeiQw < 10:
 		*clr & cla
@@ -210,8 +210,8 @@ else
 		gs 'stat'
 
 		act 'Leave':gt $loc, $loc_arg
-	end if
-end if
+	end
+end
 
 --- sergeihunter ---------------------------------
 

+ 2 - 2
locations/sexshop.qsrc

@@ -729,7 +729,7 @@ if $ARGS[0] = 'panties':
 	i = 1
 
 	:loopsexshop_panties
-		if sexshop_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''panties2''"><img src="images/pc/panties/sexshop/<<i>>.jpg"	height="150" /></a> '
+		if sexshop_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''panties2''"><img src="images/pc/panties/sexshop/<<i>>.jpg"	height="250" /></a> '
 		i += 1
 	if i <= 43:jump 'loopsexshop_panties'
 end
@@ -759,7 +759,7 @@ if $ARGS[0] = 'bras':
 	i = 1
 
 	:loopsexshop_bras
-		if sexshop_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''bras2''"><img src="images/pc/bras/sexshop/<<i>>.jpg"	height="150" /></a> '
+		if sexshop_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''bras2''"><img src="images/pc/bras/sexshop/<<i>>.jpg"	height="250" /></a> '
 		i += 1
 	if i <= 27:jump 'loopsexshop_bras'
 end

+ 3 - 3
locations/shop.qsrc

@@ -389,8 +389,8 @@ if $shoplocation = 'clothing':
 						cla
 						money -= 1000
 						swimwear[4] = 1
-						swimwearH[4] = 60
-						swimwearB[4] = pcs_hips
+						swimwear_h[4] = 60
+						swimwear_b[4] = pcs_hips
 						gt 'shop', '<font color="green">You bought <b>swimwear 4</b>.</font>'
 					end
 				end
@@ -413,7 +413,7 @@ if $shoplocation = 'clothing':
 						cla
 						money -= 1400
 						coat[1] = 1
-						coatH[1] = 60
+						coat_h[1] = 60
 						gt 'shop', '<font color="green">You bought <b>coat 1</b>.</font>'
 					end
 				end

+ 2 - 2
locations/shop_fashionista.qsrc

@@ -315,7 +315,7 @@ if $ARGS[0] = 'panties':
 	i = 1
 
 	:loopfashionista_panties
-		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''panties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
+		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''panties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 79:jump 'loopfashionista_panties'
 end
@@ -348,7 +348,7 @@ if $ARGS[0] = 'bras':
 	i = 1
 
 	:loopfashionista_bras
-		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''bras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="150" /></a> '
+		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''bras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 42:jump 'loopfashionista_bras'
 end

+ 2 - 2
locations/shop_pussycats.qsrc

@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'panties':
 	i = 1
 
 	:loopkats_panties
-		if kats_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''panties2''"><img src="images/pc/panties/kats/<<i>>.jpg" 	height="150" /></a> '
+		if kats_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''panties2''"><img src="images/pc/panties/kats/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 72:jump 'loopkats_panties'
 end
@@ -1226,7 +1226,7 @@ if $ARGS[0] = 'purses':
 	i = 1
 
 	:loopcats_purses
-		if cats_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''purses2''"><img src="images/pc/items/cats/purses/<<i>>.jpg" 	height="150" /></a> '
+		if cats_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''purses2''"><img src="images/pc/items/cats/purses/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 20:jump 'loopcats_purses'
 end

+ 17 - 17
locations/sister.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'pav_commcenter':
 	if npc_rel['A33'] < 20:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'
 		'"What do you want? Fuck off!" Anya and her friends laugh and point at you until you leave them alone.'
-		act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+		act 'Move away': gt $loc, $loc_arg
 	! Showing up after party invite
 	elseif week = 5 and (daystart / 7) mod 2 = 0 and sisterQW['party'] = 1 and daystart - sisterQW['partyday'] < 5:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma2.jpg"></center>'
@@ -58,7 +58,7 @@ if $ARGS[0] = 'pav_commcenter':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'
 				'You meet Anya''s friends, who are all her former classmates. There''s the small and nimble Lusya, the ditzy Ira, a tall athletic guy whom everyone calls "Rex" and a lanky, red-haired guy named Roma. After the introductions, you sit down with them, drinking beer and chatting with Anya and her friends.'
 			end
-			act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+			act 'Move away': gt $loc, $loc_arg
 		end
 		gs 'willpower', 'drink', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
@@ -76,18 +76,18 @@ if $ARGS[0] = 'partyanswer':
 			if mesec > 0:
 				'"Sorry Anya, I''m not in the mood today. You go without me."'
 				'"What, are you on the rag today? You should have told me! Alright, go home and get some rest."'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			elseif pcs_mood < 25:
 				'"Sorry Anya, I''m not in the mood today. You go without me."'
 				'"You do look a little pale sis. Go home and get some rest."'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			elseif alko >= 3:
 				'"<<$pcs_nickname>>, how the hell did you get so drunk already? I was going to invite you to a party, but you look like you have already been to one. Go home and sleep it off!"'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			else
 				'Her smile fades and she seems confused for a moment before a look of disgust appears on her blushing face. "My God, why are you walking around with cum all over your face!? You''ll get yourself a reputation! Go home and wash that off, quickly!" She then shoos you away as her friends stare at you.'
 				'You feel a little ashamed that you have embarrassed yourself and your sister by walking around like this in public.'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			end
 		else
 			act 'Decline':
@@ -98,7 +98,7 @@ if $ARGS[0] = 'partyanswer':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_sister_1.jpg"></center>'
 				'"I''d love to, but I have a lot of homework to do. I''m sorry."'
 				'"Don''t worry. Maybe you can come next time?"'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			end
 			act 'Go to the party': if sisterQW['partycount'] > 0: gt 'sbReksHome', 'party' else gt 'sister_party', 'sisboyQW_party'
 		end
@@ -114,22 +114,22 @@ if $ARGS[0] = 'partyanswer':
 				'"I don''t know what came over me. I wasn''t myself. Please, forgive me if you can."'
 				'"Listen, everything''s OK, but let''s just be friends and forget being together. Okay?"'
 				'"Okay..."'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			else
 				'"Shit <<$pcs_nickname>>, is that cum?" He leans in to get a better look then recoils in disgust.'
 				'Your hand goes up to the dried cum on your face that you forgot to wipe off. "I don''t know what came over me, I wasn''t myself. Please, forgive me if you can."'
 				'"Whatever slut. Just get away from me." He moves away from you and you see everyone giving you either a disgusted or angry look.'
 				'"Okay..." Not knowing what else to say, you walk away disheartened.'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			end
 		elseif mesec > 0 or pcs_mood < 50:
 			'"Sorry sweetie, but I''m not feeling too good today. You go without me."'
 			'"Babe, I don''t want to leave you alone, but I need to go with the guys. Take care and do not be sad."'
 			'Rex gives you a gentle kiss on the cheek and leaves.'
-			act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+			act 'Move away': gt $loc, $loc_arg
 		elseif alko >= 3:
 			'"<<$pcs_nickname>>, are you drunk? I wanted to invite you to the party, but you look like you just left one. Go home and sleep it off."'
-			act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+			act 'Move away': gt $loc, $loc_arg
 		else
 			'"Babe, let''s go to my place. I''m throwing another one of my parties."'
 			act 'Decline':
@@ -139,7 +139,7 @@ if $ARGS[0] = 'partyanswer':
 				gs 'stat'
 				'"Sorry Rex, but I have a lot of homework. I''d love to come, but I don''t want to fail my exams."'
 				'"Well, go on then. But you''re definitely coming next time, okay?"'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			end
 			act 'Accept': gt 'sbReksHome', 'party'
 		end
@@ -430,7 +430,7 @@ if $ARGS[0] = 'scene1':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_3.jpg"></center>'
 				'You turn down the invitation.'
 				'"Sorry Roma, I would love to, but I can''t get behind at school. I have homework to do and books to read, you know what it''s like."'
-				act 'Finish':SiSgdk = 0 & gt 'sister', 'pav_commcenter'
+				act 'Finish': gt 'sister', 'pav_commcenter'
 			end
 			if razradbeg > 0:
 				act 'No (training)':
@@ -439,7 +439,7 @@ if $ARGS[0] = 'scene1':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_4.jpg"></center>'
 					'You turn down the invitation.'
 					'"I would love to, but I have a competition to prepare for. I have to train."'
-					act 'Finish':SiSgdk = 0 & gt 'sister', 'pav_commcenter'
+					act 'Finish': gt 'sister', 'pav_commcenter'
 				end
 			end
 			if volleysostav = 1 or volleysostav = 2:
@@ -449,7 +449,7 @@ if $ARGS[0] = 'scene1':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_5.jpg"></center>'
 					'You turn down the invitation.'
 					'"Sorry, but I can''t. The coach doesn''t allow me to stay out late and drinking is also prohibited."'
-					act 'Finish':SiSgdk = 0 & gt 'sister', 'pav_commcenter'
+					act 'Finish': gt 'sister', 'pav_commcenter'
 				end
 			end
 			act 'Yes':
@@ -459,7 +459,7 @@ if $ARGS[0] = 'scene1':
 				'You agree to go to the party.'
 				'"Awesome <<$pcs_nickname>>, it''ll be fun. We will meet here. Just don''t forget to be here before 18:00, otherwise we will leave without you."'
 				'Anya gives Roma a dirty look, but he just shrugs it off.'
-				act 'Finish':SiSgdk = 0 & gt 'sister', 'pav_commcenter'
+				act 'Finish': gt 'sister', 'pav_commcenter'
 			end
 		end
 	end
@@ -471,7 +471,7 @@ if $ARGS[0] = 'scene2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'
 	'The bottles of beer are quickly drained and everyone seems a little tipsy at this point. Soon everyone gets up and staggers inside. As they go, they all shout goodbye at you, so you wave to them and head on your way.'
-	act 'Leave':SiSonWork = 0 & SiSgdk = 0 & gt 'pav_commcenter'
+	act 'Leave': gt 'pav_commcenter'
 end
 
 --- sister ---------------------------------

+ 131 - 1
locations/sister_chat.qsrc

@@ -761,7 +761,7 @@ if $ARGS[0] = 'sister_chat':
 					act 'Keep talking': gt 'sister_chat', 'sister_chat'
 				end
 			
-				if sisterLesb => 7 and $loc = 'bedrPar':
+				if sisterLesb >= 7 and $loc = 'bedrPar':
 					act 'Tell her you want to have sex':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
@@ -1066,6 +1066,69 @@ if $ARGS[0] = 'sister_chat':
 						end
 					end
 				end
+				!! talk about the twin sex request
+				if npc_rel['A33'] >= 80 and sisterknowslut > 0 and TwinQW >= 1 and TwinQW <= 5:
+					!! Note: the original code had "and sisterdialog < 2" but that var seems depricated
+					if TwinQW < 5:
+						if tmp_TwinQW_AskedToday < daystart:
+							tmp_TwinQW_AskedToday = daystart
+							act 'Talk about the twin request':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
+								if TwinQW < 3:
+									if TwinQW = 1:
+										'"Sis, I have a confession to make.... I have been selling my body in the Pavlovsk hotel." You wince inwardly as the admission leaves your mouth, worried what your sister will think.'
+										'Your sister''s face turns to shock and she shakes her head. "<<$pcs_nickname>>, really? Why would you do something like that? If people find out you''ll be ruined! I know I sleep around, but there''s a big difference between being a slut and being a whore."'
+										'You roll your eyes at her. "Please. That''s just <<$npc_nickname[''A29'']>> talking. If you''re going to sleep around, you might as well get paid for it while you''re still hot! Besides, nobody will find out, there is a guy there who takes care of everything. And look at all the money I have been making!"'
+										'You open your wallet and show your sister all the cash you have on you, <<money>> <b>₽</b>.'
+									else
+										'You bring up your prostitution job again to your sister and show off your wallet.'
+									end
+									if money < 5000:
+										'Your sister furrows her brow, looking at your meager amount of money. "Wait, how many times have you prostituted yourself so far?"'
+										'You think for a second before responding. "I don''t know. About <<pavproscount>> times?"'
+										'You sister gives you a concerned look. "<<pavproscount>> times and this is all you have to show for it?"'
+										'Your sister approaches you and gives you a hug, squeezing you tightly. "I really hope you can stop what you are doing, it is not worth it <<$pcs_nickname>>! Not for this pittance! Can''t you see that this asshole is taking advantage of you?"'
+										'<br>'
+										'You lower your head in shame and walk away from your sibling. You didn''t even get the chance to bring up the twin request. It looks like you''ll have to convince your sister that the work you do is worth the risks.'
+										TwinQW = 2
+									else
+										'"Ok, I must admit, that looks like a lot. Do you know how many hours I''d have to work in the supermarket to earn this kind of money? Still, it seems very risky to me." Your sister says.' 
+										'She''s still trying to sound responsible, but you can practically see her salivating at the sight of cold, hard, cash.'
+										'"How would you like to earn some of this and spend some time with your favorite sister at the same time?" You ask, raising your eyebrows playfully while waving the money back and forth.'
+										'"What do you mean, <<$pcs_nickname>>?" Anya asks, finally dropping any act of disapproval.'
+										'You explain the twins request to your sister.'
+										if sisboyparty = 0:
+											'"Sorry, <<$pcs_nickname>>. You know I love you, but my boyfriend would never allow this. And I could never do something like this behind his back. Anyway, thanks for confiding in me. Please stay safe and tell me if you get in over your head. Can''t have my little sis in danger." Anya gives you a little smile and a warm hug.'
+											'You''re happy that Anya has a boyfriend she loves, but right now you would give anything to be rid of him.'
+											TwinQW = 3
+										else
+											'"Ha! That actually sounds like a lot of fun." Your sister seems to consider everything for a moment before continuing. "Ok, I''ll do it! When do we leave?"'
+											'"Well, first I have to make myself look more like you so we''ll pass as twins. I''ll come and get you when I am ready."'
+											TwinQW = 5
+										end
+									end
+								elseif TwinQW = 3:
+									if sisboyparty = 0:
+										'You bring up the twins request again but Anya still refuses, claiming Roma would be heartbroken if he found out.'
+									else
+										'You bring up the twins request again. Since her relationship with Roma is a little different now, she seems a lot more receptive.'
+										'"Ha, that actually sounds like a lot of fun. Ok, I''ll do it! When do we leave?"'
+										'"Well, first I have to make myself look more like you so we''ll pass as twins. I''ll come and get you when I am ready."'
+										TwinQW = 5
+									end
+								end
+								act 'Finish': gt 'sister_chat', 'sister_chat'
+								if TwinQW = 5: killvar 'tmp_TwinQW_AskedToday' & delact 'Talk about the twin request'
+							end
+						end
+					end
+					if TwinQW = 5:
+						act 'Compare yourself with your sister':
+							gt 'sister_chat', 'twincompare'
+						end
+					end
+				end
 			end
 		end
 	else
@@ -1075,6 +1138,73 @@ if $ARGS[0] = 'sister_chat':
 	end
 end
 
+if $ARGS[0] = 'twincompare':
+	!!! <summary>compare yourself with your sister</summary>
+	!!! <continues>
+	!!! gt 'HotelHole','Twins' if you are similar enough and Pavlin is at the hotel
+	!!! otherwise: gt 'sister_chat', 'sister_chat'
+	!!! </continues>
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
+	'Your sister has straight blonde hair. Her hair reaches her shoulders with several strands going just beyond.'
+	'She has good looks. Men and women check her out when they think she isn''t looking.'
+	'<br>'
+	'<<$hair>>'
+	'<<$pcs_apprnc>>'
+	'<<$pcs_makeup>>'
+	'<br>'
+	tmp_twinsiscompare = 0
+	if pcs_hairlng > 160 and pcs_hairlng <= 260:
+		'<font color=#008000>Your hair is the correct length</font>'
+		tmp_twinsiscompare +=1
+	elseif pcs_hairlng <= 160:
+		'<font color=#FF0000>Your hair is to short.</font>'
+	else
+		'<font color=#FF0000>Your hair is to long.</font>'
+	end
+	if pcs_hairbsh = 0:
+		'<font color=#FF0000>You need to brush your hair.</font>'
+	else
+		tmp_twinsiscompare +=1
+	end
+	if pcs_haircol = 3:
+		'<font color=#008000>Your hair is the correct color.</font>'
+		tmp_twinsiscompare +=1
+	else
+		'<font color=#FF0000>Your hair is not the correct color.</font>'
+	end
+	if curly = 0:
+		'<font color=#008000>Your hair is straight, which is a match for your sister''s.</font>'
+		tmp_twinsiscompare +=1
+	else
+		'<font color=#FF0000>Your hair is too curly</font>'
+	end
+	if pcs_apprnc >= 60 and pcs_apprnc <= 120:
+		'<font color=#008000>Your looks matches your sister''s.</font>'
+		tmp_twinsiscompare +=1
+	else
+		'<font color=#FF0000>Your looks are too different from your sister''s. You are at <<pcs_apprnc>>. You need a score between 60 and 120 </font>'
+	end
+	if pcs_makeup = 4:
+		'<font color=#008000>Your make up hides the last differences between you and your sister.</font>'
+		tmp_twinsiscompare +=1
+	else
+		'<font color=#FF0000>You need some more make up to make you look more like your sister.</font>'
+	end
+	act 'Finish': gt 'sister_chat', 'sister_chat'
+	if tmp_twinsiscompare >= 6:
+		act 'Go to the hotel and have some twin fun':
+			if hour >= 12 and hour < 20:
+				gt 'HotelHole','Twins'
+			else
+				delact 'Go to the hotel and have some twin fun'
+				'Pavlin is usually in the hotel lobby between 12:00 and 20:00, No reason to go now.'
+			end
+		end
+	end
+	killvar 'tmp_twinsiscompare'
+end
+
 if $ARGS[0] = 'pargone':
 	*clr & cla
 	gs 'stat'

+ 2 - 2
locations/sister_party.qsrc

@@ -438,10 +438,10 @@ if $ARGS[0] = 'anya_kit':
 					if hour < 22:
 						minut += ((21 - hour) * 60) + (60 - minut)
 						gs 'arousal', 'end'
-						act 'Leave': SiSonWork = 0 & SiSgdk = 0 & gt 'bedrPar'
+						act 'Leave': gt 'bedrPar'
 					else
 						gs 'arousal', 'end'
-						act 'Leave': SiSonWork = 0 & SiSgdk = 0 & minut += 15 & gt 'bedrPar'
+						act 'Leave': minut += 15 & gt 'bedrPar'
 					end
 				end
 			end

+ 1 - 1
locations/soniadisco.qsrc

@@ -1466,7 +1466,7 @@ if $ARGS[0] = 'followsonia':
 			'She gives you a look of disbelief. "NO, I''m not ok. You saw what happened, everyone is going to think I''m a slut now, hell I am a slut." She says between sobs.'
 			'You nod a bit. "I know, but I tried to help you and I wish I could have done more." You tell her.'
 			'She nods a bit. "I know, god I was so stupid." She says before she start sobbing harder.'
-		elseif soniaencourage > 0 and npc_rel['A25'] => 50:
+		elseif soniaencourage > 0 and npc_rel['A25'] >= 50:
 			npc_rel['A25'] -= 10
 			'As you walk up she turns and sees you. "I thought you were my friend, why would you do that to me?"'
 		elseif soniaencourage > 0:

+ 2 - 2
locations/sportShop.qsrc

@@ -209,7 +209,7 @@ if $ARGS[0] = 'panties':
 	i = 1
 
 	:loopsport_panties
-		if sport_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''panties2''"><img src="images/pc/panties/sport/<<i>>.jpg" 	height="150" /></a> '
+		if sport_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''panties2''"><img src="images/pc/panties/sport/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 8:jump 'loopsport_panties'
 end
@@ -241,7 +241,7 @@ if $ARGS[0] = 'bras':
 	i = 1
 
 	:loopsport_bras
-		if sport_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''bras2''"><img src="images/pc/bras/sport/<<i>>.jpg" 	height="150" /></a> '
+		if sport_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''bras2''"><img src="images/pc/bras/sport/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 8:jump 'loopsport_bras'
 end

+ 1 - 1
locations/start.qsrc

@@ -16,7 +16,7 @@ $counter = 'counter'
 $usercom = 'inputProcessing'
 $fname = 'Tahoma'
 fsize = 12
-$version = '0.8.2 "The I broke all your lovely clothes and I''m not even sorry about it version."'
+$version = '0.8.2.2 bug fix 2 for "The I broke all your lovely clothes and I''m not even sorry about it version."'
 
 opPRE = 1
 

+ 7 - 7
locations/swamp_woods.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'start':
 		end
 	else
 		'You think about picking up some firewood before you remember you have plenty back at the yard.'
-	end if
+	end
 
 	act 'Try to circle around the swamp':
 		!no one likes to be trapped. Need to update gadfrestswamp with pcs_bushcraft method, but there should always be an option to try, no matter how low the skill.
@@ -90,7 +90,7 @@ if $ARGS[0] = 'start':
 					'You can see some broken branches and prints nearby ahead of you, marking the direction you initially started walking towards.'
 
 					act 'That''s interesting...': bushcraft_exp += 2 & gt 'swamp_woods', 'start'
-				end if
+				end
 			end
 		else
 			minut += 90
@@ -147,8 +147,8 @@ if $ARGS[0] = 'shooting_practice':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/andrei_shooting.jpg"></center>'
 					'You try to get Andrei''s attention, but he kind of ignores you. When you keep on trying, he waves his hand in a gesture for you to go away.'
 					act 'Further': gt 'swamp_woods', 'start'
-				end if
-			end if
+				end
+			end
 		end
 
 		act 'Walk away': gt 'swamp_woods', 'start'
@@ -234,11 +234,11 @@ if $ARGS[0] = 'shooting_practice':
 
 					act 'Further': gt 'swamp_woods', 'shooting_practice', 'practice'
 				end
-			end if
-		end if
+			end
+		end
 
 		act 'Walk away': gt 'swamp_woods', 'start'
 	end
 end
 
---- swamp_woods ---------------------------------
+--- swamp_woods ---------------------------------

+ 1 - 1
locations/tatiana_missions.qsrc

@@ -585,7 +585,7 @@ if $ARGS[0] = 'mission2C':
 			act '"I am..."':gt'tatiana_missions','mission2D'
 		end
 	end
-end	if
+end
 
 if $ARGS[0] = 'mission2D':
 	menu_off = 1

+ 1 - 8
locations/torgcentr.qsrc

@@ -50,7 +50,7 @@ if hour >= 8 and hour <= 20:
 	*p '<a href="exec: minut += 3 & gt ''shopdacha''"><img src="images/locations/city/citycenter/mall/constructiont.png"></a>'
 !! Ilyich and Biryukov Construction - Builders / Land developers
 		*p '   '
-	*p '<a href="exec: minut += 3 & gt ''city_musicstore'', ''musicshop''"><img src="images/locations/city/citycenter/mall/musicstore.png"></a>'
+	*p '<a href="exec: ml_boughtamp = 0 & ml_boughtguitar = 0 & minut += 3 & gt ''city_musicstore'', ''musicshop''"><img src="images/locations/city/citycenter/mall/musicstore.png"></a>'
 !! O''Skull music store
 		*p '   '
 	*p '<a href="exec: minut += 3 & gt ''scandalicious'',''start''"><img src="images/locations/city/citycenter/mall/scandalicious.png"></a>'
@@ -62,13 +62,6 @@ if hour >= 8 and hour <= 20:
 	act 'Go bowling': gt 'bouling'
 	act 'Play pool': gt 'billiard'
 	act 'Go to the cinema': gt 'kino'
-	
-	act 'Go to the O''Skull Music Store': 
-		ml_boughtamp = 0
-		ml_boughtguitar = 0
-		minut += 3
-		gt 'city_musicstore', 'musicshop'
-	end
 else
 	'The shopping center is closed and security are guiding everyone out so they can lock up.'
 	

+ 27 - 2
locations/tour_guide.qsrc

@@ -18,7 +18,16 @@ if $ARGS[0] = 'tourstart':
 		*nl
 		'You answer a few questions the management team asks you and are offered a summer position at 100 <b>₽</b> an hour, 6 hours a day. Fresh uniforms are provided daily and training will be you shadowing another guide for the first couple of days to make sure you know the details required to lead your groups.'
 		'Like any teenager your only questions are about breaks and days off. The manager smiles, not surprised, and tells you that working is voluntary. If you do not show up then obviously you will not make any money that day, but otherwise no daily commitment is required from you. Breaks will be allowed if there are no groups to lead at that time and you will be given a small lunch everyday that you choose to work.'
-		act 'Accept the position':TourGuide = 1 & work = 1 & gt 'pav_park', 'start'
+		act 'Accept the position':
+			if cheatWork = 1:
+				TourGuide = 1
+				gt 'pav_park', 'start'
+			else
+				TourGuide = 1
+				work = 1
+				gt 'pav_park', 'start'
+			end
+		end
 		act 'Change your mind': gt 'pav_park', 'start'
 	elseif TourGuide = 1:
 		*clr & cla
@@ -279,8 +288,23 @@ if $ARGS[0] = 'toursdone':
 		'Walking into the tour office, you find your boss waiting for you. "Follow me, <<$pcs_firstname>>," he says with an unpleasant look on his face, and heads to a room way in the back.'
 		act 'Follow him': gt 'tour_guide', 'backroom'
 	else
-		act 'Done for the day': gt 'pav_park', 'start'
+		act 'Done for the day':gt 'pav_park', 'start'
+		act 'Resign from your job':gt 'tour_guide', 'resign'
+	end
+end
+
+if $ARGS[0] = 'resign':
+	$location_type = 'indoors'
+	menu_off = 1
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/palace/office/angry_boss.jpg"></center>'
+	'You let your boss know you have decided to quit your job for the rest of the summer. He is not pleased about you quitting, but manages to keep his temper and lets you know if you want to come back next summer he will at least consider it.'
+	act 'Resign':
+		TourGuide = 3
+		work = 0
+		gt 'pav_park', 'start'
 	end
+	act 'Change your mind':gt 'pav_park', 'start'
 end
 
 if $ARGS[0] = 'backroom':
@@ -313,6 +337,7 @@ if $ARGS[0] = 'backroom':
 	act 'Take your punishment': gt 'tour_guide', 'spank'
 	act 'Quit your job':
 		TourGuide = 2
+		work = 0
 		killvar 'riverbusted'
 		pcs_mood -= 25
 		gs 'stat'

+ 8 - 1
locations/version.qsrc

@@ -2,8 +2,15 @@
 
 act 'Return': gt 'start'
 
-'0.8.2'
+'0.8.2.2'
+'- Text edits by Spackled Lanturn'
+'- Bug fixes by Kevin Smarts, slonon, Alaratt, rachels and dalu98'
+
+'0.8.2.1'
+'- Text edits by Spackled Lanturn'
+'- Bug fixes by Kevin Smarts, dalu98, Alaratt and slonon'
 
+'0.8.2'
 '- Complete overhaul of clothing, new shops, new images, splitting of dresses from regular outfits and code standardization by Gwen and Kevin Smarts'
 '- New handbags added to the shops changing existing bags'
 '<b> This WILL break existing clothing and bags from save files</b>'

+ 1 - 1
locations/yesgorslut.qsrc

@@ -71,7 +71,7 @@ if pav_slut >= 250:
 			if numnpc = 9:
 				!!Vitek
 				'You try to talk with <<$npc_nickname[''A<<numnpc>>'']>>, but he immediately cuts you off: "I don''t talk to sluts, <<$pcs_nickname>>. Fuck off."'
-			else:
+			else
 				'<<$npc_firstname[''A<<numnpc>>'']>> laughs at you when you try to talk to him: "Haha, what''s wrong <<$gnikname>>? Looking for more cocks to suck?"'
 			end
 		else

+ 10 - 85
locations/ykuh.qsrc

@@ -53,51 +53,6 @@ act 'Leave the room':minut += 1 & gt 'ymans'
 
 if edahot > 0:'<a href="exec:dynamic $edahotd">There''s a warm meal on the table.</a>'
 
-if pranik > 0:
-	'You have <<pranik>> tea biscuits.'
-	act 'Drink tea with biscuits (0:05)':
-		cla
-		*clr
-		minut += 5
-		pranik -= 1
-		pcs_health += 30
-		pcs_mood += 20
-		pcs_energy += 20
-		pcs_hydra += 60
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		fat += 4
-		frost = 0
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
-		'You drank tea with tea biscuits, it''s sweet and very bad for your figure, but they''re so good you can''t resist.'
-
-		act 'Get up from the table':gt $curloc
-	end
-end
-
-dynamic $edaD
-
-dynamic $fatdel
-
-act 'Drink':
-	cla
-	minut += 5
-
-	if pcs_hydra >= 100:
-		'You are not thirsty.'
-	elseif pcs_hydra < 80:
-		pcs_hydra += 30
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
-		'You gladly drink a glass of water.'
-	end
-
-	act 'Get up from the table':gt $curloc
-end
-
 if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 	act 'Cook a meal for your husband, 2 servings (1:00)':
 		cla
@@ -114,48 +69,18 @@ if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 	end
 end
 
-if lekarstvo > 0:
-	if lekarstvo > 1:'You have <<lekarstvo>> pills left.' else 'You have one pill left.'
-	if sick > 0 and lekarday ! daystart:
-		act 'Take a pill':
-			cla
-			*clr
-			minut += 5
-			lekarday = daystart
-			lekarstvo -= 1
-			sick -= sick * 20 / 100
-			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/lekr1.jpg"></center>'
-			'You took a pill.'
-
-			act 'Move away':gt $curloc
-		end
-	end
-end
-
-if vitamin > 0:
-	if vitamin > 1:'You have <<vitamin>> vitamin pills left.' else 'You have one vitamin pill left.'
-
-	if vitaminday ! daystart:
-		act 'Take a vitamin pill':
-			cla
-			*clr
-			minut += 5
-			vitaminday = daystart
-			vitamin -= 1
-			frost = 0
-
-			if KandidozOnce = 1:Kandidoz -= 2
-			if GerpesOnce = 1:Gerpes -= 2
-			if SifacOnce = 1 and Sifilis >= 10:Sifilis -= rand(0, 1)
+act 'Have a snack (0:15)':gs 'food', 'snack'
 
-			pcs_skin += 1
-
-			'You took a vitamin pill.'
+dynamic $sandwich
+dynamic $driwater
+dynamic $dritea
+dynamic $fill_bottle
+dynamic $edaD
+dynamic $pranik
+dynamic $fatdel
+dynamic $lekarstvo
+dynamic $vitamin
 
-			act 'Move away':gt $curloc
-		end
-	end
-end
 
 --- ykuh ---------------------------------
 

+ 1 - 1
locations/zsoft_gopskverGorSlut.qsrc

@@ -882,7 +882,7 @@ if $ARGS[0] = 'cumpussy':
 	'<center><video autoplay loop src="images/locations/pavlovsk/park/gop/sex/oral/cum/gif/cump'+rand(1,2)+'.mp4"></video></center>'
 	if $ARGS[1] = 'wanted':
 		'After several minutes of hard fucking, his thrusts grow shorter and more intense. He then slams his cock inside you all the way to the balls, and you feel his warm load being shot inside you.'
-	else:
+	else
 		'Despite your request, he does not pull out and comes inside your quivering snatch. When he pulls out, his load slowly drips out of you while he gives you an indifferent shrug.'
 		'You sigh in frustration. Nevertheless... there''s not a whole lot you can do about it now, and getting angry over it will probably just cause trouble with the guys.'
 	end

BIN
tools/qsp-analyser/QSP_Analyser.exe


+ 3 - 3
tools/qsp-analyser/QSP_Analyser/Common.cs

@@ -739,14 +739,14 @@ namespace Analyser
             {
                 for (int j = 0; j < qspOpsNamesCounts[i]; j++)
                 {
-                    if ((name.Equals(qspOpsNames[i, j].Name)) && 
+                    if ((name.Equals(qspOpsNames[i, j].Name)) &&
                         (!functionsOnly || (qspOpsNames[i, j].Code >= (int)QspFunctionType.First_Function)))
                         return qspOpsNames[i, j].Code;
                 }
             }
             return (int)QspFunctionType.Unknown;
         }
-        
+
         static public QspVariable GetVar(string name)
         {
             foreach (QspVariable var in vars)
@@ -1436,7 +1436,7 @@ namespace Analyser
                                     }
                                 }
 
-                                if ((csv_line == null) || (csvLineCompleted && 
+                                if ((csv_line == null) || (csvLineCompleted &&
                                     ((csvLocName != locName) || (quoted_line_counter != csvLineIndex) || (csvOriginalLine != quotedText))))
                                 {
                                     SubmitError("CSV-file does not match the original! Generate it again.", INVALID_INDEX);

+ 2 - 2
tools/qsp-analyser/QSP_Analyser/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3")]
+[assembly: AssemblyVersion("1.3.3.2")]
+[assembly: AssemblyFileVersion("1.3.3.2")]

+ 5 - 1
tools/qsp-analyser/QSP_Analyser/QSPGameCode.cs

@@ -587,6 +587,11 @@ namespace Analyser
                                 return false;
                             }
                         }
+                        else if ((c == ':') && (block == "else"))
+                        {
+                            SubmitError("ELSE with :", lineNum);
+                            return false;
+                        }
                         else if ((c == ':') && (controlBlock == (int)ControlBlockType.ActCondition))
                         {
                             //Разбор аргумента
@@ -1896,7 +1901,6 @@ namespace Analyser
                         {
                             pos++;
                         }
-
                     }
                     else if ((block.Length == 0) && (c2 == '"'))
                     {

+ 1 - 1
tools/qsp-analyser/QSP_Analyser/QSP_Analyser.csproj

@@ -35,7 +35,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
     <ApplicationVersion>1.3.3.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>

+ 0 - 0
tools/txt2gam.exe