Parcourir la source

Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

Arcadia il y a 3 ans
Parent
commit
90d077927d
48 fichiers modifiés avec 1958 ajouts et 904 suppressions
  1. 21 13
      glife.qproj
  2. 1 1
      locations/JuliaMilHome.qsrc
  3. 1 1
      locations/VolleyTrenCentr.qsrc
  4. 1 1
      locations/Voltrener.qsrc
  5. 108 0
      locations/_attributes_bomba_coats.qsrc
  6. 114 81
      locations/_attributes_bomba_shoes.qsrc
  7. 108 0
      locations/_attributes_cats_coats.qsrc
  8. 108 0
      locations/_attributes_danilovich_coats.qsrc
  9. 66 24
      locations/_attributes_danilovich_shoes.qsrc
  10. 108 0
      locations/_attributes_dolls_coats.qsrc
  11. 79 96
      locations/_attributes_dolls_shoes.qsrc
  12. 107 0
      locations/_attributes_gm_coats.qsrc
  13. 57 144
      locations/_attributes_gm_shoes.qsrc
  14. 107 0
      locations/_attributes_moncheri_coats.qsrc
  15. 86 71
      locations/_attributes_moncheri_shoes.qsrc
  16. 6 4
      locations/_shoe_description.qsrc
  17. 7 7
      locations/_shoe_image.qsrc
  18. 31 31
      locations/artemhome.qsrc
  19. 1 1
      locations/bedrPar.qsrc
  20. 10 19
      locations/budgetclothes.qsrc
  21. 0 1
      locations/clothing_attributes.qsrc
  22. 284 42
      locations/femcyc.qsrc
  23. 6 4
      locations/gdksport.qsrc
  24. 2 2
      locations/gschool_break.qsrc
  25. 1 1
      locations/gschool_girls_bathroom.qsrc
  26. 155 0
      locations/journal_quests.qsrc
  27. 21 1
      locations/lact_bp.qsrc
  28. 5 11
      locations/moncheri.qsrc
  29. 2 2
      locations/pav_complex.qsrc
  30. 1 1
      locations/pav_park.qsrc
  31. 4 12
      locations/pav_pharmacy.qsrc
  32. 1 1
      locations/preSYS2.qsrc
  33. 41 41
      locations/rex_events.qsrc
  34. 47 47
      locations/rex_party_boys_events.qsrc
  35. 24 24
      locations/rex_party_events.qsrc
  36. 51 51
      locations/rex_party_girls_events.qsrc
  37. 38 39
      locations/rex_party_home.qsrc
  38. 39 39
      locations/rex_party_sister_events.qsrc
  39. 1 1
      locations/sexshop.qsrc
  40. 11 9
      locations/shoe_attributes.qsrc
  41. 10 0
      locations/shoe_description2.qsrc
  42. 36 15
      locations/shoes.qsrc
  43. 3 9
      locations/shop_dolls.qsrc
  44. 0 28
      locations/shop_pussycats.qsrc
  45. 25 0
      locations/shop_tsar_bomba.qsrc
  46. 7 7
      locations/sister.qsrc
  47. 9 15
      locations/spellList.qsrc
  48. 7 7
      locations/sportShop.qsrc

+ 21 - 13
glife.qproj

@@ -92,7 +92,6 @@
 		<Location name="clothing"/>
 		<Location name="clothing_QV"/>
 		<Location name="changingroom"/>
-		<Location name="cloakroom"/>
 		<Location name="$clothing_name"/>
 		<Location name="$clothing_image"/>
 		<Location name="clothing_attributes"/>
@@ -133,12 +132,21 @@
 		<Location name="$shoe_description"/>
 		<Location name="shoe_attributes"/>
 		<Location name="shoe_description2"/>
-		<Location name="$attrib_shoe_boutique"/>
-		<Location name="$attrib_shoe_pussy"/>
-		<Location name="$attrib_shoe_dolls"/>
+		<Location name="$attributes_bomba_shoes"/>
+		<Location name="$attributes_danilovich_shoes"/>
+		<Location name="$attributes_gm_shoes"/>
+		<Location name="$attributes_dolls_shoes"/>
+		<Location name="$attributes_moncheri_shoes"/>
 		<Location name="$attrib_shoe_fetish"/>
-		<Location name="$attrib_shoe_gandm"/>
-		<Location name="$attrib_shoe_trainers"/>
+	</Folder>
+	<Folder name="coats">
+		<Location name="cloakroom"/>
+		<Location name="$attributes_bomba_coats"/>
+		<Location name="$attributes_cats_coats"/>
+		<Location name="$attributes_danilovich_coats"/>
+		<Location name="$attributes_dolls_coats"/>
+		<Location name="$attributes_gm_coats"/>
+		<Location name="$attributes_moncheri_coats"/>
 	</Folder>
 	<Folder name="underwear">
 		<Location name="underwear"/>
@@ -428,13 +436,13 @@
 		<Location name="brother_lessons"/>
 		<Location name="seeporn"/>
 	</Folder>
-	<Folder name="Reks">
-		<Location name="reks"/>
-		<Location name="sbReksHome"/>
-		<Location name="dinParty"/>
-		<Location name="party_boys"/>
-		<Location name="party_girls"/>
-		<Location name="sister_party"/>
+	<Folder name="Rex">
+		<Location name="rex_events"/>
+		<Location name="rex_party_home"/>
+		<Location name="rex_party_events"/>
+		<Location name="rex_party_boys_events"/>
+		<Location name="rex_party_girls_events"/>
+		<Location name="rex_party_sister_events"/>
 	</Folder>
 	<Folder name="Dima Nosov">
 		<Location name="dimaEv"/>

+ 1 - 1
locations/JuliaMilHome.qsrc

@@ -78,7 +78,7 @@ elseif lernHome = 0:
 
 				act 'Relax in Julia''s room':gt $curloc
 
-				if pcs_horny >= 50:
+				if JulMilBestFrend >= 5:
 					act 'Talk about sex':
 						cls
 						minut += 5

+ 1 - 1
locations/VolleyTrenCentr.qsrc

@@ -75,7 +75,7 @@ elseif ShowerIvan = 5 and centr = 2:
 								cla & *clr
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak17.jpg"></center>'
 								'"He almost ended up in jail, but the officials decided to avoid a scandal and just kicked Mikhail off of the team," Guang concluded his story.'
-								'"Now I understand why coach shies away from me whenever we start to get close," you think to yourself.'
+								+$OpenInnerThought+'"Now I understand why coach shies away from me whenever we start to get close,"'+$CloseInnerThought+'you think to yourself.'
 								act 'Move away':gt 'fit', 'start'
 							end
 						end

+ 1 - 1
locations/Voltrener.qsrc

@@ -421,7 +421,7 @@ if $ARGS[0] = 'trener_speak':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak20.jpg"></center>'
 			'"<<$pcs_lastname>>, I will not be drawn into talking about the championship. And no, coaches don''t get paid a lot. I spend my Sunday mornings training rich women in the fitness center. One lesson there pays more than a month working as a coach in our town."'
-			+$OpenInnerThought+'"Didn''t get anything out of him there, <<$pcs_lastname>>. Although, the classes in the fitness center should be worth investigating."'+$CloseInnerThought
+			+$OpenInnerThought+'"Didn''t get anything out of him there, <<$pcs_lastname>>. Although, the classes in the fitness center should be worth investigating."'+$CloseInnerThought 
 			npc_rel['A69'] += 3
 			'Seeing Mikhail a little upset by your questions, you decide to cheer him up.'
 			!! the flag on the emergence of Turner in the centre

+ 108 - 0
locations/_attributes_bomba_coats.qsrc

@@ -0,0 +1,108 @@
+# $attributes_bomba_coats
+!2020/12/28
+!Price ranges from 4 to 7, please avoid adding too many 7s
+
+if ARGS[1] = 1:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style coat with flared, pointed sleeves and decorative D-rings.'
+	
+elseif ARGS[1] = 2:
+	CloQuality = 6
+    CloWarm = 3
+	$coat_description = 'Great: A gothic style coat made from suede in the color black.'
+	
+elseif ARGS[1] = 3:
+	CloQuality = 5
+    CloWarm = 3
+	$coat_description = 'Great: A gothic style coat with faux fur and hood. It has decorative metal rivets.'
+	
+elseif ARGS[1] = 4:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A belted gothic style coat with faux fur and faux leather.'
+	
+elseif ARGS[1] = 5:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style Parka jacket with oversized hood and front zipper.'
+	
+elseif ARGS[1] = 6:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style duffle coat with oversized hood and front zipper with bat toggles.'
+	
+elseif ARGS[1] = 7:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A high waist gothic style trench coat with puff shoulders and a turn down collar'
+	
+elseif ARGS[1] = 8:
+	CloQuality = 6
+    CloWarm = 3
+	$coat_description = 'Great: A gothic style hooded Parka coat with faux fur and belt.'
+	
+elseif ARGS[1] = 9:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style, hooded coat with faux fur.'
+	
+elseif ARGS[1] = 10:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style long coat.'
+	
+elseif ARGS[1] = 11:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style short coat.'
+	
+elseif ARGS[1] = 12:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A gothic style cape.'
+	
+elseif ARGS[1] = 13:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A gothic style hooded jersey with bondage straps.'
+	
+elseif ARGS[1] = 14:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A crop top jacket with faux fur and an oversized hood.'
+	
+elseif ARGS[1] = 15:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A gothic style medium length cape.'
+	
+elseif ARGS[1] = 16:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style long coat.'
+	
+elseif ARGS[1] = 17:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: An alternative style tailcoat in black and purple.'
+	
+elseif ARGS[1] = 18:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A gothic style jacket in relaxed fit.'
+	
+elseif ARGS[1] = 19:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A dark velvet lace fringed shawl.'
+	
+elseif ARGS[1] = 20:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A punk style long coat in the color black.'
+	
+end
+
+--- $attributes_bomba_coats ---------------------------------
+

+ 114 - 81
locations/_attrib_shoe_pussy.qsrc → locations/_attributes_bomba_shoes.qsrc

@@ -1,164 +1,197 @@
-# $attrib_shoe_pussy
+# $attributes_bomba_shoes
+!2020/12/14
+!price range from 3 to 5 but please avoid adding too many 5s
 
 if ARGS[1] = 1:
-	ShoQuality = 4
-	ShoHeels = 3
+	ShoQuality = 3
+	ShoHeels = 2
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 2:
-	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 2
+	ShoQuality = 3
+	ShoHeels = 2
+	ShoCut = 1
 elseif ARGS[1] = 3:
 	ShoQuality = 3
-	ShoHeels = 4
+	ShoHeels = 2
 	ShoCut = 1
-	ShoStyle = 1
 elseif ARGS[1] = 4:
-	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 5:
 	ShoQuality = 3
-	ShoHeels = 4
-	ShoCut = 1
-	ShoStyle = 1
-elseif ARGS[1] = 6:
+	ShoHeels = 2
+	ShoCut = 2
+	ShoStyle = 3
+elseif ARGS[1] = 5:
 	ShoQuality = 4
-	ShoHeels = 1
-	ShoCut = 1
-	ShoStyle = 2
+	ShoHeels = 2
+	ShoCut = 3
+elseif ARGS[1] = 6:
+	ShoQuality = 3
+	ShoHeels = 2
+	ShoCut = 4
 elseif ARGS[1] = 7:
-	ShoQuality = 4
-	ShoHeels = 4
+	ShoQuality = 3
+	ShoHeels = 3
 	ShoCut = 1
 elseif ARGS[1] = 8:
-	ShoQuality = 4
-	ShoHeels = 4
+	ShoQuality = 3
+	ShoHeels = 3
 	ShoCut = 1
 elseif ARGS[1] = 9:
-	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 3
+	ShoHeels = 3
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 10:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 3
+	ShoHeels = 3
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 11:
 	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 2
+	ShoHeels = 3
+	ShoCut = 3
+	ShoStyle = 3
 elseif ARGS[1] = 12:
 	ShoQuality = 3
-	ShoHeels = 4
-	ShoCut = 5
-	ShoStyle = 1
+	ShoHeels = 3
+	ShoCut = 4
+	ShoStyle = 3
 elseif ARGS[1] = 13:
-	ShoQuality = 5
-	ShoHeels = 1
-	ShoCut = 2
+	ShoQuality = 4
+	ShoHeels = 3
+	ShoCut = 4
+	ShoStyle = 3
 elseif ARGS[1] = 14:
 	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 2
+	ShoHeels = 3
+	ShoCut = 4
+	ShoStyle = 3
 elseif ARGS[1] = 15:
-	ShoQuality = 3
-	ShoHeels = 1
+	ShoQuality = 4
+	ShoHeels = 4
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 16:
 	ShoQuality = 3
 	ShoHeels = 4
 	ShoCut = 1
 elseif ARGS[1] = 17:
-	ShoQuality = 5
-	ShoHeels = 1
+	ShoQuality = 4
+	ShoHeels = 4
 	ShoCut = 2
-	ShoStyle = 3
 elseif ARGS[1] = 18:
 	ShoQuality = 3
 	ShoHeels = 4
 	ShoCut = 1
 elseif ARGS[1] = 19:
-	ShoQuality = 4
-	ShoHeels = 1
-	ShoCut = 1
+	ShoQuality = 3
+	ShoHeels = 4
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 20:
 	ShoQuality = 4
 	ShoHeels = 4
 	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 21:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 4
 	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 22:
 	ShoQuality = 3
 	ShoHeels = 4
 	ShoCut = 2
 elseif ARGS[1] = 23:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 3
 	ShoStyle = 3
 elseif ARGS[1] = 24:
 	ShoQuality = 4
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 4
+	ShoStyle = 3
 elseif ARGS[1] = 25:
 	ShoQuality = 4
-	ShoHeels = 3
-	ShoCut = 2
+	ShoHeels = 4
+	ShoCut = 4
+	ShoStyle = 3
 elseif ARGS[1] = 26:
-	ShoQuality = 3
-	ShoHeels = 1
-	ShoCut = 1
-elseif ARGS[1] = 27:
 	ShoQuality = 4
 	ShoHeels = 4
-	ShoCut = 5
+	ShoCut = 4
+	ShoStyle = 3
+elseif ARGS[1] = 27:
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 28:
 	ShoQuality = 3
-	ShoHeels = 2
+	ShoHeels = 5
 	ShoCut = 1
 elseif ARGS[1] = 29:
-	ShoQuality = 3
-	ShoHeels = 4
+	ShoQuality = 4
+	ShoHeels = 5
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 30:
-	ShoQuality = 4
-	ShoHeels = 4
+	ShoQuality = 3
+	ShoHeels = 5
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 31:
 	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 5
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 32:
 	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 5
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 33:
 	ShoQuality = 3
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 5
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 34:
-	ShoQuality = 3
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 35:
 	ShoQuality = 4
-	ShoHeels = 3
+	ShoHeels = 5
 	ShoCut = 2
+	ShoStyle = 3
+elseif ARGS[1] = 35:
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 36:
 	ShoQuality = 4
-	ShoHeels = 2
-	ShoCut = 2
+	ShoHeels = 5
+	ShoCut = 3
+	ShoStyle = 3
 elseif ARGS[1] = 37:
-	ShoQuality = 3
-	ShoHeels = 3
-	ShoCut = 2
+	ShoQuality = 4
+	ShoHeels = 5
+	ShoCut = 4
+	ShoStyle = 3
 elseif ARGS[1] = 38:
 	ShoQuality = 4
-	ShoHeels = 4
+	ShoHeels = 5
+	ShoCut = 5
+	ShoStyle = 3
+elseif ARGS[1] = 39:
+	ShoQuality = 4
+	ShoHeels = 6
 	ShoCut = 2
+	ShoStyle = 3
+elseif ARGS[1] = 40:
+	ShoQuality = 5
+	ShoHeels = 6
+	ShoCut = 4
+	ShoStyle = 3
 end
 
---- $attrib_shoe_pussy ---------------------------------
+--- $attributes_bomba_shoes ---------------------------------
 

+ 108 - 0
locations/_attributes_cats_coats.qsrc

@@ -0,0 +1,108 @@
+# $attributes_cats_coats
+!2020/12/28
+!Price ranges from 2 to 4, please avoid adding too many 5s
+
+if ARGS[1] = 1:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A fleece sweater jacket with full-zip in evening blue.'
+	
+elseif ARGS[1] = 2:
+	CloQuality = 4
+    CloWarm = 3
+	$coat_description = 'Great: A mountain Parka jacket in light hickory.'
+	
+elseif ARGS[1] = 3:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A navy blue jacket that is wind-and water-resistant.'
+	
+elseif ARGS[1] = 4:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A fleece full zip jacket with silver blue triangular print.'
+	
+elseif ARGS[1] = 5:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A raincoat in khaki color.'
+	
+elseif ARGS[1] = 6:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: An ultralight Down jacket in royal plum.'
+	
+elseif ARGS[1] = 7:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A colorblock pullover in gunmetal gray and light rosewood.'
+	
+elseif ARGS[1] = 8:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A raw indigo light jacket that is water- and wind-resistant.'
+	
+elseif ARGS[1] = 9:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: A fleece pullover with hood with platinum geo multistripe.'
+	
+elseif ARGS[1] = 10:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A water- and wind-resistant jacket in gunmetal gray mountain geo.'
+	
+elseif ARGS[1] = 11:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: An ultralight Down jacket in ocean teal.'
+	
+elseif ARGS[1] = 12:
+	CloQuality = 4
+    CloWarm = 3
+	$coat_description = 'Great: A wool coat in the deep shade of Kelp green.'
+	
+elseif ARGS[1] = 13:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A duffel coat in the color of camel.'
+	
+elseif ARGS[1] = 14:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A puffer coat in the color of carbon navy.'
+	
+elseif ARGS[1] = 15:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A waterproof long coat in the color of deep navy.'
+	
+elseif ARGS[1] = 16:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A light gray peacoat made of wool.'
+	
+elseif ARGS[1] = 17:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A multicolor jacket with a Kangaroo pocket.'
+	
+elseif ARGS[1] = 18:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A water- and wind-resistant coat in cactus leaf print.'
+	
+elseif ARGS[1] = 19:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A sweater fleece coat in the color of dark cinder.'
+	
+elseif ARGS[1] = 20:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A red currant pullover coat.'
+	
+end
+
+--- $attributes_cats_coats ---------------------------------
+

+ 108 - 0
locations/_attributes_danilovich_coats.qsrc

@@ -0,0 +1,108 @@
+# $attributes_danilovich_coats
+!2020/12/28
+!Price ranges from 3 to 6, please avoid adding too many 5s and 6s
+
+if ARGS[1] = 1:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A light sports coat that offers decent insulation.'
+	
+elseif ARGS[1] = 2:
+	CloQuality = 6
+    CloWarm = 3
+	$coat_description = 'Great: A light sports coat that offers great insulation.'
+	
+elseif ARGS[1] = 3:
+	CloQuality = 5
+    CloWarm = 3
+	$coat_description = 'Great: A sports coat that offers great insulation.'
+	
+elseif ARGS[1] = 4:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A stylish sports coat that is both water- and wind-resistant.'
+	
+elseif ARGS[1] = 5:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A sports coat designed for runners.'
+	
+elseif ARGS[1] = 6:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A winter sports coat.'
+	
+elseif ARGS[1] = 7:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A light sports coat that is both water- and wind-resistant.'
+	
+elseif ARGS[1] = 8:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A water- and wind-resistant sports coat in the color rose.'
+	
+elseif ARGS[1] = 9:
+	CloQuality = 5
+    CloWarm = 3
+	$coat_description = 'Great: A very decent quality sports coat in the color bone.'
+	
+elseif ARGS[1] = 10:
+	CloQuality = 5
+    CloWarm = 3
+	$coat_description = 'Great: A great quality winter sports coat in the color resin gold.'
+	
+elseif ARGS[1] = 11:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A light sports jacket designed for hiking in the color of ballet slipper.'
+	
+elseif ARGS[1] = 12:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A thin and trendy sports coat in stripe prints.'
+	
+elseif ARGS[1] = 13:
+	CloQuality = 6
+    CloWarm = 3
+	$coat_description = 'Great: A thick sports coat in the color black.'
+	
+elseif ARGS[1] = 14:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A thin and trendy sports coat in the color off-white.'
+	
+elseif ARGS[1] = 15:
+	CloQuality = 5
+    CloWarm = 3
+	$coat_description = 'Great: A inner wind proof winter sports jacket in rose color.'
+	
+elseif ARGS[1] = 16:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A sports jacket for running in the color celery.'
+	
+elseif ARGS[1] = 17:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A multicolor runner''s sports coat.'
+	
+elseif ARGS[1] = 18:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A waterproof running jacket in the color Maya.'
+	
+elseif ARGS[1] = 19:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A waterproof and windproof sports coat with multicolor dotted print.'
+	
+elseif ARGS[1] = 20:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A waterproof and windproof sports coat in the color black.'
+	
+end
+
+--- $attributes_danilovich_coats ---------------------------------
+

+ 66 - 24
locations/_attrib_shoe_trainers.qsrc → locations/_attributes_danilovich_shoes.qsrc

@@ -1,7 +1,9 @@
-# $attrib_shoe_trainers
+# $attributes_danilovich_shoes
+!2020/12/07
+!price range from 2 to 5 but please avoid adding too many 5s
 
 if ARGS[1] = 1:
-	ShoQuality = 3
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 2:
@@ -9,47 +11,47 @@ elseif ARGS[1] = 2:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 3:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 4:
-	ShoQuality = 4
+	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 5:
-	ShoQuality = 5
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 6:
-	ShoQuality = 5
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 7:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 8:
-	ShoQuality = 5
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 9:
-	ShoQuality = 3
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 10:
-	ShoQuality = 4
+	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 11:
-	ShoQuality = 5
+	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 12:
-	ShoQuality = 5
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 13:
-	ShoQuality = 5
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 14:
@@ -57,7 +59,7 @@ elseif ARGS[1] = 14:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 15:
-	ShoQuality = 3
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 16:
@@ -65,15 +67,15 @@ elseif ARGS[1] = 16:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 17:
-	ShoQuality = 5
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 18:
-	ShoQuality = 5
+	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 19:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 20:
@@ -81,7 +83,7 @@ elseif ARGS[1] = 20:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 21:
-	ShoQuality = 3
+	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 22:
@@ -89,7 +91,7 @@ elseif ARGS[1] = 22:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 23:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 24:
@@ -97,19 +99,19 @@ elseif ARGS[1] = 24:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 25:
-	ShoQuality = 5
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 26:
-	ShoQuality = 5
+	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 27:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 28:
-	ShoQuality = 3
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 29:
@@ -117,10 +119,50 @@ elseif ARGS[1] = 29:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 30:
+	ShoQuality = 4
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 31:
+	ShoQuality = 3
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 32:
+	ShoQuality = 2
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 33:
+	ShoQuality = 3
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 34:
+	ShoQuality = 2
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 35:
+	ShoQuality = 5
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 36:
+	ShoQuality = 3
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 37:
+	ShoQuality = 2
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 38:
+	ShoQuality = 2
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 39:
+	ShoQuality = 3
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 40:
 	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 end
 
---- $attrib_shoe_trainers ---------------------------------
+--- $attributes_danilovich_shoes ---------------------------------
 

+ 108 - 0
locations/_attributes_dolls_coats.qsrc

@@ -0,0 +1,108 @@
+# $attributes_dolls_coats
+!2020/12/28
+!Price ranges from 3 to 5, please avoid adding too many 5s
+
+if ARGS[1] = 1:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A hooded, plain and button tap coat with faux fur.'
+	
+elseif ARGS[1] = 2:
+	CloQuality = 4
+    CloWarm = 3
+	$coat_description = 'Great: A long winter coat with 2-way zip.'
+	
+elseif ARGS[1] = 3:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A 40s style long coat in the olive color.'
+	
+elseif ARGS[1] = 4:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A stylized army coat for women in deep red.'
+	
+elseif ARGS[1] = 5:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A black and white dotted coat with faux fur from Hell BUNNY.'
+	
+elseif ARGS[1] = 6:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: A khaki Parka jacket with faux fur collar and decorative stitching.'
+	
+elseif ARGS[1] = 7:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A red jacket with embroidery with button tap.'
+	
+elseif ARGS[1] = 8:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: A plain long coat in the color grey.'
+	
+elseif ARGS[1] = 9:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: A hooded winter coat in red wine color.'
+	
+elseif ARGS[1] = 10:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A hooded Parka coat with sand cameo and ribbed cuffs.'
+	
+elseif ARGS[1] = 11:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: A checkered wool coat with button tap.'
+	
+elseif ARGS[1] = 12:
+	CloQuality = 3
+    CloWarm = 3
+	$coat_description = 'Great: A thick coat with leopard pattern.'
+	
+elseif ARGS[1] = 13:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A short multicolor coat with button tap.'
+	
+elseif ARGS[1] = 14:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A plaid faux fur coat in the color green.'
+	
+elseif ARGS[1] = 15:
+	CloQuality = 4
+    CloWarm = 3
+	$coat_description = 'Great: A hooded short coat in dusty pink.'
+	
+elseif ARGS[1] = 16:
+	CloQuality = 3
+    CloWarm = 3
+	$coat_description = 'Great: A trendy black winter coat with hook buttons.'
+	
+elseif ARGS[1] = 17:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A denim jacket with sweat sleeves and hood.'
+	
+elseif ARGS[1] = 18:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A flo flocked floral wide collar flare coat.'
+	
+elseif ARGS[1] = 19:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A short coat with cherry pattern print in black.'
+	
+elseif ARGS[1] = 20:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A Marjorie floral belted trench coat.'
+	
+end
+
+--- $attributes_dolls_coats ---------------------------------
+

+ 79 - 96
locations/_attrib_shoe_dolls.qsrc → locations/_attributes_dolls_shoes.qsrc

@@ -1,145 +1,128 @@
-# $attrib_shoe_dolls
+# $attributes_dolls_shoes
+!2020/12/14
+!price range from 3 to 5 but please avoid adding too many 5s
 
 if ARGS[1] = 1:
-	ShoQuality = 4
-	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
+	ShoQuality = 3
+	ShoHeels = 2
+	ShoCut = 1
 elseif ARGS[1] = 2:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 2
 	ShoCut = 2
-	ShoStyle = 3
 elseif ARGS[1] = 3:
 	ShoQuality = 3
-	ShoHeels = 1
-	ShoCut = 3
-	ShoStyle = 3
+	ShoHeels = 3
+	ShoCut = 1
 elseif ARGS[1] = 4:
-	ShoQuality = 5
-	ShoHeels = 2
-	ShoCut = 2
-	ShoStyle = 3
-	ShoStyle = 2
-elseif ARGS[1] = 5:
 	ShoQuality = 3
-	ShoHeels = 1
+	ShoHeels = 3
 	ShoCut = 1
-	ShoStyle = 3
+elseif ARGS[1] = 5:
+	ShoQuality = 3
+	ShoHeels = 3
+	ShoCut = 2
 elseif ARGS[1] = 6:
-	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 1
-	ShoStyle = 3
-elseif ARGS[1] = 7:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 3
+	ShoCut = 2
+elseif ARGS[1] = 7:
+	ShoQuality = 3
+	ShoHeels = 4
 	ShoCut = 1
-	ShoStyle = 3
 elseif ARGS[1] = 8:
-	ShoQuality = 5
-	ShoHeels = 3
+	ShoQuality = 3
+	ShoHeels = 4
 	ShoCut = 1
-	ShoStyle = 3
-	ShoStyle = 2
 elseif ARGS[1] = 9:
-	ShoQuality = 3
-	ShoHeels = 2
+	ShoQuality = 4
+	ShoHeels = 4
 	ShoCut = 1
-	ShoStyle = 3
 elseif ARGS[1] = 10:
-	ShoQuality = 4
-	ShoHeels = 3
-	ShoCut = 2
-	ShoStyle = 3
-	ShoStyle = 2
+	ShoQuality = 3
+	ShoHeels = 4
+	ShoCut = 1
 elseif ARGS[1] = 11:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 4
-	ShoCut = 3
-	ShoStyle = 3
+	ShoCut = 1
 elseif ARGS[1] = 12:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 2
-	ShoStyle = 3
-elseif ARGS[1] = 13:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 4
 	ShoCut = 3
-	ShoStyle = 3
+elseif ARGS[1] = 13:
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 14:
 	ShoQuality = 4
-	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 15:
-	ShoQuality = 3
-	ShoHeels = 1
+	ShoQuality = 4
+	ShoHeels = 5
 	ShoCut = 1
-	ShoStyle = 3
 elseif ARGS[1] = 16:
 	ShoQuality = 3
-	ShoHeels = 1
+	ShoHeels = 5
 	ShoCut = 1
-	ShoStyle = 3
 elseif ARGS[1] = 17:
-	ShoQuality = 4
-	ShoHeels = 3
-	ShoCut = 2
-	ShoStyle = 3
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 18:
-	ShoQuality = 5
-	ShoHeels = 1
-	ShoCut = 3
-	ShoStyle = 3
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 19:
-	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 5
-	ShoStyle = 3
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 20:
-	ShoQuality = 4
-	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 21:
-	ShoQuality = 4
-	ShoHeels = 2
-	ShoCut = 3
-	ShoStyle = 3
-	ShoStyle = 2
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 22:
-	ShoQuality = 5
-	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 23:
 	ShoQuality = 4
-	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 24:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 2
-	ShoStyle = 3
+	ShoQuality = 4
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 25:
-	ShoQuality = 5
-	ShoHeels = 3
+	ShoQuality = 4
+	ShoHeels = 5
 	ShoCut = 2
-	ShoStyle = 3
 elseif ARGS[1] = 26:
 	ShoQuality = 5
-	ShoHeels = 4
+	ShoHeels = 5
 	ShoCut = 2
-	ShoStyle = 3
 elseif ARGS[1] = 27:
-	ShoQuality = 3
-	ShoHeels = 3
+	ShoQuality = 4
+	ShoHeels = 5
 	ShoCut = 2
-	ShoStyle = 3
+elseif ARGS[1] = 28:
+	ShoQuality = 4
+	ShoHeels = 5
+	ShoCut = 3
+elseif ARGS[1] = 29:
+	ShoQuality = 4
+	ShoHeels = 5
+	ShoCut = 5
+elseif ARGS[1] = 30:
+	ShoQuality = 4
+	ShoHeels = 6
+	ShoCut = 1
 end
 
---- $attrib_shoe_dolls ---------------------------------
+--- $attributes_dolls_shoes ---------------------------------
 

+ 107 - 0
locations/_attributes_gm_coats.qsrc

@@ -0,0 +1,107 @@
+# $attributes_gm_coats
+!Price ranges from 1 to 3
+
+if ARGS[1] = 1:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A gigh shine faux fur trim fitted puffer jacket.'
+	
+elseif ARGS[1] = 2:
+	CloQuality = 2
+    CloWarm = 1
+	$coat_description = 'Low: An oversized teddy faux fur bomber jacket.'
+	
+elseif ARGS[1] = 3:
+	CloQuality = 2
+    CloWarm = 1
+	$coat_description = 'Low: A faux fur trim parka jacket.'
+	
+elseif ARGS[1] = 4:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A plus blurred check longline shacket.'
+	
+elseif ARGS[1] = 5:
+	CloQuality = 1
+    CloWarm = 1
+	$coat_description = 'Low: A collarless blazer.'
+	
+elseif ARGS[1] = 6:
+	CloQuality = 2
+    CloWarm = 1
+	$coat_description = 'Low: A plus hounds tooth check frayed hem blazer.'
+	
+elseif ARGS[1] = 7:
+	CloQuality = 1
+    CloWarm = 1
+	$coat_description = 'Low: A tailored tie sleeve pocket blazer.'
+	
+elseif ARGS[1] = 8:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A stitch detail oversized wool look coat.'
+	
+elseif ARGS[1] = 9:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A belted wool look trench coat.'
+	
+elseif ARGS[1] = 10:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A tailored wool look coat.'
+	
+elseif ARGS[1] = 11:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: A wool look belted cuff detail trench coat.'
+	
+elseif ARGS[1] = 12:
+	CloQuality = 2
+    CloWarm = 1
+	$coat_description = 'Low: A La embroidered varsity jacket.'
+	
+elseif ARGS[1] = 13:
+	CloQuality = 2
+    CloWarm = 1
+	$coat_description = 'Low: A plus pu oversized boyfriend shacket.'
+	
+elseif ARGS[1] = 14:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A boyfriend belted utility blazer.'
+	
+elseif ARGS[1] = 15:
+	CloQuality = 2
+    CloWarm = 3
+	$coat_description = 'Great: A hooded faux fur coat.'
+	
+elseif ARGS[1] = 16:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A petite teddy faux fur oversized bomber jacket.'
+	
+elseif ARGS[1] = 17:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A funnel neck puffer jacket.'
+	
+elseif ARGS[1] = 18:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A faux fur hooded panelled Parka jacket.'
+	
+elseif ARGS[1] = 19:
+	CloQuality = 3
+    CloWarm = 3
+	$coat_description = 'Great: A tall faux fur coat.'
+	
+elseif ARGS[1] = 20:
+	CloQuality = 2
+    CloWarm = 1
+	$coat_description = 'Low: A plus lapel detail ruched sleeve blazer.'
+	
+end
+
+--- $attributes_gm_coats ---------------------------------
+

+ 57 - 144
locations/_attrib_shoe_gandm.qsrc → locations/_attributes_gm_shoes.qsrc

@@ -1,214 +1,127 @@
-# $attrib_shoe_gandm
-
+# $attributes_gm_shoes
+!2020/12/19
+!price range from 1 to 3 but please avoid adding too many 3s
 if ARGS[1] = 1:
 	ShoQuality = 2
-	ShoHeels = 4
+	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 2:
 	ShoQuality = 2
-	ShoHeels = 4
+	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 3:
 	ShoQuality = 2
-	ShoHeels = 3
-	ShoCut = 3
+	ShoHeels = 1
+	ShoCut = 1
 elseif ARGS[1] = 4:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 5
+	ShoQuality = 1
+	ShoHeels = 1
+	ShoCut = 1
 elseif ARGS[1] = 5:
-	ShoQuality = 3
-	ShoHeels = 4
+	ShoQuality = 1
+	ShoHeels = 1
 	ShoCut = 1
-	ShoStyle = 2
 elseif ARGS[1] = 6:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 7:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 4
+	ShoQuality = 1
+	ShoHeels = 1
+	ShoCut = 1
 elseif ARGS[1] = 8:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 3
+	ShoQuality = 1
+	ShoHeels = 1
+	ShoCut = 1
 elseif ARGS[1] = 9:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 10:
-	ShoQuality = 2
+	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 11:
-	ShoQuality = 2
-	ShoHeels = 4
+	ShoQuality = 1
+	ShoHeels = 1
 	ShoCut = 1
-	ShoStyle = 2
 elseif ARGS[1] = 12:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 13:
-	ShoQuality = 3
+	ShoQuality = 2
 	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
+	ShoCut = 1
 elseif ARGS[1] = 14:
-	ShoQuality = 3
+	ShoQuality = 2
 	ShoHeels = 1
-	ShoCut = 1
+	ShoCut = 2
 elseif ARGS[1] = 15:
 	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 1
+	ShoCut = 2
 elseif ARGS[1] = 16:
 	ShoQuality = 2
-	ShoHeels = 3
+	ShoHeels = 1
 	ShoCut = 2
 elseif ARGS[1] = 17:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 3
+	ShoHeels = 1
+	ShoCut = 3
 elseif ARGS[1] = 18:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 19:
 	ShoQuality = 3
-	ShoHeels = 4
-	ShoCut = 5
+	ShoHeels = 1
+	ShoCut = 3
+elseif ARGS[1] = 19:
+	ShoQuality = 2
+	ShoHeels = 2
+	ShoCut = 2
 elseif ARGS[1] = 20:
 	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 5
+	ShoHeels = 2
+	ShoCut = 2
 elseif ARGS[1] = 21:
-	ShoQuality = 3
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 2
+	ShoHeels = 2
+	ShoCut = 2
 elseif ARGS[1] = 22:
 	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 2
+	ShoCut = 2
 elseif ARGS[1] = 23:
 	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 2
+	ShoCut = 2
 elseif ARGS[1] = 24:
 	ShoQuality = 2
-	ShoHeels = 1
-	ShoCut = 1
+	ShoHeels = 2
+	ShoCut = 3
 elseif ARGS[1] = 25:
-	ShoQuality = 1
-	ShoHeels = 1
-	ShoCut = 1
-elseif ARGS[1] = 26:
 	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 27:
-	ShoQuality = 1
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 28:
-	ShoQuality = 1
-	ShoHeels = 4
+	ShoHeels = 2
 	ShoCut = 4
-elseif ARGS[1] = 29:
-	ShoQuality = 1
-	ShoHeels = 1
-	ShoCut = 1
-elseif ARGS[1] = 30:
-	ShoQuality = 3
-	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
-elseif ARGS[1] = 31:
-	ShoQuality = 1
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 32:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 33:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 34:
+elseif ARGS[1] = 26:
 	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 35:
-	ShoQuality = 1
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 36:
+	ShoHeels = 2
+	ShoCut = 4
+elseif ARGS[1] = 27:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 1
-elseif ARGS[1] = 37:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 38:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 39:
-	ShoQuality = 1
-	ShoHeels = 1
-	ShoCut = 1
-elseif ARGS[1] = 40:
+elseif ARGS[1] = 28:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 1
-elseif ARGS[1] = 41:
-	ShoQuality = 1
-	ShoHeels = 4
-	ShoCut = 2
-elseif ARGS[1] = 42:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 43:
-	ShoQuality = 1
-	ShoHeels = 1
-	ShoCut = 1
-elseif ARGS[1] = 44:
-	ShoQuality = 1
-	ShoHeels = 2
-	ShoCut = 2
-elseif ARGS[1] = 45:
-	ShoQuality = 1
-	ShoHeels = 1
-	ShoCut = 1
-elseif ARGS[1] = 46:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 2
-elseif ARGS[1] = 47:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 48:
+elseif ARGS[1] = 29:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 2
-elseif ARGS[1] = 49:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 50:
-	ShoQuality = 1
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 51:
+elseif ARGS[1] = 30:
 	ShoQuality = 2
 	ShoHeels = 4
 	ShoCut = 1
 end
 
---- $attrib_shoe_gandm ---------------------------------
+--- $attributes_gm_shoes ---------------------------------
 

+ 107 - 0
locations/_attributes_moncheri_coats.qsrc

@@ -0,0 +1,107 @@
+# $attributes_moncheri_coats
+!Price ranges from 5 to 7, please avoid adding too many 7s.
+
+if ARGS[1] = 1:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A waterproof cotton Gabardine trench coat from RED VALENTINO.'
+	
+elseif ARGS[1] = 2:
+	CloQuality = 7
+    CloWarm = 2
+	$coat_description = 'Moderate: A logo felted wool jacquard cape from GUCCI.'
+	
+elseif ARGS[1] = 3:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A messi belted virgin wool wrap coat from MAX MARA.'
+	
+elseif ARGS[1] = 4:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A check wool tweed coat from GUCCI.'
+	
+elseif ARGS[1] = 5:
+	CloQuality = 6
+    CloWarm = 3
+	$coat_description = 'Great: A techno waterproof coat with hood from MAX MARA.'
+	
+elseif ARGS[1] = 6:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A Pirello leather trench coat from REMAIN.'
+	
+elseif ARGS[1] = 7:
+	CloQuality = 7
+    CloWarm = 3
+	$coat_description = 'Great: A wool crepe double breast long coat from DOLCE & GABBANA.'
+	
+elseif ARGS[1] = 8:
+	CloQuality = 7
+    CloWarm = 3
+	$coat_description = 'Great: A Pirella leather trench coat from REMAIN.'
+	
+elseif ARGS[1] = 9:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A reversible faux leather and sequins coat from ANOUKI.'
+	
+elseif ARGS[1] = 10:
+	CloQuality = 7
+    CloWarm = 3
+	$coat_description = 'Great: A hooded alpaca and silk teddy coat from MAX MARA.'
+	
+elseif ARGS[1] = 11:
+	CloQuality = 7
+    CloWarm = 3
+	$coat_description = 'Great: A wool coat with leather harness from JUNYA WATANABE.'
+	
+elseif ARGS[1] = 12:
+	CloQuality = 7
+    CloWarm = 2
+	$coat_description = 'Moderate: A wool check cape with leather details from BURBERRY.'
+	
+elseif ARGS[1] = 13:
+	CloQuality = 7
+    CloWarm = 2
+	$coat_description = 'Moderate: A wrap velvet long dust coat with belt from ANN DEMEULEMEESTER.'
+	
+elseif ARGS[1] = 14:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A patent leather trench coat with belt from BOTTEGA VENETA.'
+	
+elseif ARGS[1] = 15:
+	CloQuality = 7
+    CloWarm = 2
+	$coat_description = 'Moderate: A chevron wool belted coat from SPORTMAX.'
+	
+elseif ARGS[1] = 16:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A pleated Gabardine Trench Coat from RED VALENTINO.'
+	
+elseif ARGS[1] = 17:
+	CloQuality = 7
+    CloWarm = 1
+	$coat_description = 'Low: A cotton blend long coat from GUCCI.'
+	
+elseif ARGS[1] = 18:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A waterproof cotton blend zip coat with hood from MAX MARA.'
+	
+elseif ARGS[1] = 19:
+	CloQuality = 7
+    CloWarm = 3
+	$coat_description = 'Great: A leather coat with fox fur from SAKS POTTS.'
+	
+elseif ARGS[1] = 20:
+	CloQuality = 7
+    CloWarm = 2
+	$coat_description = 'Moderate: A printed compact wool long coat from PACO RABANNE.'
+	
+end
+
+--- $attributes_moncheri_coats ---------------------------------
+

+ 86 - 71
locations/_attrib_shoe_boutique.qsrc → locations/_attributes_moncheri_shoes.qsrc

@@ -1,156 +1,171 @@
-# $attrib_shoe_boutique
+# $attributes_moncheri_shoes
+!2020/12/17
+!price range from 6 to 7 but please avoid adding too many 7s
 
 if ARGS[1] = 1:
-	ShoQuality = 5
-	ShoHeels = 3
-	ShoCut = 2
+	ShoQuality = 6
+	ShoHeels = 1
+	ShoCut = 1
+	ShoStyle = 2
 elseif ARGS[1] = 2:
-	ShoQuality = 5
-	ShoHeels = 4
+	ShoQuality = 6
+	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 3:
 	ShoQuality = 6
-	ShoHeels = 4
+	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 4:
-	ShoQuality = 7
-	ShoHeels = 3
-	ShoCut = 3
-	ShoStyle = 2
+	ShoQuality = 6
+	ShoHeels = 1
+	ShoCut = 1
 elseif ARGS[1] = 5:
 	ShoQuality = 6
-	ShoHeels = 4
+	ShoHeels = 2
 	ShoCut = 1
+	ShoStyle = 2
 elseif ARGS[1] = 6:
-	ShoQuality = 5
-	ShoHeels = 4
+	ShoQuality = 6
+	ShoHeels = 2
 	ShoCut = 1
 elseif ARGS[1] = 7:
 	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 2
+	ShoCut = 2
 elseif ARGS[1] = 8:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 6
+	ShoHeels = 2
+	ShoCut = 4
 elseif ARGS[1] = 9:
 	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 3
+	ShoHeels = 3
+	ShoCut = 1
 elseif ARGS[1] = 10:
-	ShoQuality = 4
-	ShoHeels = 4
+	ShoQuality = 6
+	ShoHeels = 3
 	ShoCut = 1
 elseif ARGS[1] = 11:
 	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 3
+	ShoHeels = 3
+	ShoCut = 1
 elseif ARGS[1] = 12:
-	ShoQuality = 5
-	ShoHeels = 4
+	ShoQuality = 6
+	ShoHeels = 3
 	ShoCut = 1
 elseif ARGS[1] = 13:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 2
+	ShoQuality = 6
+	ShoHeels = 3
+	ShoCut = 1
 elseif ARGS[1] = 14:
 	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 3
+	ShoHeels = 3
+	ShoCut = 2
 elseif ARGS[1] = 15:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 6
+	ShoHeels = 3
+	ShoCut = 2
 elseif ARGS[1] = 16:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 6
+	ShoHeels = 3
+	ShoCut = 2
 elseif ARGS[1] = 17:
 	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 1
-	ShoStyle = 1
+	ShoHeels = 3
+	ShoCut = 3
 elseif ARGS[1] = 18:
 	ShoQuality = 6
-	ShoHeels = 4
+	ShoHeels = 3
 	ShoCut = 4
 elseif ARGS[1] = 19:
 	ShoQuality = 6
 	ShoHeels = 4
 	ShoCut = 1
 elseif ARGS[1] = 20:
-	ShoQuality = 5
+	ShoQuality = 6
 	ShoHeels = 4
 	ShoCut = 1
 elseif ARGS[1] = 21:
 	ShoQuality = 6
-	ShoHeels = 3
-	ShoCut = 2
+	ShoHeels = 4
+	ShoCut = 1
 elseif ARGS[1] = 22:
-	ShoQuality = 5
+	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 2
+	ShoCut = 1
 elseif ARGS[1] = 23:
-	ShoQuality = 5
+	ShoQuality = 7
 	ShoHeels = 4
 	ShoCut = 1
 elseif ARGS[1] = 24:
-	ShoQuality = 5
+	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 2
+	ShoCut = 1
 elseif ARGS[1] = 25:
-	ShoQuality = 5
+	ShoQuality = 6
 	ShoHeels = 4
 	ShoCut = 1
 elseif ARGS[1] = 26:
-	ShoQuality = 6
+	ShoQuality = 7
 	ShoHeels = 4
 	ShoCut = 2
 elseif ARGS[1] = 27:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 2
 elseif ARGS[1] = 28:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 2
 elseif ARGS[1] = 29:
-	ShoQuality = 5
+	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 4
 elseif ARGS[1] = 30:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 4
 elseif ARGS[1] = 31:
-	ShoQuality = 5
+	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 3
+	ShoCut = 4
 elseif ARGS[1] = 32:
-	ShoQuality = 6
+	ShoQuality = 7
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 5
 elseif ARGS[1] = 33:
-	ShoQuality = 5
-	ShoHeels = 4
+	ShoQuality = 6
+	ShoHeels = 5
 	ShoCut = 1
 elseif ARGS[1] = 34:
-	ShoQuality = 5
-	ShoHeels = 4
+	ShoQuality = 7
+	ShoHeels = 5
 	ShoCut = 1
 elseif ARGS[1] = 35:
 	ShoQuality = 6
-	ShoHeels = 4
+	ShoHeels = 5
 	ShoCut = 1
 elseif ARGS[1] = 36:
 	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 4
+	ShoHeels = 5
+	ShoCut = 2
 elseif ARGS[1] = 37:
-	ShoQuality = 6
-	ShoHeels = 4
+	ShoQuality = 7
+	ShoHeels = 5
 	ShoCut = 2
+	ShoStyle = 2
+elseif ARGS[1] = 38:
+	ShoQuality = 6
+	ShoHeels = 5
+	ShoCut = 4
+elseif ARGS[1] = 39:
+	ShoQuality = 7
+	ShoHeels = 5
+	ShoCut = 5
+elseif ARGS[1] = 40:
+	ShoQuality = 7
+	ShoHeels = 6
+	ShoCut = 1
 end
 
---- $attrib_shoe_boutique ---------------------------------
+--- $attributes_moncheri_shoes ---------------------------------
 

+ 6 - 4
locations/_shoe_description.qsrc

@@ -1,16 +1,18 @@
 # $shoe_description
 
-if $ARGS[0] = 'boutique':
+if $ARGS[0] = 'moncheri':
 	$RESULT = 'Mon Chéri shoe number '
-elseif $ARGS[0] = 'pussy':
+elseif $ARGS[0] = 'cats':
 	$RESULT = 'Pussy-Cats shoe number '
+elseif $ARGS[0] = 'bomba':
+	$RESULT = 'Tsar Bomba shoe number '
 elseif $ARGS[0] = 'dolls':
 	$RESULT = 'Patchwork Dolls shoe number '
 elseif $ARGS[0] = 'fetish':
 	$RESULT = 'Fetish shoe number '
-elseif $ARGS[0] = 'gandm':
+elseif $ARGS[0] = 'gm':
 	$RESULT = 'G&M shoe number '
-elseif $ARGS[0] = 'trainers':
+elseif $ARGS[0] = 'danilovich':
 	$RESULT = 'Training shoe number '
 end
 

+ 7 - 7
locations/_shoe_image.qsrc

@@ -3,18 +3,18 @@
 !! ARGS 0 - clothing group name
 !! ARGS 1 - clothing index
 
-if $ARGS[0] = 'boutique':
-	$RESULT = 'images/pc/shoes/boutique/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'pussy':
-	$RESULT = 'images/pc/shoes/cats/<<ARGS[1]>>.jpg'
+if $ARGS[0] = 'moncheri':
+	$RESULT = 'images/pc/items/moncheri/shoes/<<ARGS[1]>>.jpg'
+elseif $ARGS[0] = 'bomba':
+	$RESULT = 'images/pc/items/bomba/shoes/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'dolls':
-	$RESULT = 'images/pc/shoes/dolls/<<ARGS[1]>>.jpg'
+	$RESULT = 'images/pc/items/dolls/shoes/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'fetish':
 	$RESULT = 'images/pc/shoes/fetish/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'gandm':
-	$RESULT = 'images/pc/shoes/g&m/<<ARGS[1]>>.jpg'
+	$RESULT = 'images/pc/items/gm/shoes/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'trainers':
-	$RESULT = 'images/pc/shoes/trainers/<<ARGS[1]>>.jpg'
+	$RESULT = 'images/pc/items/danilovich/shoes/<<ARGS[1]>>.jpg'
 end
 
 --- $shoe_image ---------------------------------

+ 31 - 31
locations/artemhome.qsrc

@@ -606,7 +606,7 @@ if $ARGS[0] = 'livingroom':
 	gs 'stat'
 	'<center><b><font color = maroon>Living room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/living.jpg"></center>'
-	'The living room is clean and neat. A couch rests against one wall, with a throw rug between it and the TV stand. On the throw rug is a nice coffee table. On the TV stand sits a nice but not too big flat screen tv, while in the bottom of the stand is a neatly stored playstation. Along one side of the tv is a stand with several dozen movies.'
+	'The living room is clean and neat. A couch rests against one wall, with a throw rug between it, and the TV stand. On the throw rug is a nice coffee table. On the TV stand sits a nice but not too big flat screen tv, while in the bottom of the stand is a neatly stored playstation. Along one side of the tv is a stand with several dozen movies.'
 	if hour < 6:
 		gt 'artemhome', 'timecheck'
 	elseif hour > 22:
@@ -621,15 +621,15 @@ if $ARGS[0] = 'livingroom':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 			if pav_slut >= 200 or grupTipe = 4:
 				'As the two of you walk into the living room he turns towards you, looking a bit appalled at you, "So <<$pcs_firstname>> how did you and my boy become friends?"'
-				'Stretching out your clothes so they cover you up a little, "I don'' really remember. We kinda just connected and started hanging out... It doesn''t hurt that Artem is really hot so that made it much easier." Artem blushes at the comment.'
-				'Masharin squirms a little by your answer, clears his throat and asks, "My boy is very ambitious and we''re very proud of him, we want him to succeed in school. I really hope that he will be able to continue to pursue that because you know, he''s not used to girls like you..."'
+				'Stretching out your clothes so they cover you up a little, "I don''t really remember. We kinda just connected and started hanging out... It doesn''t hurt that Artem is really hot, so that made it much easier." Artem blushes at the comment.'
+				'Masharin squirms a little by your answer, clears his throat and asks, "My boy is very ambitious and we''re very proud of him, we want him to succeed in school. I really hope that he will be able to continue to pursue that because, you know, he''s not used to girls like you..."'
 				act 'What do you mean?':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 					'You tilt your head and start playing with your hair, "Girls like me...?"'
-					'Masharin starts squirming even more, "You know... Experienced..."'
+					'Masharin starts squirming even more, "You know... experienced..."'
 					'Artem sighs really loud, "Dad, stop embarrassing me..."'
-					'You keep prodding some more, "I don''t really follow what you mean... Experienced, in what way?"'
+					'You keep prodding some more, "I don''t really follow what you mean... experienced, in what way?"'
 					'He''s now looking around avoiding eye-contact, "Ehm, you know sexually..."'
 					act 'Did you just assume something?':
 						*clr & cla
@@ -637,27 +637,27 @@ if $ARGS[0] = 'livingroom':
 						'You start shaking your head, "Did you just assume that I''m a slut just because of what clothes I''m wearing?"'
 						'"N-No, <<$pcs_firstname>>, I d-didn''t assume anything..." you can see Masharin sweat a little.'
 						'You stand in silence for a few seconds as you finally start laughing, "Don''t worry about Artem, I''ll make sure that he keeps his head straight..."'
-						'Masharin sighs, "Well, I think Artem and I will have a talk later..." as he looks sternly at Artem'
+						'Masharin sighs, "Well, I think Artem and I will have to have a talk later..." as he looks sternly at Artem'
 						'You smile, "You do that..." as you and Artem turn around, you show off a bit of your behind as you leave the room without Artem noticing at first, then he turns to hurry to catch up to you and walk you to his room.'
 						act 'Leave': ArtemLoc = 2 & gt 'artemhome','artemroom'
 					end
 				end
 			else 
-				'As the two of you walk into the living room Artem''s father turns around, it seems like you''ve startled him a bit, "Oh, I''m sorry... we didn''t mean to startle you..."'
+				'As the two of you walk into the living room Artem''s father turns around, it seems like you''ve startled him a bit. "Oh, I''m sorry... we didn''t mean to startle you..."'
 				'He waves your fears away, "Don''t worry about it, I''m just happy to see Artem spending time with a nice girl like yourself..."'
 				act 'Thank you':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 					'You nod and give a subtle smile, "You''re making me blush. You''re giving me way too much credit..."'
-					'Masharin shakes his head, "Not at all. Artem has been talking about you quite a lot and he''s really excited when he talks about you so I''m glad that he found someone nice to be friends with."'
+					'Masharin shakes his head, "Not at all. Artem has been talking about you quite a lot and he''s really excited when he talks about you, so I''m glad that he found someone nice to be friends with."'
 					'Artem cries out in embarrassment, "Dad, that was supposed to be a private thing between us two. You weren''t supposed to say that to <<$pcs_nickname>>..." he starts blushing.'
 					act 'Smile':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-						'Masharin looks worrying at Artem as you decide to ease the tension a bit, you playfully push Artem a little, "Ease up a little, your dad was just looking out for you is all."'
-						'"Still he shouldn''t have talked about it... I said all of that in confidence." Artem is still upset.'
-						'"Artem, I-I''m..." Masharin begins but is cut off by Artem, "Let''s go <<$pcs_nickname>>, that''s enough embarrassment for one day..."'
-						'"Don''t worry, Mr. Chebotarev. I''m sure it''s not a big thing, Artem will be over it soon enough..." you say a couple of encouraging words before leaving the living room and going to Artems room.'
+						'Masharin looks worrying at Artem, so you decide to ease the tension a bit by playfully pushing Artem a little. "Ease up a little, your dad was just looking out for you is all."'
+						'"Still, he shouldn''t have talked about it... I said all of that in confidence." Artem is still upset.'
+						'"Artem, I-I''m..." Masharin begins but is cut off by Artem, "Let''s go <<$pcs_nickname>>, that''s enough embarrassment for one day."'
+						'"Don''t worry, Mr. Chebotarev. I''m sure it''s not a big thing, Artem will be over it soon enough." you say encouragingly before going to Artems room.'
 						act 'Leave': ArtemLoc = 2 & gt 'artemhome','artemroom'
 					end
 				end
@@ -672,22 +672,22 @@ if $ARGS[0] = 'livingroom':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 					if pav_slut >= 200 or grupTipe = 4:
-						'"Didn''t think Artem would still be socializing with you after our talk..." Masharin reacts to seeing you once again...'
-						'"Yeah, well you know how it goes." you nonchalantly answer.'
+						'"Didn''t think Artem would still be socializing with you after our talk..." Masharin reacts to seeing you once again.'
+						'"Yeah, well, you know how it goes." you nonchalantly answer.'
 						'All of a sudden his posture changes and he slouches back in his chair, "<<$pcs_firstname>>, can''t you find some other boy to toy with, other than my son?"'
 						act 'Toy with?':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 							'You look confusingly at Masharin, "Toy with him?"'
-							'"Like I told you the last time my Artem is a smart and a bright boy and he''s doing great in school..." Masharin starts explaining, "And since this is his last year in school I would like him to be able to keep up his grades..."'
+							'"Like I told you the last time, my Artem is a smart and bright boy, and he''s doing great in school." Masharin starts explaining, "Since this is his last year in school I would like him to be able to keep up his grades."'
 							'"So what does this have to do with me?" you cross your arms, looking impatiently at him.'
-							'"We both know the kind of girl you are, you enjoy toying with boys for your own amusement..." he tries to reason, "Can you just leave him alone and I''ll owe you one."'
+							'"We both know the kind of girl you are, you enjoy toying with boys for your own amusement." he tries to reason, "Can you just leave him alone and I''ll owe you one?"'
 							act 'Talk is cheap':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-								'"Just because you think I''m acting like this, you think I could only be toying with him, just because of how I dress and act?!" you start raising your voice, "You don''t think Artem and I could just be friends?! Aren''t you really judgmental?! And to think Artem was telling me about his non-judgmental parents..."'
-								'"N-No not at all," Masharin starts trembling in his voice, "Y-You may behave however you want..."'
-								'"But I can''t be friends with your son, that''s what you''re saying?!" you continue confronting him...'
+								'"You think I am only be toying with him, just because of how I dress and act?!" you start raising your voice, "You don''t think Artem and I could just be friends?! Aren''t you really judgmental?! And to think Artem was telling me about his non-judgmental parents."'
+								'"N-No not at all," Masharin voice starts trembling, "Y-You may behave however you want..."'
+								'"But I can''t be friends with your son, that''s what you''re saying?!" you continue confronting him.'
 								'Masharin curls up slightly and then sighs and goes almost limp, in apparent defeat, at least for now. "I... just don''t hurt him please?"'
 								'With that your roll your eyes and leave.'
 								act 'Leave':gt 'artemhome','hallway'
@@ -701,15 +701,15 @@ if $ARGS[0] = 'livingroom':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 							'You nod your head, "It''s going good, Artem and I make a great team. If there''s something he doesn''t know, I try to help him out and the same goes when it comes to me."'
-							'"I''m glad to hear that it''s going well. Academics are important, you can get a good job and don''t have to rely on going to a work that you don''t like everyday." Masharin starts in like he is about to start preaching the values of education.'
-							'He continues, "When I was younger I used to spend my days focused on school and got teased for it, but if you look it at it now I have a great job and family, we go on vacations every year. I don''t have to worry about anything."'
+							'"I''m glad to hear that it''s going well. Academics are important, you can get a good job and don''t have to rely on going to a job you don''t like everyday." Masharin starts in like he is about to start preaching the values of education.'
+							'He continues, "When I was younger I used to spend my days focused on school and got teased for it, but if you look it at it now I have a great job and family, we even go on vacations every year. I don''t have to worry about anything."'
 							act 'Listen politely':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 								'You keep quiet and listen to him while he goes on a rant about life and how you should keep a straight head and avoid all the evil stuff that happen around this town.'
-								'All of a sudden he stops, "Oh, sorry. I must be boring you... Sometimes I get way ahead of myself, and then I have to remind myself that no one wants to listen to a boring tale about nothing..."'
-								'You shake your head and reply politely, "Not at all, it''s always good hearing a positive opinion about studying as it''s not always seen in a keen light around here..."'
-								'Masharin sighs, "Well, don''t pay too much attention to it and you''ll see it''ll be easier for you later in life..."'
+								'All of a sudden he stops, "Oh, sorry. I must be boring you... Sometimes I get way ahead of myself, and then I have to remind myself that no one wants to listen to a boring tale about nothing."'
+								'You shake your head and reply politely, "Not at all, it''s always good hearing a positive opinion about studying, as it''s not always seen in a keen light around here."'
+								'Masharin sighs, "Well, don''t pay too much attention to it, and you''ll see how much better life is as time goes by."'
 								act 'Leave':gt 'artemhome','hallway'
 							end
 						end
@@ -721,11 +721,11 @@ if $ARGS[0] = 'livingroom':
 							act 'What is it?':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-								'Yours eyes widen, "What was it?"'
+								'Your eyes widen, "What was it?"'
 								'Masharin tries to excuse himself, "It worked for me but it doesn''t mean it will work for anyone else. We all have our own quirks that helps us when it comes to that stuff, you have your breaks and I have mine."'
 								'"Well, I would love to hear what you did, it would be of great help." you tell him.'
-								'Masharin smiles, "Fine, fine, I''ll tell you then. I used to close my eyes and think that I''m in the middle of a forest, only hearing those unusual sounds that you can hear in a silent forest. This always cleared my mind and it helped me re-focus."'
-								'Hmm maybe but what does a forest have to do with math or science? "I might try this some time, thanks a lot for the advice but it''s probably best that I head back."'
+								'Masharin smiles, "Fine, fine, I''ll tell you then. I used to close my eyes and think that I''m in the middle of a forest, only hearing those unusual sounds that you can hear in a silent forest. This always cleared my mind and it helped me regain my focus."'
+								'Hmm maybe, but what does a forest have to do with math or science? "I might try this some time, thanks a lot for the advice, but it''s probably best that I head back."'
 								act 'Leave':gt 'artemhome','hallway'
 							end
 						end
@@ -759,21 +759,21 @@ if $ARGS[0] = 'livingroom':
 							minut += 10
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/glinina.jpg"></center>'
-							'"As a matter of fact you can." You continue further inside living room, taking a seat next to Glinina, "I just need to see the first part of that scandalous show they''re showing right now."'
+							'"As a matter of fact you can." You continue further inside living room, taking a seat next to Glinina. "I just need to see the first part of that scandalous show they''re showing right now."'
 							'You grab the controller off the coffee table and switch the channel, "Oh, here it is." The show goes on showing the contestants fight, having sex and other morally questionable actions.'
 							'"I can''t believe he picked that slut," you shout out, "She''s clearly just playing with him to win the whole thing." you tell Glinina.'
 							'"Shouldn''t you head back to Artem?" Masharin asks.'
-							'"Hmm?" and just as you''re about to answer the commercials come on and you let out a sigh, "I guess it''s time to head back. Thanks for letting me watch the first part." You quickly get up and leave them still stunned not really understanding what just happened.'
+							'"Hmm?" and just as you''re about to answer the commercials come on and you let out a sigh, "I guess it''s time to head back. Thanks for letting me watch the first part." You quickly get up and leave them still stunned, not really understanding what just happened.'
 							act 'Leave':gt 'artemhome','hallway'
 						end
 						act 'No':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 							'"No, just needed to get away for a while... You know school work is boring as hell and your son is super serious about that stuff, which is no fun." you reply.'
-							'Masharin looking away from the TV, "Well, school work is important. You''re about to head to the university and you need to be ready for what is waiting there..."'
+							'Masharin looking away from the TV, "Well, school work is important. You''re about to head to the university and you need to be ready for what is waiting there."'
 							'"I don''t know if I''ll end up there, I''m already tired of it and I don''t want to spend more time in school when I could be making money." you explain.'
 							'"Oh, and what would you be doing without a degree?" Masharin asks.'
-							'"Well you know, some odd jobs here and there. I''m sure I''ll get by fine. After all I''m still young and vigorous, so I''ll manage." you confidently reply, "Well, time to head back. Don''t want to keep Artem waiting..." you stretch showing off your curves a little before turning around leaving the Chebotarev''s looking in disbelief.'
+							'"Well you know, some odd jobs here and there. I''m sure I''ll get by fine. After all I''m still young and vigorous, so I''ll manage." you confidently reply, "Well, time to head back. Don''t want to keep Artem waiting..." you stretch showing off your curves a little before turning around leaving the Chebotarev''s looking at you in disbelief.'
 							act 'Leave':gt 'artemhome','hallway'
 						end
 					else 

+ 1 - 1
locations/bedrPar.qsrc

@@ -185,7 +185,7 @@ if $ARGS[0] = '':
 		if sisterHere = 0 or sisboytrio > 0:
 			if pornMagazine > 0:gs 'events', 'read_porn'
 			if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
-				act 'Send Rex a text message': gt 'reks','sms'
+				act 'Send Rex a text message': gt 'rex_events','sms'
 			end
 			if pcs_horny >= 50:
 				act 'Masturbate':gt 'selfplay', 'start'

+ 10 - 19
locations/budgetclothes.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = 'start':
 
 		act 'View exercise shoes':
 			minut += 5
-			gt 'budgetclothes', 'trainers'
+			gt 'budgetclothes', 'danilovich'
 		end
 	end
 
@@ -391,28 +391,19 @@ if $ARGS[0] = 'shoes':
 		gt 'budgetclothes', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 1
-	elseif Clothingstock > 7:
-		i = 2
-	else
-		i = 3
-	end
-
 	:loopgandm_shoes
 		if sgandm[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''budget_shoes''"><img src="images/pc/shoes/g&m/<<i>>.jpg" height="250" /></a>'
-		i += 3
-		if i = 6:i = 9
-	if i <= 51:jump 'loopgandm_shoes'
+		i += 1
+	if i <= 40:jump 'loopgandm_shoes'
 end
 
 if $ARGS[0] = 'budget_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'gandm',i, 700
 
-if $ARGS[0] = 'trainers':
-	$loc_arg = 'trainers'
+if $ARGS[0] = 'danilovich':
+	$loc_arg = 'danilovich'
 	$loc = 'budgetclothes'
 	$menu_loc = 'budgetclothes'
-	$menu_arg = 'trainers'
+	$menu_arg = 'danilovich'
 	menu_off = 0
 	*clr & cla
 	gs'stat'
@@ -429,14 +420,14 @@ if $ARGS[0] = 'trainers':
 		i = 2
 	end
 
-	:looptrainers_shoes
-		if strainers[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''training_shoes''"><img src="images/pc/shoes/trainers/<<i>>.jpg" height="250" /></a>'
+	:loopdanilovich_shoes
+		if sdanilovich[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''danilovich_shoes''"><img src="images/pc/items/danilovich/shoes/<<i>>.jpg" height="250" /></a>'
 		i += 2
 		if i = 21:i = 23
-	if i <= 30:jump 'looptrainers_shoes'
+	if i <= 30:jump 'loopdanilovich_shoes'
 end
 
-if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'trainers',i, 800
+if $ARGS[0] = 'danilovich_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'danilovich',i, 800
 
 if $ARGS[0] = 'coats':
 	$menu_loc = 'budgetclothes'

+ 0 - 1
locations/clothing_attributes.qsrc

@@ -2,7 +2,6 @@
 
 !! **Clothing Organization
 !! CloCategory: based on attribute file name and usually the shop name often with _outfits or _dress as postfix
-!!		Notes: 1-3 are general purpose clothing, 4-7 are self-explanatory, 8 is fetish wear, latex and leather. 9 is extreme clothing that exposes your body and likely to get you arrested . 10 is waitress, maid and stripper uniforms. 13 is for burlesque shows or a bordello
 !! CloStyle: 1 Girlie, 2 Rebel, 3 Wealthy, 4 Prostitute, 5 is Loose fit
 !!		Notes: 1 is clothing themed to give the impression of innocence of youth. 2 is for stereotypical punks; ripped clothing, leather jackets, etc. 3 gives the impression that theyre debutanttes or rich at first glance. 4 is stuff worn by prostitutes. 5 is formless clothing that doesn''t requiring refitting.
 !! CloStyle2: 1 Maid, 2 Server, 3 Stripper, 4 School

+ 284 - 42
locations/femcyc.qsrc

@@ -1,22 +1,251 @@
 # femcyc
 
-!! important values for pillcon
-!!at 7000 pillcon sveta will begin slowing down the build up of hormone to release eggs - see cyc1
-!!at 20000 pillcon sveta will very rarely even build up hormone to release eggs but its random so it can still happen anyways - see cyc1 and cyc2
-!!at 26000 pillcon sveta only has a 1/400 chance of even releasing an egg at all even if she does build up enough hormone - see cyc2
-!!at 38000 pillcon sveta no longer has periods at all and cannot get pregnant anymore -- see cyc3
+!!
+!!	THIS IS A CORE FILE TO GAME MECHANICS. Please edit CAREFULLY, and leave as many comments as possible!!
+!!
+!!------------------------------------------------------------------------------------------------------------
+!!	femcyc documentation
+!!------------------------------------------------------------------------------------------------------------
+!!
+!!	The femcyc functions try to reproduce a realistic mentruation cycle as well as the proper
+!!	pregnancy of Sveta and the mostly realistic semen absorption/decay cycle.
+!!	The below will explain every variable in use as well as every function and the general construct.
+!!	The femcyc is a highly complex and confusing collection of calculations. So if you do not understand
+!!	it, it is best to leave it alone.
+!!
+!!------------------------------------------------------------------------------------------------------------
+!!
+!!	$ChildFath : array for names of the childs biological father
+!!	$ChildFathDNA : array for the DNA of the childs father
+!!	$ChildThFath : array for the names of the childs believed father (can be different from the biological father)
+!!	$childtype : child type. single child, fraternal twin, identical twin ...
+!!	$cumfthname : the name of the father if sveta is sure
+!!	$cycreport_txt : Text for the current menstruation cycle. e.g. In labour.
+!!	$d_cycreport_update : Dynamic variable to update cycle report
+!!	$d_pregmovement : Dynamic variable for kid movement
+!!	$kid_dna : DNA of the baby/kid
+!!	$kidname : Name of the baby/kid
+!!	$npc_dna : npc DNA
+!!	$pcs_dna : Svetas DNA
+!!	$wombDNA : sperm in womb potent enough to cause pregnancy
+!!	$wombName : the name of the NPC
+!!	$wombpotfath : the name of the potential father, if sveta is not sure
+!!	arrmodtmp : temp array used in pregnancy progression
+!!	babyembryo : used during implant phase. if the fertegg successfully nests, babyembryo is +1. BabyEmbryo is for how many unborn babies are inside Sveta.
+!!	Babyptype : pregnancy type of unborn babies. they might be unimplanted 0, healthy 1, or Ectopic 2.
+!!	broodcurse : some modifier for fertility - brood curse
+!!	can_idx : candidate index - the index for the possible father
+!!	can_sz : has array size of cumarrnam[], used to check if there is cum in the womb.
+!!	cfl_ct : cum father lotto counter. used in a loop
+!!	cfl_idx : cum father lotto index. used as index for arrays.
+!!	cfl_sz : cum father lotto size. used for the size of the array
+!!	cfw_idx : used for the sperm lotto. Index for the father
+!!	cfw_sz : used for the sperm lotto. amount of semen in womb
+!!	ChildConType : Contraceptives used during conception. e.g. condom slipped off or sveta was on a pill.
+!!	ctemp : temporay array for cum ammount
+!!	cum_total : how many amounts of cum are in svetas womb
+!!	cumarr_idx : cum array index, used to identify how much cum is stored in the cum arrays
+!!	cumarrtemp : another temp var for cum arrays
+!!	cumcondslip : Introduced in Cum_Manage.qsrc. Did the condom slip off?
+!!	cumcondslip_aware : is Sveta aware it slipped?
+!!	cumfatherDNA[] : used to figure out the DNA of the father in the sperm lotto
+!!	cumfathlotto[] : used to figure out the name of the father in the sperm lotto
+!!	cumpdrop : used for calculation of drop in cum current potential
+!!	cumsumass : sum of cum on ass
+!!	cumsumbod : sum of cum on body
+!!	cumsumvag : sum of cum on vagina
+!!	cumtime[] : array to store how many times someone came in Sveta. More cumtime means more possibility to be the father.
+!!	cyccustom : custom cycle flag variable. Either 0 or 1. Activates custom cycle reports during pregnancy.
+!!	cycle : current state of svetas cycle, can be 0 to 5. 0 to 4 are usual mentruation cycles including fertilization. 5 is for the status 'pregnant'.
+!!	daykid : Birthday of the baby/kid
+!!	daylastperiod : daylastperiod is for Svetas knowledge on when she began her last period
+!!	egg_idx : egg index. There could be more than one egg in Svetas womb, so the eggs have an index
+!!	egg_sz : var to store amount of unfertilized eggs
+!!	EggRH : The egg release counter. The level of egg release that Sveta has for her ovulation event. 150 generates a single egg, higher amounts might release more.
+!!	eyeskid : Eye color of the child
+!!	fert_thresh : the threshold of an egg to be fertilized. Modified by being on contraceptives and negative factors.
+!!	FertEgg : How many unimplanted eggs Sveta has in her. These are possible babies, but they die 330 hours after ovulation if they do not implant.
+!!	ferteggage : fertile egg age. used to check age of the egg (in hours). Time since the ovulation event. They last 330 and die if not implanted.
+!!	firstmens : The first day that Sveta bled during her last cycle. this is different than daylastperiod because this is the actual date, while daylastperiod is when Svetlana remembers it being.
+!!	FocH : FocH is for how many hours of Foccular cycle Sveta has gone through in her current fertility cycle. Focular starts at the end of her Luteal and contains the bleeding period in Svetkas cycle.
+!!	FocH_Max : maximum Follicular time (in hours)
+!!	hairkid : Hair color of the child
+!!	imp_rand : randomizer variable used during egg implantation phase
+!!	implant_day : day the egg was implanted
+!!	implant_hour : hour the egg was implanted
+!!	implant_idx : implant index used for array indexing, used in implantation phase
+!!	implant_sz : implant array size, used in implantation phase
+!!	isprok : used for menstruation bleeding flagging. can be 0 or 1.
+!!	kid : Kid counter variable
+!!	kidage : Age of the baby/child
+!!	knowpregloss : knowpregloss is for Svetas knowledge that she lost a baby. 1 is for an abortion, 2 is for a miscarrage. 
+!!	knowpregrecover : knowpregrecover is for Svetas knowledge that she just gave birth.
+!!	lactation[] : The lactation array. More on that in lact_lib
+!!	lastmens : timestamp of last menstruation. The last day that Sveta bled during her last cycle.
+!!	lastovulation : used to store the last ovulation date
+!!	lotto_idx : lotto index. Used to randomly pick a sperm.
+!!	LutH : How many hours of Luteal cycle Sveta has gone through in her current fertility cycle.
+!!	LutH_Max : maximum Luteal time (in hours)
+!!	menoage : The age Svetas will be when she goes through menopause.
+!!	mesec : variable for menstruation. How many hours of bleeding Sveta has left in her current fertility cycle.
+!!	monthkid : birth month of the kid
+!!	nextbaby : index for babies.
+!!	Ovulate : Ovulate is the amount of hours remaining in Svetas ovulation period of her current fertility cycle. 
+!!	pillcon : variable for contraceptive pills to prevent pregnancy. More on that below.
+!!	polkid : Sex of the baby/kid. 0 = female, 1 = male
+!!	preg : Pregnancy flag. 0 = not pregnant, 1 = pregnant, 2 = delivery
+!!	PregChem : Progress of the pregnancy in hours.
+!!	pregminut : total minutes + 1440 minutes. The time Sveta has from the first uterine contraction to labour. Usually Sveta dies during labour if this time is surpassed.
+!!	pregspeedcheat : Cheat variable for faster pregnancies.
+!!	rcntorgzm : determine wether Sveta had an orgasm withhin the last hour or not (1 or 0)
+!!	rcntorgzmtmp : temp variable to rewrite to rcntorgzm
+!!	RecovH : Recovery counter in hours. RecovH is the amount of recover hours before Svetas fertility cycle resets after having a baby.
+!!	rej_idx : egg rejection array index. used during luteal phase to loop through any eggs not implanted.
+!!	rej_sz : egg rejection array size. used during luteal phase to loop through any eggs not implanted.
+!!	sexnutrition : succubus sex nutrition
+!!	sparrtmpv : temp var for spatter arrays for temporary array index tracking
+!!	sterileov : sterile ovulation. used for negative effects on ovulation.
+!!	steriletu : sterilized through tubal ligation procedure. Usually smaller than 0 when sterile.
+!!	sterilewb : sterile womb. Womb damage. Used for negative impact in the womb.
+!!	sucabscum : was cum absorbed by succubus? (1 or 0)
+!!	succublvl : succubus level (obviously)
+!!	succubusflag : used for succubus story arc. If Sveta is a succubus, the sperm will be absorbed
+!!	succubxp : succubus experience
+!!	succycletmp : succubus cycle temp var. Used during sperm absorption function.
+!!	tempbabyi : temp var for baby variable removal.
+!!	tempovbonus : temp var for ovulation bonus. Fertility bonus.
+!!	temprand : used as temp var for randomizer
+!!	tempwbbonus : temp variable for womb bonus during egg implant function
+!!	totminut : total minutes variable, used by various functions
+!!	UnfertEgg : UnfertEgg is how many unfertilized eggs Sveta has in her for fertilization during her Ovulation period. Unfertilized eggs are removed at the end of her Ovulation period.
+!!	wombAmount : how potent is the sperm of a guy
+!!	x : used as temp for a loop
+!!	y : used as temp for a loop
+!!	yearkid : Birth year of the baby/kid
+!!	z : used as temp for a loop
+!!
+!!	Cum Array indices (taken from Cum_Manage.qsrc):
+!!
+!!	cumarrnam : Sperm Owner
+!!	cumarrppt : Sperm Potential Potency (max sperm delivery)
+!!	cumarrcpt : Sperm Current Potency	(current amount of sperm)
+!!	cumarrdel : Sperm "Delivery" (method of *VAGINAL ONLY* acquisition)
+!!	cumarrcon :	Contraception typ used
+!!	cumarrage : Sperm age in hours
+!!	cumarrkno : Did you know/realize who did it?
+!!	cumarrcnt : Unique identifier of the exact which time the MC has had this sperm incident occur.
+!!
+!!	Spatter Array indices (taken from Cum_Manage.qsrc):
+!!
+!!	sparrloc : Location of the sperm, as per cumarrdel
+!!	sparrnam : Spatter Owner
+!!	sparrppt : Spatter Potential Potency (Used to increase potency if you don't clean yourself out)
+!!	sparridt : Did you know/realize who did it?
+!!	sparrvol : Volume of the spatter. 40 is average.
+!!	sparrslc : Spread status of the spatter. High volume can spread the contaminant from it's starting place.
+!!	sparrcnt : Unique identifier of the exact which time the MC has had this spatter incident occur.
+!!
+!!	Values of 'cumarrdel' as defined by the cum_arr (taken from Cum_Manage.qsrc):
+!!
+!!	cumarrdel = 0 : 'Vaginal intercourse'
+!!	cumarrdel = 1 : 'From spatter on labia'
+!!	cumarrdel = 2 : 'From the anal area'
+!!	cumarrdel = 3 : 'From sperm on clothing'
+!!	cumarrdel = 4 : 'From sperm on fingers'
+!!	cumarrdel = 5 : 'From sperm on wipes'
+!!	cumarrdel = 6 : 'Unknown'
+!!
+!!	Values of 'cumarrcon' as defined by the cum_arr (taken from Cum_Manage.qsrc):
+!!
+!!	cumarrcon = 0: 'No contraception used'
+!!	cumarrcon = 1: 'You lied about being on the pill'
+!!	cumarrcon = 2: 'You were on the pill'
+!!	cumarrcon = 3: 'You used a condom'
+!!	cumarrcon = 4: 'The condom broke'
+!!	cumarrcon = 5: 'The condom slipped off inside you'
+!!	cumarrcon = 6: 'The condom was sabotaged by someone else'
+!!	cumarrcon = 7: 'You sabotaged the condom'
+!!	cumarrcon = 8: 'Precum had sperm in it'
+!!	cumarrcon = 9: 'You believe are sterile'
+!!
+!!	Values of 'cumarrkno' as defined by the cum_arr (taken from Cum_Manage.qsrc):
+!!
+!!	cumarrkno = -2 : 'You were unaware there was sperm in you'
+!!	cumarrkno = -1 : 'You do not think that any sperm has gotten into you'
+!!	cumarrkno =  0 : 'You know somebody got sperm in you, but you don''t know that person'
+!!	cumarrkno =  1 : 'You know who got sperm in you'
+!!
+!!	Setting for no STD checks
+!!
+!!	cumnostd = 1 : No risk of STD, resets at end of file so must be used for all related cum_management calls
+!!
+!!	0 = 'In your Vagina'
+!!	1 = 'On your labia'
+!!	2 = 'On your panties over your vagina'
+!!	3 = 'In your anus'
+!!	4 = 'On your butt'
+!!	5 = 'On your panties over your butt'
+!!	6 = 'On your clothes in your groin area'
+!!	7 = 'On your clothes'
+!!	8 = 'On your back'
+!!	9 = 'On your legs'
+!!	10 = 'On your arms'
+!!	11 = 'On your face'
+!!	12 = 'Inside your mouth'
+!!	13 = 'On your hands'
+!!	14 = 'On your stomach'
+!!	15 = 'On your breasts'
+!!	16 = 'In your hair'
+!!	17 = 'In a condom in your vagina'
+!!------------------------------------------------------------------------------------------------------------
+!!	important values for pillcon
+!!------------------------------------------------------------------------------------------------------------
+!!	at 7000 pillcon sveta will begin slowing down the build up of hormone to release eggs - see cyc1
+!!	at 20000 pillcon sveta will very rarely even build up hormone to release eggs but its random so it can still happen anyways - see cyc1 and cyc2
+!!	at 26000 pillcon sveta only has a 1/400 chance of even releasing an egg at all even if she does build up enough hormone - see cyc2
+!!	at 38000 pillcon sveta no longer has periods at all and cannot get pregnant anymore -- see cyc3
+!!------------------------------------------------------------------------------------------------------------
+!!	Functions
+!!------------------------------------------------------------------------------------------------------------
+!!	Default :
+!!	- Hourly reduction in semen potency and semen absorption.
+!!	- Hourly call for the breastcycle, managing lactation and changes in the breasts.
+!!	- Hourly call of Svetas cycle via cycle variable.
+!!
+!!	cyc0:
+!!	- Handles actions from Menstruation to Follicular.
+!!
+!!	cyc1:
+!!	- Handles actions from Follicular to Ovulation.
+!!
+!!	cyc2:
+!!	- Handles actions for the Fertilization.
+!!
+!!	cyc3:
+!!	- handles actions from Luteal to Menstration or Pregnancy.
+!!
+!!	cyc4:
+!!	- handles actions from (post pregnancy) Recovery to Follicular..
+!!
+!!	preg:
+!!	- handles actions for the Pregnancy Progression.
+!!------------------------------------------------------------------------------------------------------------
+
+
 
 !! I have to initialize the variables somewhere, maybe in preCUST?
 if Luth_Max = 0: LutH_Max = rand(312,360) & !! 13-15 days including ovulation
 if Foch_Max = 0: FocH_Max = rand(312,360) & !! 13-15 days including menstruation
 
 if $ARGS[0] = '':
+	!!	calling the variable error handler, fixing variables here.
+	gs 'femcyc', 'femcyc_errhdl'
 	!{Hourly reduction in semen potency}
 	!{First it sets the array index to the first index, then it checks to be sure the array tracking the age is less than 144 hours. If it is 144 hours old, it kills that index, which should shift the index up. If it is less than 144 hours old, it sets a current potency drop. The drop is 2x or 3x regularly, but during ovulation it is only 1x, to represent the better environment from fertile cervical mucus.}
 	!{144 hours was selected due to that being approximately the maximum amount of time sperm is viable in the womb (120 would be more accurate, but there is leeway). PLEASE DO NOT CHANGE IT.}
 	!{The potency drop may seem small in game-time, but is meant to be a reasonable approximation to real life. Avoid unprotected sex within 5 days of ovulation if you want to mitigate your risk.}
 	!{the 'rcntorgzm' variable is set to determine whether Sveta has orgasmed within the last hour. If she has, a small potency boost for the guys she has slept with in that hour.}
-
+	
 	if rcntorgzm = 1:
 		if rcntorgzmtmp = 1: rcntorgzm = 0 & rcntorgzmtmp = 0
 		if rcntorgzmtmp = 0: rcntorgzmtmp = 1
@@ -207,7 +436,7 @@ if $ARGS[0] = '':
 		cumsumbod = ctemp[0]
 		cumsumvag = ctemp[1]
 		cumsumass = ctemp[2]
-		KILLVAR 'ctemp'
+		killvar 'ctemp'
 	end
 	!!	Breastcycle. Every breast related change with lactation happens in here.
 	if cheat_NoLactation > 0:
@@ -272,13 +501,13 @@ if $ARGS[0] = 'cyc1':
 		!! the setting of the max_time can be here although it can be changed in the future
 		LutH_Max = rand(312,360) & !! 13-15 days including ovulation
 		!{If you are ready to ovulate, it creates a chance to double ovulate. That chance is increased by your age. Then it does the same for a triple ovulation. Then it sets the ovulation tag, ovulation hour count, and begins a ticker for the life of the eggs.}
-		Temprand = rand(0,20)
-		Temprand += age/15
-		Temprand -= pillcon/1000
+		temprand = rand(0,20)
+		temprand += age/15
+		temprand -= pillcon/1000
 		if temprand > 20:
 			EggRH += 205
-			Temprand = rand(0,20)
-			Temprand += age/15
+			temprand = rand(0,20)
+			temprand += age/15
 			if temprand > 20: EggRH += 410
 		end
 		FocH = 0
@@ -295,9 +524,9 @@ end
 if $ARGS[0] = 'cyc2':
 	can_sz = arrsize('$cumarrnam')
 	if Ovulate > 0 and can_sz > 0 and UnfertEgg > 0:
-		KILLVAR 'cumtime'
-		KILLVAR 'cumfthname'
-		KILLVAR '$wombpotfath'
+		killvar 'cumtime'
+		killvar 'cumfthname'
+		killvar '$wombpotfath'
 		$cumfthname[0] = 'unknown'
 		cumtime[0] = 0
 		can_idx = 0
@@ -360,7 +589,7 @@ if $ARGS[0] = 'cyc2':
 		end
 
 !!{Create lotto of potential fathers based on each potential fathers sperm as a percentage of the total. The higher percentage of sperm from a given father, the more lotto entries he will have.}
-		KILLVAR '$cumfathlotto'
+		killvar '$cumfathlotto'
 		cfw_idx = 0
 		cfw_sz = arrsize('wombAmount')
 		:FathLottoLoop
@@ -418,7 +647,7 @@ if $ARGS[0] = 'cyc2':
 				hairkid[nextbaby] = rand(0, 3)
 				eyeskid[nextbaby] = rand(0, 3)
 				ChildConType[nextbaby] = cumarrcon[nextbaby]
-				if fertegg > 1:
+				if FertEgg > 1:
 					$childtype[nextbaby] = 'fraternal twin'
 					$childtype[nextbaby-1] = 'fraternal twin'
 				else
@@ -435,7 +664,7 @@ if $ARGS[0] = 'cyc2':
 !!{Ovulation to Luteal. It checks to see if you are on the ovulation cycle. If you are, it checks you for your pillcon. If it is high enough, no egg is released. Under high concentrations of pill chemical, ovulation ticks away quicker. Otherwise, it checks to see if your ovulation hormone is high enough, and if it is it gives you an egg and drops a good chunk down on your ovulation hormone. if its still high, it drops another egg. Then it checks your ovulation hours. If its down to 0, it starts the Luteal phase. Otherwise, it adds an hour to the egg age and reduces the ovulation window by an hour.}
 	if pillcon > 26000 and rand(0,400) ! 0: EggRH = 0
 	:OviLoop
-	If EggRH > ((UnfertEgg + FertEgg) * 150):
+	if EggRH > ((UnfertEgg + FertEgg) * 150):
 		UnfertEgg += 1
 		EggRH -= (200 * UnfertEgg)
 		jump 'OviLoop'
@@ -444,9 +673,9 @@ if $ARGS[0] = 'cyc2':
 		cycle = 3
 		UnfertEgg = 0
 	end
-	if fertegg = 1 and ferteggage < 330:
+	if FertEgg = 1 and ferteggage < 330:
 		if rand(0,(2000 - age*20)) = 0:
-			fertegg += 1
+			FertEgg += 1
 			nextbaby = arrsize('$ChildFath')
 			polkid[nextbaby] = polkid[nextbaby-1]
 			$kidname[nextbaby] = 'unborn'
@@ -476,9 +705,9 @@ end
 !{Otherwise, it adds your womb sterility factor to the imp_rand. Then it checks if your imp_rand crosses a threshold for implantation. Younger women implant easier. It then sets the next baby to the next unimplanted baby in your kid array. It registers the kid as a normal pregnancy, removes a fertilized egg and adds an embryo. Then it adds some pregnancy hormone if you arent already pregnant, and calls you officially pregnant.}
 
 if $ARGS[0] = 'cyc3':
-	if fertegg = 1 and ferteggage < 330:
+	if FertEgg = 1 and ferteggage < 330:
 		if rand(0,(2000 - age*20)) = 0:
-			fertegg += 1
+			FertEgg += 1
 			nextbaby = arrsize('$ChildFath')
 			polkid[nextbaby] = polkid[nextbaby-1]
 			$kidname[nextbaby] = 'unborn'
@@ -556,18 +785,18 @@ if $ARGS[0] = 'cyc3':
 		:lutcycloop
 		if rej_idx < rej_sz:
 			if Babyptype[rej_idx] = 0:
-				KILLVAR 'polkid',tempbabyi
-				KILLVAR '$kidname',tempbabyi
-				KILLVAR 'kidage',tempbabyi
-				KILLVAR 'daykid',tempbabyi
-				KILLVAR 'monthkid',tempbabyi
-				KILLVAR 'yearkid',tempbabyi
-				KILLVAR 'Babyptype',tempbabyi
-				KILLVAR '$ChildFath',tempbabyi
-				KILLVAR '$ChildThFath',tempbabyi
-				KILLVAR 'hairkid',tempbabyi
-				KILLVAR 'eyeskid',tempbabyi
-				KILLVAR 'cumarrcon',tempbabyi
+				killvar 'polkid',tempbabyi
+				killvar '$kidname',tempbabyi
+				killvar 'kidage',tempbabyi
+				killvar 'daykid',tempbabyi
+				killvar 'monthkid',tempbabyi
+				killvar 'yearkid',tempbabyi
+				killvar 'Babyptype',tempbabyi
+				killvar '$ChildFath',tempbabyi
+				killvar '$ChildThFath',tempbabyi
+				killvar 'hairkid',tempbabyi
+				killvar 'eyeskid',tempbabyi
+				killvar 'cumarrcon',tempbabyi
 				FertEgg -= 1
 			end
 			rej_idx += 1
@@ -577,13 +806,13 @@ if $ARGS[0] = 'cyc3':
 		if preg = 1:
 			cycle = 5
 		elseif menoage <= age:
-			KILLVAR '$wombpotfath'
+			killvar '$wombpotfath'
 			killvar '$cumfthname'
 			killvar '$cumfthusedname'
 			killvar 'cumtime'
 			cycle = 6
 		else
-			KILLVAR '$wombpotfath'
+			killvar '$wombpotfath'
 			killvar '$cumfthname'
 			killvar '$cumfthusedname'
 			killvar 'cumtime'
@@ -612,7 +841,7 @@ if $ARGS[0] = 'cyc3':
 			end
 		end
 	else
-		if preg = 1:PregChem += 1+pregspeedcheat
+		if preg = 1:PregChem += 1 + pregspeedcheat
 		if rand(0,100) < 100: LutH += 1
 	end
 end
@@ -642,7 +871,7 @@ end
 !{Pregnancy Progression. It checks to see if you are in the pregnancy phase of a cycle. If you are, it progresses your pregnancy chemical. Then it gives a fluxuation of possible due dates. If you cross the due date threshold, you enter labor, marked by preg = 2. Other milestones will also be placed in here, including body deformations. Right now this is mostly an empty placeholder.}
 
 if $ARGS[0] = 'preg':
-	if fertegg = 1 and ferteggage < 330:
+	if FertEgg = 1 and ferteggage < 330:
 		if rand(0,(2000 - age*20)) = 0:
 			babyembryo += 1
 			PregChem += rand(10,30)
@@ -670,7 +899,7 @@ if $ARGS[0] = 'preg':
 		!!	switch on lactation if not already active.
 		if lactation['active'] < 1: func('lact_lib','lact_switch')
 		$cycreport_txt = 'In labour'
-		arrmodtmp =arrsize('$ChildFath')
+		arrmodtmp = arrsize('$ChildFath')
 		arrmodtmp -= (babyembryo+1)
 		:babyfinalpreploop
 		if arrmodtmp < arrsize('$ChildFath') and daykid[arrmodtmp] = 0:
@@ -679,8 +908,8 @@ if $ARGS[0] = 'preg':
 			arrmodtmp += 1
 			jump 'babyfinalpreploop'
 		end
-		KILLVAR '$wombpotfath'
-		KILLVAR '$wombthfath'
+		killvar '$wombpotfath'
+		killvar '$wombthfath'
 		preg = 2
 		pregminut = totminut + 1440
 		if babyembryo > 1:
@@ -702,7 +931,7 @@ if $ARGS[0] = 'preg':
 		'You need to get to a clinic.'
 	end
 	if PregChem > 2203:
-		if pregchem > 2853 or kid > 0:
+		if PregChem > 2853 or kid > 0:
 			if rand(0,7) = 0: dynamic $d_pregmovement
 		else
 			if rand(0,500) = 0: dynamic $d_pregmovement
@@ -710,5 +939,18 @@ if $ARGS[0] = 'preg':
 	end
 end
 
+!!	Variable error handler for femcyc. Checking if variables are out of range and resets them.
+if $ARGS[0] = 'femcyc_errhdl':
+	if cycle < 0 or cycle > 6: cycle = 0
+	if rcntorgzmtmp < 0 or rcntorgzmtmp > 1: rcntorgzmtmp = 0
+	if rcntorgzm < 0 or rcntorgzm > 1: rcntorgzm = 0
+	if PregChem < 0: PregChem = 0
+	if preg < 0 or preg > 2: preg = 0
+	if ferteggage < 0: ferteggage = 0
+	if EggRH < 0: EggRH = 0
+	if FocH < 0: FocH = 0
+	if FertEgg < 0: FertEgg = 0
+end
+
 --- femcyc ---------------------------------
 

+ 6 - 4
locations/gdksport.qsrc

@@ -615,12 +615,14 @@ if $ARGS[0] = 'shower':
 	!! but was changed to make it repeatable because showering with Ivan here is non-obviously an
 	!! intermediate step in becoming a starter on the volleyball team. If avoiding needing this
 	!! scene to be repeatable is desired, someone with a better sense of Ivan as a character than
-	!! me could add one at some point. If this is done, this scene can be made non-repeatable by
-	!! removing the (kotovVSprohorov = 2 and IvanShowerQW = 0 and rand(0,3) = 1) part
-	elseif (kotovVSprohorov = 1 or (kotovVSprohorov = 2 and IvanShowerQW = 0 and rand(0,3) = 1)) and ShowerIvan < 3:
+	!! me could add a version of the followup scene at school for when the player doesn''t shower
+	!! with Ivan using IvanShowerQW = 2 at some point. If this is done, this scene can be made
+	!! non-repeatable by removing the (IvanShowerQW = 2 and rand(0,3) = 1) part
+	elseif (kotovVSprohorov = 1 or (IvanShowerQW = 2 and rand(0,3) = 1)) and ShowerIvan < 3:
 		'You enter the women''s shower and turning the water on, begin to lather your body with a washcloth. Suddenly, you hear the door creak open and you remember that you forgot to lock it.'
-		'You look around and see Ivan standing in the doorway looking at you. "Hi <<$pcs_nickname>>. Can I join you? The men''s shower is full' + iif(kotovVSprohorov = 2, ' again', '') + '." He smiles.'
+		'You look around and see Ivan standing in the doorway looking at you. "Hi <<$pcs_nickname>>. Can I join you? The men''s shower is full' + iif(IvanShowerQW = 2, ' again', '') + '." He smiles.'
 		kotovVSprohorov = 2
+		IvanShowerQW = 2
 		gs 'willpower', 'bj', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Throw Ivan out (<<will_cost>> Willpower)':

+ 2 - 2
locations/gschool_break.qsrc

@@ -1384,7 +1384,7 @@ if $ARGS[0] = 'naked_bathroom':
 					gm_school_h[35] = 50
 					gm_school_b[35] = pcs_hips
 				end
-				gs 'clothing', 'wear', 'school', 35
+				gs 'clothing', 'wear', 'gm_school', 35
 				act 'Leave her office': 
 					if hour >= 14:
 						gt 'gschool_grounds', 'main'
@@ -1426,7 +1426,7 @@ if $ARGS[0] = 'naked_bathroom':
 						gm_school_h[35] = 50
 						gm_school_b[35] = pcs_hips
 					end
-					gs 'clothing', 'wear', 'school', 35
+					gs 'clothing', 'wear', 'gm_school', 35
 					act 'Leave her office': 
 						if hour >= 14:
 							gt 'gschool_grounds', 'main'

+ 1 - 1
locations/gschool_girls_bathroom.qsrc

@@ -327,7 +327,7 @@ if $ARGS[0] = 'girl3':
 	elseif grupTipe = 2:
 	  !!Lead to an event during break where Sveta is confronted by Vitek, but is defended by the other jocks?
 	    act 'Fuck off':
-		  *clr and cla
+		  *clr & cla
 		  npc_rel['A20'] -= 5
 		  npc_rel['A21'] -= 5
 		  grupvalue[4] -= 3

+ 155 - 0
locations/journal_quests.qsrc

@@ -10,6 +10,68 @@ if $ARGS[0] = 'start':
 
 !!to check Sveta is at school. All school quests must pass this and it should become a category as we expand
 	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+		'<center><h1>Cheerleading</h1></center>'
+		*nl
+		if (month > 11 or month < 6) and cheerleadingQW['quest_stage'] = 0:
+			'For various reasons, I cannot be a cheerleader.'
+		elseif month < 10 and month >= 6 and cheerleadingQW['quest_stage'] = 0:
+			'If I want to be a cheerleader, I should keep my eyes out for the tryout posters that usually go up in the school around October.'
+		elseif (month = 10 or month = 11) and cheerleadingQW['quest_stage'] = 0:
+			'If I want to be a cheerleader, I should keep my eye out for the cheerleader tryout posters that usually go up in school around this time of year.'
+		elseif cheerleadingQW['quest_stage'] = -1 and cheerleadingQW['try_count'] > 0:
+			'If I want to try again to become a cheerleader, I will need to wait until the posters go back up in school.'
+		elseif cheerleadingQW['quest_stage'] = -1:
+			'If I change my mind about joining the cheerleading squad, I will have to wait for the posters to go up again.'
+		elseif cheerleadingQW['quest_stage'] = -2:
+			'For one reason or another, I don''t want to join the cheerleading squad.'
+		elseif cheerleadingQW['quest_stage'] = 1:
+			'I have signed up to tryout for the cheerleading squad.'
+		elseif cheerleadingQW['quest_stage'] = 2:
+			'I was accepted into the cheerleading squad as a backup. Unless people start thinking I am a jock or see me as cool enough, this is as far as Albina will let me go.'
+		elseif cheerleadingQW['quest_stage'] = 3:
+			'I joined the cheerleading squad as a full member.'
+		else
+			'Unknown. You might want to report this as a bug on the TFGS Forum.'
+		end
+		*nl
+		*nl
+		'<center><h1>Julia Milov</h1></center>'
+		*nl
+		if pav_slut < 200:
+			if npc_rel['A12'] >= 60:
+				if JuliaMilLernQW = 1:
+					if BeInJulMilHome = 1:
+						if wine = 1:
+							if JulMilBestFrend >= 5:
+								if SexTalkJulia >= 4:
+									'Julia and I are in a sexual relationship now.'
+								elseif SexTalkJulia > 0:
+									'I should try getting Julia to tell me more about her sexual adventures.'
+								else
+									'I should try talking to Julia about sex.'
+								end
+							else
+								'I should spend some time chatting with Julia. I bet if I get to know her weel enough, she would open up to me more.'
+							end
+						else
+							'I bet if I bought some wine, Julia would drink it with me.'
+						end
+					else
+						'Julia agreed to help me with my homework, she should be waiting for me after school ends.'
+					end
+				else
+					'I should ask Julia to help me with my homework afterschool sometime. I can find her hanging out with the other nerds in a classroom during school breaks.'
+				end
+			else
+				'I need to get to know Julia better before she is willing to hang out with me after school.'
+			end
+		else
+			'As long as people see me as a slut around town, there is no way Julia will give me the time of day.'
+		end
+		*nl
+		*nl
+		'<center><h1>Natasha Belova</h1></center>'
+		*nl
 		!! 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.'
@@ -36,6 +98,99 @@ if $ARGS[0] = 'start':
 		else
 			'Natasha seems really smart, I should try to befriend her to help me with my grades. During school breaks seems like a good time to chat her up. It might take a lot of effort for her to trust me though.'
 		end
+		*nl
+		*nl
+		'<center><h1>Volleyball</h1></center>'
+		*nl
+		if trener_Speak = 8 and volleysostav > 0:
+			'Coach Mikhail has finally made me a starter on the Volleyball Team.'
+		elseif trener_Speak = 7 and volleysostav > 0:
+			if pcs_vball > 70:
+				'I am pretty sure I have pushed every button and jumped through every hoop I can with the coach. It''s time to request that starter spot again.'
+			else
+				'I have done everything I can do to twist Mikhail around my finger. Now I just need to keep practicing my volleyball skills to be worthy of a starter position.'
+			end
+		elseif trener_Speak = 6 and volleysostav > 0:
+			if trenerSex >= 1:
+				'It''s time to start pushing for a spot as a starter. I should be careful about pushing too hard though, or I could ruin my chances, and worse.'
+			else
+				'I need to at least give the coach a blowjob to finish my seduction scheme.'
+			end
+		elseif trener_Speak = 5 and volleysostav > 0:
+			if ShowerIvan = 6:
+				'I should talk to the coach.'
+			elseif ShowerIvan = 5:
+				if ricewine = 1:
+					'I should deliver the rice wine to Guang next Sunday morning, before noon.'
+				else
+					'I need to find some rice wine. The Pavlovsk train station market would be a good place to look.'
+				end
+			else
+				'I need to check out the city gym on Sunday morning, before noon. Maybe I can learn something about Coach Mikhail there.'
+			end
+		elseif trener_Speak = 4 and volleysostav > 0:
+			if VoltrenerVoyeur >= 3:
+				if npc_rel['A3'] >= 80:
+					if kotovVSprohorov = 2:
+						if IvanShowerQW = 11:
+							if IvanShowerYes = 1:
+								if VoltrenerVoyeur = 6:
+								   'I should talk to the coach.'
+								elseif VoltrenerVoyeur = 5:
+									'I should shower with Ivan again'
+								elseif VoltrenerVoyeur = 4:
+									'I should shower with Ivan again'
+								else
+									'I should shower with Ivan again'
+								end
+							else
+								'I should chat with Ivan at school again.'
+							end
+						elseif IvanShowerQW = 1:
+							'I should talk to Ivan about what happened in the sports center the next time I am at school.'
+						else
+							'I need to not chicken out the next time Ivan tries to join my in the sports center shower.'
+						end
+					elseif kotovVSprohorov = 1:
+						'I should take a shower at the sports center. If the rumors I heard about Ivan are true, he should try to join me.'
+					else
+						'I want to use Ivan to make the coach jealous, somehow. I should start by chatting with him in the sports section when he is just showing up, usually around 17:00.'
+					end
+				else
+					'I need something to make the coach jealous of me. Ivan spends a lot of time at the sports center, maybe I can use him to my advantage. I should put some effort into getting to know him better.'
+				end
+			elseif VoltrenerVoyeur = 2:
+				if trenerlust >= 40:
+					'I should talk to the coach about him spying on me in the sports center showers.'
+				else
+					'I need to keep trying to tease the coach.'
+				end
+			elseif VoltrenerVoyeur = 1:
+				if trenerlust >= 40:
+					'I should take a shower again at the sports center. Maybe this time he wont run away so fast.'
+				else
+					'I need to keep trying to tease the coach.'
+				end
+			else
+				if trenerlust >= 40:
+					'I should take a shower at the sports center. I have driven the coach so crazy with lust, he is bound to come for me eventually.'
+				else
+					'I need to keep trying to tease the coach.'
+				end
+			end
+		elseif trener_Speak = 3 and volleysostav > 0:
+			'As much as I did not enjoy the lecture about volleyball the last time I spoke with the coach, if I keep asking about it, maybe he will volunteer some information on his own about his past on the European Team. If all else fails, maybe I can straight seduce him.'
+		elseif trener_Speak = 2 and volleysostav > 0:
+			'Lets see what other information I can get out of the Coach. Surely there is something I can use to manipulate him. I should try just asking about volleyball in general.'
+		elseif trener_Speak = 1 and volleysostav > 0:
+			'Apparently the memories of the Coach''s time on the European team are painful, something bad must have happened. I should remember that for later, for now, lets see what I can get out of him about his personal life.'
+		elseif trener_Speak = 0 and volleysostav > 0:
+			'I should talk to Mikhail. The only way I am ever going to be a starter for the team is if I manage to wrap him around my finger. Maybe I should ask him about the rumors of him playing for the European championship winning team in the past.'
+		elseif volleysostav < 0:
+			'I got kicked off the Volleyball Team, pretty sure there is nothing I can say or do to get back on the team.'
+		else
+			'If I want to join the Volleyball Team, I need to practice my skills at the community center, then talk to the coach about joining.'
+		end
 	end
 end
 

+ 21 - 1
locations/lact_bp.qsrc

@@ -56,6 +56,26 @@
 !!	umbc_i
 !!	usbc_i
 !!	vmb_i
+!!	bpID_arr['index'] : breast pump id. Starts at 0, with every purchased breast pump the id will be added
+!!	bpType_arr['index'] : breast pump type. 0 = 'manual_single', 1 = 'electric_single', 2 ='electric_dual'
+!!	bpLocID_arr['index'] : 0 = lost, 1 = in svetas hand... same as bottle locations
+!!	bpbID1_arr['index'] : index of milk bottle array.
+!!	bpbID2_arr['index'] : only used for dual pump, index for milk bottle array. cannot be the same like breastpump_arr['bottle_id_1'].
+
+!!	when ever sveta buys a new breastpump, it has to be added to the breast pump array.
+if $ARGS[0] = 'build_bp':
+	!!	ARGS[1] = type
+	!!	ARGS[2] = location_id
+	!!	usage func('lact_bp', 'build_bp', 'breast pump type', 'location id')
+	!!	returns the new bottle ID
+	bp_i = arrsize('bpID_arr')
+	bpID_arr[bp_i] = bp_i
+	bpType_arr[bp_i] = ARGS[1]
+	bpLocID_arr[bp_i] = ARGS[2]
+	bpbID1_arr[bp_i] = ''
+	bpbID2_arr[bp_i] = ''
+	result = bp_i
+end
 
 !!	view milk bottles function
 if $ARGS[0] = 'view_milk_bottles':
@@ -292,7 +312,7 @@ if $ARGS[0] = 'useable_mbottle_count':
 end
 
 !!	bp_milking - breast pump milking
-!!	use href="exec:gt ''lact_bp'',''bp_milking''"
+!!	use href="exec:gt ''lact_bp'',''bp_milking''" or gt 'lact_bp','bp_milking'
 
 if $ARGS[0] = 'bp_milking':
 	pumptime = 0

+ 5 - 11
locations/moncheri.qsrc

@@ -126,19 +126,13 @@ if $ARGS[0] = 'shoes':
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
 
-	if Clothingstock > 11:
-		i = 1
-	else
-		i = 2
-	end
-
-	:loopboutique_shoes
-		if sboutique[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''boutique_shoes''"><img src="images/pc/shoes/boutique/<<i>>.jpg" height="250" /></a>'
-		i += 2
-	if i <= 37:jump 'loopboutique_shoes'
+	:loopmoncheri_shoes
+		if smoncheri[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_shoes''"><img src="images/pc/items/moncheri/shoes/<<i>>.jpg" height="250" /></a>'
+		i += 1
+	if i <= 40:jump 'loopmoncheri_shoes'
 end
 
-if $ARGS[0] = 'boutique_shoes':	gt 'shoes', 'view_shoe_item', 'shop', 'boutique',i, 5000
+if $ARGS[0] = 'moncheri_shoes':	gt 'shoes', 'view_shoe_item', 'shop', 'moncheri',i, 5000
 
 if $ARGS[0] = 'purses':
 	$loc_arg = 'purses'

+ 2 - 2
locations/pav_complex.qsrc

@@ -60,10 +60,10 @@ if $ARGS[0] = 'start':
 	
 	if rexCar = 1 and rexCarDay = daystart and hour >= 21 and hour < 23 and rexSisTalk = 3:
 		'<br>Rex is in his car, waiting for you at the parking lot near the apartment building where your parents live.'
-		act 'Join Rex in his car':gt'reks','avto'
+		act 'Join Rex in his car':gt 'rex_events','avto'
 	elseif rexCar = 1 and rexCarDay = daystart and hour = 21 and rexSisTalk >= 4:
 		'<br>Rex is in his car, waiting for you at the parking lot near the apartment building where your parents live.'
-		act 'Join Rex in his car':gt'reks','avto2'
+		act 'Join Rex in his car':gt 'rex_events','avto2'
 	end
 
 	if StoryLine = 1:

+ 1 - 1
locations/pav_park.qsrc

@@ -125,7 +125,7 @@ if $ARGS[0] = 'start':
 
 	if rexPark = 1 and rexParkDay = daystart and hour >= 16 and hour < 18:
 		'You see Rex walking in the park.'
-		act 'Go and see Rex':gt 'reks', 'skver'
+		act 'Go and see Rex':gt 'rex_events', 'skver'
 	end
 
 	if week >= 6 and hour >= 8 and hour <= 9 and StoryLine = 1 and socialchg['tVanya_day'] ! daystart: '<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'

+ 4 - 12
locations/pav_pharmacy.qsrc

@@ -95,23 +95,15 @@ if $ARGS[0] = 'start' or $message ! '':
 		*P FUNC ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', 'pav_pharmacy', 'start')
 		*P FUNC ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', 'pav_pharmacy', 'start')
 		*P FUNC ('$stock_item', 20, 'Tampons', 200, 'tampon', 'pav_pharmacy', 'start')
-			*P FUNC ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', 'pav_pharmacy', 'start')
-		if klisma > 0:
-			*P FUNC ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'pav_pharmacy', 'start')
-		else
-			*P FUNC ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'pav_pharmacy', 'start')
-		end
-		if breastpump > 0:
-			*P FUNC ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'pav_pharmacy', 'start')
-		else
-			*P FUNC ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'pav_pharmacy', 'start')
-		end
+		*P FUNC ('$stock_item', 20, 'Sanitary napkins', 100, 'sanpad', 'pav_pharmacy', 'start')
+		*P FUNC ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'pav_pharmacy', 'start')
+		*P FUNC ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'pav_pharmacy', 'start')
 		*P FUNC ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', 'pav_pharmacy', 'start')
 		*P FUNC ('$stock_item', 2, 'Breastmilk bottle M', 930, 'bpbottlem', 'pav_pharmacy', 'start')
 		if pcs_knows_nipplecream = 1:
 			*P FUNC ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', 'pav_pharmacy', 'start')
 		end
-		if KandidNapr = 1: *P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', 'pav_pharmacy', 'start')
+		*P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', 'pav_pharmacy', 'start')
 		*P '</table></center>'
 	end
 end

+ 1 - 1
locations/preSYS2.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 		end
 		if pcs_inhib < 10: pcs_inhib = 10
 		!!This line should get sveta to wear school uniform because she has no other clothing with > 50
-		if pcs_inhib > 50: gs 'clothing', 'wear', 'school', 6
+		if pcs_inhib > 50: gs 'clothing', 'wear', 'gm_school', 6
 		if bag = 1:
 			!!using current combination should prevent having more than 1 bag at the start of game.
 			dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'

+ 41 - 41
locations/reks.qsrc → locations/rex_events.qsrc

@@ -1,4 +1,4 @@
-# reks
+# rex_events
 
 if $ARGS[0] = 'rexRep':
 	if npc_rel['A57'] < 20:
@@ -141,7 +141,7 @@ if $ARGS[0] = 'skver':
 	npc_rel['A57'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
-	gs 'reks', 'rexRep'
+	gs 'rex_events', 'rexRep'
 	'Rex is standing at the bench with his hands behind his back. Just as you walk up to him you see him smiling and then he pulls out from behind his back a little, but very beautiful, bouquet of flowers and hands it to you.'
 	'You don''t know what to say – "Wow..." you take the bouquet, inhaling the aroma, and on the exhale, keeping the smile hidden from your face, say: "Thank you, Rex...!"'
 	act 'Walk':
@@ -285,7 +285,7 @@ if $ARGS[0] = 'skver':
 																			minut += 5
 																			gs 'stat'
 																			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
-																			gs 'reks', 'rexRep'
+																			gs 'rex_events', 'rexRep'
 																			'You laugh a little and try to change the subject. But you can''t shake the thought of what you just saw... And your opinion of Rex changed dramatically.'
 																			'Well, Rex, I have to go. Can you take me home now, you ask him Thank you for the dress and I''ll talk to you soon.'
 																			act 'Leave': gt 'pav_residential'
@@ -330,7 +330,7 @@ if $ARGS[0] = 'avto':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
 			'You pretty much sit around waiting for an already tipsy Rex to finish the beer.'
-			gs 'reks', 'rex_story'
+			gs 'rex_events', 'rex_story'
 		end
 	else
 		act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -343,7 +343,7 @@ if $ARGS[0] = 'avto':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
 		'You sit around drinking for quite a long time, thinking this beer is too bitter to take big gulps. Rex, however, who was already tipsy, manages to finish most of the bottle.'
-		gs 'reks', 'rex_story'
+		gs 'rex_events', 'rex_story'
 	end
 end
 
@@ -427,7 +427,7 @@ if $ARGS[0] = 'avto2':
 		if rexTalk = 3: 'You ride with Rex, and he tells you that all he remembers about his birthday party was being drunk.'
 		if rexTalk = 4: 'You ride with Rex, and he shares his dream of one day opening up his own studio.'
 		killvar 'rexTalk'
-		gs 'reks', 'rex_car_end'
+		gs 'rex_events', 'rex_car_end'
 	elseif rexCarCount > 3 and rexCarCount <= 6:
 		'You ride with Rex. During the conversation, he takes your hand.'
 		act 'Let him':
@@ -438,7 +438,7 @@ if $ARGS[0] = 'avto2':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/car/carrex2.jpg"></center>'
 			'Rex holds you by the hand. He is surprised that you don''t mind. You notice he is a little nervous.'
-			gs 'reks', 'rex_car_end'
+			gs 'rex_events', 'rex_car_end'
 		end
 		gs 'willpower', 'misc', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
@@ -450,7 +450,7 @@ if $ARGS[0] = 'avto2':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/car/carrex4.jpg"></center>'
 				'You gently remove his arm. Rex lets out a little sigh and continued the conversation.'
-				gs 'reks', 'rex_car_end'
+				gs 'rex_events', 'rex_car_end'
 			end
 		else
 			act 'Pull your hand away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -467,7 +467,7 @@ if $ARGS[0] = 'avto2':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/car/carrex4.jpg"></center>'
 				'You gently remove his arm. Rex lets out a little sigh and continued the conversation.'
-				gs 'reks', 'rex_car_end'
+				gs 'rex_events', 'rex_car_end'
 			end
 		else
 			act 'Pull your hand away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -490,7 +490,7 @@ if $ARGS[0] = 'avto2':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/car/carrex4.jpg"></center>'
 					'You gently remove his arm. Rex lets out a little sigh and continued the conversation.'
-					gs 'reks', 'rex_car_end'
+					gs 'rex_events', 'rex_car_end'
 				end
 			else
 				act 'Pull your hand away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -513,7 +513,7 @@ if $ARGS[0] = 'avto2':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/car/carrex4.jpg"></center>'
 						'You gently remove his arm. Rex lets out a little sigh and continued the conversation.'
-						gs 'reks', 'rex_car_end'
+						gs 'rex_events', 'rex_car_end'
 					end
 				else
 					act 'Pull your hand away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -542,7 +542,7 @@ if $ARGS[0] = 'avto2':
 						'<<$pcs_nickname>>, it''s a pity that you share a room with your sister, we could have talked on the phone at night.'
 						'"Sorry... Anya would hear us and she needs to sleep since she works in the shop. If I wake her up she goes crazy and I can''t deal with her when she''s like that... she does sleep quite deeply though. I could text you goodnight on my phone." You smile.'
 						'Would be cool! said Rex while smiling back at you .'
-						gs 'reks', 'rex_car_end'
+						gs 'rex_events', 'rex_car_end'
 					end
 				end
 			end
@@ -578,7 +578,7 @@ if $ARGS[0] = 'sms':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex1.jpg"></center>'
 				'You exposed your legs and took a picture.'
-				act 'Send': gt 'reks', 'sms_end1'
+				act 'Send': gt 'rex_events', 'sms_end1'
 			end
 		elseif smsForRex = 2:
 			act 'Photos in stockings ':
@@ -587,7 +587,7 @@ if $ARGS[0] = 'sms':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex2.jpg"></center>'
 				'You decided to try on some of your sisters''s sexy stockings and took a picture.'
-				act 'Send': gt 'reks', 'sms_end1'
+				act 'Send': gt 'rex_events', 'sms_end1'
 			end
 		elseif smsForRex = 3:
 			act 'Photo with inscription':
@@ -596,7 +596,7 @@ if $ARGS[0] = 'sms':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex3.jpg"></center>'
 				'You decided to write something on your leg to wish him a good night and you take a picture.'
-				act 'Send': gt 'reks', 'sms_end1'
+				act 'Send': gt 'rex_events', 'sms_end1'
 			end
 		elseif smsForRex = 4:
 			act 'Photos in stockings ':
@@ -605,7 +605,7 @@ if $ARGS[0] = 'sms':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex4.jpg"></center>'
 				'You decided to try on some of your sisters''s sexy stockings and took a picture.'
-				act 'Send': gt 'reks', 'sms_end1'
+				act 'Send': gt 'rex_events', 'sms_end1'
 			end
 		end
 	elseif pcs_horny >= 50 and smsForRex >= 4 and smsForRex < 13:
@@ -620,7 +620,7 @@ if $ARGS[0] = 'sms':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex5.jpg"></center>'
 				'You took off your clothes and took a picture in front of the mirror in your underwear.'
-				act 'Send': gt 'reks', 'sms_end2'
+				act 'Send': gt 'rex_events', 'sms_end2'
 			end
 		elseif smsForRex = 6:
 			act 'Photo_ 2':
@@ -629,7 +629,7 @@ if $ARGS[0] = 'sms':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex6.jpg"></center>'
 				'You took off your clothes and took a picture in front of the mirror in your underwear.'
-				act 'Send': gt 'reks', 'sms_end2'
+				act 'Send': gt 'rex_events', 'sms_end2'
 			end
 		elseif smsForRex = 7:
 			act 'Photo_ 3':
@@ -638,7 +638,7 @@ if $ARGS[0] = 'sms':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex7.jpg"></center>'
 				'you took off your clothes and took a picture wearing little panties'
-				act 'Send': gt 'reks', 'sms_end2'
+				act 'Send': gt 'rex_events', 'sms_end2'
 			end
 		elseif smsForRex = 8:
 			act 'Photo_ 4':
@@ -647,7 +647,7 @@ if $ARGS[0] = 'sms':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex8.jpg"></center>'
 				'You took off your clothes and put on your sister''s sexy stockings. You adopted a pose in front of the mirror and took a picture.'
-				act 'Send': gt 'reks', 'sms_end2'
+				act 'Send': gt 'rex_events', 'sms_end2'
 			end
 		elseif smsForRex = 9:
 			act 'Photo_ 5':
@@ -656,7 +656,7 @@ if $ARGS[0] = 'sms':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex9.jpg"></center>'
 				'You took off your clothes and posed in front of the mirror. You lift your top a little so that the underside of your boobs is a little bit exposed.'
-				act 'Send': gt 'reks', 'sms_end2'
+				act 'Send': gt 'rex_events', 'sms_end2'
 			end
 		elseif smsForRex = 10:
 			act 'Photo_ 6':
@@ -665,7 +665,7 @@ if $ARGS[0] = 'sms':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex10.jpg"></center>'
 				'You took off your clothes and laid down on your bed while wearing some stockings '
-				act 'Send': gt 'reks', 'sms_end2'
+				act 'Send': gt 'rex_events', 'sms_end2'
 			end
 		elseif smsForRex = 11:
 			act 'Photo_ 7':
@@ -674,7 +674,7 @@ if $ARGS[0] = 'sms':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex11.jpg"></center>'
 				'You stood in front of the mirror and took a picture in shorts and a t-shirt.'
-				act 'Send': gt 'reks', 'sms_end2'
+				act 'Send': gt 'rex_events', 'sms_end2'
 			end
 		elseif smsForRex = 12:
 			act 'Photo_ 8':
@@ -683,7 +683,7 @@ if $ARGS[0] = 'sms':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/event/phone/smsrex12.jpg"></center>'
 				'You stood in front of the mirror in panties. You lifted your shirt up to your chest and took a picture of your belly button.'
-				act 'Send': gt 'reks', 'sms_end2'
+				act 'Send': gt 'rex_events', 'sms_end2'
 			end
 		elseif smsForRex = 13:
 			act 'Photo_ 9':
@@ -812,7 +812,7 @@ if $ARGS[0] = 'Party_rex_sex_cum':
 	It seems the evening was a success, you can''t keep you eyes open any longer and start to fall asleep...'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Fall asleep': gt 'dinParty', 'sleep'
+	act 'Fall asleep': gt 'rex_party_events', 'sleep'
 end
 
 if $ARGS[0] = 'Party_rex_sex_cow':
@@ -830,9 +830,9 @@ if $ARGS[0] = 'Party_rex_sex_cow':
 	if sexvar = 1: '<br>He indicates that he will cum soon.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
-	if sexvar = 0:act 'Make him cum': gt 'reks', 'Party_rex_sex_cum'
-	if sexvar > 0:act 'Lie on your back': gt 'reks', 'Party_rex_sex_missionary'
-	if sexvar > 0:act 'Get on all fours': gt 'reks', 'Party_rex_sex_dog'
+	if sexvar = 0:act 'Make him cum': gt 'rex_events', 'Party_rex_sex_cum'
+	if sexvar > 0:act 'Lie on your back': gt 'rex_events', 'Party_rex_sex_missionary'
+	if sexvar > 0:act 'Get on all fours': gt 'rex_events', 'Party_rex_sex_dog'
 end
 
 if $ARGS[0] = 'Party_rex_sex_dog':
@@ -854,9 +854,9 @@ if $ARGS[0] = 'Party_rex_sex_dog':
 	if sexvar = 1: '<br>He indicates that he will cum soon.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
-	if sexvar = 0:act 'Make him cum': gt 'reks', 'Party_rex_sex_cum'
-	if sexvar > 0:act 'Get on top': gt 'reks', 'Party_rex_sex_cow'
-	if sexvar > 0:act 'Lie on your back': gt 'reks', 'Party_rex_sex_missionary'
+	if sexvar = 0:act 'Make him cum': gt 'rex_events', 'Party_rex_sex_cum'
+	if sexvar > 0:act 'Get on top': gt 'rex_events', 'Party_rex_sex_cow'
+	if sexvar > 0:act 'Lie on your back': gt 'rex_events', 'Party_rex_sex_missionary'
 end
 
 if $ARGS[0] = 'Party_rex_sex_missionary':
@@ -873,9 +873,9 @@ if $ARGS[0] = 'Party_rex_sex_missionary':
 	if sexvar = 1: '<br>He indicates that he will cum soon.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
-	if sexvar > 0: act 'Get on all fours': gt 'reks', 'Party_rex_sex_dog'
-	if sexvar > 0: act 'Get on top': gt 'reks', 'Party_rex_sex_cow'
-	if sexvar = 0: act 'Make him cum': gt 'reks', 'Party_rex_sex_cum'
+	if sexvar > 0: act 'Get on all fours': gt 'rex_events', 'Party_rex_sex_dog'
+	if sexvar > 0: act 'Get on top': gt 'rex_events', 'Party_rex_sex_cow'
+	if sexvar = 0: act 'Make him cum': gt 'rex_events', 'Party_rex_sex_cum'
 end
 
 if $ARGS[0] = 'Party_rex_sex':
@@ -900,9 +900,9 @@ if $ARGS[0] = 'Party_rex_sex':
 	'You keep sucking his dick. ' + iif( Rex_Love = 0, 'Rex', 'Your lover') + ' looks at you and you can see in his eyes that he is ready for the next step.'
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
-	act 'Lie on your back': gt 'reks', 'Party_rex_sex_missionary'
-	act 'Get on all fours': gt 'reks', 'Party_rex_sex_dog'
-	act 'Get on top': gt 'reks', 'Party_rex_sex_cow'
+	act 'Lie on your back': gt 'rex_events', 'Party_rex_sex_missionary'
+	act 'Get on all fours': gt 'rex_events', 'Party_rex_sex_dog'
+	act 'Get on top': gt 'rex_events', 'Party_rex_sex_cow'
 end
 
 if $ARGS[0] = 'party':
@@ -915,10 +915,10 @@ if $ARGS[0] = 'party':
 	if Rex_Love = 0: 'You walk up to Rex but then you realize he looks way too drunk and distracted by the other girls to pay much attention to you.'
 	if Rex_Love = 1: 'Rex comes up to you and hugs you sweetly.'
 	act 'Move away': gt $loc,$loc_arg
-	if $loc_arg = 'party_home' and alko < 6: act 'propose a toast': gt 'sbReksHome', 'party_drink'
-	if $loc_arg = 'party_gost': act 'Chat': gt 'dinParty', 'rex_talk'
-	if $loc_arg = 'party_gost': act 'Dance together': gt 'dinParty', 'rex_dance'
+	if $loc_arg = 'party_home' and alko < 6: act 'propose a toast': gt 'rex_party_home', 'party_drink'
+	if $loc_arg = 'party_gost': act 'Chat': gt 'rex_party_events', 'rex_talk'
+	if $loc_arg = 'party_gost': act 'Dance together': gt 'rex_party_events', 'rex_dance'
 end
 
---- reks ---------------------------------
+--- rex_events ---------------------------------
 

+ 47 - 47
locations/party_boys.qsrc → locations/rex_party_boys_events.qsrc

@@ -1,11 +1,11 @@
-# party_boys
+# rex_party_boys_events
 
 if $ARGS[0] = 'drink':
 	cls
 	minut += 5
 	gs 'drugs ', 'alcohol', 'beer'
 	party_boys_drink += 1
-	$menu_loc = 'party_boys'
+	$menu_loc = 'rex_party_boys_events'
 	$menu_arg = 'drink'
 	menu_off = 0
 	minut += 5
@@ -47,15 +47,15 @@ if $ARGS[0] = 'drink':
 		'"Guys, you poured too much into the glass. I''m drunk already.", you say."'
 		'"Come on <<$pcs_nickname>>, lets have another." with that, one of the guys puts his arm around you and bares your breasts. The touchy guy is surprisingly nice and you are a little amused by this situation.'
 		if npc_rel['A57'] >= 50: 'You notice Rex in the room...'
-		if npc_rel['A57'] >= 50: act 'Get Rex''s attention': gt 'party_boys', 'Rex_save'
-		act 'Have fun with them': gt 'party_boys', 'smile'
+		if npc_rel['A57'] >= 50: act 'Get Rex''s attention': gt 'rex_party_boys_events', 'Rex_save'
+		act 'Have fun with them': gt 'rex_party_boys_events', 'smile'
 		gs 'willpower', 'action', 'type', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Break free of them (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'pay', 'type'
 				gs 'stat'
-				gt 'party_boys', 'Try_save'
+				gt 'rex_party_boys_events', 'Try_save'
 			end
 		else
 			act 'Break free of them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -66,7 +66,7 @@ end
 if $ARGS[0] = 'Rex_save':
 	cls
 	Rex_save += 1
-	$menu_loc = 'party_boys'
+	$menu_loc = 'rex_party_boys_events'
 	$menu_arg = 'Rex_save'
 	menu_off = 0
 	minut += 5
@@ -76,12 +76,12 @@ if $ARGS[0] = 'Rex_save':
 	'He quickly exclaims, "Hey boys, are you insane? Take your hands off my fucking girl. One more time and I will kick your ass!"'
 	'The guy takes his hands off of you, "Rex, bro, we were just having a bit of drunken fun. I''m sorry, if I hurt your girl."'
 	'Rex comes up to you and picks you up, "Come on, sweety. I''ll make sure the other guys leave you alone. Lets go to another room."'
-	act 'Go to the Rex''s room': gt 'party_boys', 'V_komnatu'
+	act 'Go to the Rex''s room': gt 'rex_party_boys_events', 'V_komnatu'
 end
 
 if $ARGS[0] = 'smile':
 	cls
-	$menu_loc = 'party_boys'
+	$menu_loc = 'rex_party_boys_events'
 	$menu_arg = 'smile'
 	menu_off = 0
 	party_boys_in += 1
@@ -97,13 +97,13 @@ if $ARGS[0] = 'smile':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_4_<<rand(1,3)>>.jpg"></center>'
 	'You give the guys a faint smile, showing your availability. They quickly realize the situation and come over to you and start to stroke your hair and massage your neck. It is very relaxing and you give a soft sigh which turns into a moan. You have the full attention of the boys and they decide to drag you.'
-	act 'Go outside Rex''s house': gt 'party_boys', 'out'
-	act 'Go to another room':minut += 5 & gt 'party_boys', 'V_komnatu'
+	act 'Go outside Rex''s house': gt 'rex_party_boys_events', 'out'
+	act 'Go to another room':minut += 5 & gt 'rex_party_boys_events', 'V_komnatu'
 end
 
 if $ARGS[0] = 'Try_save':
 	cls
-	$menu_loc = 'party_boys'
+	$menu_loc = 'rex_party_boys_events'
 	$menu_arg = 'Try_save'
 	menu_off = 0
 	minut += 5
@@ -112,12 +112,12 @@ if $ARGS[0] = 'Try_save':
 	'You find the strength to break free of the grasping hands, shouting "Let me go, I don''t want that. Get your filthy hands off me."'
 	'"Come on, <<$pcs_nickname>>, we''re just having fun. Just admit that you liked where this was going." the touchy guy responds.'
 	act 'Move away': gt $loc,$loc_arg
-	act 'Have fun with them': gt 'party_boys', 'smile'
+	act 'Have fun with them': gt 'rex_party_boys_events', 'smile'
 end
 
 if $ARGS[0] = 'V_komnatu':
 	cls
-	$menu_loc = 'party_boys'
+	$menu_loc = 'rex_party_boys_events'
 	$menu_arg = 'V_komnatu'
 	menu_off = 0
 	gs 'stat'
@@ -154,8 +154,8 @@ if $ARGS[0] = 'V_komnatu':
 		if party_boys_in >= 1: '"Do you mind, guys?" one of the boy asks with a grin.'
 		'"No, sit. There is room enough for everyone!" one of the guys who is fucking Lena answers.	The boys then unceremoniously put you on your knees and unzip their pants. Even in your drunken delirium you know what they want.'
 	end
-	if Rex_save = 1: act 'Fall asleep': gt 'dinParty', 'sleep'
-	if party_boys_in >= 1: act 'Start to suck': gt 'party_boys', 'in'
+	if Rex_save = 1: act 'Fall asleep': gt 'rex_party_events', 'sleep'
+	if party_boys_in >= 1: act 'Start to suck': gt 'rex_party_boys_events', 'in'
 end
 
 if $ARGS[0] = 'out':
@@ -206,8 +206,8 @@ if $ARGS[0] = 'out':
 				'You turn around and kneel in front of him, playfully sticking out your tongue. The drunk guy gives a little jerk and sprays of sperm jets into your mouth. "Ah, <<$pcs_nickname>>, you are truly the best bitch at this party!" the guys all laugh. You try to join in, but your laughter is stifled by the mouthful of sperm.'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Swallow': gt 'dinParty', 'boys_swalow'
-				act 'Spit out': gt 'dinParty', 'boys_spit'
+				act 'Swallow': gt 'rex_party_events', 'boys_swalow'
+				act 'Spit out': gt 'rex_party_events', 'boys_spit'
 			end
 		end
 	elseif i = 2:
@@ -287,7 +287,7 @@ if $ARGS[0] = 'out':
 			killvar 'i2'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Fall asleep': gt 'dinParty', 'sleep'
+			act 'Fall asleep': gt 'rex_party_events', 'sleep'
 		end
 	elseif i = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_4_9.jpg"></center>'
@@ -349,7 +349,7 @@ if $ARGS[0] = 'out':
 			gs 'cuminsidereact', 'one of the guys from the party'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Fall asleep': gt 'dinParty', 'sleep'
+			act 'Fall asleep': gt 'rex_party_events', 'sleep'
 		end
 	elseif i = 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_kuh_4_11.jpg"></center>'
@@ -433,7 +433,7 @@ if $ARGS[0] = 'out':
 			killvar 'i2'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Fall asleep': gt 'dinParty', 'sleep'
+			act 'Fall asleep': gt 'rex_party_events', 'sleep'
 		end
 	end
 end
@@ -519,7 +519,7 @@ if $ARGS[0] = 'in':
 			'The guys stand over you and begin to finish at the same time, spurting streams of semen on you from all sides. Some of them come into your mouth and you swallow copious amounts of sperm. You sit in front of the happy guys, licking every last drop off of their limp dicks. "Good work boys. We really used this bitch up.", you hear a muffled voice say, as you begin to fall asleep.'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Fall asleep': gt 'dinParty', 'sleep'
+			act 'Fall asleep': gt 'rex_party_events', 'sleep'
 		end
 	end
 end
@@ -545,8 +545,8 @@ if $ARGS[0] = 'gost_drink':
 	else
 		act 'Move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end	
-	act 'Show your tits': gt 'party_boys', 'boobs'
-	if alko >= 7: act 'Fall asleep drunk': gt 'dinParty', 'sleep'
+	act 'Show your tits': gt 'rex_party_boys_events', 'boobs'
+	if alko >= 7: act 'Fall asleep drunk': gt 'rex_party_events', 'sleep'
 end
 
 if $ARGS[0] = 'boobs_yes':
@@ -618,8 +618,8 @@ if $ARGS[0] = 'boobs_yes':
 						'The crowd whistles and cheers him on: "Go on! Cover that bitch in cum!" You quickly turn around and get your pretty face covered in sperm. Streams of sticky semen flow down your lashes, lips and chin.'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Swallow': gt 'dinParty', 'boys_swalow'
-						act 'Spit it out': gt 'dinParty', 'boys_spit'
+						act 'Swallow': gt 'rex_party_events', 'boys_swalow'
+						act 'Spit it out': gt 'rex_party_events', 'boys_spit'
 					end
 				end
 			end
@@ -640,10 +640,10 @@ if $ARGS[0] = 'boobs':
 	'"So what do you think, boys?" you ask with a smile on your face.'
 	'"You are a straight up sex grenade, and I would like to pull your pin." one of the guys answers. With these words, they come over to you.'
 	if Rex_Love = 1: 'Rex looks unhappily in your direction, his eyes flashing with anger and jealousy.'
-	if Rex_Love = 1: act 'Drag Rex to the restroom': gt 'party_girls', 'rex'
+	if Rex_Love = 1: act 'Drag Rex to the restroom': gt 'rex_party_girls_events', 'rex'
 	gs 'arousal', 'flash', 5, 'exhibitionism'
 	gs 'stat'
-	act 'Move closer': gt 'party_boys', 'boobs_yes'
+	act 'Move closer': gt 'rex_party_boys_events', 'boobs_yes'
 	gs 'willpower', 'exhib', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Move away (<<will_cost>> Willpower)':
@@ -741,7 +741,7 @@ if $ARGS[0] = 'gost_drink_else':
 					'Sperm sprinkles on you from all sides like rain. After they finish they leave you alone in the room, exhausted and covered in cum.'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Fall asleep': gt 'dinParty', 'sleep'
+					act 'Fall asleep': gt 'rex_party_events', 'sleep'
 				end
 			end
 		end
@@ -772,7 +772,7 @@ if $ARGS[0] = 'gost_home_cum':
 	iif(Rex_Love = 0,'Roma and Rex', 'The guys') + ' pull their dick out and cover your face and body with thick streams of semen. They are leaning over you, breathing heavily, only gradually calming down while you are lying there relaxed, licking the last drops of semen off of their limp dicks. ' + iif(Rex_Love = 0,'Roma and Rex', 'The guys') + ' leave you alone, exhausted and ready to fall asleep.'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Fall asleep': gt 'dinParty', 'sleep'
+	act 'Fall asleep': gt 'rex_party_events', 'sleep'
 end
 
 if $ARGS[0] = 'gost_home_cow':
@@ -797,7 +797,7 @@ if $ARGS[0] = 'gost_home_cow':
 	gs 'arousal', 'anal', 5, 'sub', 'group'
 	minut -= 5
 	gs 'stat'
-	act 'Continue': gt 'party_boys', 'gost_home_cum'
+	act 'Continue': gt 'rex_party_boys_events', 'gost_home_cum'
 end
 
 if $ARGS[0] = 'gost_home_dog':
@@ -819,7 +819,7 @@ if $ARGS[0] = 'gost_home_dog':
 	gs 'arousal', 'vaginal', 5, 'sub', 'group'
 	minut -= 5
 	gs 'stat'
-	act 'Continue': gt 'party_boys', 'gost_home_cum'
+	act 'Continue': gt 'rex_party_boys_events', 'gost_home_cum'
 end
 
 if $ARGS[0] = 'gost_home_suck':
@@ -834,8 +834,8 @@ if $ARGS[0] = 'gost_home_suck':
 	iif(Rex_Love = 0,'Roma and Rex', 'The guys') + ' push down on your shoulders and you dutifully kneel down in front of them. You start sucking both their cocks, bringing them close to orgasm, when they ask you what you want to do next.'
 	gs 'arousal', 'bj', 5, 'sub', 'group'
 	gs 'stat'
-	act 'Bend over': gt 'party_boys', 'gost_home_dog'
-	act 'Get on his cock': gt 'party_boys', 'gost_home_cow'
+	act 'Bend over': gt 'rex_party_boys_events', 'gost_home_dog'
+	act 'Get on his cock': gt 'rex_party_boys_events', 'gost_home_cow'
 end
 
 if $ARGS[0] = 'gost_home_hand':
@@ -846,7 +846,7 @@ if $ARGS[0] = 'gost_home_hand':
 	'You run your fingers up and down their shafts before gripping them firmly. You start to stroke them, feeling their dicks getting harder and harder in your hands.'
 	gs 'arousal', 'hj', 5, 'sub', 'group'
 	gs 'stat'
-	act 'Suck': gt 'party_boys', 'gost_home_suck'
+	act 'Suck': gt 'rex_party_boys_events', 'gost_home_suck'
 end
 
 if $ARGS[0] = 'gost_home':
@@ -866,8 +866,8 @@ if $ARGS[0] = 'gost_home':
 	'As soon as you get in the room, ' + iif(Rex_Love = 0,'Roma and Rex', 'the guys') + ' begin to undress and gently caress you. You feel like the belle of the ball as they passionately kiss you and start to lick your ass and pussy at the same time. After taking care of you for a long time, their dicks are both erect and the guys look expectantly at you.'
 	gs 'arousal', 'foreplay', 5, 'sub', 'group'
 	gs 'stat'
-	act 'Give them a handjob': gt 'party_boys', 'gost_home_hand'
-	act 'Give them a blowjob': gt 'party_boys', 'gost_home_suck'
+	act 'Give them a handjob': gt 'rex_party_boys_events', 'gost_home_hand'
+	act 'Give them a blowjob': gt 'rex_party_boys_events', 'gost_home_suck'
 end
 
 if $ARGS[0] = 'gost_dance':
@@ -880,9 +880,9 @@ if $ARGS[0] = 'gost_dance':
 	if Rex_Love = 1: 'Two of the hottest guys come over to you, apparently deciding you are the finest girl here. Rex looks indignantly at you, trying to figure out what you are going to do.'
 	if Rex_Love = 0: 'Roma and Rex come to you. Having decided that you are the finest girl here they start do dance with you.'
 	'You lasciviously move your sexy young body, dancing with ' + iif(Rex_Love = 0,'Roma and Rex', 'the guys') + ' . Visibly turned on by you they offer to take you somewhere else and do more than just dancing.'
-	if Rex_Love = 1:act 'Dance with Rex': gt 'dinParty', 'rex_dance'
-	act 'Drink': gt 'party_boys', 'gost_drink_else'
-	act 'Go with them': gt 'party_boys', 'gost_home'
+	if Rex_Love = 1:act 'Dance with Rex': gt 'rex_party_events', 'rex_dance'
+	act 'Drink': gt 'rex_party_boys_events', 'gost_drink_else'
+	act 'Go with them': gt 'rex_party_boys_events', 'gost_home'
 end
 
 if $ARGS[0] = 'dance':
@@ -895,8 +895,8 @@ if $ARGS[0] = 'dance':
 	'You are enthralled by the rhythmic sounds and indulge in unrestrained dancing with the crowd. You jump around and twist your body, completely absorbed in the moment.'
 	if pcs_danc >= 50: 'Your curves and movements to the music make you a pleasure to watch. The boys stare at you excitedly.'
 	if pcs_danc < 50: 'Your ridiculous movements during the dance don''t bother anyone. You dance badly, but you do not care.'
-	act 'Dance with Rex': gt 'dinParty', 'rex_dance'
-	act 'Dance with the guys': gt 'party_boys', 'gost_dance'
+	act 'Dance with Rex': gt 'rex_party_events', 'rex_dance'
+	act 'Dance with the guys': gt 'rex_party_boys_events', 'gost_dance'
 	act 'Have a rest': gt $loc,$loc_arg
 end
 
@@ -917,12 +917,12 @@ if $ARGS[0] = 'party_boys':
 	if $loc_arg = 'party_gost': 'A couple of fun energetic guys come over to you. "Hey <<$pcs_nickname>>, long time no see. Do you want to come with us?"'
 	if alko >= 5: '"Hey <<$pcs_nickname>>, how about you show us your great tits. Just for fun?"'
 	act 'Move away': gt $loc,$loc_arg
-	if alko < 6 and $loc_arg = 'party_home': act 'Drink': gt 'sbReksHome', 'party_drink'
-	if $loc_arg = 'party_kuh': act 'Drink': gt 'party_boys', 'drink'
-	if $loc_arg = 'party_gost': act 'Drink': gt 'party_boys', 'gost_drink'
-	if alko >= 5 and $loc_arg = 'party_gost': act 'Show your tits': gt 'party_boys', 'boobs'
-	if $loc_arg = 'party_gost': act 'Dance': gt 'party_boys', 'dance'
+	if alko < 6 and $loc_arg = 'party_home': act 'Drink': gt 'rex_party_home', 'party_drink'
+	if $loc_arg = 'party_kuh': act 'Drink': gt 'rex_party_boys_events', 'drink'
+	if $loc_arg = 'party_gost': act 'Drink': gt 'rex_party_boys_events', 'gost_drink'
+	if alko >= 5 and $loc_arg = 'party_gost': act 'Show your tits': gt 'rex_party_boys_events', 'boobs'
+	if $loc_arg = 'party_gost': act 'Dance': gt 'rex_party_boys_events', 'dance'
 end
 
---- party_boys ---------------------------------
+--- rex_party_boys_events ---------------------------------
 

+ 24 - 24
locations/dinParty.qsrc → locations/rex_party_events.qsrc

@@ -1,4 +1,4 @@
-# dinParty
+# rex_party_events
 
 !A random event in the toilet
 if $ARGS[0] = 'party_toilet_event':
@@ -14,15 +14,15 @@ if $ARGS[0] = 'party_toilet_event':
 	if temp = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_2_<<rand(1,2)>>.jpg"></center>'
 		'A girl sits on the toilet drinking.'
-		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+		act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 	elseif temp = 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_3_<<rand(1,5)>>.jpg"></center>'
 		'A girl sits on the toilet, urinating. She seems oddly happy to see you.'
-		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+		act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 	elseif temp = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_4.jpg"></center>'
 		'A wasted girl sits on the toilet masturbating.'
-		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+		act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 	elseif temp = 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_5_1.jpg"></center>'
 		'You go into the bathroom, only to find Rex standing in there completely naked with a raging hard on.'
@@ -93,7 +93,7 @@ if $ARGS[0] = 'party_toilet_event':
 				end
 			end
 		end
-		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+		act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 	elseif temp = 5:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_6_1.jpg"></center>'
 		'Entering the bathroom, you find your sister sitting on the toilet. You notice the cum on her face.'
@@ -118,7 +118,7 @@ if $ARGS[0] = 'party_toilet_event':
 			'"Roma tried to make up again." your sister responds angrily. Once she has finished peeing, she gets up and leaves, obviously not wanting to talk about it.'
 			act 'Move away': gt $loc, $loc_arg
 		end
-		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+		act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 	elseif temp = 6:
 		toiletEvent_Girls = daystart
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_7_1.jpg"></center>'
@@ -184,13 +184,13 @@ if $ARGS[0] = 'party_toilet_event':
 							end
 						end
 					end
-				act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+				act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 				end
-			act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+			act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 			end
-		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+		act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 		end
-	act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+	act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 	elseif temp = 7:
 		i = rand(1,3)
 		if i = 2:
@@ -199,12 +199,12 @@ if $ARGS[0] = 'party_toilet_event':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_8_<<i>>.jpg"></center>'
 		end
 		'From the sounds of the groans, moans and cries of passion, the bathroom is in use again. Peeking inside, you see a sweet couple fucking like rabbits.'
-		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+		act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 	elseif temp = 8:
 		toiletEvent_SisBoy = daystart
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_toilet_9.jpg"></center>'
 		'Looking inside the bathroom, you see your sister with her back against the wall, her skirt pulled up and panties around her ankles with Roma''s face buried between her legs. He''s apparently asking for forgiveness from your sister again.'
-		act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+		act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 	end
 end
 
@@ -251,7 +251,7 @@ if $ARGS[0] = 'dj_beer':
 	'You take two beers to the guys. They gratefully appreciate your offer.'
 	'"<<$pcs_nickname>>, you ever use one of these before?" the DJ asks you, indicating the turntable.'
 	'You shake your head. "No, I can''t say I have."'
-	'He smiles at you. "While everyone is still sitting and drinking, you can give it a little <a href="exec: gt ''dinParty'', ''dj_thank''">twist</a>. Let''s see what you can do girl!"'
+	'He smiles at you. "While everyone is still sitting and drinking, you can give it a little <a href="exec: gt ''rex_party_events'', ''dj_thank''">twist</a>. Let''s see what you can do girl!"'
 	act 'Move away': gt $loc, $loc_arg
 end
 
@@ -280,7 +280,7 @@ if $ARGS[0] = 'dj_boobs':
 	'"Like this boys?" you ask as you put your breasts on the turntable and move it a bit with your breasts.'
 	'Not much sound comes out from your attempt, but the guys seem to love it all the same.'
 	act 'Move away': gt $loc, $loc_arg
-	act 'Take off your top': gt 'dinParty', 'dj_cock'
+	act 'Take off your top': gt 'rex_party_events', 'dj_cock'
 end
 
 if $ARGS[0] = 'dj_cock':
@@ -293,7 +293,7 @@ if $ARGS[0] = 'dj_cock':
 	'Seeing the interest from the smiling guys watching you, you get rid of your top and bra and then place your naked breasts on the turntable, trying to play it topless. "I think I did better that time. What do you think?"'
 	'The guy pulls out his erection and says "Not bad. Maybe try this instead."'
 	act 'Move away': gt $loc, $loc_arg
-	act 'Give his dick a try': gt 'dinParty', 'dj_suck'
+	act 'Give his dick a try': gt 'rex_party_events', 'dj_suck'
 end
 
 if $ARGS[0] = 'dj_suck':
@@ -355,7 +355,7 @@ if $ARGS[0] = 'dance':
 	if pcs_danc >= 50: 'You move your body perfectly with the rhythm of the music in an erotic way. This gets you a lot of attention from the others. Attention that you love.'
 	if pcs_danc < 50: 'Your ridiculous movements during the dance doesn''t bother anyone. You dance badly, but you don''t care.'
 	act 'Have a rest': gt $loc, $loc_arg
-	act 'Dance more': gt 'dinParty', 'dance' 
+	act 'Dance more': gt 'rex_party_events', 'dance' 
 end
 
 
@@ -378,7 +378,7 @@ if $ARGS[0] = 'boys_swalow':
 	'"Uhh <<$pcs_nickname>>! You''re still the best cocksucker around. If you want more sperm to swallow, call us."'
 	'The guys help you back into the apartment and into one of the bedrooms as you are too drunk to do it yourself.'
 	
-	act 'Fall asleep': gt 'dinParty', 'sleep'
+	act 'Fall asleep': gt 'rex_party_events', 'sleep'
 end
 
 if $ARGS[0] = 'boys_spit':
@@ -400,7 +400,7 @@ if $ARGS[0] = 'boys_spit':
 	'"What''s wrong <<$pcs_nickname>>? Didn''t you like it? I thought all girls loved the taste of cum." one of the guys asked you with a laugh.'
 	'The guys help you back into the apartment and into one of the bedrooms as you are too drunk to do it yourself.'
 	
-	act 'Fall asleep': gt 'dinParty', 'sleep'
+	act 'Fall asleep': gt 'rex_party_events', 'sleep'
 end
 
 if $ARGS[0] = 'rex_talk':
@@ -412,8 +412,8 @@ if $ARGS[0] = 'rex_talk':
 	'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_2_<<rand(1,5)>>.mp4"></video></center>'
 	'You find a space to sit and talk to Rex. He''s quite interesting and very handsome, so you spend most of the time just nodding and flirting.'
 	act 'Move away': gt $loc, $loc_arg
-	if rex_talk >= 2: act 'Hug': gt 'dinParty', 'rex_hug'
-	act 'Ask Rex to dance': gt 'dinParty', 'rex_dance'
+	if rex_talk >= 2: act 'Hug': gt 'rex_party_events', 'rex_hug'
+	act 'Ask Rex to dance': gt 'rex_party_events', 'rex_dance'
 end
 
 if $ARGS[0] = 'rex_hug':
@@ -446,7 +446,7 @@ if $ARGS[0] = 'rex_hug':
 			gs 'stat'
 	
 			act 'Move away': gt $loc, $loc_arg
-			act 'Follow Rex': gt 'reks', 'Party_rex_sex'
+			act 'Follow Rex': gt 'rex_events', 'Party_rex_sex'
 		end
 	end
 
@@ -463,7 +463,7 @@ if $ARGS[0] = 'rex_hug':
 		gs 'arousal', 'foreplay', 5, 'exhibitionism'
 		gs 'stat'
 		
-		act 'Follow Rex': gt 'reks', 'Party_rex_sex'
+		act 'Follow Rex': gt 'rex_events', 'Party_rex_sex'
 	end    
 end
 
@@ -482,7 +482,7 @@ if $ARGS[0] = 'rex_dance':
 	'You dance, slowly getting closer to each other and finally grinding a bit against each other.'
 	'You turn around, putting your back to him and grind your tight ass against his crotch. You can feel his hard cock against your ass as you grind against it.'
 	act 'Move away': gt $loc, $loc_arg 
-	if rex_talk >= 2: act 'Hug': gt 'dinParty', 'rex_hug'
+	if rex_talk >= 2: act 'Hug': gt 'rex_party_events', 'rex_hug'
 end
 
 if $ARGS[0] = 'sleep':
@@ -669,5 +669,5 @@ if $ARGS[0] = 'sleep':
 	end
 end
 
---- dinParty ---------------------------------
+--- rex_party_events ---------------------------------
 

+ 51 - 51
locations/party_girls.qsrc → locations/rex_party_girls_events.qsrc

@@ -1,4 +1,4 @@
-# party_girls
+# rex_party_girls_events
 
 menu_off = 1
 
@@ -64,7 +64,7 @@ if $ARGS[0] = 'talk':
 		'You sit and chat with a couple of cute girls. One of them tells you, "My former boyfriend''s member was as big, as my whole arm. At first it hurt fucking him, but then I got used to it and really enjoyed it."'
 	end
 
-	act 'Move away': gt 'sbReksHome', 'party_home'
+	act 'Move away': gt 'rex_party_home', 'party_home'
 end
 
 if $ARGS[0] = 'smoke':
@@ -75,14 +75,14 @@ if $ARGS[0] = 'smoke':
 		girls_smoke = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_home_3_1.jpg"></center>'
 		'"Girls, look what I stole from my worthless, addicted brother.", one of the girls says, showing you two bags of marijuana. "So, do you want to keep staring at me, or do you want to have fun?"'
-		act 'Start smoking': gt 'party_girls', 'smoke'
+		act 'Start smoking': gt 'rex_party_girls_events', 'smoke'
 		gs 'willpower', 'drugs ', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Move away (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'sbReksHome', 'party_home'
+				gt 'rex_party_home', 'party_home'
 			end
 		else
 			act 'Move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -111,7 +111,7 @@ if $ARGS[0] = 'smoke':
 			elseif i = 5:
 				'The smoke makes you feel good, letting you focus on positive emotions. You are able to feel all kinds of effects, happy, pleased, delighted, euphoric.'
 			end
-			act 'Move away': gt 'sbReksHome', 'party_home'
+			act 'Move away': gt 'rex_party_home', 'party_home'
 		end
 	end
 end
@@ -138,7 +138,7 @@ if $ARGS[0] = 'fun':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_home_fun_1_<<rand(7,11)>>.jpg"></center>'
 				'You seductively wag your ass. ' + iif(Rex_Love = 0,'One boy', 'Rex') + ' is standing right in front of you and you firmly press your buttocks in his palms. He exclaims, "Boys, I think I already know the winner!" You win the competition easily.'
-				act 'Move away': gt 'sbReksHome', 'party_home'
+				act 'Move away': gt 'rex_party_home', 'party_home'
 			end
 		elseif fun_rand = 2:
 			cls
@@ -160,7 +160,7 @@ if $ARGS[0] = 'fun':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
-							gt 'sbReksHome', 'party_home'
+							gt 'rex_party_home', 'party_home'
 						end
 					else
 						act 'Move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -199,7 +199,7 @@ if $ARGS[0] = 'fun':
 								gs 'arousal', 'cuni', 15, 'exhibitionism'
 								gs 'arousal', 'end'
 								cumspclnt = 14 & gs 'cum_cleanup'
-								act 'Move away': gt 'sbReksHome', 'party_home'
+								act 'Move away': gt 'rex_party_home', 'party_home'
 							end
 							act 'Move faster':
 								cls
@@ -211,7 +211,7 @@ if $ARGS[0] = 'fun':
 								gs 'arousal', 'vaginal', 5, 'exhibitionism'
 								gs 'arousal', 'end'
 								gs 'Cum_Manage'
-								act 'Move away': gt 'sbReksHome', 'party_home'
+								act 'Move away': gt 'rex_party_home', 'party_home'
 							end
 						end
 					end
@@ -227,7 +227,7 @@ if $ARGS[0] = 'fun':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
-							gt 'sbReksHome', 'party_home'
+							gt 'rex_party_home', 'party_home'
 						end
 					else
 						act 'Move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -248,7 +248,7 @@ if $ARGS[0] = 'fun':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_home_fun_2_7_7.jpg"></center>'
 								'You start to moan and the girls quickly lay you down on your back an start to caress you with their tongues. They take turns kissing you and licking your pussy, quickly bringing you to orgasm.'
 							end
-							act 'Move away': gt 'sbReksHome', 'party_home'
+							act 'Move away': gt 'rex_party_home', 'party_home'
 						end
 					end
 				end
@@ -262,7 +262,7 @@ if $ARGS[0] = 'fun':
 			iif(reksMeet = 1,'You have Rex'' member in front of you and compare it with your arm.', 'One of the more persistent guys comes up to you and you compare his penis with your arm.')
 			gs 'willpower', 'bj', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
-				act 'Move away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'sbReksHome', 'party_home'
+				act 'Move away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'rex_party_home', 'party_home'
 			else
 				act 'Move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
@@ -284,7 +284,7 @@ if $ARGS[0] = 'fun':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_home_fun_2_8_<<rand(6,12)>>.jpg"></center>'
 						'You open your mouth and stick out your tongue.'
 						iif(Rex_Love = 0,'The guy', 'Rex') + ' cums hard, filling up your mouth and smearing sperm all over your face.'
-						act 'Move away': gt 'sbReksHome', 'party_home'
+						act 'Move away': gt 'rex_party_home', 'party_home'
 					end
 				}
 				if rand(1,2) = 1:
@@ -307,7 +307,7 @@ if $ARGS[0] = 'fun':
 			*clr & cla
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'sbReksHome', 'party_home'
+			gt 'rex_party_home', 'party_home'
 		end
 	else
 		act 'Move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -323,7 +323,7 @@ if $ARGS[0] = 'drunk':
 	if i = 1: '<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_3_1.mp4"></video></center>'
 	if i = 2: '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_3_<<rand(2,3)>>.jpg"></center>'
 	'You have another drink, and start to lose touch with reality. You feel dizzy and very sick...'
-	act 'Pass out': gt 'dinParty', 'sleep'
+	act 'Pass out': gt 'rex_party_events', 'sleep'
 end
 
 if $ARGS[0] = 'lena':
@@ -345,21 +345,21 @@ if $ARGS[0] = 'lena':
 		
 		gs 'willpower', 'drink', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
-			act 'Drink (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'self' &  gt 'party_girls', 'ira_drink'
+			act 'Drink (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'self' &  gt 'rex_party_girls_events', 'ira_drink'
 		else
 			act 'Drink (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end	
 		
-		act 'Dance': gt 'party_girls', 'ira_dance'
+		act 'Dance': gt 'rex_party_girls_events', 'ira_dance'
 	else
-		if alko < 6 and $loc_arg = 'party_home': act 'Have a drink': gt 'sbReksHome', 'party_drink'
+		if alko < 6 and $loc_arg = 'party_home': act 'Have a drink': gt 'rex_party_home', 'party_drink'
 	end
 end
 
 if $ARGS[0] = 'ira':
 	cls
 	minut += 5
-	$menu_loc = 'party_girls'
+	$menu_loc = 'rex_party_girls_events'
 	$menu_arg = 'ira'
 	menu_off = 0
 	gs 'stat'
@@ -375,10 +375,10 @@ if $ARGS[0] = 'ira':
 	act 'Move away': gt $loc, $loc_arg
 	if $loc_arg = 'party_gost':
 		'Lena and Ira together clink cups. "<<$pcs_nickname>>, Lets party!" As they offer you a drink.'
-		act 'Drink': gt 'party_girls', 'ira_drink'
-		act 'Dance': gt 'party_girls', 'ira_dance'
+		act 'Drink': gt 'rex_party_girls_events', 'ira_drink'
+		act 'Dance': gt 'rex_party_girls_events', 'ira_dance'
 	else
-		if alko < 6 and $loc_arg = 'party_home': act 'Have a drink': gt 'sbReksHome', 'party_drink'
+		if alko < 6 and $loc_arg = 'party_home': act 'Have a drink': gt 'rex_party_home', 'party_drink'
 	end
 end
 
@@ -451,7 +451,7 @@ if $ARGS[0] = 'ira_dance':
 						gs 'arousal', 'vaginal_finger_give', -5, 'lesbian', 'group'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Fall asleep': gt 'dinParty', 'sleep'
+						act 'Fall asleep': gt 'rex_party_events', 'sleep'
 					end
 				end
 			end
@@ -471,8 +471,8 @@ if $ARGS[0] = 'ira_drink':
 	'Ira and Lena ply you with drinks, the more you drink the more your mood is markedly improved.'
 	'After several drinks Lena and Ira pull you roughly along to come have fun with them.'
 	if alko >= 7: 'Sudden your head starts spinning and you feel unsteady.'
-	if alko >= 7: act 'Pass out': gt 'dinParty', 'sleep'
-	if alko < 7: act 'Have fun': gt 'party_girls', 'ira_lena_fun'
+	if alko >= 7: act 'Pass out': gt 'rex_party_events', 'sleep'
+	if alko < 7: act 'Have fun': gt 'rex_party_girls_events', 'ira_lena_fun'
 	if alko < 7: act 'Move away': gt $loc, $loc_arg
 end
 
@@ -492,13 +492,13 @@ if $ARGS[0] = 'ira_lena_fun':
 		if Rex_Love = 0: 'Seeing what you are doing, Rex walks over and grabs you, then drags you into another room.'
 		if Rex_Love = 1: 'Seeing what you are doing, Rex walks over and grabs you, then drags you into another room.'
 		if Rex_Love = 1: 'Rex glares in the direction of Roma and your female companions.'
-		act 'Go with him': gt 'party_girls', 'ira_boy'
-		if Rex_Love = 1:act 'Stay with Rex': gt 'dinParty', 'rex_talk'
+		act 'Go with him': gt 'rex_party_girls_events', 'ira_boy'
+		if Rex_Love = 1:act 'Stay with Rex': gt 'rex_party_events', 'rex_talk'
 	else
 		'Seeing what you are doing, a couple of guys walk over and grab you, then they drag you into another room.'
 		if Rex_Love = 1: 'Rex glares in the direction of your female companions.'
-		act 'Go with them': gt 'party_girls', 'ira_fun_boys'
-		if Rex_Love = 1:act 'Stay with Rex': gt 'dinParty', 'rex_talk'
+		act 'Go with them': gt 'rex_party_girls_events', 'ira_fun_boys'
+		if Rex_Love = 1:act 'Stay with Rex': gt 'rex_party_events', 'rex_talk'
 	end
 end
 
@@ -546,7 +546,7 @@ if $ARGS[0] = 'ira_boy':
 			gs 'arousal', 'vaginal', 5, 'sub', 'unknown'
 			minut -= 5
 			gs 'stat'
-			act 'Cum': gt 'party_girls', 'ira_boy_cum'
+			act 'Cum': gt 'rex_party_girls_events', 'ira_boy_cum'
 		end
 
 		act 'Bend over':
@@ -561,7 +561,7 @@ if $ARGS[0] = 'ira_boy':
 			'You got the feeling he meant to take turns fucking each of you, but he grunts and can no longer hold back.'
 			gs 'arousal', 'vaginal', 5, 'sub', 'unknown', 'group'
 			gs 'stat'
-			act 'Cum': gt 'party_girls', 'ira_boy_cum'
+			act 'Cum': gt 'rex_party_girls_events', 'ira_boy_cum'
 		end
 	end
 end
@@ -594,7 +594,7 @@ if $ARGS[0] = 'ira_boy_cum':
 	end
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Move away': gt 'sbReksHome', 'party_home'
+	act 'Move away': gt 'rex_party_home', 'party_home'
 end
 
 if $ARGS[0] = 'ira_fun_boys':
@@ -616,9 +616,9 @@ if $ARGS[0] = 'ira_fun_boys':
 		'With Lena and Ira, you get down on your knees in front of the guys, each of you take one of the cocks into your mouth and begin sucking on it. After a bit you switch which cock your sucking on, until all three of you have sucked all the guys cocks.'
 		gs 'arousal', 'bj', 5, 'sub', 'group', 'unknown'
 		gs 'stat'
-		act 'Fuck': gt 'party_girls', 'ira_boys_fuck'
+		act 'Fuck': gt 'rex_party_girls_events', 'ira_boys_fuck'
 	end
-	act 'Fuck': gt 'party_girls', 'ira_boys_fuck'
+	act 'Fuck': gt 'rex_party_girls_events', 'ira_boys_fuck'
 end
 
 if $ARGS[0] = 'ira_boys_fuck':
@@ -648,7 +648,7 @@ if $ARGS[0] = 'ira_boys_fuck':
 		cumspclnt = 14  & gs 'cum_cleanup'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Fall asleep': gt 'dinParty', 'sleep'
+		act 'Fall asleep': gt 'rex_party_events', 'sleep'
 	end
 end
 
@@ -672,7 +672,7 @@ if $ARGS[0] = 'rex':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_8.jpg"></center>'
 		'You eagerly open your mouth and instantly get hit by a stream of semen. Rex groans passionately as he finishes. "Ooh, babe, that was fantastic. You know how to get me in a good mood. You clean yourself up, while I go back to the guests."'
-		act 'Move away': gt 'sbReksHome', 'party_toilet'
+		act 'Move away': gt 'rex_party_home', 'party_toilet'
 	end
 end
 
@@ -686,7 +686,7 @@ if $ARGS[0] = 'bra':
 	if Rex_Love = 1: 'Rex watches you closely, but says nothing.'
 	gs 'willpower', 'exhib', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:
-		act 'Move away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'sbReksHome', 'party_home'
+		act 'Move away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'rex_party_home', 'party_home'
 	else
 		act 'Move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
@@ -699,7 +699,7 @@ if $ARGS[0] = 'bra':
 		'Under the merry shouts of the boys and girls you take off your bra and dance half-naked. A lot of the guys come closer trying to enjoy the view.'
 		if Rex_Love = 1: 'You enjoy yourself when Rex shouts "Maybe thats enough? This isn''t very nice to look at."'
 		act 'Move away': gt $loc, $loc_arg
-		if Rex_Love = 1: act 'Drag him to the restroom': gt 'party_girls', 'rex'
+		if Rex_Love = 1: act 'Drag him to the restroom': gt 'rex_party_girls_events', 'rex'
 		act 'Undress':
 			gs 'npcgeneratec', 0, 'Boy from Rex''s Party', 17
 			gs 'boyStat', $npclastgenerated
@@ -749,7 +749,7 @@ if $ARGS[0] = 'bra':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_13.jpg"></center>'
 							'Still squatting and barely able to stay in this position they grab their hard dicks and masturbate them until you get splashed with their semen, spurts of cum cover your face and hair. The boys wipe off the last drop of cum from their limp dicks onto your face and cackle as they leave you alone in the room.'
-							act 'Move away': gt 'sbReksHome', 'party_toilet'
+							act 'Move away': gt 'rex_party_home', 'party_toilet'
 						end
 					end
 				end
@@ -769,15 +769,15 @@ if $ARGS[0] = 'drink':
 	if i = 2: '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_2_<<rand(2,4)>>.jpg"></center>'
 	'The girls have some booze with them and you are happy to share a drink with them. You and the girls keep drinking during dancing. Your drunk yelling drowned out by the music, as the girls tell you they want to have even more fun...'
 	if alko >= 7: 'You are dizzy, and feel very ill.'
-	if alko >= 7: act 'Sleep': gt 'dinParty', 'sleep'
+	if alko >= 7: act 'Sleep': gt 'rex_party_events', 'sleep'
 	gs 'willpower', 'exhib', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:
-		act 'Move away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'sbReksHome', 'party_home'
+		act 'Move away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'rex_party_home', 'party_home'
 	else
 		act 'Move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	act 'Drink more': gt 'party_girls', 'drunk'
-	act 'Take off your top': gt 'party_girls', 'bra'
+	act 'Drink more': gt 'rex_party_girls_events', 'drunk'
+	act 'Take off your top': gt 'rex_party_girls_events', 'bra'
 end
 
 if $ARGS[0] = 'boys':
@@ -898,7 +898,7 @@ if $ARGS[0] = 'dirty':
 	'The girls are only getting warmed up and offer you more.'
 	gs 'willpower', 'cuni', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:
-		act 'Move away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'sbReksHome', 'party_home'
+		act 'Move away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'rex_party_home', 'party_home'
 	else
 		act 'Move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
@@ -909,8 +909,8 @@ if $ARGS[0] = 'dirty':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_15_<<rand(1,8)>>.jpg"></center>'
 		'"Come on <<$pcs_nickname>>, lets get wild." You give in to the general madness, taking off all your clothes, and diving headlong into the abyss of insane lesbian fervor.'
-		act 'Have fun with the guys': gt 'party_girls', 'boys'
-		act 'Go into another room with the girls': gt 'party_girls', 'girls'
+		act 'Have fun with the guys': gt 'rex_party_girls_events', 'boys'
+		act 'Go into another room with the girls': gt 'rex_party_girls_events', 'girls'
 	end
 end
 if $ARGS[0] = 'dance':
@@ -923,7 +923,7 @@ if $ARGS[0] = 'dance':
 	if pcs_danc >= 50: 'Your curves and movements to the music make you a pleasure to watch. The others stare at you excitedly.'
 	if pcs_danc < 50: 'Your ridiculous movements during the dance don''t bother anyone. You dance badly, but you do not care.'
 	act 'Take a breather': gt $loc, $loc_arg
-	act 'Dance more': gt 'party_girls', 'dirty'
+	act 'Dance more': gt 'rex_party_girls_events', 'dirty'
 end
 
 if $ARGS[0] = 'party_girls':
@@ -940,10 +940,10 @@ if $ARGS[0] = 'party_girls':
 	end
 	'Some former classmates of your sister. You are not familiar with them.'
 	act 'Move away': gt $loc, $loc_arg
-	if $loc_arg = 'party_gost': act 'Drink': gt 'party_girls', 'drink'
-	if $loc_arg = 'party_gost': act 'Dance together': gt 'party_girls', 'dance'
-	if $loc_arg = 'party_home' and alko < 6: act 'Propose a toast': gt 'sbReksHome', 'party_drink'
+	if $loc_arg = 'party_gost': act 'Drink': gt 'rex_party_girls_events', 'drink'
+	if $loc_arg = 'party_gost': act 'Dance together': gt 'rex_party_girls_events', 'dance'
+	if $loc_arg = 'party_home' and alko < 6: act 'Propose a toast': gt 'rex_party_home', 'party_drink'
 end
 
---- party_girls ---------------------------------
+--- rex_party_girls_events ---------------------------------
 

+ 38 - 39
locations/sbReksHome.qsrc → locations/rex_party_home.qsrc

@@ -1,4 +1,4 @@
-# sbReksHome
+# rex_party_home
 
 if indorf = 0 and (sisboyparty_day + 2 = daystart or hour > 21):
 	cls
@@ -16,12 +16,11 @@ end
 if $ARGS[0] = 'party':
 	CLOSE ALL
 	$location_type = 'event'
-	gs 'dinParty'
 
 	gs 'themes', 'indoors'
 	$loc_arg = 'party'
-	$loc = 'sbReksHome'
-	$menu_loc = 'sbReksHome'
+	$loc = 'rex_party_home'
+	$menu_loc = 'rex_party_home'
 	$menu_arg = 'party'
 	menu_off = 0
 	cls
@@ -58,36 +57,36 @@ if $ARGS[0] = 'party':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_2_' + rand(1,4) + '.jpg"></center>'
 		'In all this mess, you are unable to find a clean cup and are handed a full bottle of booze. Clinking glasses with the bottle, you put your lips to its mouth and turn it up, gulping down several swigs of strong drink, noticing the effects almost at once.'
 		'The party has just begun. You can still walk through the apartment and find something to do.'
-		act 'Move away': gt 'sbReksHome', 'party_home'
+		act 'Move away': gt 'rex_party_home', 'party_home'
 	end
 end
 
 !room Rex
 if $ARGS[0] = 'party_home':
 	$loc_arg = 'party_home'
-	$loc = 'sbReksHome'
+	$loc = 'rex_party_home'
 	killvar '$locclass'
 	cls
 	minut += 5
 	gs 'stat'
 	'<center><b><font color = maroon>Rex''s Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_1_' + rand(1,5) + '.jpg"></center>'
-	'You sit at a table and drink with your friends. Sitting to one side of you sharing a bottle as always are <a href="exec: gt ''party_girls'', ''lena''">Lena</a> who is always fun, her slightly more reserved friend <a href="exec: gt ''party_girls'', ''ira''">Ira</a>, and always upbeat <a href="exec: gt ''reks'', ''party''">Rex</a>.'
-	'To your other side sits your sister <a href="exec: gt ''sister_party'', ''sister_party''">Anya</a>, drinking already, and <a href="exec: gt ''sbReksHome'', ''roma''">Roma</a>, who himself sits just a bit away looking more serious than normal, plus lots of <a href="exec: gt ''party_girls'', ''party_girls''">girls</a> and <a href="exec: gt ''party_boys'', ''party_boys''">guys</a> you barely know.'
-	if alko < 3:'One of the guys offers you a bottle to <a href="exec: gt ''sbReksHome'', ''party_drink''">drink</a> from as he says, "A little more to set the mood."'
+	'You sit at a table and drink with your friends. Sitting to one side of you sharing a bottle as always are <a href="exec: gt ''rex_party_girls_events'', ''lena''">Lena</a> who is always fun, her slightly more reserved friend <a href="exec: gt ''rex_party_girls_events'', ''ira''">Ira</a>, and always upbeat <a href="exec: gt ''rex_events'', ''party''">Rex</a>.'
+	'To your other side sits your sister <a href="exec: gt ''rex_party_sister_events'', ''sister_party''">Anya</a>, drinking already, and <a href="exec: gt ''rex_party_home'', ''roma''">Roma</a>, who himself sits just a bit away looking more serious than normal, plus lots of <a href="exec: gt ''rex_party_girls_events'', ''party_girls''">girls</a> and <a href="exec: gt ''rex_party_boys_events'', ''party_boys''">guys</a> you barely know.'
+	if alko < 3:'One of the guys offers you a bottle to <a href="exec: gt ''rex_party_home'', ''party_drink''">drink</a> from as he says, "A little more to set the mood."'
 	!You''re drunk
 	if alko >= 3:
 		*clr
 		gs 'stat'
 		'<center><b><font color = maroon>Rex''s Room</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_home_1_' + rand(1,5) + '.jpg"></center>'
-		'After a while, everyone gets up to go dance and drink. Only a few <a href="exec: gt ''party_girls'', ''party_girls''">girls</a> are left in the room, but they are fun to hang out and gossip with.'
-		iif(party_girls_talk >= 2,'You <a href="exec: gt ''party_girls'', ''talk''">chat</a> and gossip with them. One of the girls pulls out some marijuana and invites all of you to <a href="exec: gt ''party_girls'', ''smoke''">have a smoke</a>.', 'You <a href="exec: gt ''party_girls'', ''talk''">chat</a> and gossip with them.')
+		'After a while, everyone gets up to go dance and drink. Only a few <a href="exec: gt ''rex_party_girls_events'', ''party_girls''">girls</a> are left in the room, but they are fun to hang out and gossip with.'
+		iif(party_girls_talk >= 2,'You <a href="exec: gt ''rex_party_girls_events'', ''talk''">chat</a> and gossip with them. One of the girls pulls out some marijuana and invites all of you to <a href="exec: gt ''rex_party_girls_events'', ''smoke''">have a smoke</a>.', 'You <a href="exec: gt ''rex_party_girls_events'', ''talk''">chat</a> and gossip with them.')
 		if pcs_mood = 100 and pcs_horny >= 50 and girls_smoke > 1:
-			'All the girls are in a good mood, and several of them excitedly pull you with them to have some <a href="exec: gt ''party_girls'', ''fun''">fun</a>.'
+			'All the girls are in a good mood, and several of them excitedly pull you with them to have some <a href="exec: gt ''rex_party_girls_events'', ''fun''">fun</a>.'
 		end
 	end
-	act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+	act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 end
 
 if $ARGS[0] = 'roma':
@@ -116,7 +115,7 @@ end
 !Rex Lounge
 if $ARGS[0] = 'party_gost':
 	$loc_arg = 'party_gost'
-	$loc = 'sbReksHome'
+	$loc = 'rex_party_home'
 	$locclass = 'livingr'
 	cls
 	minut += 5
@@ -124,18 +123,18 @@ if $ARGS[0] = 'party_gost':
 	if alko < 3:
 		'<center><b><font color = maroon>Living room</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_3.jpg"></center>'
-		'This is a large living room. Hardly anyone is here, most are all still sitting in the other room talking and drinking. Only one <a href="exec: gt ''sbReksHome'', ''party_boy''">guy</a> is in here tinkering with a turntable.'
+		'This is a large living room. Hardly anyone is here, most are all still sitting in the other room talking and drinking. Only one <a href="exec: gt ''rex_party_home'', ''party_boy''">guy</a> is in here tinkering with a turntable.'
 	elseif alko >= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_4_' + rand(1,8) + '.jpg"></center>'
-		'The party is in full swing. In one corner. a <a href="exec: gt ''sbReksHome'', ''party_boy''">guy</a>, the party DJ, is spinning beats at the turntable. You want to give it a try and <a href="exec: gt ''dinParty'', ''dance''">spin some beats</a>.'
-		'<a href="exec: gt ''sbReksHome'', ''roma''">Roma</a> and <a href="exec: gt ''sister_party'', ''sister_party''">Anya</a> are locked together having fun dancing.'
-		if Rex_Love = 0:'<a href="exec: gt ''reks'', ''party''">Rex</a> is having fun dancing with some <a href="exec: gt ''party_girls'', ''party_girls''">girls</a>.'
-		if Rex_Love = 1:'You are dancing with some <a href="exec: gt ''party_girls'', ''party_girls''">girls</a> and <a href="exec: gt ''reks'', ''party''">Rex</a>, who looks at you with loving eyes.'
-		'<a href="exec: gt ''party_girls'', ''lena''">Lena</a> and <a href="exec: gt ''party_girls'', ''ira''">Ira</a> are having fun in the company of drunken <a href="exec: gt ''party_boys'', ''party_boys''">guys</a>.'
+		'The party is in full swing. In one corner. a <a href="exec: gt ''rex_party_home'', ''party_boy''">guy</a>, the party DJ, is spinning beats at the turntable. You want to give it a try and <a href="exec: gt ''rex_party_events'', ''dance''">spin some beats</a>.'
+		'<a href="exec: gt ''rex_party_home'', ''roma''">Roma</a> and <a href="exec: gt ''rex_party_sister_events'', ''sister_party''">Anya</a> are locked together having fun dancing.'
+		if Rex_Love = 0:'<a href="exec: gt ''rex_events'', ''party''">Rex</a> is having fun dancing with some <a href="exec: gt ''rex_party_girls_events'', ''party_girls''">girls</a>.'
+		if Rex_Love = 1:'You are dancing with some <a href="exec: gt ''rex_party_girls_events'', ''party_girls''">girls</a> and <a href="exec: gt ''rex_events'', ''party''">Rex</a>, who looks at you with loving eyes.'
+		'<a href="exec: gt ''rex_party_girls_events'', ''lena''">Lena</a> and <a href="exec: gt ''rex_party_girls_events'', ''ira''">Ira</a> are having fun in the company of drunken <a href="exec: gt ''rex_party_boys_events'', ''party_boys''">guys</a>.'
 	end
-	act 'Go to Rex''s room': gt 'sbReksHome', 'party_home'
-	act 'Go to the kitchen': gt 'sbReksHome', 'party_kuh'
-	act 'Go to the bathroom': gt 'sbReksHome', 'party_toilet'
+	act 'Go to Rex''s room': gt 'rex_party_home', 'party_home'
+	act 'Go to the kitchen': gt 'rex_party_home', 'party_kuh'
+	act 'Go to the bathroom': gt 'rex_party_home', 'party_toilet'
 	act 'Leave Rex''s home': gt 'pav_commercial'
 end
 
@@ -152,11 +151,11 @@ if $ARGS[0] = 'party_boy':
 	elseif dj_beer = 1 and dj_thank < 1:
 		'<center><b><font color = maroon>DJ</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boy.jpg"></center>'
-		'The guy messes with the soundboard and makes the sound even louder. "Well, <<$pcs_nickname>>, where are our beers?" You go into the kitchen, get two bottles of beer and <a href="exec:gt ''dinParty'', ''dj_beer''">bring</a> them to the guys.'
+		'The guy messes with the soundboard and makes the sound even louder. "Well, <<$pcs_nickname>>, where are our beers?" You go into the kitchen, get two bottles of beer and <a href="exec:gt ''rex_party_events'', ''dj_beer''">bring</a> them to the guys.'
 	elseif dj_thank = 1 and dj_bad < 1:
 		'<center><b><font color = maroon>DJ</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boy.jpg"></center>'
-		'The guy messes with the soundboard and makes the sound even louder. You are allowed to <a href="exec:gt ''dinParty'', ''dj_thank''">twist</a> some knobs on the turntable.'
+		'The guy messes with the soundboard and makes the sound even louder. You are allowed to <a href="exec:gt ''rex_party_events'', ''dj_thank''">twist</a> some knobs on the turntable.'
 	elseif dj_bad = 1 and dj_boobs < 1:
 		'<center><b><font color = maroon>DJ</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boy.jpg"></center>'
@@ -164,12 +163,12 @@ if $ARGS[0] = 'party_boy':
 	elseif dj_boobs = 1:
 		'<center><b><font color = maroon>DJ</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boy.jpg"></center>'
-		'The guy messes with the soundboard and makes the sound even louder. You are again allowed to <a href="exec:gt ''dinParty'', ''dj_cock''">twist</a> some knobs on the turntable.'
+		'The guy messes with the soundboard and makes the sound even louder. You are again allowed to <a href="exec:gt ''rex_party_events'', ''dj_cock''">twist</a> some knobs on the turntable.'
 	end
 	act 'Move away': gt $loc, $loc_arg
 	gs 'willpower', 'exhib', 'self', 'medium'
 	if will_cost <= pcs_willpwr:
-		act 'Flash boobs (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'self' & gt 'dinParty', 'dj_boobs'
+		act 'Flash boobs (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'self' & gt 'rex_party_events', 'dj_boobs'
 	else
 		act 'Flash boobs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
@@ -178,36 +177,36 @@ end
 !Kitchen Rex
 if $ARGS[0] = 'party_kuh':
 	$loc_arg = 'party_kuh'
-	$loc = 'sbReksHome'
+	$loc = 'rex_party_home'
 	$locclass = 'kitr'
 	cls
 	minut += 5
 	gs 'stat'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/kuh.jpg"></center>'
-	'The kitchen is spacious, but kinda dirty. The kitchen table is covered in cans and bottles of beer as well as 5ths of booze. You can grab any bottle you want and <a href="exec: gt ''sbReksHome'', ''party_drink''">drink</a>.'
-	if party_dj =1 and dj_beer < 1:'You grab two bottle for the <a href="exec: gt ''dinParty'', ''dj''">DJ and his friend</a>.'
-	if alko >= 3: 'Some <a href="exec: gt ''party_boys'', ''party_boys''">guys</a> bang their empty drinks down on the table. Refilling, they offer a cup to you and try to get you to <a href="exec: gt ''party_boys'', ''drink''">drink</a> with them.'
-	act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+	'The kitchen is spacious, but kinda dirty. The kitchen table is covered in cans and bottles of beer as well as 5ths of booze. You can grab any bottle you want and <a href="exec: gt ''rex_party_home'', ''party_drink''">drink</a>.'
+	if party_dj =1 and dj_beer < 1:'You grab two bottle for the <a href="exec: gt ''rex_party_events'', ''dj''">DJ and his friend</a>.'
+	if alko >= 3: 'Some <a href="exec: gt ''rex_party_boys_events'', ''party_boys''">guys</a> bang their empty drinks down on the table. Refilling, they offer a cup to you and try to get you to <a href="exec: gt ''rex_party_boys_events'', ''drink''">drink</a> with them.'
+	act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 end
 
 !Toilet Rex
 if $ARGS[0] = 'party_toilet':
 	$loc_arg = 'party_toilet'
-	$loc = 'sbReksHome'
+	$loc = 'rex_party_home'
 	$locM_arg = 'party_toilet'
-	$locM = 'sbReksHome'
+	$locM = 'rex_party_home'
 	killvar '$locclass'
 	cls
 	minut += 5
 	gs 'stat'
-	if alko > 3 and rand(1,100) <= 30: gt 'dinParty', 'party_toilet_event'
+	if alko > 3 and rand(1,100) <= 30: gt 'rex_party_events', 'party_toilet_event'
 	'<center><b><font color = maroon>Toilet</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/toilet.jpg"></center>'
 
 	'Here you can wash your face, freshen up or touch up your make-up at <a href="exec: gt ''mirror'', ''start''">mirrors</a>.'
-	if pcs_horny > 50:'Feeling yourself ready to burst with desire, you can''t take it anymore and begin to <a href="exec: gt ''dinParty'', ''toilet_mast''">masturbate</a>.'
-	act 'Go to the living room': gt 'sbReksHome', 'party_gost'
+	if pcs_horny > 50:'Feeling yourself ready to burst with desire, you can''t take it anymore and begin to <a href="exec: gt ''rex_party_events'', ''toilet_mast''">masturbate</a>.'
+	act 'Go to the living room': gt 'rex_party_home', 'party_gost'
 	if cumloc[11] = 1 or cumloc[12] = 1:
 		act 'Clean the sperm from your face (0:10)':
 			cla
@@ -223,10 +222,10 @@ if $ARGS[0] = 'party_toilet':
 			*nl
 			'You clean your face and get rid of any trace of cum.'
 
-			act 'Move away': gt 'sbReksHome', 'party_toilet'
+			act 'Move away': gt 'rex_party_home', 'party_toilet'
 		end
 	end
 end
 
---- sbReksHome ---------------------------------
+--- rex_party_home ---------------------------------
 

+ 39 - 39
locations/sister_party.qsrc → locations/rex_party_sister_events.qsrc

@@ -1,4 +1,4 @@
-# sister_party
+# rex_party_sister_events
 
 if $ARGS[0] = 'sister_party':
 	*clr & cla
@@ -15,9 +15,9 @@ if $ARGS[0] = 'sister_party':
 	'Your sister' + iif($loc_arg = 'party_gost', ' is drunk and in good spirits.', '.')
 	'"Oh <<$pcs_nickname>>, how do you like our humble party? It looks like you''re having a good time."'
 	act 'Move away': gt $loc, $loc_arg
-	if alko < 6 and $loc_arg = 'party_home': act 'Have a drink': gt 'sbReksHome', 'party_drink'
-	if $loc_arg = 'party_gost': act 'Drink': gt 'sister_party', 'sister_drink'
-	if $loc_arg = 'party_gost': act 'Chat about guys': gt 'sister_party', 'talk'
+	if alko < 6 and $loc_arg = 'party_home': act 'Have a drink': gt 'rex_party_home', 'party_drink'
+	if $loc_arg = 'party_gost': act 'Drink': gt 'rex_party_sister_events', 'sister_drink'
+	if $loc_arg = 'party_gost': act 'Chat about guys': gt 'rex_party_sister_events', 'talk'
 end
 
 if $ARGS[0] = 'talk':
@@ -97,11 +97,11 @@ if $ARGS[0] = 'sister_drink':
 	if alko >= 7:
 		'With her encouragement, you end up drinking more than you should.'
 		'Suddenly your head is severely spinning...'
-		act 'Pass out': gt 'dinParty', 'sleep'
+		act 'Pass out': gt 'rex_party_events', 'sleep'
 	else
 		'You gladly drink more, sharing it with your sister.'
 		'Feeling buzzed, you are ready to plunge into the wild debauchery of the party.'
-		act 'Dance topless': gt 'sister_party', 'fun'
+		act 'Dance topless': gt 'rex_party_sister_events', 'fun'
 		act 'Move away': gt $loc, $loc_arg
 	end
 end
@@ -152,7 +152,7 @@ if $ARGS[0] = 'fun':
 				gs 'arousal', 'cuni_give', 5, 'lesbian', 'incest'
 				gs 'stat'
 		
-				act 'Caress Anya with your hand': gt 'sister_party', 'hand'
+				act 'Caress Anya with your hand': gt 'rex_party_sister_events', 'hand'
      
 			end
 			act 'Lie on your back':
@@ -168,7 +168,7 @@ if $ARGS[0] = 'fun':
 				gs 'arousal', 'cuni', 5, 'lesbian', 'incest'
 				gs 'stat'
 		
-				act 'Let Anya caress you with her hand': gt 'sister_party', 'hand'
+				act 'Let Anya caress you with her hand': gt 'rex_party_sister_events', 'hand'
 			end
 		end
 	end
@@ -211,7 +211,7 @@ if $ARGS[0] = 'hand':
 			gs 'arousal', 'cuni', 5, 'lesbian', 'incest'
 			gs 'stat'
 			
-			act 'Cum': gt 'sister_party', 'cum'
+			act 'Cum': gt 'rex_party_sister_events', 'cum'
 		else
 			if rand(1,2) = 1:
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_sister_7_1.mp4"></video></center>'
@@ -229,7 +229,7 @@ if $ARGS[0] = 'hand':
 			gs 'arousal', 'cuni', 5, 'lesbian', 'incest'
 			gs 'stat'
 			
-			act 'Cum': gt 'sister_party', 'cum'
+			act 'Cum': gt 'rex_party_sister_events', 'cum'
 		end
 	end
 
@@ -243,7 +243,7 @@ if $ARGS[0] = 'hand':
 		gs 'arousal', 'trib', 5, 'lesbian', 'incest'
 		gs 'stat'
 		
-		act 'Cum': gt 'sister_party', 'cum'
+		act 'Cum': gt 'rex_party_sister_events', 'cum'
 	end
 end
 
@@ -260,7 +260,7 @@ if $ARGS[0] = 'cum':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act 'Fall asleep': gt 'dinParty', 'sleep'
+	act 'Fall asleep': gt 'rex_party_events', 'sleep'
 end
 
 !!this is the party stuff from sisterQW file so we can keep all the party stuff in a single file. Not sure how we should merge it.
@@ -287,9 +287,9 @@ if $ARGS[0] = 'sisboyQW_party':
 		*nl
 		'You politely try to refuse the drink, but everyone watching has gathered round and started chanting, "Drink! Drink! Drink! Drink! Drink! Drink!"'
 		'Giving in to peer pressure, you take the bottle from Anya''s hand and gulp down a huge swig of vodka.'
-		act 'Go dance': gt 'sister_party', 'dance'
-		act 'Drink': gt 'sister_party', 'drink'
-		act 'Sit': gt 'sister_party', 'sit'
+		act 'Go dance': gt 'rex_party_sister_events', 'dance'
+		act 'Drink': gt 'rex_party_sister_events', 'drink'
+		act 'Sit': gt 'rex_party_sister_events', 'sit'
 	end
 	act 'Accept the drink':
 		*clr & cla
@@ -300,9 +300,9 @@ if $ARGS[0] = 'sisboyQW_party':
 		*nl
 		'You take the bottle from her hand. "Well, let''s party!" you say and gulp down a huge swig of vodka.'
 		'Roma looks at Anya and smirks. "Look, <<$pcs_nickname>> is drinking more than you!" Everyone then begins to drink heavily.'
-		act 'Go dance': gt 'sister_party', 'dance'
-		act 'Drink': gt 'sister_party', 'drink'
-		act 'Sit': gt 'sister_party', 'sit'
+		act 'Go dance': gt 'rex_party_sister_events', 'dance'
+		act 'Drink': gt 'rex_party_sister_events', 'drink'
+		act 'Sit': gt 'rex_party_sister_events', 'sit'
 	end
 	act 'Get up to dance':
 		*clr & cla
@@ -314,9 +314,9 @@ if $ARGS[0] = 'sisboyQW_party':
 		'Standing, you try to get out from behind the table to go dancing, but no one is actually dancing. They are all just sitting and drinking.'
 		'Seeing what you''re doing, Rex pulls you over. "Where are you going? It''s only the beginning! Hold the bottle and let''s drink, otherwise I will be offended."'
 		'You can''t deny the ' + iif(sisterQW['rexbday'] = 2, 'birthday boy', 'host of the party') + ', so you take the bottle from his hand and gulp down a huge shot, feeling it burn down your throat. You hear others shouting in encouragement.'
-		act 'Go dance': gt 'sister_party', 'dance'
-		act 'Drink': gt 'sister_party', 'drink'
-		act 'Sit': gt 'sister_party', 'sit'
+		act 'Go dance': gt 'rex_party_sister_events', 'dance'
+		act 'Drink': gt 'rex_party_sister_events', 'drink'
+		act 'Sit': gt 'rex_party_sister_events', 'sit'
 	end
 end
 
@@ -341,7 +341,7 @@ if $ARGS[0] = 'dance':
 		'You want to drink again and again. The boys quickly give you two bottles of whiskey, and without any hesitation, you start to pour both of them into your mouth. The whiskey spills out of your mouth as you are unable to drink it all fast enough. It pours all down your body.'
 		'Your clothes are soaked in alcohol, and everyone can see your nipples poking through your wet bra.'
 		'Two guys, mad with energy, begin to dance around you, persistently lapping at the booze on your body.'
-		act 'Dance with them': gt 'sister_party', 'two_boy'
+		act 'Dance with them': gt 'rex_party_sister_events', 'two_boy'
 	end
 	act 'Keep dancing':
 		*clr & cla
@@ -352,12 +352,12 @@ if $ARGS[0] = 'dance':
 		gs 'arousal', 'foreplay', 10
 		gs 'stat'
 !! This should have a way to back out, but where to?
-		if sisterQW['rexbday'] = 2: act 'Congratulate Rex personally': gt 'sister_party', 'reks'
-		if sisterQW['AnyaRomaQW'] = 0: act 'Look for Anya': gt 'sister_party', 'anya_find'
-		act 'Dance with them': gt 'sister_party', 'two_boy'
+		if sisterQW['rexbday'] = 2: act 'Congratulate Rex personally': gt 'rex_party_sister_events', 'reks'
+		if sisterQW['AnyaRomaQW'] = 0: act 'Look for Anya': gt 'rex_party_sister_events', 'anya_find'
+		act 'Dance with them': gt 'rex_party_sister_events', 'two_boy'
 	end
 	if sisterQW['rexbday'] = 2:
-		act 'Congratulate Rex personally': gt 'sister_party', 'reks'
+		act 'Congratulate Rex personally': gt 'rex_party_sister_events', 'reks'
 	end
 end
 
@@ -366,9 +366,9 @@ if $ARGS[0] = 'anya_find':
 	minut += 5
 	gs 'stat'
 	'You look for your sister but can''t find her. "Where the hell did she go?" You look everywhere in desperation.'
-	act 'Look in the bathroom': gt 'sister_party', 'anya_toilet'
-	act 'Look in the kitchen': gt 'sister_party', 'anya_kit'
-	act 'Look in the bedroom': gt 'sister_party', 'anya_bed'
+	act 'Look in the bathroom': gt 'rex_party_sister_events', 'anya_toilet'
+	act 'Look in the kitchen': gt 'rex_party_sister_events', 'anya_kit'
+	act 'Look in the bedroom': gt 'rex_party_sister_events', 'anya_bed'
 end
 
 if $ARGS[0] = 'anya_kit':
@@ -451,8 +451,8 @@ if $ARGS[0] = 'anya_toilet':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_22.jpg"></center>'
 	*nl
 	'You walk into the bathroom and find some guy pushing some poor girl''s head into the toilet. Thankfully, it isn''t Anya, and not wanting to get involved any further, you leave.'
-	act 'Look in the kitchen': gt 'sister_party', 'anya_kit'
-	act 'Look in the bedroom': gt 'sister_party', 'anya_bed'
+	act 'Look in the kitchen': gt 'rex_party_sister_events', 'anya_kit'
+	act 'Look in the bedroom': gt 'rex_party_sister_events', 'anya_bed'
 end
 
 if $ARGS[0] = 'anya_bed':
@@ -464,8 +464,8 @@ if $ARGS[0] = 'anya_bed':
 	*nl
 	'In the bedroom, you see two guys jerking off onto the face of some poor unconscious girl as one of them says to the other, "Let''s get the fuck out of here before she wakes up. I don''t want to deal with her ex-boyfriend. He''s one of the boxers."'
 	'Anya isn''t here, so you keep searching.'
-	act 'Look in the bathroom': gt 'sister_party', 'anya_toilet'
-	act 'Look in the kitchen': gt 'sister_party', 'anya_kit'
+	act 'Look in the bathroom': gt 'rex_party_sister_events', 'anya_toilet'
+	act 'Look in the kitchen': gt 'rex_party_sister_events', 'anya_kit'
 end
 
 if $ARGS[0] = 'reks':
@@ -478,7 +478,7 @@ if $ARGS[0] = 'reks':
 	'"Hey girl! Damn, you''ve been having fun. Oh yeah, you''re Anya''s little sister, right? I know she''s... That''s odd, I haven''t seen her. Although I have been drinking bubbly all day. Here, drink up!"'
 	'He starts pouring the sweet champagne down your throat. He''s so drunk that he pours it too fast, and as much as you try to keep up, a lot of it spills on you and the floor.
 	 Then, without a word, Rex just staggers off.'
-	act 'Look for Anya': gt 'sister_party', 'anya_find'
+	act 'Look for Anya': gt 'rex_party_sister_events', 'anya_find'
 	act 'Follow Rex to the toilet for birthday sex':
 		*clr & cla
 		toiletRexSex = 1
@@ -503,7 +503,7 @@ if $ARGS[0] = 'reks':
 			'With a final grunt, he shoots his load deep inside your pussy. "Wow <<$pcs_nickname>>, you are hotter than your sister!" He then zips his pants and leaves you alone in the bathroom.'
 			gs 'arousal', 'vaginal', 5, 'sub', 'rough'
 			gs 'stat'
-			act 'Look for Anya': gt 'sister_party', 'anya_find'
+			act 'Look for Anya': gt 'rex_party_sister_events', 'anya_find'
 		end
 	end
 end
@@ -566,7 +566,7 @@ if $ARGS[0] = 'two_boy':
 				gs 'arousal', 'end'
 				minut -= 5
 				gs 'stat'
-				act 'Look For Anya': gt 'sister_party', 'anya_find'
+				act 'Look For Anya': gt 'rex_party_sister_events', 'anya_find'
 			end
 		end
 	end
@@ -581,7 +581,7 @@ if $ARGS[0] = 'drink':
 	*nl
 	'Everyone undresses to the waist and goes into the hall to dance. "Come dance <<$pcs_nickname>>, you don''t want to be left alone," Anya calls out to you.'
 	'Not now Anya. I want to drink some more first," you reply, but not taking no for an answer, Anya drags you out to dance with her and her friends.'
-	act 'Go dance': gt 'sister_party', 'dance'
+	act 'Go dance': gt 'rex_party_sister_events', 'dance'
 end
 
 if $ARGS[0] = 'sit':
@@ -591,8 +591,8 @@ if $ARGS[0] = 'sit':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_12.jpg"></center>'
 	*nl
 	'You are starting to feel a little dizzy after drinking so much and so sit down for a while. Anya and her friends then approach you. "<<$pcs_nickname>>? Why are you just sitting there? Come dance with us." Not taking no for an answer, Anya drags you out to dance with her and her friends.'
-	act 'Go dance': gt 'sister_party', 'dance'
+	act 'Go dance': gt 'rex_party_sister_events', 'dance'
 end
 
---- sister_party ---------------------------------
+--- rex_party_sister_events ---------------------------------
 

+ 1 - 1
locations/sexshop.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 	clr
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b><font color="maroon">Dildopolis Inc.</font></b></center>'
+	'<center><b><font color="maroon">The Erotomaniac</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 	'The main counter displays various sex toys:'
 	'Lubricant - 145 <b>₽</b>'

+ 11 - 9
locations/shoe_attributes.qsrc

@@ -7,7 +7,7 @@
 !!
 !! **Shoe Variables
 !!
-!! ShoStlye = 1-3 Different styles of footwear which might give bonuses to certain npcs or events (0 if it does not fit these styles)
+!! ShoStyle = 1-3 Different styles of footwear which might give bonuses to certain npcs or events (0 if it does not fit these styles)
 !!				1 Stripper - the kind of thing a stripper would wear, good for stripping and whoring
 !!				2 Bimbo - bonus to bimbo point gains
 !!				3 Alternative - For all good rebels might help your willpower
@@ -36,18 +36,20 @@ ShoQuality = 0
 ShoHeels = 0
 ShoCut = 0
 
-if $ARGS[0] = 'boutique':
-	*P FUNC('$attrib_shoe_boutique', $ARGS[0], ARGS[1])
+if $ARGS[0] = 'moncheri':
+	*P FUNC('$attributes_moncheri_shoes', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'pussy':
-	*P FUNC('$attrib_shoe_pussy', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_cats_shoes', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'bomba':
+	*P FUNC('$attributes_bomba_shoes', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'dolls':
-	*P FUNC('$attrib_shoe_dolls', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_dolls_shoes', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'fetish':
 	*P FUNC('$attrib_shoe_fetish', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'gandm':
-	*P FUNC('$attrib_shoe_gandm', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'trainers':
-	*P FUNC('$attrib_shoe_trainers', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'gm':
+	*P FUNC('$attributes_gm_shoes', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'danilovich':
+	*P FUNC('$attributes_danilovich_shoes', $ARGS[0], ARGS[1])
 end
 
 --- shoe_attributes ---------------------------------

+ 10 - 0
locations/shoe_description2.qsrc

@@ -49,5 +49,15 @@ else
 	end
 end
 
+*nl
+
+if ShoStlye = 1:
+	'These shoes are considered stripper shoes.'
+elseif ShoStlye = 2:
+	'These shoes are considered bimbo shoes.'
+elseif ShoStlye = 3:
+	'These shoes are considered alternative shoes.'
+end
+
 --- shoe_description2 ---------------------------------
 

+ 36 - 15
locations/shoes.qsrc

@@ -101,16 +101,22 @@ if $ARGS[0] = 'view_shoe_list':
 	'<center><table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Shoe</TH><TH>Description</TH><TH>Bimbo</TH><TH>Stripper</TH><TH>Actions</TH>'
 
 	i = 1
-	:loopsboutique
-		if sboutique[i] = 1 and sboutiqueS[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'boutique', i)
+	:loopsmoncheri
+		if smoncheri[i] = 1 and smoncheriS[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'moncheri', i)
 		i += 1
-	if i <= 37:jump 'loopsboutique'
+	if i <= 37:jump 'loopsmoncheri'
 
 	i = 1
-	:loopspussy
-		if spussy[i] = 1 and spussyS[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'pussy', i)
+	:loopscats
+		if scats[i] = 1 and scatsS[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'cats', i)
 		i += 1
-	if i <= 38:jump 'loopspussy'
+	if i <= 38:jump 'loopscats'
+
+	i = 1
+	:loopsbomba
+		if sbomba[i] = 1 and sbombaS[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'bomba', i)
+		i += 1
+	if i <= 27:jump 'loopsbomba'
 
 	i = 1
 	:loopsdolls
@@ -125,20 +131,35 @@ if $ARGS[0] = 'view_shoe_list':
 	if i <= 27:jump 'loopsfetish'
 
 	i = 1
-	:loopsgandm
-		if sgandm[i] = 1 and sgandmS[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'gandm', i)
+	:loopsgm
+		if sgm[i] = 1 and sgmS[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'gm', i)
 		i += 1
-	if i <= 51:jump 'loopsgandm'
+	if i <= 51:jump 'loopsgm'
 
 	i = 1
-	:loopstrainers
-		if strainers[i] = 1 and strainersS[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'trainers', i)
+	:loopsdanilovich
+		if sdanilovich[i] = 1 and sdanilovichS[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'danilovich', i)
 		i += 1
-	if i <= 29:jump 'loopstrainers'
+	if i <= 29:jump 'loopsdanilovich'
 
 	'</table></center>' 
 end
 
+if $ARGS[0] = 'moncheri':
+	*P FUNC('$attributes_moncheri_shoes', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'cats':
+	*P FUNC('$attributes_cats_shoes', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'bomba':
+	*P FUNC('$attributes_bomba_shoes', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'dolls':
+	*P FUNC('$attributes_dolls_shoes', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'fetish':
+	*P FUNC('$attrib_shoe_fetish', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'gm':
+	*P FUNC('$attributes_gm_shoes', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'danilovich':
+	*P FUNC('$attributes_danilovich_shoes', $ARGS[0], ARGS[1])
+end
 if $ARGS[0] = 'gym':
 	if $regularwornshoetype = '':
 		$regularwornshoetype = $shoeworntype
@@ -148,10 +169,10 @@ if $ARGS[0] = 'gym':
 	'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
 
 	i = 1
-	:loopstrainers2
-		if strainers[i] = 1 and strainersS[i] = 0:'<a href="exec:gt ''shoes'', ''view_shoe_item'', ''wardrobe'', ''trainers'', <<i>>"><img src="images/pc/shoes/trainers/<<i>>.jpg" 	height="250" /></a>'
+	:loopsdanilovich2
+		if sdanilovich[i] = 1 and sdanilovichS[i] = 0:'<a href="exec:gt ''shoes'', ''view_shoe_item'', ''wardrobe'', ''danilovich'', <<i>>"><img src="images/pc/shoes/danilovich/<<i>>.jpg" 	height="250" /></a>'
 		i += 1
-	if i <= 29:jump 'loopstrainers2'
+	if i <= 29:jump 'loopsdanilovich2'
 
 	act 'Return': gt $loc, $loc_arg
 

+ 3 - 9
locations/shop_dolls.qsrc

@@ -188,16 +188,10 @@ if $ARGS[0] = 'shoes':
 		gt 'shop_dolls', 'browse'
 	end
 
-	if Clothingstock > 11:
-		i = 1
-	else
-		i = 2
-	end
-
 	:loopdolls_shoes
-		if sdolls[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_shoes''"><img src="images/pc/shoes/dolls/<<i>>.jpg" height="250" /></a>'
-		i += 2
-	if i <= 27:jump 'loopdolls_shoes'
+		if sdolls[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_shoes''"><img src="images/pc/items/dolls/shoes/<<i>>.jpg" height="250" /></a>'
+		i += 1
+	if i <= 30:jump 'loopdolls_shoes'
 end
 
 if $ARGS[0] = 'dolls_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'dolls',i, 2000

+ 0 - 28
locations/shop_pussycats.qsrc

@@ -22,8 +22,6 @@ if $ARGS[0] = 'start':
 
 	act 'View bras': minut += 5 & gt 'shop_pussycats', 'bras'
 
-	act 'View shoes': minut += 5 & gt 'shop_pussycats', 'shoes'
-
 	act 'View purses': minut += 5 & gt 'shop_pussycats', 'purses'
 
 	if hour >= 8 and hour <= 18 and young_shop_miss >= 3 and week < 6 and young_shop_work = 1:gt 'andrey'
@@ -1121,32 +1119,6 @@ end
 
 if $ARGS[0] = 'yshopclo_outfit': gt 'clothing', 'view_clothing_item', 'shop', 'cats_outfits',i, 3000
 
-if $ARGS[0] = 'shoes':
-	$loc_arg = 'shoes'
-	$loc = 'shop_pussycats'
-	cls
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_pussycats', 'start'
-	end
-
-	if Clothingstock > 11:
-		i = 1
-	else
-		i = 2
-	end
-
-	:loopcats_shoes
-		if spussy[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''young_shoes''"><img src="images/pc/shoes/cats/<<i>>.jpg" height="250" /></a>'
-		i += 2
-	if i <= 38:jump 'loopcats_shoes'
-end
-
-if $ARGS[0] = 'young_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'pussy',i, 1750
-
 if $ARGS[0] = 'panties':
 	$loc_arg = 'panties'
 	$loc = 'shop_pussycats'

+ 25 - 0
locations/shop_tsar_bomba.qsrc

@@ -23,6 +23,8 @@ if $ARGS[0] = 'start':
 
 	act 'View other outfits': minut += 5 & gt 'shop_tsar_bomba', 'clothes'
 
+	act 'View shoes': minut += 5 & gt 'shop_tsar_bomba', 'shoes'
+
 	act 'View purses': minut += 5 & gt 'shop_tsar_bomba', 'purses'
 
 end
@@ -146,5 +148,28 @@ end
 
 if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'bomba',i, 2000
 
+if $ARGS[0] = 'shoes':
+	$loc_arg = 'shoes'
+	$loc = 'shop_tsar_bomba'
+	$menu_arg = 'purses'
+	$menu_loc = 'shoes'
+	menu_off = 0
+	*clr & cla
+	gs'stat'
+
+	act 'Return':
+		cla
+		minut += 5
+		gt 'shop_tsar_bomba', 'browse'
+	end
+
+	:loopbomba_shoes
+		if sbomba[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_shoes''"><img src="images/pc/items/bomba/shoes/<<i>>.jpg" height="250" /></a>'
+		i += 1
+	if i <= 40:jump 'loopbomba_shoes'
+end
+
+if $ARGS[0] = 'bomba_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'bomba',i, 2000
+
 --- shop_tsar_bomba ---------------------------------
 

+ 7 - 7
locations/sister.qsrc

@@ -100,7 +100,7 @@ if $ARGS[0] = 'partyanswer':
 				'"Don''t worry. Maybe you can come next time?"'
 				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'
+			act 'Go to the party': if sisterQW['partycount'] > 0: gt 'rex_party_home', 'party' else gt 'rex_party_sister_events', 'sisboyQW_party'
 		end
 	elseif $ARGS[1] = 'rex':
 		if pav_slut >= 250 or cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1):
@@ -141,7 +141,7 @@ if $ARGS[0] = 'partyanswer':
 				'"Well, go on then. But you''re definitely coming next time, okay?"'
 				act 'Move away': gt $loc, $loc_arg
 			end
-			act 'Accept': gt 'sbReksHome', 'party'
+			act 'Accept': gt 'rex_party_home', 'party'
 		end
 	end
 end
@@ -375,7 +375,7 @@ if $ARGS[0] = 'scene1':
 			rexPark = 0
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
-			gs 'reks', 'rexRep'
+			gs 'rex_events', 'rexRep'
 			'Rex comes up to you. "<<$pcs_nickname>>, I looked like a real chump waiting for you alone in the park yesterday! That wasn''t very nice..."'
 			act 'Continue to drink beer': gt 'sister', 'scene2'
 		elseif rexCar = 1 and rexCarDay < daystart and rexSisTalk = 3:
@@ -385,7 +385,7 @@ if $ARGS[0] = 'scene1':
 			rexCar = 0
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
-			gs 'reks', 'rexRep'
+			gs 'rex_events', 'rexRep'
 			'Rex comes up to you. "<<$pcs_nickname>>, I was waiting at your door for almost two hours last night! It wasn''t very nice to ditch me like that..."'
 			act 'Continue to drink beer': gt 'sister', 'scene2'
 		elseif rexCar = 1 and rexCarDay < daystart and rexSisTalk = 4:
@@ -395,7 +395,7 @@ if $ARGS[0] = 'scene1':
 			rexCar = 0
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
-			gs 'reks', 'rexRep'
+			gs 'rex_events', 'rexRep'
 			'Rex comes up to you. "<<$pcs_nickname>>, you could have at least told me you didn''t want to go out! Last night was a disaster! Next time, please just tell me if you can''t make it."'
 			act 'Continue to drink beer': gt 'sister', 'scene2'
 		elseif temp > 50 and npc_rel['A57'] >= 30:
@@ -403,13 +403,13 @@ if $ARGS[0] = 'scene1':
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'
-			gs 'reks', 'rexRep'
+			gs 'rex_events', 'rexRep'
 			'Rex is drinking a glass of beer.'
 			act 'Chat':
 				cla
 				npc_rel['A57'] += 1
 				minut += 5
-				gt 'reks', 'rexGdkTalk'
+				gt 'rex_events', 'rexGdkTalk'
 			end
 			act 'Continue to drink beer': gt 'sister', 'scene2'
 

+ 9 - 15
locations/spellList.qsrc

@@ -603,44 +603,38 @@ if $ARGS[0] = 'teacherActions':
 	i = 0
 	:LearnSpellLoop
 	$ThisSpellName = dyneval("$result = $<<$ThisArrayName>>[<<i>>]")
-	spellDifficulty = $spellDiff[$ThisSpellName]
-	if spellDifficulty = 0: spellDifficulty = 1
+	spellDifficulty = Max(spellDiff[$ThisSpellName],1)
 	if i < ThisArraySize and i < MaxAvailable:
-		if pcs_magik >= spellDifficulty and spellKnown[$ThisSpellName] = 0 and ($spellReq[$ThisSpellName] = '' or spellKnown[$spellReq[$ThisSpellName]]):
-			dynamic "act 'Learn <<$spellName[$ThisSpellName]>> (1:00)':
+		if pcs_magik >= spellDifficulty and spellKnown[$ThisSpellName] = 0 and ($spellReq[$ThisSpellName] = '' or (spellKnown[$spellReq[$ThisSpellName]] = 1)):
+			act 'Learn <<$spellName[$ThisSpellName]>> (1:00)':
 				cla
 				if pcs_mana >= 1000:
 					pcs_mana -= 1000
 					minut += 60
 
-					spellLearn['<<$ThisSpellName>>'] += rand(1, 100/<<spellDifficulty>>)
+					dynamic 'spellLearn[<<$ThisSpellName>>] += rand(1, 100/<<spellDifficulty>>)'
 
-					if spellLearn['<<$ThisSpellName>>'] < 100:
+					if spellLearn[$ThisSpellName] < 100:
 						'You diligently study the spell for an hour, but cannot grasp it.'
 					else
-						spellKnown['<<$ThisSpellName>>'] = 1
+						spellKnown[$ThisSpellName] = 1
 						'Finally, you are able to grasp and learn the spell.'
 						*nl
 						'<<$spellName[$ThisSpellName]>>: <<$spellDesc[$ThisSpellName]>>'
 					end
 				else
-					*pl ""You don't have enough mana to learn this spell.""
+					*pl 'You don''t have enough mana to learn this spell.'
 				end
-				act 'Move away':gt '<<$ExitLocation>>', '<<$ExitLocation2>>'
-			end"
+				act 'Move away': gt $ExitLocation, $ExitLocation2
+			end
 		end
-
 		i += 1
 		jump 'LearnSpellLoop'
 	end
 	killvar 'i'
-	killvar '$ThisSpellName'
 	killvar 'ThisArraySize'
 	killvar 'MaxAvailable'
 	killvar '$ThisArrayName'
-	killvar '$ExitLocation'
-	killvar '$ExitLocation2'
-	killvar 'spellDifficulty'
 end
 
 

+ 7 - 7
locations/sportShop.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'start':
 	
 	act 'View sports panties':minut += 5 & gt 'sportshop', 'panties'
 	
-	act 'View exercise shoes':minut += 5 & gt 'sportshop', 'trainers'
+	act 'View exercise shoes':minut += 5 & gt 'sportshop', 'danilovich'
 
 	act 'View swimwear':minut += 5 & gt 'sportshop', 'swim'
 
@@ -127,8 +127,8 @@ end
 
 if $ARGS[0] = 'exercise': gt 'clothing', 'view_clothing_item', 'shop', 'exercise',i, 2000
 
-if $ARGS[0] = 'trainers':
-	$loc_arg = 'trainers'
+if $ARGS[0] = 'danilovich':
+	$loc_arg = 'danilovich'
 	$loc = 'sportShop'
 	cls
 	gs'stat'
@@ -140,13 +140,13 @@ if $ARGS[0] = 'trainers':
 	end
 
 	i = 1
-	:looptrainers_shoes
-		if strainers[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''training_shoes''"><img src="images/pc/shoes/trainers/<<i>>.jpg" height="250" /></a>'
+	:loopdanilovich_shoes
+		if sdanilovich[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''training_shoes''"><img src="images/pc/shoes/danilovich/<<i>>.jpg" height="250" /></a>'
 		i += 1
-	if i <= 30:jump 'looptrainers_shoes'
+	if i <= 40:jump 'loopdanilovich_shoes'
 end
 
-if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'trainers',i, 1500
+if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'danilovich',i, 1500
 
 if $ARGS[0] = 'swim':
 	$loc_arg = 'swim'