Browse Source

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

hornguy6 2 years ago
parent
commit
6cfc268ffe
45 changed files with 2568 additions and 1399 deletions
  1. 1 2
      locations/ParkKafe.qsrc
  2. 543 150
      locations/_attributes_scandalicious_dress.qsrc
  3. 6 0
      locations/_body_image.qsrc
  4. 23 23
      locations/anushkachat.qsrc
  5. 41 1
      locations/changingroom.qsrc
  6. 4 0
      locations/cikl.qsrc
  7. 0 42
      locations/city_clinic.qsrc
  8. 2 2
      locations/city_lake.qsrc
  9. 3 0
      locations/city_library.qsrc
  10. 20 4
      locations/clothing.qsrc
  11. 43 43
      locations/dinSex.qsrc
  12. 540 312
      locations/dorm.qsrc
  13. 3 3
      locations/dormev1.qsrc
  14. 14 2
      locations/family.qsrc
  15. 35 12
      locations/family_schedule.qsrc
  16. 11 11
      locations/foto.qsrc
  17. 3 8
      locations/gargazel.qsrc
  18. 32 18
      locations/gopnik_initiation.qsrc
  19. 15 0
      locations/gschool_girls_bathroom.qsrc
  20. 0 1
      locations/gschool_grounds.qsrc
  21. 19 17
      locations/gschool_lessonsev1.qsrc
  22. 91 80
      locations/gschool_socialchg.qsrc
  23. 120 0
      locations/gschool_socialchg1.qsrc
  24. 126 126
      locations/hookup_after.qsrc
  25. 192 189
      locations/hookup_morning.qsrc
  26. 4 2
      locations/kuhrPar.qsrc
  27. 163 126
      locations/mother.qsrc
  28. 1 0
      locations/obkitchen.qsrc
  29. 1 1
      locations/pav_aptcourtev.qsrc
  30. 350 94
      locations/pav_disco_coolkids.qsrc
  31. 51 35
      locations/pav_disco_gopniks.qsrc
  32. 45 40
      locations/pav_disco_jocks.qsrc
  33. 4 0
      locations/pav_industrial.qsrc
  34. 8 8
      locations/praiders_garage.qsrc
  35. 1 1
      locations/scandalicious.qsrc
  36. 1 11
      locations/sewing.qsrc
  37. 3 3
      locations/shoe_description2.qsrc
  38. 1 1
      locations/shulgahome.qsrc
  39. 18 10
      locations/sitrPar.qsrc
  40. 2 2
      locations/soniadisco.qsrc
  41. 6 1
      locations/spellList.qsrc
  42. 3 3
      locations/stat.qsrc
  43. 1 1
      locations/tatiana_lab.qsrc
  44. 17 13
      locations/treeCircle.qsrc
  45. 1 1
      locations/underwear.qsrc

+ 1 - 2
locations/ParkKafe.qsrc

@@ -1083,14 +1083,13 @@ if $ARGS[0] = 'the_boy':
 									act 'Flash him':
 										*clr & cla
 										npc_rel['A127'] += 1
-										gs 'flash', 'tits', 'outdoors', 1
 										'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/sex/flash.jpg"></center>'
 										'You look around to make sure that no one can see you, and you quickly pull down you shirt exposing your breasts to Gosha.'
 										'He stands there a bit flabbergasted not saying a word, but watching you closely. As he starts approaching you and you pull up the shirt. "No touching allowed this time."'
 										'You can clearly see that he has more in mind, but he''s keeping his distance and respecting your wishes for now. "You''re going to leave me like that?" he asks.'
 										'You let out a laugh, "Yeah, that was more than enough or did you expect something more for only showing me this place?"'
 										'The two of you chat for a while before heading back to the café.'
-										gs 'arousal', 'flash', 15, 'sub'
+										gs 'arousal', 'flash', 15, 'sub', 'exhibitionism'
 										gs 'stat'
 										act 'Head back to the café': gt 'parkKafe', 'end', 'cafe'
 									end

+ 543 - 150
locations/_attributes_scandalicious_dress.qsrc

@@ -1,370 +1,763 @@
 # $attributes_scandalicious_dress
-!2021/05/08
-!price range from 2 to 3, please avoid adding too many outside of that range
+!2021/08/11
+!price range from 3 to 5
 
 if ARGS[1] = 1:
-	CloQuality = 2
-	CloThinness = 6
+	CloQuality = 3
+	CloThinness = 5
 	CloTopCut = 3
-	CloSkirtShortness = 4
+	CloSkirtShortness = 2
 	CloDress = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 2:
-	CloQuality = 2
-	CloThinness = 6
-	CloTopCut = 2
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloDress = 1
 	
 elseif ARGS[1] = 3:
-	CloQuality = 2
-	CloThinness = 5
+	CloQuality = 3
+	CloThinness = 4
 	CloTopCut = 3
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 4:
-	CloQuality = 2
-	CloThinness = 4
-	CloBra = 1
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
 	CloSkirtShortness = 4
-	CloBimbo = 1
+	CloDress = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 5:
-	CloQuality = 2
-	CloThinness = 4
+	CloQuality = 3
+	CloThinness = 5
 	CloTopCut = 4
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 6:
 	CloQuality = 3
-	CloThinness = 6
-	CloTopCut = 3
-	CloSkirtShortness = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 5
 	CloDress = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 7:
-	CloQuality = 3
-	CloThinness = 6
-	CloTopCut = 3
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloDress = 1
 	
 elseif ARGS[1] = 8:
 	CloQuality = 3
-	CloThinness = 6
-	CloBra = 1
-	CloSkirtShortness = 4
+	CloThinness = 4
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	
 elseif ARGS[1] = 9:
-	CloQuality = 2
-	CloThinness = 6
-	CloTopCut = 3
-	CloSkirtShortness = 5
-	CloDress = 1
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	
 elseif ARGS[1] = 10:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 5
-	CloBra = 1
-	CloSkirtShortness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle = 4
 	
 elseif ARGS[1] = 11:
-	CloQuality = 2
-	CloThinness = 4
-	CloBra = 1
-	CloSkirtShortness = 4
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 2
+	CloDress = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 12:
-	CloQuality = 2
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 2
 	CloDress = 1
-	CloBimbo = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 13:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 5
-	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 3
 	CloDress = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 14:
-	CloQuality = 2
+	CloQuality = 5
 	CloThinness = 5
-	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 4
 	CloDress = 1
 	
 elseif ARGS[1] = 15:
-	CloQuality = 2
-	CloThinness = 6
+	CloQuality = 3
+	CloThinness = 5
 	CloTopCut = 3
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloDress = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 16:
-	CloQuality = 2
-	CloThinness = 6
-	CloBra = 1
-	CloSkirtShortness = 5
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 4
 	CloDress = 1
-	CloBimbo = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 17:
-	CloQuality = 2
-	CloThinness = 4
-	CloBra = 1
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 1
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 18:
-	CloQuality = 2
-	CloThinness = 4
-	CloTopCut = 4
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloDress = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 19:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 5
-	CloTopCut = 3
+	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloDress = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 20:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloDress = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 21:
 	CloQuality = 3
-	CloThinness = 4
+	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloDress = 1
-	CloBimbo = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 22:
-	CloQuality = 2
-	CloThinness = 5
+	CloQuality = 3
+	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloDress = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 23:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloDress = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 24:
-	CloQuality = 2
-	CloThinness = 5
+	CloQuality = 3
+	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloDress = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 25:
-	CloQuality = 2
-	CloThinness = 5
+	CloQuality = 3
+	CloThinness = 6
 	CloTopCut = 3
-	CloSkirtShortness = 6
-	CloDress = 1
+	CloSkirtShortness = 5
 	CloStyle = 4
 	
 elseif ARGS[1] = 26:
-	CloQuality = 2
+	CloQuality = 5
 	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 5
 	CloDress = 1
-	CloBimbo = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 27:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloDress = 1
-	CloBimbo = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 28:
-	CloQuality = 3
-	CloThinness = 4
+	CloQuality = 5
+	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloDress = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 29:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 4
-	CloTopCut = 3
+	CloBra = 1
 	CloSkirtShortness = 5
 	CloDress = 1
+	CloStyle = 4
 
 elseif ARGS[1] = 30:
-	CloQuality = 3
+	CloQuality = 5
 	CloThinness = 4
-	CloTopCut = 3
+	CloBra = 1
 	CloSkirtShortness = 5
-	CloDress = 1
+	CloStyle = 4
 
 elseif ARGS[1] = 31:
-	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 4
+	CloQuality = 4
+	CloThinness = 4
+	CloBra = 1
 	CloSkirtShortness = 5
-	CloDress = 1
+	CloStyle = 4
 
 elseif ARGS[1] = 32:
-	CloQuality = 2
+	CloQuality = 4
 	CloThinness = 4
-	CloTopCut = 3
+	CloBra = 1
 	CloSkirtShortness = 5
-	CloDress = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 33:
-	CloQuality = 2
-	CloThinness = 4
+	CloQuality = 3
+	CloThinness = 5
 	CloTopCut = 3
-	CloSkirtShortness = 5
+	CloSkirtShortness = 6
 	CloDress = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 34:
-	CloQuality = 2
-	CloThinness = 6
-	CloTopCut = 4
-	CloSkirtShortness = 5
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 6
 	CloDress = 1
-	CloBimbo = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 35:
 	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
-	CloSkirtShortness = 5
+	CloThinness = 6
+	CloTopCut = 3
+	CloSkirtShortness = 6
 	CloDress = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 36:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 4
-	CloSkirtShortness = 5
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 6
+	CloDress = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 37:
 	CloQuality = 3
 	CloThinness = 4
-	CloBra = 1
-	CloSkirtShortness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloDress = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 38:
-	CloQuality = 2
-	CloThinness = 4
-	CloBra = 1
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
 	CloSkirtShortness = 6
+	CloDress = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 39:
-	CloQuality = 2
+	CloQuality = 4
 	CloThinness = 4
-	CloBra = 1
-	CloSkirtShortness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloDress = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 40:
-	CloQuality = 2
+	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
-	CloSkirtShortness = 5
-	CloBimbo = 1
+	CloSkirtShortness = 6
+	CloStyle = 4
 	
 elseif ARGS[1] = 41:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 4
 	CloBra = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 6
 	CloStyle = 4
 	
 elseif ARGS[1] = 42:
-	CloQuality = 2
-	CloThinness = 6
-	CloTopCut = 2
+	CloQuality = 3
+	CloThinness = 4
+	CloBra = 1
 	CloSkirtShortness = 6
+	CloDress = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 43:
-	CloQuality = 2
-	CloThinness = 6
-	CloTopCut = 2
-	CloSkirtShortness = 6
-	CloStyle = 4
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
 	
 elseif ARGS[1] = 44:
-	CloQuality = 2
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 45:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 4
+	CloDress = 1
+	
+elseif ARGS[1] = 46:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 47:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+	
+elseif ARGS[1] = 48:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+	
+elseif ARGS[1] = 49:
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+	
+elseif ARGS[1] = 50:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloStyle = 4
+
+elseif ARGS[1] = 51:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 52:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 5
+	
+elseif ARGS[1] = 53:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloBimbo = 1
+	CloDress = 1
 	CloStyle = 4
 	
-elseif ARGS[1] = 45:
-	CloQuality = 2
+elseif ARGS[1] = 54:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloDress = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 55:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+	
+elseif ARGS[1] = 56:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 57:
+	CloQuality = 5
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 4
+	CloDress = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 58:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+	
+elseif ARGS[1] = 59:
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 60:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 4
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 61:
+	CloQuality = 4
+	CloThinness = 4
+	CloBra = 1
 	CloSkirtShortness = 6
+	CloStyle = 4
+	
+elseif ARGS[1] = 62:
+	CloQuality = 4
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloStyle = 4
+	
+elseif ARGS[1] = 63:
+	CloQuality = 4
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloStyle = 4
+	
+elseif ARGS[1] = 64:
+	CloQuality = 4
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloStyle = 4
+	
+elseif ARGS[1] = 65:
+	CloQuality = 5
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 3
+	CloDress = 1
 	
 elseif ARGS[1] = 46:
-	CloQuality = 2
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+	
+elseif ARGS[1] = 67:
+	CloQuality = 4
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 68:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+	
+elseif ARGS[1] = 69:
+	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
+	CloSkirtShortness = 5
+	CloStyle = 4
+	
+elseif ARGS[1] = 70:
+	CloQuality = 4
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 5
+	CloStyle = 4
+	
+elseif ARGS[1] = 71:
+	CloQuality = 3
+	CloThinness = 5
+	CloBra = 1
 	CloSkirtShortness = 6
 	CloStyle = 4
 	
-elseif ARGS[1] = 47:
-	CloQuality = 2
+elseif ARGS[1] = 72:
+	CloQuality = 3
+	CloThinness = 5
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloStyle = 4
+	
+elseif ARGS[1] = 73:
+	CloQuality = 3
+	CloThinness = 5
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloStyle = 4
+	
+elseif ARGS[1] = 74:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 3
+	CloDress = 1
+	
+elseif ARGS[1] = 75:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 2
+	CloSkirtShortness = 4
+	CloDress = 1
+	
+elseif ARGS[1] = 76:
+	CloQuality = 4
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 77:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 4
+	CloDress = 1
+	CloBimbo = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 78:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloBimbo = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 79:
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloBimbo = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 80:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloBimbo = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 81:
+	CloQuality = 4
 	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+	
+elseif ARGS[1] = 82:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloBimbo = 1
+	
+elseif ARGS[1] = 83:
+	CloQuality = 4
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 5
+	CloDress = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 84:
+	CloQuality = 4
+	CloThinness = 5
 	CloBra = 1
+	CloSkirtShortness = 5
+	CloBimbo = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 85:
+	CloQuality = 3
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 5
+	CloBimbo = 1
+	
+elseif ARGS[1] = 86:
+	CloQuality = 3
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 5
+	CloBimbo = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 87:
+	CloQuality = 3
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 5
+	CloBimbo = 1
+	
+elseif ARGS[1] = 88:
+	CloQuality = 3
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 5
+	CloBimbo = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 89:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 2
 	CloSkirtShortness = 6
+	CloDress = 1
+	CloBimbo = 1
 	CloStyle = 4
 	
-elseif ARGS[1] = 48:
+elseif ARGS[1] = 90:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 6
+	CloDress = 1
+	
+elseif ARGS[1] = 91:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 6
+	CloDress = 1
+	CloBimbo = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 92:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloSkirtShortness = 6
+	CloDress = 1
+	CloBimbo = 1
+	
+elseif ARGS[1] = 93:
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 3
+	CloSkirtShortness = 6
+	CloDress = 1
+	CloBimbo = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 94:
 	CloQuality = 2
+	CloThinness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
+	CloDress = 1
+	CloBimbo = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 95:
+	CloQuality = 3
 	CloThinness = 4
 	CloBra = 1
 	CloSkirtShortness = 6
+	CloBimbo = 1
 	CloStyle = 4
 	
-elseif ARGS[1] = 49:
-	CloQuality = 2
+elseif ARGS[1] = 96:
+	CloQuality = 3
 	CloThinness = 4
 	CloBra = 1
 	CloSkirtShortness = 6
+	CloBimbo = 1
 	CloStyle = 4
 	
-elseif ARGS[1] = 50:
-	CloQuality = 2
+elseif ARGS[1] = 97:
+	CloQuality = 3
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloStyle = 4
+	
+elseif ARGS[1] = 98:
+	CloQuality = 3
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloBimbo = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 99:
+	CloQuality = 3
+	CloThinness = 4
+	CloBra = 1
+	CloSkirtShortness = 6
+	CloBimbo = 1
+	
+elseif ARGS[1] = 100:
+	CloQuality = 3
 	CloThinness = 4
 	CloBra = 1
 	CloSkirtShortness = 6

+ 6 - 0
locations/_body_image.qsrc

@@ -94,6 +94,12 @@ if $ARGS[0] = 'clothes':
 			elseif $clothingworntype = 'allure_bikinis':
 				FUNC('$attributes_allure_swim_two', $clothingworntype, clothingwornnumber)
 				$swimwear_description
+			elseif $clothingworntype = 'nerdvana_swimsuit':
+				FUNC('$attributes_nerdvana_swim_one', $clothingworntype, clothingwornnumber)
+				$swimwear_description
+			elseif $clothingworntype = 'nerdvana_bikinis':
+				FUNC('$attributes_nerdvana_swim_two', $clothingworntype, clothingwornnumber)
+				$swimwear_description
 			end
 		end
 

+ 23 - 23
locations/anushkachat.qsrc

@@ -507,29 +507,29 @@ if $ARGS[0] = 'photo_chat':
 		'You do a bit of a double take. "Wait what? Your modelling portfolio?"'
 		'She giggles at your reaction. "Yeah, I model at the Aphrodite Photography Agency, in the city."'
 		'You are a little surprised, not that she models, but that you hadn''t heard about it yet. "Oh, uh yeah sure I can do that."'
-		act 'Take out your camera':
-			cla & *clr
-			nush_photoshoot >= 1
-			gs 'stat'
-			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
-			if sunWeather = 1:
-				'You pull out your camera, but before you can take her picture, she interrupts you. "What now?"'
-				'You look up at her, confused. "Uh yeah, why?"'
-				'She shakes her head. "This really isn''t the best place. Outside with natural light would be better, since we don''t have any studio lighting."'
-				'You pause. She has a point and does model, so she would know a thing or two about it. "Oh... Yeah okay, that makes sense." You glance at the time and notice it''s still light out. "Well let''s go while we still have light."'
-				'She giggles. "Alright, let''s do this." You get up and follow her as she leads you out of her room and out of the apartment.'
-				act 'Do photoshoot': gt 'anushkachat', 'photoshoot'
-			else
-				'You pull out your camera, but before you can take her picture, she interrupts you. "What now?"'
-				'You look up at her, confused. "Uh yeah, why?"'
-				'She shakes her head. "This really isn''t the best place. Outside with natural light would be better, since we don''t have any studio lighting."'
-				'You pause. She has a point and does model, so she would know a thing or two about it. "Oh... Yeah okay, that makes sense." You glance at the time and notice that it''s too late.'
-				'She smiles at you. "Don''t worry. Just come over one day when it''s still light out and we can do it then."'
-				'You nod and put your camera away. "Ok sounds good."'
-				act 'Stop talking': gt 'anushapt', 'anushroom'
-				act 'Keep talking': gt 'anushkachat', 'chat'
-			end
+	end
+	act 'Take out your camera':
+		cla & *clr
+		!!nush_photoshoot >= 1
+		gs 'stat'
+		'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
+		if sunWeather = 1:
+			'You pull out your camera, but before you can take her picture, she interrupts you. "What now?"'
+			'You look up at her, confused. "Uh yeah, why?"'
+			'She shakes her head. "This really isn''t the best place. Outside with natural light would be better, since we don''t have any studio lighting."'
+			'You pause. She has a point and does model, so she would know a thing or two about it. "Oh... Yeah okay, that makes sense." You glance at the time and notice it''s still light out. "Well let''s go while we still have light."'
+			'She giggles. "Alright, let''s do this." You get up and follow her as she leads you out of her room and out of the apartment.'
+			act 'Do photoshoot': gt 'anushkachat', 'photoshoot'
+		else
+			'You pull out your camera, but before you can take her picture, she interrupts you. "What now?"'
+			'You look up at her, confused. "Uh yeah, why?"'
+			'She shakes her head. "This really isn''t the best place. Outside with natural light would be better, since we don''t have any studio lighting."'
+			'You pause. She has a point and does model, so she would know a thing or two about it. "Oh... Yeah okay, that makes sense." You glance at the time and notice that it''s too late.'
+			'She smiles at you. "Don''t worry. Just come over one day when it''s still light out and we can do it then."'
+			'You nod and put your camera away. "Ok sounds good."'
+			act 'Stop talking': gt 'anushapt', 'anushroom'
+			act 'Keep talking': gt 'anushkachat', 'chat'
 		end
 	end
 end

+ 41 - 1
locations/changingroom.qsrc

@@ -5,7 +5,7 @@ menu_off = 1
 
 if $ARGS[0] = 'view_swim_list':
 
-	if ARRSIZE('danilovich_swimsuit') = 0 and ARRSIZE('scandalicious_swimsuit') = 0 and ARRSIZE('scandalicious_bikinis') = 0 and ARRSIZE('allure_swimsuit') = 0 and ARRSIZE('allure_bikinis') = 0:
+	if ARRSIZE('danilovich_swimsuit') = 0 and ARRSIZE('scandalicious_swimsuit') = 0 and ARRSIZE('scandalicious_bikinis') = 0 and ARRSIZE('allure_swimsuit') = 0 and ARRSIZE('allure_bikinis') = 0 and ARRSIZE('nerdvana_swimsuit') = 0 and ARRSIZE('nerdvana_bikinis') = 0:
 		'<center>You do not own any swimwear.</center>'
 	elseif $loc = 'fit' or $loc = 'bass' or temper >= 15:
 		if PCloswimwear = 0:
@@ -62,6 +62,24 @@ if $ARGS[0] = 'view_swim_list':
 
 		if $clothingworntype = 'swimwear' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis': '<center>You are wearing swimwear.</center>'
 
+		*nl
+
+		i = 1
+		:loopnerdvana_swimsuit
+			if nerdvana_swimsuit[i] = 1 and nerdvana_swimsuit_s[i] = 0 and ($clothingworntype ! 'nerdvana_swimsuit' or clothingwornnumber ! i):*p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''nerdvana_swimsuit'', <<i>>"><img <<$set_imgh>> src="images/pc/items/nerdvana/swim/one/<<i>>.jpg" 	height="250" /></a>'
+			i += 1
+		if i <= ARRSIZE('nerdvana_swimsuit'):jump 'nerdvana_swimsuit'
+
+		*nl
+
+		i = 1
+		:loopnerdvana_bikinis
+			if nerdvana_bikinis[i] = 1 and nerdvana_bikinis_s[i] = 0 and ($clothingworntype ! 'nerdvana_bikinis' or clothingwornnumber ! i):*p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''nerdvana_bikinis'', <<i>>"><img <<$set_imgh>> src="images/pc/items/nerdvana/swim/two/<<i>>.jpg" 	height="250" /></a>'
+			i += 1
+		if i <= ARRSIZE('nerdvana_bikinis'):jump 'loopnerdvana_bikinis'
+
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis': '<center>You are wearing swimwear.</center>'
+
 	elseif temper < 15:
 		'<center>It''s below 15C - far too cold to get changed into swimwear. You should wait until the weather warms up.</center>'
 	end
@@ -101,6 +119,12 @@ if $ARGS[0] = 'view_swim_item':
 	elseif $ARGS[1] = 'allure_bikinis':
 		FUNC('$attributes_allure_swim_two', $ARGS[1], ARGS[2])
 		$swimwear_description
+	elseif $ARGS[1] = 'nerdvana_swimsuit':
+		FUNC('$attributes_nerdvana_swim_one', $ARGS[1], ARGS[2])
+		$swimwear_description
+	elseif $ARGS[1] = 'nerdvana_bikinis':
+		FUNC('$attributes_nerdvana_swim_two', $ARGS[1], ARGS[2])
+		$swimwear_description
 	end
 
 	$RESULT = '(strength '
@@ -175,6 +199,22 @@ if $ARGS[0] = 'count_swim_item':
 			i += 1
 		if i <= ARRSIZE('allure_bikinis'):jump 'loopcount_allure_bikinis'
 	end
+
+	if $ARGS[1] = 'nerdvana_swimsuit' or $ARGS[1] = '':
+		i = 1
+		:loopcount_nerdvana_swimsuit
+			if nerdvana_swimsuit[i] = 1 and nerdvana_swimsuit_s[i] = 0 :h += 1
+			i += 1
+		if i <= ARRSIZE('nerdvana_swimsuit'):jump 'loopcount_nerdvana_swimsuit'
+	end
+
+	if $ARGS[1] = 'nerdvana_bikinis' or $ARGS[1] = '':
+		i = 1
+		:loopcount_nerdvana_bikinis
+			if nerdvana_bikinis[i] = 1 and nerdvana_bikinis_s[i] = 0 :h += 1
+			i += 1
+		if i <= ARRSIZE('nerdvana_bikinis'):jump 'loopcount_nerdvana_bikinis'
+	end
 	result = h
 	killvar 'i'
 	killvar 'h'

+ 4 - 0
locations/cikl.qsrc

@@ -1486,6 +1486,10 @@ if storyline = 1:
 				if old_grupvalue[2] + 8 < grupvalue[2]: grupvalue[2] = old_grupvalue[2] + 8
 				if old_grupvalue[3] + 8 < grupvalue[3]: grupvalue[3] = old_grupvalue[3] + 8
 				if old_grupvalue[4] + 8 < grupvalue[4]: grupvalue[4] = old_grupvalue[4] + 8
+				if old_grupvalue[1] - 30 > grupvalue[1]: grupvalue[1] = old_grupvalue[1] - 30
+				if old_grupvalue[2] - 30 > grupvalue[2]: grupvalue[2] = old_grupvalue[2] - 30
+				if old_grupvalue[3] - 30 > grupvalue[3]: grupvalue[3] = old_grupvalue[3] - 30
+				if old_grupvalue[4] - 30 > grupvalue[4]: grupvalue[4] = old_grupvalue[4] - 30
 			end
 			!!Limit to max school group values
 			if grupvalue[1] > 1000: grupvalue[1] = 1000

+ 0 - 42
locations/city_clinic.qsrc

@@ -237,48 +237,6 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if pcs_ass > 5:
-		act 'Go to the proctologist (0:15)':
-			*clr & cla
-			menu_off = 1
-			minut += 15
-
-			if analplugIN ! 0:analplugIN = 0
-
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/body/anus/<<anpic>>.jpg"></center>'
-			'You go to the office to the proctologist. He immediately asks you to remove all clothes from your lower body and bend over a table.'
-
-			if pcs_ass <= 15:
-				'The doctor examines your anus and says: "Hmm... slightly distended, but no abnormalities."'
-			elseif pcs_ass > 15 and pcs_ass <= 25:
-				'The doctor examines your anus and says: "Hmm... your anus and sphincter appear to have stretched beyond their normal capabilities. I would recommend massage therapy, 1,000 <b>₽</b> per session. This will help restore the anus to its normal size."'
-			elseif pcs_ass > 25 and pcs_ass <= 35:
-				'The doctor examines your anus and says: "Oh my... you have a greatly distended anus, and most likely your sphincter is not able to close fully either? I would recommend massage therapy, 1,000 <b>₽</b> per session. This will help restore the anus to its normal size."'
-			elseif pcs_ass > 35:
-				'The doctor examines your anus and says: "Oh my God! In all my years, I have never seen anything like this! You''ll have to be careful not to cough, or your guts could fall out!"'
-				'He chuckles at his own joke, and continues: "I''m sorry, that was unprofessional of me. However, I would strongly recommend we start massage therapy right away to restore the area, it''s 1,000 <b>₽</b> per session. This will in time help restore the anus to its normal size, but it''ll take more than a few sessions."'
-			end
-
-			if money >= 1000 and pcs_ass > 15 and proktologday ! daystart:
-				act 'Massage therapy (1:00)':
-					*clr & cla
-					money -= 1000
-					minut += 60
-					proktologday = daystart
-					pcs_ass -= 5
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/pc/body/anus/<<anpic>>.jpg"></center>'
-					'You pay for the massage therapy and the doctor spends an hour carefully massaging your anal muscles, occasionally rubbing some ointment on them. It really isn''t as much fun as it looked in the brochure.'
-
-					act 'Leave the clinic': minut += 5 & gt 'city_residential'
-				end
-			end
-
-			act 'Leave the clinic': minut += 5 & gt 'city_residential'
-		end
-	end
-
 	if glassqw = 1:
 		act'Visit the optometrist (0:35)':
 			*clr & cla

+ 2 - 2
locations/city_lake.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/lake2.jpg"></center>'
 
 	'A large lake close to the city, it is a favorite destination of residents in the summer.'
-	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis':
+	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis' and $clothingworntype ! 'nerdvana_swimsuit' and $clothingworntype ! 'nerdvana_bikinis':
 		'There is a winding <a href="exec:gt ''city_lake_path'',''start''">path</a> leading to the railway station in the city industrial region.'
 	else
 		'You can see the winding path to the railway station in the city industrial region, you should get properly dressed if you want to go there.'
@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 
 	if car > 0 and cardrive = 4:
 		cardrive = 4
-		if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis':
+		if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis' and $clothingworntype ! 'nerdvana_swimsuit' and $clothingworntype ! 'nerdvana_bikinis':
 			'At the lake stands <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
 		else
 			'At the lake stands your <<$car>>, you should get properly dressed if you want to drive away.'

+ 3 - 0
locations/city_library.qsrc

@@ -94,10 +94,13 @@ if hour >= 8 and hour <= 18:
 				'There don''t seem to be any more spells to learn here, but perhaps I can still improve my skills in the ones that I''ve already found.'
 			end
 
+			!!Adding to the Actions opportunity to practice spells MC found
 			gs 'spellList', 'teacherActions', '$librarySpells', 'city_library', ''
 
 			act 'Put the book down':gt $curloc
 		end
+		!!Adding to the Actions opportunity to practice spells MC found
+		gs 'spellList', 'teacherActions', '$librarySpells', 'city_library', ''
 	end
 
 else

+ 20 - 4
locations/clothing.qsrc

@@ -60,7 +60,7 @@ $clothing_list_line = {
 	if $ARGS[0] ! 'sell' and $ARGS[0] ! 'resize':
 		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $ARGS[1] = 'gm_school' and ARGS[2] = 6:
 			$RESULT += ' <a href="exec:gs ''clothing'', ''wear'', ''<<$ARGS[1]>>'', <<ARGS[2]>> & gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Wear</a></TD>'
-		elseif $ARGS[2] ! 'danilovich_swimsuit' and $ARGS[2] ! 'scandalicious_bikinis' and $ARGS[2] ! 'scandalicious_swimsuit' and $ARGS[2] ! 'allure_bikinis' and $ARGS[2] ! 'allure_bikinis' and dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') > 0:
+		elseif $ARGS[2] ! 'danilovich_swimsuit' and $ARGS[2] ! 'scandalicious_bikinis' and $ARGS[2] ! 'scandalicious_swimsuit' and $ARGS[2] ! 'allure_bikinis' and $ARGS[2] ! 'allure_bikinis' and $ARGS[2] ! 'nerdvana_bikinis' and $ARGS[2] ! 'nerdvana_swimsuit' and dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') > 0:
 			if $ARGS[1] ! 'danilovich_outfits' and CloStyle ! 5 and (dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') < (pcs_hips - 8) or dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') > (pcs_hips + 8)) or (ARRPOS('$CloLosTyp', $ARGS[1]) ! -1 and ARRPOS('CloLosNum',ARGS[2]) ! -1):
 				$RESULT += '</TD>'
 			else
@@ -233,7 +233,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 		if ARRSIZE('bomba_outfits') > 0 or ARRSIZE('nerdvana_cosplay') > 0:'<center><a href="exec:$ward_list_store = ''bomba'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''bomba''"><img src="images/locations/pushkin/bomba/shop_name.png"></a></center>'
 
-		if ARRSIZE('nerdvana_outfits') > 0 or ARRSIZE('nerdvana_cosplay') > 0:'<center><a href="exec:$ward_list_store = ''nerdvana'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''nerdvana''"><img src="images/locations/city/island/nerdvana/shop_name.png"></a></center>'
+		if ARRSIZE('nerdvana_outfits') > 0 or ARRSIZE('nerdvana_cosplay') > 0 or ARRSIZE('nerdvana_bikinis') > 0 or ARRSIZE('nerdvana_swimsuit') > 0:'<center><a href="exec:$ward_list_store = ''nerdvana'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''nerdvana''"><img src="images/locations/city/island/nerdvana/shop_name.png"></a></center>'
 
 		if ARRSIZE('danilovich_outfits') > 0:'<center><a href="exec:$ward_list_store = ''sports'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
@@ -595,8 +595,24 @@ if $ARGS[0] = 'view_clothing_list':
 
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
-		end
 
+			i = 1
+			:loopnerdvana_bikinis
+				if nerdvana_bikinis[i] = 1 and nerdvana_bikinis_s[i] = cloc and ($clothingworntype ! 'nerdvana_bikinis' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'nerdvana_bikinis', i)
+				i += 1
+			if i <= ARRSIZE('nerdvana_bikinis'):jump 'loopnerdvana_bikinis'
+
+			$ward_list_store = $ARGS[2]
+			i = 1
+			:loopnerdvana_swimsuit
+				if nerdvana_swimsuit[i] = 1 and nerdvana_swimsuit_s[i] = cloc and ($clothingworntype ! 'nerdvana_swimsuit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'nerdvana_swimsuit', i)
+				i += 1
+			if i <= ARRSIZE('nerdvana_swimsuit'):jump 'loopnerdvana_swimsuit'
+
+			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
+			gs 'clothing', 'clothwidth'
+		end
+		
 		if $ARGS[2] = 'sports':
 			$ward_list_store = $ARGS[2]
 			i = 1
@@ -1183,7 +1199,7 @@ if $ARGS[0] = 'wear':
 
 	if PCloPanties = 1: PXCloBottomShortness = 400
 
-	if $clothingworntype = 'danilovich_swimsuit' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis' or $clothingworntype = 'allure_swimsuit' or $clothingworntype = 'allure_bikinis': PCloswimwear = 1
+	if $clothingworntype = 'danilovich_swimsuit' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis' or $clothingworntype = 'allure_swimsuit' or $clothingworntype = 'allure_bikinis' or $clothingworntype = 'nerdvana_swimsuit' or $clothingworntype = 'nerdvana_bikinis' : PCloswimwear = 1
 end
 
 if $ARGS[0] = 'wear_last_worn':

+ 43 - 43
locations/dinSex.qsrc

@@ -31,7 +31,7 @@ end
 
 $penis_desc = $dick_girth + ', ' + $penis_desc
 
-if ARGS[0] = 'std_trigger':
+if $ARGS[0] = 'std_trigger':
 	tipvenerarand = rand(0, 10)
 	if protect = 1:
 		if rand(0, 1000) = 1000: gs 'dinSex', 'disease_picker'
@@ -40,15 +40,20 @@ if ARGS[0] = 'std_trigger':
 	end
 end
 
-if ARGS[0] = 'disease_picker': 
+if $ARGS[0] = 'disease_picker': 
 	if cheatHealth = 0:
-		if tipvenerarand = 8:
-			!!herpes
-			if rand(1, 100) > 90 and GerpesOnce = 0:
-				GerpesOnce = 1
+		if tipvenerarand < 5:
+			!!candidiasis/thrush
+			if rand(1, 100) > 85 and KandidozOnce = 0:
+				KandidozOnce = 1
+				Kandidoz += 1
+			end
+		elseif tipvenerarand < 7:
+			!!gonorrhea/triper
+			if rand(1, 100) > 95 and TriperOnce = 0:
+				TriperOnce = 1
+				Triper += 1
 				Venera += 1
-				Gerpes += 1
-				GenHerpes = 1
 			end
 		elseif tipvenerarand = 7:
 			!!syphilis
@@ -57,24 +62,19 @@ if ARGS[0] = 'disease_picker':
 				Sifilis += 1
 				Venera += 1
 			end
-		elseif tipvenerarand >= 5 and tipvenerarand < 7:
-			!!gonorrhea/triper
-			if rand(1, 100) > 95 and TriperOnce = 0:
-				TriperOnce = 1
-				Triper += 1
+		elseif tipvenerarand = 8:
+			!!herpes
+			if rand(1, 100) > 90 and GerpesOnce = 0:
+				GerpesOnce = 1
 				Venera += 1
-			end
-		elseif tipvenerarand < 5:
-			!!candidiasis/thrush
-			if rand(1, 100) > 85 and KandidozOnce = 0:
-				KandidozOnce = 1
-				Kandidoz += 1
+				Gerpes += 1
+				GenHerpes = 1
 			end
 		end
 	end	
 end
 
-if ARGS[0] = 'std_trigger_oral':
+if $ARGS[0] = 'std_trigger_oral':
 	tipvenerarand = rand(0, 10)
 	if protect = 1:
 		if rand(0, 1000) = 1000: gs 'dinSex', 'disease_picker_oral'
@@ -83,7 +83,7 @@ if ARGS[0] = 'std_trigger_oral':
 	end
 end
 
-if ARGS[0] = 'disease_picker_oral':
+if $ARGS[0] = 'disease_picker_oral':
 	if cheatHealth = 0:
 		if tipvenerarand >= 5 and tipvenerarand < 7:
 			if rand(1, 100) > 95 and TriperOnce = 0:
@@ -119,7 +119,7 @@ if ARGS[0] = 'disease_picker_oral':
 	end
 end
 
-if ARGS[0] = 'wear_condom':
+if $ARGS[0] = 'wear_condom':
 	protect = 0
 	vidageday -= 1
 	if prezik > 0:
@@ -162,7 +162,7 @@ if $ARGS[0] = 'vaginal_sex':
 		elseif vaginal_tightness < -3: 
 			'You feel <<$boydesc>>''s <<$penis_desc>> sliding through your wet folds<<$temp_mens>>. You savor the intense pleasure from the <<$penis_desc>> inside you, your cunt aching to be filled even more.'
 		end
-		gs 'arousal','vaginal',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
+		gs 'arousal','vaginal',$ARGS[1],$$ARGS[2],$$ARGS[3],$$ARGS[4],$$ARGS[5],$$ARGS[6],$$ARGS[7],$$ARGS[8]
 
 		pcs_horny += arousal_modifier
 		pcs_mood += arousal_modifier
@@ -173,7 +173,7 @@ if $ARGS[0] = 'vaginal_sex':
 		pcs_mood += arousal_modifier * 2
 		'<<$boydesc>> pushes <<$xyr>> <<$penis_desc>> into your unexplored pussy gently. It is a bit painful, but as your lust builds up you do not want to wait anymore.'
 		'With the next push from <<$boydesc>>, you push your ass towards <<$xyr>> cock. You feel your hymen break and his cock slide into deep inside you, <<$xyr>> head rubbing against your no longer untouched walls as you both moan very loudly.'
-		gs 'arousal','vaginal',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
+		gs 'arousal','vaginal',$ARGS[1],$$ARGS[2],$$ARGS[3],$$ARGS[4],$$ARGS[5],$$ARGS[6],$$ARGS[7],$$ARGS[8]
 	end
 	killvar '$temp_mens'
 end
@@ -182,7 +182,7 @@ end
 !! gs 'dinsex', 'boy_puts_condom'
 if $ARGS[0] = 'boy_puts_condom':
 	protect = iif(prezik > 0,1,0)
-	if $ARGS[1] = '':
+	if $$ARGS[1] = '':
 		! do you have condoms?
 		if prezik > 0:
 			if rand(1,prezik) <= badprezik: 
@@ -202,7 +202,7 @@ if $ARGS[0] = 'boy_puts_condom':
 			!! the hormonal contraception is still taken in account
 		end
 	else
-		$custmsg = $ARGS[1]
+		$custmsg = $$ARGS[1]
 		*p '<<$custmsg>>'
 		! do you have condoms?
 		if prezik > 0:
@@ -225,7 +225,7 @@ end &! --- boy_puts_condom ---
 
 !! gs 'dinsex', 'boy_puts_his_condom'[, $boydesc]
 if $ARGS[0] = 'boy_puts_his_condom':
-	$bwa_boy = iif($ARGS[1] = '',$boydesc,$ARGS[1])
+	$bwa_boy = iif($$ARGS[1] = '',$boydesc,$$ARGS[1])
 	protect = 1
 	sexcontra = 3
 	*p '<<ucase(mid($bwa_boy,1,1))>><<mid($bwa_boy,2,len($bwa_boy)-1)>> takes his condom and puts it on <<$xyr>> <<$penis_desc>>.'
@@ -236,7 +236,7 @@ end &! --- boy_puts_his_condom ---
 if $ARGS[0] = 'pc_puts_condom':
 	protect = iif(prezik > 0,1,0)
 	vidageday -= 1 &! the people guess that you are a bit more older than you are in fact
-	if $ARGS[1] = '':
+	if $$ARGS[1] = '':
 		! do you have condoms?
 		if prezik > 0:
 			if rand(1,prezik) <= badprezik: 
@@ -256,7 +256,7 @@ if $ARGS[0] = 'pc_puts_condom':
 			!! the hormonal contraception is still taken in account
 		end
 	else
-		$custmsg = $ARGS[1]
+		$custmsg = $$ARGS[1]
 		*p '<<$custmsg>>'
 		! do you have condoms?
 		if prezik > 0:
@@ -279,7 +279,7 @@ end &! --- pc_puts_condom ---
 
 !! gs 'dinsex','boy_wants_anal' [, $boydesc [, 'lubri']]
 if $ARGS[0] = 'boy_wants_anal':
-	$bwa_boy = iif($ARGS[1] = '',$boydesc,$ARGS[1])
+	$bwa_boy = iif($$ARGS[1] = '',$boydesc,$$ARGS[1])
 	if $bwa_boy = 'lubri': $bwa_boy = $boydesc
 	if analplugin = 1:
 		if pcs_ass < 16:
@@ -290,7 +290,7 @@ if $ARGS[0] = 'boy_wants_anal':
 			analplugout = 1
 		end
 	end
-	if $ARGS[2] = 'lubri':
+	if $$ARGS[2] = 'lubri':
 		'<<$bwa_boy>> takes a tube of lubricant, squeezes a little on <<$xyr>> palm and rubs your anus.'
 		gs 'arousal', 'anal_finger', 1,'lube' 
 	else
@@ -314,7 +314,7 @@ end &! --- boy_wants_anal ---
 
 !! gs 'dinsex', 'girl_wants_anal'[, $boydesc [, 'lubri']]
 if $ARGS[0] = 'girl_wants_anal':
-	$bwa_girl = iif($ARGS[1] = '',$boydesc,$ARGS[1])
+	$bwa_girl = iif($$ARGS[1] = '',$boydesc,$$ARGS[1])
 	if $bwa_girl = 'lubri': $bwa_girl = $boydesc
 	if analplugin = 1:
 		if pcs_ass < 16:
@@ -325,7 +325,7 @@ if $ARGS[0] = 'girl_wants_anal':
 			analplugout = 1
 		end
 	end
-	if $ARGS[2] = 'lubri':
+	if $$ARGS[2] = 'lubri':
 		lubri +=1
 		'<<$bwa_girl>> takes a tube of lubricant, squeezes a little on her palm and rubs your anus.'
 		gs 'arousal', 'anal_finger', 1,'lube' 
@@ -344,19 +344,19 @@ end &! --- girl_wants_anal ---
 !! gs 'dinsex', 'after_anal','boy',$boydesc
 if $ARGS[0] = 'after_anal':
 	if analplugout = 1:
-		if $ARGS[1] = 'boy':
+		if $$ARGS[1] = 'boy':
 			analplugin = 1
-			'<<$ARGS[2]>> takes your butt plug and he puts it back into your anus. He grins: "Continue your training"' 
+			'<<$$ARGS[2]>> takes your butt plug and he puts it back into your anus. He grins: "Continue your training"' 
 		end
-		if $ARGS[1] = 'girl':
+		if $$ARGS[1] = 'girl':
 			analplugin = 1
-			'<<$ARGS[2]>> takes your butt plug and she puts it back into your anus. She grins: "Continue your training"' 
+			'<<$$ARGS[2]>> takes your butt plug and she puts it back into your anus. She grins: "Continue your training"' 
 		end
-		if $ARGS[1] = 'pc':
+		if $$ARGS[1] = 'pc':
 			analplugin = 1
 			'You take your butt plug and put it back into your anus. You grin: "I have to keep my butt trained"' 
 		end
-		if $ARGS[1] = 'no_plug':
+		if $$ARGS[1] = 'no_plug':
 			analplugin = 0
 			'You take your butt plug and put it into your purse. Your anus has to rest for a while now.' 
 		end
@@ -372,7 +372,7 @@ if $ARGS[0] = 'analsex':
 	if pcs_ass < 10:'When <<$xe>> tries inserting a third finger you groan in pain.'
 	if pcs_ass >= 10:'<<$boydesc>> inserts a third finger, very slowly thrusting and wiggling to stretch your anus.'
 	*p '<<$boydesc>> pulls <<$xyr>> fingers out of your ass and you feel <<$xyr>> <<$penis_desc>> pushing against your butthole'
-	gs 'arousal','anal',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
+	gs 'arousal','anal',$ARGS[1],$$ARGS[2],$$ARGS[3],$$ARGS[4],$$ARGS[5],$$ARGS[6],$$ARGS[7],$$ARGS[8]
 	if (agrdif + altdif) >= 20:'You scream and bite your lip from the sharp pain when <<$xe>> penetrates your ass.'
 	if (agrdif + altdif) < 20:'You moan when <<$xe>> penetrates your ass.'
 	'<<$boydesc>> stops for a moment, giving your ass time to adjust to <<$xyr>> cock in it. Then he starts to slowly move, pumping your anus.'
@@ -471,10 +471,10 @@ if $ARGS[0] = 'enema':
 	minut += 5
 	klismaday = daystart
 	klismaday1= 1
-	if $ARGS[1]='':
+	if $$ARGS[1]='':
 		*p 'You give yourself an enema, feeling clean down there. Your ass is now ready for anal sex without any awkward surprises.'
-	elseif $ARGS[1]!' ': 
-		*p '<<$ARGS[1]>>'
+	elseif $$ARGS[1]!' ': 
+		*p '<<$$ARGS[1]>>'
 	end
 end &! --- enema ---
 

+ 540 - 312
locations/dorm.qsrc

@@ -1,5 +1,5 @@
 # dorm
-!2021/05/02
+!2021/05/29
 
 if $ARGS[0] = 'start':
 	*clr & cla
@@ -11,29 +11,25 @@ if $ARGS[0] = 'start':
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Dormitory</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
-
-	act 'Leave':
-		*clr & cla
-		minut += 5
-		reccoldorm = 0
-		gt 'city_island'
-	end
-	
+	'You walk up to the dorm building and go inside. It is pretty clean and in good shape. There is a older woman, with a very unpleasant and judgmental look on her face in a room just off the main hallway. It has a partially glass wall and a window, splitting it from the main room. She looks up at you as you enter, her look tells you she is already judging you, as a face frowns into a look of disapproval.'
 	if func('uniutil', 'student', 'not_enrolled'):
 		menu_off = 1
-		'Since you''re not attending the University, you''re not allowed to enter unless you''re visiting someone you know.'
+		'Since you''re not attending the University, you know without a ID you are not allowed in the dorms. Unless you are on the guest list of a student you know.'
 		act 'Leave': minut += 5 & gt 'city_island'
-		if meet_djibril = 1 and hour < 22 and hour >= 7:
+		if meet_djibril = 1 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Djibril':
 				*clr & cla
-				'You say that you are here to visit Djibril. The janitor remarks "Look at this whore... What, your own kind not good enough for you? Go ahead and take care of those black cocks."'
+				'You walk over to the counter pulling our your ID as you say. "I''m here to visit Djibril."' 
+				'The woman gives you a look of complete disgust and remarks "What, your own kind not good enough for you? Go ahead and take care of those black cocks. He is on the eighth floor room 810." Then she turns away from you and goes back to what he was doing, not wanting to reply and possibly get in a argument that would cause her to call security, you say nothing and go get in the elevator to the eighth floor.'
 				act 'Enter':gt 'dorm', 'korr'
 			end
 		end
 		if gosh > 0 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Gosha':
 				*clr & cla
-				'You say that you''re here to visit Gosha. The janitor chuckles and says "Gosha''s new bitch? What you sluts see in that scrawny bastard, I''ll never understand. He''s been through half of the dorm already. Heh, go to your stud, bitch."'
+				
+				'You walk over to the counter pulling our your ID as you say. "I''m here to visit Gosha."' 
+				'The woman shakes her head in disapproval, as she remarks "Gosha''s new whore? What you sluts see in that scrawny bastard, I''ll never understand. He''s been through half of the dorm already. He is on the sixth floor room 602." Then she turns away from you and goes back to what she was doing, not wanting to reply and possibly get in a argument that would cause her to call security, you say nothing and go get in the elevator to the sixth floor.'
 				reccoldorm = 1
 				goshiflag = 1
 				act 'Enter':gt 'dorm', 'korr'
@@ -42,18 +38,27 @@ if $ARGS[0] = 'start':
 		if meet_kendra = 1 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Kendra':
 				*clr & cla
-				'You say that you''re here to visit Kendra. The janitor chuckles and says "Go on then, have fun!"'
-				act 'Enter':gt 'dorm', 'korr'
+				if npc_rel['A84'] <= 40:
+					'You walk over to the counter pulling our your ID as you say. "I''m here to visit Kendra."' 
+					'The woman gives you a look of complete disgust and remarks "Seems she has gotten tired of you, you''re no longer on the guest list. Now get out of her before I call security." Surprised Kendra removed you from her guest list, you turn and leave the dorm before the old woman calls security.'
+					act 'Leave': minut += 5 & gt 'city_island'
+				else
+					'You walk over to the counter pulling our your ID as you say. "I''m here to visit Kendra."' 
+					'The woman gives you a look of complete disgust and remarks "What, a man not good enough for you? Go ahead and go serve that black whore. She is on the eighth floor room 801." Then she turns away from you and goes back to what she was doing, not wanting to reply and possibly get in a argument that would cause her to call security, you say nothing and go get in the elevator to the eighth floor.'
+					act 'Enter':gt 'dorm', 'korr'
+				end
 			end
 		end
 	else
-		act 'Enter':
+		act 'Show him your student ID':
 			*clr & cla
-			minut += 5
-			reccoldorm = 1
-			gt 'dorm', 'korr'
+			minut += 1
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
+			'As you walk by you take out your student ID and show it to her. She looks for just a moment then goes back to doing what ever it was, she was doing before you walked in. You head for the elevators.'
+			act 'Take elevator':gt 'dorm', 'korr'
 		end
 	end
+	act 'Leave':gt 'city_island'
 end
 
 if $ARGS[0] = 'korr':
@@ -66,15 +71,22 @@ if $ARGS[0] = 'korr':
 	killvar '$locclass'
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obkorr.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 	'Before you is the usual dorm hallway with dilapidated walls. You can hear music and loud talking from drunk students escaping from some rooms.'
-	act 'Leave':
-		*clr & cla
-		minut += 5
-		reccoldorm = 0
-		gt 'city_island'
+	gs 'willpower', 'exhib', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Enter the men''s restroom (<<will_cost>> Willpower)':
+			gs 'willpower', 'exhib', 'self'
+			gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			gt 'dorm', 'mens_restroom'
+		end
+	else
+		act 'Enter the men''s restroom (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	act 'Go to the shared bathroom':
+	act 'Enter the women''s restroom': gt 'dorm', 'womens_restroom'
+	act 'Leave':gt 'city_island'
+	act 'Go to the shared shower':
 		minut += 5
 		obdysh = 1
 		gt 'vann', 'start'
@@ -96,57 +108,97 @@ if $ARGS[0] = 'korr':
 		end
 	end
 
-	if meet_djibril = 1 and hour < 22 and hour >= 7:
+	if meet_djibril = 1:
 		act 'Djibril'' room':
 			*clr & cla
-			afrand = rand(1, 2)
-			if afrand = 1:
+			if (week <= 4 and hour >= 16 and hour < 23 and rand(1, 2) = 2) or (week = 6 and hour >= 9 and hour < 23 and rand(1, 2) = 2) or (week = 7 and hour >= 9 and hour < 23 and rand(1, 3) >= 2):
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+				'You knock on the door. After a couple of seconds, Djibril opens the door. He smiles as he notices it''s you. "I was hoping you would stop by <<$pcs_nickname>>, come on in." He says as he invites you into his room.'
+				act 'Enter': gt 'dorm', 'djibril_room'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 				minut += 5
 				gs 'stat'
-				'You knock on the door, but he is not there.'
+				'You knock on the door, but no one answers. He must be asleep or not home.'
 				act 'Leave':gt 'dorm', 'korr'
-			elseif afrand = 2:
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You knock on the door. After a couple of seconds, Djibril opens the door. He smiles as he notices it''s you, and invites you in.'
-				act 'Enter': gt 'dorm', 'djibrilroom'
 			end
 		end
 	end
 
-	if meet_kendra = 1 and hour >= 8 and hour < 22:
+	if meet_kendra = 1:
 		act 'Kendra''s room':
 			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
-			'You knock on the door. After a couple of seconds, Kendra opens the door and invites you in.'
-			act 'Enter': gt 'dorm', 'kendraroom'
+			if (week <= 4 and hour >= 16 and hour < 23 and rand(1, 2) = 2) or (week = 6 and hour >= 9 and hour < 23 and rand(1, 2) = 2) or (week = 7 and hour >= 9 and hour < 23 and rand(1, 3) >= 2):
+				if kendra_busy ! daystart:
+					if rand(1,5) = 1:
+						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
+						'As you get close to the door you can hear her voice. It is fairly loud and sounds harsh in tone, but you can''t quite make out what she is saying. You hear a muffled reply that sounds male. It sounds like she is busy, you could knock or just leave her to her company.'
+						act 'Knock':
+							kendra_busy = daystart
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
+							'You knock on the door. After a couple of seconds, Kendra opens the door. She is standing in the doorway completely naked other than the strapon harness buckled in place around her hips, with a large black dildo attached to it that she is playing with. "Well if it isn''t my new favorite white slave bitch. I am kinda busy at the moment, I am punishing one of my other slaves."'
+							*nl
+							'She starts to close the door before you can even say anything, then she stops and smiles at you, like she just had a good idea. "Or you could come in and watch." She stands aside to let you come in, holding the door open. As you glance in the room, you see a naked college boy kneeling next to the couch. When he notices you he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she is going to do to him, considering the strapon she is wearing. Is that something you want to watch? It could be interesting and you might learn something from her as well. On the other hand do you want to humiliate him more than he already is?'
+							gs 'arousal', 'erotic_nudity', 3
+							gs 'stat'
+							act 'Enter': gt 'dormev1', 'kendra_male_slave'
+							act 'Decline':
+								*clr & cla
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
+								'You shake your head no. "No thanks you look busy and I don''t want to disturb you."'
+								'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you of that in time. Maybe next time then." Then she closes the door, as she does. You see her stroking her strapon as she heads for the young man. Once the door is closed you turn and leave yourself.'
+								gs 'arousal', 'end'
+								gs 'stat'
+								act 'Leave':gt 'dorm', 'korr'
+							end
+						end
+						act 'Leave':gt 'dorm', 'korr'
+					else
+						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
+						if npc_rel['A84'] <= 40:
+							'You knock on the door. After a couple of seconds, Kendra opens the door. "I told you last time, I don''t have time for games and I am tired of yours. Now get lost." She closes the door in your face.'
+							act 'Leave':gt 'dorm', 'korr'
+						else
+							'You knock on the door. After a couple of seconds, Kendra opens the door. "Well if it isn''t my new favorite white slave bitch. Well come in." She stands aside to let you come in, as you enter she closes the door.'
+							act 'Enter': gt 'dorm', 'kendra_room_start'
+						end
+					end
+				else
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
+					'As you get close to the door you can hear her voice. It is fairly loud and sounds harsh in tone, but you can''t quite make out what she is saying. You do hear a muffled reply that sounds male. She seems busy right now, you shouldn''t bother her.'
+					act 'Leave':gt 'dorm', 'korr'
+				end
+			else
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
+				'You knock on the door, but no one answers. She must be asleep or not home.'
+				act 'Leave':gt 'dorm', 'korr'
+			end
 		end
 	end
 
-	if gosh > 0 and hour >= 8 and hour < 22:
+	if gosh > 0:
 		act 'Gosha''s room':
-			*clr & cla
-			menu_off = 1
-			minut += 15
-			gs 'stat'
-			'Gosha opens the door and invites you inside.'
-			act 'Walk into Gosha''s Room':
-				*clr & cla
-				gt 'dorm', 'gophiroom'
-			end
-			act 'Go for a walk with Gosha':
-				*clr & cla
-				gosh += 1
-				minut += 120
+			*clr & cla 
+			if (week <= 4 and hour >= 16 and hour < 23 and rand(1, 2) = 2) or (week = 6 and hour >= 9 and hour < 23 and rand(1, 2) = 2) or (week = 7 and hour >= 9 and hour < 23 and rand(1, 3) >= 2):
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big83.jpg"></center>'
+				'Gosha opens the door. "Hey <<$pcs_nickname>>, why don''t you come in." He then stands aside so you can walk in, closing the door after you.'
+				act 'Enter':gt 'dorm', 'gosha_room'
+			else
+				!!not home text
+				minut += 5
 				gs 'stat'
-				'You go for a walk with Gosha. You have a great time, he''s a great conversationalist and a true gentleman.'
+				'You knock on the door, but no one answers. He must be asleep or not home.'
 				act 'Leave':gt 'dorm', 'korr'
 			end
 		end
 	end
 end
 
-if $ARGS[0] = 'djibrilroom':
+if $ARGS[0] = 'djibril_room':
 	*clr & cla
 	$location_type = 'event'
 	reccoldorm = 0
@@ -154,12 +206,6 @@ if $ARGS[0] = 'djibrilroom':
 	gs 'boyStat', 'A82'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/djibrilroom/room.jpg"></center>'
 	'His room is bigger than you expected. There is just one bed over by the windows, and next to that is a desk and a laptop. Closer to the door is a couch and a recliner, with a small tv and playstation across from them. It is clean and tastefully decorated.'
-	!!if meet_djibril = 1 and hotcat >= 5:
-		!!do stuff
-	!!elseif djibril_sex >= 1:
-		!!do stuff
-		!!will add the above two later, just wanted to get the visiting him in his dorm room after the cafe event and to make the gangbang repeatable by just going to his room. More will come later.
-	!!elseif
 	if african_gangbang >= 1:
 		'As you enter, he looks you over hungrily and asks you "Would you like me to invite my friends over?" You know he is talking about inviting his friends over to gangbang you again.'
 		act 'No, let''s just talk': gt 'dorm', 'djibril_chat'
@@ -170,19 +216,57 @@ if $ARGS[0] = 'djibrilroom':
 			'He grins at that and grabs his phone. He starts sending out text messages. Once he finishes, he sits down in the reclining chair. "They should be here shortly" he tells you, and sure enough within a few minutes the first one arrives. Not long after the other two do as well. They take a seat on the couch with you.'
 			act 'Continue': gt 'dormev1', 'djibrilgb'
 		end
-	else
-		'As you enter, he asks you "So... what do you want to do? We can play some games, or just talk." He points to the Playstation and the couch.'
-		act 'Let''s talk': gt 'dorm', 'djibril_chat'
-		act 'Let''s play':
+	elseif meet_djibril = 1 and hotcat >= 5 or djibril_sex >= 1:
+		'As you enter, he pulls you over towards the couch. "I want you, I want you right now." Before you can respond he pulls you into a kiss.'
+		gs 'arousal', 'kiss', 3
+		gs 'stat'
+		act 'Return the kiss':
 			*clr & cla
-			gaming_exp += rand(1, 2)
-			minut += 60
 			npc_rel['A82'] += 1
+			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_kiss.jpg"></center>'
+			'You return the kiss in full. He puts one hand around you to the small of your back, pulling you in tighter as you keep kissing. After a bit his hand lowers and starts squeezing your butt. After several moments of this he puts his hands on your shoulders and pushes you down, you know he wants you to drop to your knees.'
+			gs 'arousal', 'kiss', 3
+			gs 'stat'
+			act 'Drop to your knees': gt 'dormev1', 'sveta_sex1'
+			act 'Break free':
+				*clr & cla
+				npc_rel['A82'] -= 1
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+				'You pull away from the kiss, he looks a little disappointed but doesn''t press the issue. "Um what would you like to do instead then?" He asks.'
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Let''s talk': gt 'dorm', 'djibril_chat'
+				act 'Let''s play playstation': gt 'dorm', 'djibril_playgames'
+				act 'I should get going':
+					*clr & cla
+					npc_rel['A82'] -= 1
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+					'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
+					act 'Leave':gt 'dorm', 'korr'
+				end
+			end
+		end
+		act 'Stop the kiss':
+			*clr & cla
+			npc_rel['A82'] -= 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-			'You walk over and take a seat on the couch, picking up one of the controllers. "Sure, let''s play." He grins and turns the playstation on. He joins you on the couch, after grabbing the other controller. It is some sports game about football, you have played it before but not too often. He is a much better player than you are, he must play it a lot. You don''t mind, the two of you laugh and talk as you play. After an hour he finally turns it off. "I had fun, but I need to get some studying done. Maybe you can come by again some other day?"'
-			'You nod and put the controller down as you gather up your stuff. "Sure, I''d love to. Well, have fun studying." He laughs at that and then escorts you to the door.'
-			act 'Leave':gt 'dorm', 'korr'
+			'You pull away from the kiss, he looks a little disappointed but doesn''t press the issue. "Um what would you like to do instead then?" He asks.'
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Let''s talk': gt 'dorm', 'djibril_chat'
+			act 'Let''s play playstation': gt 'dorm', 'djibril_playgames'
+			act 'I should get going':
+				*clr & cla
+				npc_rel['A82'] -= 1
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+				'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
+				act 'Leave':gt 'dorm', 'korr'
+			end
 		end
+	else
+		'As you enter, he asks you "So... what do you want to do? We can play some games, or just talk." He points to the Playstation and the couch.'
+		act 'Let''s talk': gt 'dorm', 'djibril_chat'
+		act 'Let''s play playstation': gt 'dorm', 'djibril_playgames'
 		act 'I should get going':
 			*clr & cla
 			npc_rel['A82'] -= 1
@@ -193,12 +277,26 @@ if $ARGS[0] = 'djibrilroom':
 	end
 end
 
+if $ARGS[0] = 'djibril_playgames':
+	*clr & cla
+	$location_type = 'event'
+	reccoldorm = 0
+	djibrilflag = 0
+	*clr & cla
+	gaming_exp += rand(1, 2)
+	minut += 60
+	npc_rel['A82'] += 1
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+	'You walk over and take a seat on the couch, picking up one of the controllers. "Sure, let''s play." He grins and turns the playstation on. He joins you on the couch, after grabbing the other controller. It is some sports game about football, you have played it before but not too often. He is a much better player than you are, he must play it a lot. You don''t mind, the two of you laugh and talk as you play. After an hour he finally turns it off. "I had fun, but I need to get some studying done. Maybe you can come by again some other day?"'
+	'You nod and put the controller down as you gather up your stuff. "Sure, I''d love to. Well, have fun studying." He laughs at that and then escorts you to the door.'
+	act 'Leave':gt 'dorm', 'korr'
+end
+
 if $ARGS[0] = 'djibril_chat':
 	*clr & cla
 	$location_type = 'event'
 	reccoldorm = 0
 	djibrilflag = 0
-	gs 'boyStat', 'A82'
 	*clr & cla
 	chrsm_exp += rand(1,2)
 	minut += 5
@@ -210,13 +308,60 @@ if $ARGS[0] = 'djibril_chat':
 		*clr & cla
 		minut += 30
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-		'You talk about a wide range of topics. How he is enjoying school, any pretty girls that have caught his eye, things he has done recently and so on. He asks you about similar stuff, asking about your school, friends, home life etc. Overall, it is a pleasant conversation.'
-		act 'Leave':gt 'dorm', 'korr'
-		act 'Keep talking': gt 'dorm', 'djibril_chat'
+		if hotcat >= 5 or djibril_sex >= 1:
+			'You talk about a wide range of topics. How he is enjoying school, any pretty girls that have caught his eye, things he has done recently and so on. He asks you about similar stuff, asking about your school, friends, home life etc. Overall, it is a pleasant conversation. At one point he gets up, you think to go get something but instead he reaches down and pulls you up as well and starts kissing you.'
+			act 'Return the kiss':
+				*clr & cla
+				npc_rel['A82'] += 1
+				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_kiss.jpg"></center>'
+				'You return the kiss in full. He puts one hand around you to the small of your back, pulling you in tighter as you keep kissing. After a bit his hand lowers and starts squeezing your butt. After several moments of this he puts his hands on your shoulders and pushes you down, you know he wants you to drop to your knees.'
+				gs 'arousal', 'kiss', 3
+				gs 'stat'
+				act 'Drop to your knees': gt 'dormev1', 'sveta_sex1'
+				act 'Break free':
+					*clr & cla
+					npc_rel['A82'] -= 1
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+					'You pull away from the kiss, he looks a little disappointed but doesn''t press the issue. "Um what would you like to do instead then?" He asks.'
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Let''s talk': gt 'dorm', 'djibril_chat'
+					act 'Let''s play playstation': gt 'dorm', 'djibril_playgames'
+					act 'I should get going':
+						*clr & cla
+						npc_rel['A82'] -= 1
+						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+						'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
+						act 'Leave':gt 'dorm', 'korr'
+					end
+				end
+			end
+			act 'Stop the kiss':
+				*clr & cla
+				npc_rel['A82'] -= 1
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+				'You pull away from the kiss, he looks a little disappointed but doesn''t press the issue. "Um what would you like to do instead then?" He asks.'
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Let''s talk': gt 'dorm', 'djibril_chat'
+				act 'Let''s play playstation': gt 'dorm', 'djibril_playgames'
+				act 'I should get going':
+					*clr & cla
+					npc_rel['A82'] -= 1
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+					'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
+					act 'Leave':gt 'dorm', 'korr'
+				end
+			end
+		else
+			'You talk about a wide range of topics. How he is enjoying school, any pretty girls that have caught his eye, things he has done recently and so on. He asks you about similar stuff, asking about your school, friends, home life etc. Overall, it is a pleasant conversation.'
+			act 'Leave':gt 'dorm', 'korr'
+			act 'Keep talking': gt 'dorm', 'djibril_chat'
+		end
 	end
 end
 
-if $ARGS[0] = 'kendraroom':
+if $ARGS[0] = 'kendra_room_start':
 	menu_off = 1
 	$location_type = 'event'
 	reccoldorm = 0
@@ -224,265 +369,348 @@ if $ARGS[0] = 'kendraroom':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/kendraroom/room.jpg"></center>'
 	'There are two beds, one on each side of the window. There are various pictures and posters hanging on both sides of the room. One side also has a string of large lights hanging up as well. Just down from the beds on each side are two desks, against each wall. Both are decorated with slight differences. Near the door is a small couch and two wardrobes.'
-	if kendraslave >= 6:
-		'Kendra opens the door and invites you in. It doesn''t take long before you are both naked and excitedly touching each other.'
-		act 'Have sex':
-			*clr & cla
-			lesb += 1
-			gs 'stat'
-			picrand = rand(1, 5)
-			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/kendrastrap<<picrand>>.jpg"></center>'
-			'Kendra smiles as she takes out the strap-on and locks herself into it. She has you spread your legs wide as she fucks you hard, until she brings you to orgasm.'
-			$orgasm_or = 'yes'
-			gs 'arousal', 'vaginal_strap', 20, 'sub'
-			gs 'stat'
-			act 'Leave':gt 'dorm', 'korr'
-		end
-	elseif kendraslave = 5:
-		'The lovely ebony woman Kendra opens the door. She observes you for a while, and suggests that you get another tattoo. Only then, and not before, will she allow you to taste her once again.'
-		act 'Leave':gt 'dorm', 'korr'
-		act 'Get a tattoo':
-			*clr & cla
-			minut += 60
-			kendra = 5
-			tat = 5
-			gs 'stat'
-			if tatlip = 1 or tatlip = 3:
-				'"So, you went and got yourself a tattoo? Took you some time, but I''ve got to say, you''re a quite obedient. Now get to work!"'
-			else
-				if rand(1, 2) = 1:
-					tatlip = 1
-					'<center><img <<$set_imgh>> src="images/pc/body/tattoos/lip/tatlip1.jpg"></center>'
-				else
-					tatlip = 3
-					'<center><img <<$set_imgh>> src="images/pc/body/tattoos/lip/tatlip3.jpg"></center>'
-				end
-				if tatlip > 1 and tatlip ! 3:
-					'Kendra sees that you have already tattooed your lip. "Don''t you want to cover that up?" she asks. "A whore should have something else tattooed there. Cocksucker seems fitting." She does it so masterfully that the old tattoo is not noticeable anymore.'
-				else
-					tattCount += 1
-					'Kendra tattoos cocksucker on your lip.'
-				end
-			end
-			act 'Give yourself to Kendra':
-				*clr & cla
-				lesb += 1
-				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/kendrastrap1.jpg"></center>'
-				'Kendra undresses you and places you on all fours. She puts on a strap-on, and pushes it deep inside your pussy. Her thrusts are magical, and it doesn''t take long before you orgasm. After a while she decides you''ve had enough.'
-				$orgasm_or = 'yes'
-				gs 'arousal', 'vaginal_strap', 20, 'sub'
-				gs 'stat'
-				act 'Leave':gt 'dorm', 'korr'
-			end
-		end
-	elseif kendraslave = 4:
-		'The lovely African woman Kendra comes out of her room, and suggests you get another tattoo. After which, she will allow you to lick her.'
-		act 'Leave':gt 'dorm', 'korr'
-		act 'Get a tattoo':
-			*clr & cla
-			minut += 60
-			kendra = 4
-			tat = 4
-			gs 'stat'
-			if tatvag = 3 or tatvag = 18:
-				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/pubic/tatvag3.jpg"></center>'
-				'Kendra sees that you already have such a tattoo. A predatory smile spreads across her face, and she gives you a light tap on the vagina.'
-			else
-				if rand(1, 2) = 1:
-					tatvag = 3
-					'<center><img <<$set_imgh>> src="images/pc/body/tattoos/pubic/tatvag3.jpg"></center>'
-				else
-					tatvag = 18
-					'<center><img <<$set_imgh>> src="images/pc/body/tattoos/pubic/tatvag18.jpg"></center>'
-				end
-				if tatvag ! 18 and tatvag ! 3:
-					'Kendra sees that you already have a tattoo above your pussy. "Ah, this''ll be a quick fix" she says, and tattoos you above the pussy with the ''Whore for Blacks'' tattoo over the old one. She does it so masterfully that old tattoo is not noticeable.'
-				else
-					tattCount += 1
-					'Kendra tattoos you above the pussy with the ''Whore for Blacks'' tattoo.'
-				end
-			end
-			act 'Lick Kendra':
-				*clr & cla
-				*clr
-				lesb += 1
-				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/kendra3.jpg"></center>'
-				'Kendra undresses and pushes your face between her legs to get you to start licking her pussy. You skillfully run your tongue up along and inside her juicy pussy, and Kendra orgasms violently.'
-				gs 'arousal', 'cuni_give', 20, 'sub'
-				gs 'stat'
-				act 'Leave':gt 'dorm', 'korr'
-			end
-		end
-	elseif kendraslave = 3:
-		'The lovely ebony lady Kendra opens the door. She observes you for a while, and suggests that you get another tattoo. Only then, and not before, will she allow you to taste her once again.'
-		act 'Leave':gt 'dorm', 'korr'
-		act 'Get a tattoo':
-			*clr & cla
-			minut += 60
-			kendra = 3
-			tat = 3
-			gs 'stat'
-			if tatlech = 4:
-				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/shoulder/tatshldr4.jpg"></center>'
-				'Kendra sees your tattoo on your shoulder, stating that you''re a black cock loving whore. She grins, and closes the door.'
-			elseif tatlech = 0:
-				tatlech = 4
-				tattCount += 1
-				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/shoulder/tatshldr4.jpg"></center>'
-				'Kendra tattoos your shoulder with the symbol of a black cock loving whore.'
-			elseif tatlech > 0 and tatlech ! 4:
-				tatlech = 4
-				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/shoulder/tatshldr4.jpg"></center>'
-				'Kendra sees that you already have a tattoo on your shoulder. "That''s not right, I''ll fix it up" she says, and tattoos your shoulder with the symbol of a black cock loving whore, over the old tattoo. She does it so masterfully that old tattoo is not noticeable.'
-			end
-			act 'Eat Kendra out':
-				*clr & cla
-				lesb += 1
-				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/kendra2.jpg"></center>'
-				'Kendra undresses and grabs your head, then forces it towards her pussy. "Now''s your turn to impress me!" she exclaims. You skillfully run your tongue along and inside her juicy pussy, and Kendra orgasms violently.'
-				gs 'arousal', 'cuni_give', 20, 'sub'
-				gs 'stat'
-				act 'Leave':gt 'dorm', 'korr'
-			end
-		end
-	elseif kendraslave = 2:
-		'The lovely ebony woman Kendra opens the door. She observes you for a while and suggests that you get another tattoo. Only then, and not before, will she allow you to taste her once again.'
+	'As you walk in the room, she follows behind you as says. "What should I do with you today slave." You know it is a rhetorical question and she really doesn''t want you to answer. As you turn to look at her, you can tell she has something in mind that will likely either humiliate you are turn you into her submissive. Perhaps if you just go now you can avoid it, or maybe you should stay and see what happens.'
+	act 'I should get going':
+		*clr & cla
+		npc_rel['A84'] -= 10
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
+		'You look over at the clock in her room. "I should really get going, sorry to have bothered you."'
+		'She looks at you very annoyed. "What is this? I don''t have time for games. Don''t come back unless you are serious about playing." Then she grabs you by the arm and shoves you out the door, closing it behind you.'
 		act 'Leave':gt 'dorm', 'korr'
-		act 'Get a tattoo':
-			*clr & cla
-			minut += 60
-			kendra = 2
-			tat = 2
-			gs 'stat'
-			if tatankle = 1 or tatankle = 2:
-				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/foot/tatankle2.jpg"></center>'
-				'"Oh, look at this! What an independent girl, you''ve already got one. Now you can get what you came for."'
-			elseif tatankle = 0:
-				tatankle = 2
-				tattCount += 1
-				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/foot/tatankle2.jpg"></center>'
-				'Kendra tattoos your ankle with the symbol of a black cock loving whore.'
-			elseif tatankle > 2:
-				tatankle = 2
-				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/foot/tatankle2.jpg"></center>'
-				'Kendra notices you already have a tattoo on your ankle. "Nothing I can''t fix" she says, as she starts tattooing your ankle with the symbol of a black cock loving whore, over the old tattoo. She does it so masterfully that the old tattoo is not noticeable.'
-			end
-			act 'Eat Kendra out':
-				*clr & cla
-				repa = 9
-				lesb += 1
-				if kendrasex = 0:kendrasex = 1 & girl = girl + 1
-				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/kendra.jpg"></center>'
-				'Kendra undresses and grabs your head, then forces it towards her pussy. "Now''s your turn to impress me!" she exclaims. You skillfully run your tongue along and inside her juicy pussy, and Kendra orgasms violently.'
-				gs 'arousal', 'cuni_give', 20, 'sub'
-				gs 'stat'
-				act 'Leave':gt 'dorm', 'korr'
-			end
-		end
-	elseif kendraslave <= 1:
-		'A pretty ebony woman opens the door, she introduces herself as Kendra and says that she knows you love black cocks. She tells you to get a proper tattoo if you want to get it on with her.'
+	end
+	act 'Wait to see what she does':
+		npc_rel['A84'] += 1
+		gt 'dorm', 'kendra_room_routing'
+	end
+end
+
+if $ARGS[0] = 'kendra_room_routing':
+	if kendra_dom = 0:
+		gt 'dorm', 'kendra_room_0'
+	elseif kendra_dom = 1:
+		gt 'dorm', 'kendra_room_1'
+	elseif kendra_dom = 2:
+		gt 'dorm', 'kendra_room_2'
+	elseif kendra_dom = 3:
+		gt 'dorm', 'kendra_room_3'
+	elseif kendra_dom = 4:
+		gt 'dorm', 'kendra_room_4'
+	elseif kendra_dom = 5:
+		gt 'dorm', 'kendra_room_5'
+	elseif kendra_dom = 6:
+		gt 'dorm', 'kendra_room_6'
+	elseif kendra_dom = 7:
+		gt 'dorm', 'kendra_room_7'
+	elseif kendra_dom = 8:
+		gt 'dorm', 'kendra_room_8'
+	elseif kendra_dom = 9:
+		gt 'dorm', 'kendra_room_9'
+	elseif kendra_dom = 10:
+		gt 'dorm', 'kendra_room_10'
+	elseif kendra_dom = 11:
+		gt 'dorm', 'kendra_room_11'
+	else
+		kendra_dom = rand(0, 11)
+		gt 'dorm', 'kendra_room_routing'
+	end
+end
+
+if $ARGS[0] = 'kendra_room_0':
+	menu_off = 1
+	$location_type = 'event'
+	kendra_dom = 1
+	minut += 45
+	gs 'stat'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom1.jpg"></center>'
+	'She goes over and sits on the bed, then kicks off her shoes. "Come over here and paint my toenails slave." You walk over and sit on the bed, she hands you some polish. You start putting on the polish only to have her smack you slightly. "No, not good enough start over." You get out the polish remover and clean her nails and repeat the process several times before she seems to be happy.'
+	act 'Finish her toenails':
+		*clr & cla
+		minut += 15
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom1a.jpg"></center>'
+		'She looks down as you are finishing up the last toes on her other foot. "I suppose that is good enough. Now hurry up and finish, I got things to do."'
+		'"Yes mistress." You don''t rush and make sure you do a good job finishing her toenails, you blow on them until they dry.'
+		'Once you have finally finished she pushes you off the bed. "Now go!"'
+		'You stand up. "Yes mistress." Then you walk to the door and leave.'
 		act 'Leave':gt 'dorm', 'korr'
-		act 'Get a tattoo':
-			*clr & cla
-			minut += 60
-			kendra = 1
-			tat = 1
-			gs 'stat'
-			if tatupb = 4 or tatupb = 29:
-				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/trampstamp/tatlowbck<<tatupb>>.jpg"></center>'
-				'"Oh, so you already have a tramp stamp tattooed? No need to waste time here, then! Come in and eat my pussy, whore."'
-			elseif tatupb = 0:
-				tatupb = 4
-				tattCount += 1
-				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/trampstamp/tatlowbck4.jpg"></center>'
-				'Kendra tattoos a tramp stamp with the word ''Slut'' on you'
-			elseif tatupb > 0 and tatupb ! 4:
-				tatupb = 4
-				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/trampstamp/tatlowbck4.jpg"></center>'
-				'Kendra sees that you already have a tramp stamp. "Nothing that can''t be fixed" she says, as she tattoos a tramp stamp with the word ''Slut'' over the old tattoo. She does it so masterfully that the old tattoo is not noticeable.'
-			end
-			act 'Eat Kendra out':
-				*clr & cla
-				if kendrasex = 0:kendrasex = 1 & girl += 1
-				lesb += 1
-				gs 'arousal', 'cuni_give', 20, 'sub'
-				gs 'arousal', 'end'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/afra30.jpg"></center>'
-				'Kendra undresses and grabs your head, then forces it towards her pussy. "Now''s your turn to impress me!" she exclaims. You skillfully run your tongue along and inside her juicy pussy, and Kendra orgasms violently.'
-				act 'Leave':gt 'dorm', 'korr'
-			end
-		end
 	end
 end
 
-if $ARGS[0] = 'gophiroom':
+if $ARGS[0] = 'kendra_room_1':
 	menu_off = 1
 	$location_type = 'event'
-	reccoldorm = 0
-	goshiflag = 0
-	gs 'boyStat', 'A83'
-	sexpartkno = 1
-	if goshsex = 0:goshsex = 1 & guy += 1
+	*clr & cla
+	kendra_dom = 2
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom2_' + rand(1,2) + '.jpg"></center>'
+	'She goes over and sits on the couch. "Come over here and clean my boots slave." You walk over and kneel down next to the couch, you start to grab some tissue to clean her boots but she stops you. "No use your tongue."'
+	'You nod a bit. "Yes mistress." Then you start licking her boots clean, once you finish one you start on the other. A few times she smacks you on top of the head and points out a spot you missed, that you have to go back over.'
+	'Once you have finally finished cleaning her boots she looks them over one last time and then points to the door. "Now go slave."'
+	'You stand up. "Yes mistress." Then you walk to the door and leave.'
+	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'feet'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Leave':gt 'dorm', 'korr'
+end
 
-	'As soon as you walk into Gosha''s room, he begins fondling your breasts and slowly undressing you.'
-	gs 'arousal', 'foreplay', 30
+if $ARGS[0] = 'kendra_room_2':
+	menu_off = 1
+	$location_type = 'event'
+	*clr & cla
+	kendra_dom = 3
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom3.jpg"></center>'
+	'She goes over and grabs a bowl of water, with some other stuff. Then she sits on the couch. "Come over here and clean my feet slave." You walk over and kneel down next to the couch, you add a little soap to the water. Then use the cloth and water in the bowl to clean her feet'
+	'She mostly ignores you and reads a magazine. Once you have finally finished cleaning her feet she looks them over and says. "Kiss them."'
+	'You do as she says and kiss her feet, when you have kissed them enough, she then points to the door. "Now go slave."'
+	'You stand up. "Yes mistress." Then you walk to the door and leave.'
+	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'feet'
+	gs 'arousal', 'end'
 	gs 'stat'
+	act 'Leave':gt 'dorm', 'korr'
+end
 
-	srand = rand(1, 3)
+if $ARGS[0] = 'kendra_room_3':
+	menu_off = 1
+	$location_type = 'event'
+	*clr & cla
+	kendra_dom = 4
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom4.jpg"></center>'
+	'She goes over and sits on the couch. "Come over here and clean my feet slave." You start to go get the bowl of water when she says. "No use your tongue."'
+	'You nod a bit. "Yes mistress." You walk back over and kneel next to the couch. You remove her boots and then start licking her feet, after a bit you suck on her toes and lick her feet and legs half way up her calves there the boots had ended.'
+	'Once you licked every cm of her feet and lower legs, then points to the door. "Now go slave."'
+	'You stand up. "Yes mistress." Then you walk to the door and leave.'
+	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'feet'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Leave':gt 'dorm', 'korr'
+end
 
-	if srand = 1:
-		gs 'cum_manage'
-		picrand = rand(1, 5)
+if $ARGS[0] = 'kendra_room_4':
+	menu_off = 1
+	$location_type = 'event'
+	*clr & cla
+	kendra_dom = 5
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom5.jpg"></center>'
+	'Once inside she leads you over to her bed, then she opens the night stand and pulls out a collar. Which she promptly and tightly buckles around your neck, making it a little hard for you to breath and swallow. With that firmly in place she gets out a leash and attaches it to the collar. She pushes you down as she says. "Get down, like a good slave." You get down on your hands and knees. Then she leads you around the dorm room for a bit, before she finally takes you out into the hall. She leads you down the communal kitchen area and then to the lounge, where she gets some snacks and drinks for herself. Several people notice the two of you, some laugh, some just ignore it, while others give you or sometimes both of you disgusted looks.'
+	*nl
+	'Finally you make it back to the room, where she sits on the couch to watch a little tv while you stay on your hands and knees next to the couch waiting for her. After a bit she finally points to the door. "Now go slave, but put your collar and leash away first."'
+	'You stand up taking off the collar and leash, you walk over and put them back in the draw she got them from. "Yes mistress." Then you walk to the door and leave.'
+	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Leave':gt 'dorm', 'korr'
+end
 
-		if picrand = 1:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh2.jpg"></center>'
-		if picrand = 2:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh11.jpg"></center>'
-		if picrand = 3:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh13.jpg"></center>'
-		if picrand = 4:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh14.jpg"></center>'
-		if picrand = 5:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh15.jpg"></center>'
+if $ARGS[0] = 'kendra_room_5':
+	menu_off = 1
+	$location_type = 'event'
+	*clr & cla
+	kendra_dom = 6
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom6.jpg"></center>'
+	'She goes over and pulls her chair away from her desk before sitting down on it."Come over here slave." You walk over and stand next to her, she suddenly grabs you and pulls you across her lap, before you even know what is happening she starts spanking you.'
+	'"You are such a worthless and bad slave." She says as she keeps spanking you.'
+	'You grit your teeth against the pain. "I''m sorry mistress." You don''t even know what you did to upset her, she isn''t telling you and you know it would only make matters worse if you asked.'
+	*nl
+	'She starts pulling your clothes off, until she leaves you bare butt exposed, then she starts spanking you even harder. After some time it really starts to sting, you don''t know how long she has spanked you, long enough she seems to be getting tired.'
+	'Finally she pushes you off her lap into the floor, as she stands up, she points to the door. "Now go slave."'
+	'You stand up and get dressed again. "Yes mistress." Then you walk to the door and leave.'
+	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation'
+	gs 'pain', 2, 'asscheeks', 'spank'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Leave':gt 'dorm', 'korr'
+end
 
-		'Seeing that you''re not resisting, Gosha quickly removes his pants, revealing his cock. He guides it into your pussy. While he fucks you, you orgasm.'
-		'As you''re still trying to come to your senses, Gosha cums inside of you.'
-		$orgasm_or = 'yes'
-		gs 'arousal', 'vaginal', 20
+if $ARGS[0] = 'kendra_room_6':
+	menu_off = 1
+	$location_type = 'event'
+	*clr & cla
+	kendra_dom = 7
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom7.jpg"></center>'
+	'She goes over and pulls her chair away from her desk. She grabs a paddle that was laying on her desk before sitting down on the chair."Come over here slave." You walk over and lay yourself across her lap. You already know what she plans to do, at once she start paddling your ass.'
+	'"You are such a worthless and bad slave." She says as she keeps spanking you.'
+	'You grit your teeth against the pain. "I''m sorry mistress." You don''t even know what you did to upset her, she isn''t telling you and you know it would only make matters worse if you asked.'
+	*nl
+	'She starts pulling your clothes off, until she leaves you bare butt exposed, then she starts spanking you even harder. After some time it really starts to sting, you don''t know how long she has spanked you, long enough she seems to be getting tired.'
+	'Finally she pushes you off her lap into the floor, as she stands up, she points to the door. "Now go slave."'
+	'You stand up and get dressed again. "Yes mistress." Then you walk to the door and leave.'
+	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation'
+	gs 'pain', 3, 'asscheeks', 'spank'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Leave':gt 'dorm', 'korr'
+end
 
-	elseif srand = 2:
-		spafinloc = 12
-		gs 'cum_manage'
-		picrand = rand(1, 5)
-		if picrand = 1:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh.jpg"></center>'
-		if picrand = 2:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh3.jpg"></center>'
-		if picrand = 3:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh4.jpg"></center>'
-		if picrand = 4:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh5.jpg"></center>'
-		if picrand = 5:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh7.jpg"></center>'
+if $ARGS[0] = 'kendra_room_7':
+	menu_off = 1
+	$location_type = 'event'
+	*clr & cla
+	kendra_dom = 8
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom8.jpg"></center>'
+	'She goes over and sits on the couch. "Come over here." You walk over next to her. "Strip!" she commands you.'
+	'You nod a bit. "Yes mistress." Then your remove your clothes and strip down.'
+	'Once you naked she points to the floor right in front of her. "Get on your hands and knees."'
+	*nl
+	'You do as she commands, once in place she puts her feet up on your back. Then she leans back and start texting on her phone. Occasionally she laughs or makes comments about whoever she is texting but she never speaks to you.'
+	'Once a hour or so has passed she removes her feet from your back and then points to the door. "Now go slave."'
+	'You stand up and get dressed. "Yes mistress." Then you walk to the door and leave.'
+	gs 'arousal', 'foreplay', 60, 'sub', 'humiliation', 'inhibition'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Leave':gt 'dorm', 'korr'
+end
 
-		'Gosha pushes you down on your knees, and fucks you hard in the mouth. It doesn''t take long before his cock starts twitching and he quickly pulls out and cums all over your face.'
-		gs 'arousal', 'bj', 10, 'deepthroat', 'rough'
+if $ARGS[0] = 'kendra_room_8':
+	menu_off = 1
+	$location_type = 'event'
+	*clr & cla
+	kendra_dom = 9
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom9.jpg"></center>'
+	'She goes over and sits on the couch. "Come over here and strip." You walk over and strip naked while standing next to her. Once you are fully naked she says. "Now lick my shoes clean."'
+	'You kneel down. "Yes mistress." Then you start licking her shoes and feet clean, once you finish one you start on the other. A few times she smacks you on top of the head and points out a spot you missed, that you have to go back over.'
+	'Once you have finally finished cleaning her shoes and feet, she looks them over one last time and then points to the door. "Now go slave."'
+	'You stand up. "Yes mistress." Then you walk to the door and leave.'
+	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'feet', 'inhibition'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Leave':gt 'dorm', 'korr'
+end
 
-	elseif srand = 3:
-		anal += 1
-		spafinloc = 3
-		gs 'cum_manage'
-		picrand = rand(1, 5)
-		gs 'stat'
+if $ARGS[0] = 'kendra_room_9':
+	menu_off = 1
+	$location_type = 'event'
+	*clr & cla
+	kendra_dom = 10
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom10.jpg"></center>'
+	'Once inside she leads you over to her bed, then she turns toward you and says. "Strip!"'
+	'As you strip you reply. "Yes mistress." She opens the night stand and pulls out a collar. Once you are fully naked she tightly buckles it around your neck, making it a little hard for you to breath and swallow. With that firmly in place she gets out a leash and attaches it to the collar. She pushes you down as she says. "Get down, like a good slave." You get down on your hands and knees.'
+	*nl
+	'Then she leads you around the dorm room for a bit, before she gets out the bowl and fills it with water. She places it down in front of you as she sits on the couch and starts texting on her phone. "Drink!" You start lapping up the water as best you can, once you are finished you just sit there quietly until she notices you again.'
+	'After a bit she finally points to the door. "Now go slave, but put your collar and leash away first."'
+	'You stand up taking off the collar and leash, you walk over and put them back in the draw she got them from. "Yes mistress." Then you walk to the door and leave.'
+	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'inhibition'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Leave':gt 'dorm', 'korr'
+end
 
-		if picrand = 1:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh6.jpg"></center>'
-		if picrand = 2:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh8.jpg"></center>'
-		if picrand = 3:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh9.jpg"></center>'
-		if picrand = 4:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh10.jpg"></center>'
-		if picrand = 5:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh12.jpg"></center>'
+if $ARGS[0] = 'kendra_room_10':
+	menu_off = 1
+	$location_type = 'event'
+	*clr & cla
+	kendra_dom = 11
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom11.jpg"></center>'
+	'She goes over and sits down on the couch. "Come over here slave." You walk over and stand next to her. "Now strip!"'
+	'As you strip you reply. "Yes mistress." Once you are naked she pulls you over her laps and starts spanking your bare ass with her hand.'
+	'"You are such a worthless and bad slave." She says as she keeps spanking you.'
+	*nl
+	'You grit your teeth against the pain. "I''m sorry mistress." You don''t even know what you did to upset her, she isn''t telling you and you know it would only make matters worse if you asked.'
+	'After some time it really starts to sting, you don''t know how long she has spanked you, long enough she seems to be getting tired.'
+	'Finally she pushes you off her lap into the floor, as she stands up, she points to the door. "Now go slave."'
+	'You stand up and get dressed again. "Yes mistress." Then you walk to the door and leave.'
+	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'inhibition'
+	gs 'pain', 2, 'asscheeks', 'spank'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Leave':gt 'dorm', 'korr'
+end
+
+if $ARGS[0] = 'kendra_room_11':
+	menu_off = 1
+	$location_type = 'event'
+	*clr & cla
+	kendra_dom = 12
+	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/femdom/femdom12.jpg"></center>'
+	'As you enter you notice another African girl sitting on the couch as well. You assume another student and a friend of Kendra''s. Kendra goes over and sits down on the coffee table. "Come over here slave." You walk over and stand next to her. "Now strip!"'
+	'You glance at the other girl and then you strip, as you reply. "Yes mistress."'
+	'The other girl laughs. "I can''t believe you get these white bitches to do this shit.'
+	'Once you are naked she pulls you over her laps and starts spanking your bare ass with a paddle. "I just train them to accept their natural place, deep down they all know where their place is and they crave us to put them their." Then she turns her face to you. "Don''t you slave."'
+	*nl
+	'You nod. "Yes mistress, I do." They both laugh at your response.'
+	'She paddles you even harder now. You grit your teeth against the pain. "You should have seen what I did to that boy from biology."'
+	'"Which one?" Her friend asks.'
+	'"You know the one that was so confident, always hitting on us. Expecting us to to just fall to our knees and suck his dick the first day in class." She replies to her friend.'
+	'"Oh ... him... yeah I remember him. What did you do to him?" Her friend asks.'
+	*nl
+	'Kendra laughs as she keeps paddling you, they almost seem to have forgotten you was here. "I fucked him with a strapon until I had an orgasm."'
+	'"OH MY GOD! You did not." Her friend says in shock.'
+	'"Oh I did, here look." She stops paddling you a moment to pull out her phone to show here friend. You can''t see what is on it but you can hear some grunting noise coming from the phone. They both start laughing.'
+	*nl
+	'"I can''t believe you got him to do that, next time you do that, call me. I want to fuck him." Soon they are talking about things they would like to do to this mysterious guy, while Kendra paddles you. After some time it really starts to sting, you don''t know how long she has spanked you, long enough she seems to be getting tired.'
+	'Finally she pushes you off her lap into the floor, as she stands up, she points to the door. "Now go slave."'
+	'You stand up and get dressed again. "Yes mistress." As you walk to the door, the two of them are still talking about the guy.'
+	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'inhibition', 'group'
+	gs 'pain', 3, 'asscheeks', 'spank'
+	gs 'arousal', 'end'
+	gs 'stat'
+	act 'Leave':gt 'dorm', 'korr'
+end
 
-		'Gosha lubricates your asshole, and starts pushing his fingers in. After a while he deems you ready. He takes out his cock and thrusts it deeply into your ass. He fucks you for some time and ends by cumming inside of your ass.'
-		anal_slip += 4
-		$orgasm_or = 'yes'
-		gs 'arousal', 'anal_finger', 10
-		gs 'arousal', 'anal', 10, 'rough'
-		minut -= 10
 
+if $ARGS[0] = 'gosha_room':
+	menu_off = 1
+	$location_type = 'event'
+	reccoldorm = 0
+	goshiflag = 0
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/gosharoom/gosha_room.jpg"></center>'
+	'His room has two desks against the back well and two beds on either side of the room with a small path between them. Near the door is a small couch with a tv aginst the opposite wall.'
+	'As soon as you sit down on the couch, he sits next to you and begins fondling your breasts and slowly undressing you.'
+	gs 'arousal', 'foreplay', 3
+	gs 'stat'
+	act 'Stop him':
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/gosharoom/gosha_room.jpg"></center>'
+		'You push his hands away. "Stop I didn''t come for that."'
+		'He stops and gives you a confused look. "Then why did you come?"'
+		'You sigh a little. "I thought we could talk." Seeing his reaction you add. "Or maybe go for a walk instead?"'
+		'He thinks on that a moment and then shurgs. "Sure ok, lets go for a walk."'
+		act 'Go for a walk':
+			*clr & cla
+			gosh += 1
+			minut += 60
+			gs 'stat'
+			'You go for a walk with Gosha. You have a great time, he''s a great conversationalist. You spend a hour walking around the campus with him pointing out different buildings and even introducing you to some of the other students. Before long he guides you back to the dorms. "Well I got some studying I need to do, I hope you decided to come by some other day and we can spend time together again." With that he walks into the building and you leave the university grounds.'
+			act 'Leave':gt 'city_island'
+		end
 	end
-	gs 'arousal', 'end'
+	act 'Let him': gt 'dormev1', 'gosha_sex'
+end
+
+if $ARGS[0] = 'mens_restroom':
+	$location_type = 'public_indoors'
+	*clr & cla
+	$menu_loc = 'dorm'
+	$menu_arg = 'mens_restroom'
+	$locM = 'dorm'
+	$locM_arg = 'mens_restroom'
+	menu_off = 0
+	gs 'stat'
+	'<center><b><font color="maroon">Dormitory - Men''s Restroom</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/restrooms/bathroom_mens.jpg"></center>'
+	'You peek around the corner. Inside this room, stalls line the right side, with urinals on the far wall and rows of sinks and <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room has a smell of disinfectant and stale piss.'
+	act 'Leave':gt 'dorm', 'korr'
+	
+	dynamic $tampon
+	dynamic $quickwash
+	dynamic $basin
+end
+
+if $ARGS[0] = 'womens_restroom':
+	$location_type = 'public_indoors'
+	*clr & cla
+	$menu_loc = 'dorm'
+	$menu_arg = 'womens_restroom'
+	$locM = 'dorm'
+	$locM_arg = 'womens_restroom'
+	menu_off = 0
 	gs 'stat'
+	'<center><b><font color="maroon">Dormitory - Men''s Restroom</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/restrooms/bathroom_womens.jpg"></center>'
+	'You peek around the corner. Inside this room, stalls line the right side and rows of sinks, with <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room has a smell of disinfectant.'
 	act 'Leave':gt 'dorm', 'korr'
+	
+	dynamic $tampon
+	dynamic $quickwash
+	dynamic $basin
 end
 
 --- dorm ---------------------------------

+ 3 - 3
locations/dormev1.qsrc

@@ -474,7 +474,7 @@ if $ARGS[0] = 'gosha_sex':
 		act 'Clean up':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/goshaaroom/gosha_room.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/gosharoom/gosha_room.jpg"></center>'
 			'Once he cums he quickly gets dressed and then sits down at his desk. It takes you a little bit longer to get dressed but once you are, he glances over at you. "It was great you stopping by, but I got some class work I need to do if you don''t mind." He says as he indicates the door, as you walk over to it he adds. "I hope you stop by again, see you later." With that you leave.'
 			act 'Leave':gt 'dorm', 'korr'
 		end
@@ -494,7 +494,7 @@ if $ARGS[0] = 'gosha_sex':
 		act 'Clean up':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/goshaaroom/gosha_room.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/gosharoom/gosha_room.jpg"></center>'
 			'Once he cums he quickly gets dressed and then sits down at his desk. It takes you a little bit longer to get dressed but once you are, he glances over at you. "It was great you stopping by, but I got some class work I need to do if you don''t mind." He says as he indicates the door, as you walk over to it he adds. "I hope you stop by again, see you later." With that you leave.'
 			act 'Leave':gt 'dorm', 'korr'
 		end
@@ -517,7 +517,7 @@ if $ARGS[0] = 'gosha_sex':
 		act 'Clean up':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/goshaaroom/gosha_room.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/gosharoom/gosha_room.jpg"></center>'
 			'Once he cums he quickly gets dressed and then sits down at his desk. It takes you a little bit longer to get dressed but once you are, he glances over at you. "It was great you stopping by, but I got some class work I need to do if you don''t mind." He says as he indicates the door, as you walk over to it he adds. "I hope you stop by again, see you later." With that you leave.'
 			act 'Leave':gt 'dorm', 'korr'
 		end

+ 14 - 2
locations/family.qsrc

@@ -98,12 +98,24 @@ if StoryLine = 1:
 				'Your little brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
 			elseif kolloc = 11:
 				ocpd_room = 1
-				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, playing video games.'
+				if momloc = 19 and sdadloc = 10:
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing playing on his phone.'
+				elseif momloc = 19:
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing playing on his phone.'
+				elseif sdadloc = 10:
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing playing on his phone.'
+				else
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, playing video games.'
+				end
 			end
 
 			if sdadloc = 10:
 				ocpd_room = 1
-				'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
+				if momloc = 19:
+					''
+				else
+					'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
+				end
 			end
 		end
 

+ 35 - 12
locations/family_schedule.qsrc

@@ -210,7 +210,7 @@ if indorf = 0:
 			momloc['athome'] = 1
 		elseif hour < 19:
 			!! Cleaning dinner table/Doing dishes
-			momloc = 12
+			momloc = 13
 			momloc['athome'] = 1
 		elseif hour < 20:
 			if week = 1:
@@ -230,7 +230,7 @@ if indorf = 0:
 				momloc['athome'] = 0
 			else
 				!! Watches TV with Vladimir
-				momloc = 13
+				momloc = 19
 				momloc['athome'] = 1
 			end
 		else
@@ -278,12 +278,14 @@ if indorf = 0:
 		elseif hour < 12 or (hour = 12 and minut < 30):
 			!! Gets her nails done/hair cut at the salon or such things - On Sunday goes to the church during these hours
 			momloc['athome'] = 0
-			if week = 5:
+			if week = 6:
 				momloc = 15
 			else
+				!!Church
 				momloc = 16
 			end
 		elseif hour = 12 or (hour = 13 and minut < 30) and week = 6:
+			!!Church
 			momloc = 16
 		elseif hour < 14:
 			!! Walks around different shops, looking at and buying stuff - On Sunday goes to church during these hours
@@ -366,13 +368,27 @@ if indorf = 0:
 			sdadloc = 8
 			sdadloc['athome'] = 1
 		elseif hour < 19 or (hour = 19 and minut < 45):
-			!! In garage
-			sdadloc = 9
-			sdadloc['athome'] = 1
+			if week = 5:
+				!!In the garage drinking with Misha
+				fatherdrunk = 1
+				sdadloc = 9
+				sdadloc['athome'] = 1
+			else
+				!! In garage
+				sdadloc = 9
+				sdadloc['athome'] = 1
+			end
 		elseif hour < 21 or (hour = 21 and minut < 45):
-			!! Watch tv in living room
-			sdadloc = 10
-			sdadloc['athome'] = 1
+			if week = 5:
+				!!In the garage drinking with Misha
+				fatherdrunk = 1
+				sdadloc = 9
+				sdadloc['athome'] = 1
+			else
+				!! Watch tv in living room
+				sdadloc = 10
+				sdadloc['athome'] = 1
+			end
 		elseif hour < 22:
 			!! Take shower
 			sdadloc = 11
@@ -426,9 +442,16 @@ if indorf = 0:
 			sdadloc = 8
 			sdadloc['athome'] = 1
 		elseif hour < 22:
-			!! Watch tv in living room
-			sdadloc = 10
-			sdadloc['athome'] = 1
+			if week = 6:
+				!!In the garage drinking with Misha
+				fatherdrunk = 1
+				sdadloc = 9
+				sdadloc['athome'] = 1
+			else
+				!! Watch tv in living room
+				sdadloc = 10
+				sdadloc['athome'] = 1
+			end
 		else
 			!! Sleep
 			sdadloc = 1

+ 11 - 11
locations/foto.qsrc

@@ -146,32 +146,32 @@ if $ARGS[0] = 'studio':
 	*clr & cla
 	killvar '$modelopt'
 
-	if special_model['status'] < min(city_modelling, 700) and modelfoto['topless'] > 0 and hour < 15 and fame_model_event ! daystart:gt 'foto_events','fame'
+	if special_model['status'] < min(fame['city_modelling'], 700) and modelfoto['topless'] > 0 and hour < 15 and fame_model_event ! daystart:gt 'foto_events','fame'
 	if special_skill_model['status'] < pcs_mdlng and modelfoto['nip'] > 0 and skill_model_event ! daystart:gt 'foto_events','skill'
 	if foto['documentary'] >= 95 and $pantyworntype = 'none' and modelfoto['shoots']>= foto['documentary_timer']:gt'foto_model_documentary','1st_documentary'
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
 
-	if city_modelling >= 200 and city_modelling < 240:
+	if fame['city_modelling'] >= 200 and fame['city_modelling'] < 240:
 		model['rank'] = 1
-	elseif city_modelling >= 240 and city_modelling < 280:
+	elseif fame['city_modelling'] >= 240 and fame['city_modelling'] < 280:
 		model['rank'] = 2
-	elseif city_modelling >= 280 and city_modelling < 320:
+	elseif fame['city_modelling'] >= 280 and fame['city_modelling'] < 320:
 		model['rank'] = 3
-	elseif city_modelling >= 320 and city_modelling < 360:
+	elseif fame['city_modelling'] >= 320 and fame['city_modelling'] < 360:
 		model['rank'] = 4
-	elseif city_modelling >= 360 and city_modelling < 400:
+	elseif fame['city_modelling'] >= 360 and fame['city_modelling'] < 400:
 		model['rank'] = 5
-	elseif city_modelling >= 400 and city_modelling < 440:
+	elseif fame['city_modelling'] >= 400 and fame['city_modelling'] < 440:
 		model['rank'] = 6
-	elseif city_modelling >= 440 and city_modelling < 560:
+	elseif fame['city_modelling'] >= 440 and fame['city_modelling'] < 560:
 		model['rank'] = 7
-	elseif city_modelling >= 560 and city_modelling < 620:
+	elseif fame['city_modelling'] >= 560 and fame['city_modelling'] < 620:
 		model['rank'] = 8
-	elseif city_modelling >= 620 and city_modelling < 700:
+	elseif fame['city_modelling'] >= 620 and fame['city_modelling'] < 700:
 		model['rank'] = 9
-	elseif city_modelling >= 700:
+	elseif fame['city_modelling'] >= 700:
 		model['rank'] = 10
 	end
 

+ 3 - 8
locations/gargazel.qsrc

@@ -22,15 +22,10 @@ else
 end
 
 if sdadloc = 9:
-	if week < 6:
-		'Your <a href="exec:gt ''garfather''">stepfather</a> is in the garage, working on his Gazelle pickup truck.'
+	if fatherdrunk = 1:
+		'Your <a href="exec:gt ''garfather''">stepfather and uncle Misha</a> are in the garage, drinking vodka.'
 	else
-		if hour = 21:
-			fatherdrunk = 1
-			'Your <a href="exec:gt ''garfather''">stepfather and uncle Misha</a> are in the garage, drinking vodka.'
-		else
-			'Your <a href="exec:gt ''garfather''">stepfather</a> is in the garage, working on his Gazelle pickup truck.'
-		end
+		'Your <a href="exec:gt ''garfather''">stepfather</a> is in the garage, working on his Gazelle pickup truck.'
 	end
 end
 

+ 32 - 18
locations/gopnik_initiation.qsrc

@@ -77,7 +77,8 @@ end
 
 if $ARGS[0] = 'walkoff':
 	cla & *clr
-	grupvalue[4] -= 200
+	grupvalue[4] = rand(600,650)
+	old_grupvalue[4] = grupvalue[4]
 	gs 'gopnik_initiation', 'group_rel_change','gopniks', -10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
@@ -137,7 +138,8 @@ if $ARGS[0] = 'agreesteal':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
 			'You stay silent and watch them walk away. You know you just painted a target on your back to the gopniks, but you just couldn''t bring yourself to steal. Sighing you walk back out to the street.'
-			grupvalue[4] -= 200
+			grupvalue[4] = rand(600,650)
+			old_grupvalue[4] = grupvalue[4]
 			gs 'gopnik_initiation', 'group_rel_change','gopniks', -10
 			gs 'stat'
 			act 'Leave the gang': gt 'pav_residential'
@@ -172,7 +174,8 @@ if $ARGS[0] = 'noslut':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
 	'You shake your head no. "I''m not a slut."'
 	'They turn around and start walking away again. "Then fuck you bitch!" and with that they leave you behind. You know you are a target for the gopniks now, but better than being their personal slut. You turn and make your way back to the street.'
-	grupvalue[4] -= 200
+	grupvalue[4] = rand(600,650)
+	old_grupvalue[4] = grupvalue[4]
 	gs 'gopnik_initiation', 'group_rel_change','gopniks', -10
 	gs 'stat'
 	act 'Leave the gang': gt 'pav_residential'
@@ -181,13 +184,19 @@ end
 if $ARGS[0] = 'gopnik party':
 	*clr & cla
 	menu_off = 1
-	grupvalue[1] -= 500
-	grupvalue[2] -= 300
-	grupvalue[3] -= 500
-		
-	if grupTipe = 1 or grupvalue[1] < 0: grupvalue[1] = 0
-	if grupTipe = 2 or grupvalue[2] < 0: grupvalue[2] = 0
-	if grupTipe = 3 or grupvalue[3] < 0: grupvalue[3] = 0
+
+	grupvalue[1] = min(rand(600,650),grupvalue[1])
+	grupvalue[2] = min(rand(625,675),grupvalue[2])
+	grupvalue[3] = min(rand(600,650),grupvalue[3])
+
+	if grupTipe = 1: grupvalue[1] = rand(500,600)
+	if grupTipe = 2: grupvalue[2] = rand(500,600)
+	if grupTipe = 3: grupvalue[3] = rand(500,600)
+
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
 				
 	grupTipe = 4
 	grupTipe['joined_gopnik'] = 1
@@ -1026,14 +1035,19 @@ if $ARGS[0] = 'gopnik slut':
 	minut += 10
 	gs 'stat'
 	gopnik_slut = 1
-	grupvalue[1] -= 500
-	grupvalue[2] -= 300
-	grupvalue[3] -= 500
-		
-	if grupTipe = 1 or grupvalue[1] < 0: grupvalue[1] = 0
-	if grupTipe = 2 or grupvalue[2] < 0: grupvalue[2] = 0
-	if grupTipe = 3 or grupvalue[3] < 0: grupvalue[3] = 0
-				
+	grupvalue[1] = min(rand(600,650),grupvalue[1])
+	grupvalue[2] = min(rand(625,675),grupvalue[2])
+	grupvalue[3] = min(rand(600,650),grupvalue[3])
+
+	if grupTipe = 1: grupvalue[1] = rand(500,600)
+	if grupTipe = 2: grupvalue[2] = rand(500,600)
+	if grupTipe = 3: grupvalue[3] = rand(500,600)
+
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
+
 	grupTipe = 4
 	
 	gs 'gopnik_initiation', 'group_rel_change','gopniks', 5

+ 15 - 0
locations/gschool_girls_bathroom.qsrc

@@ -896,6 +896,21 @@ if $ARGS[0] = 'caught1_slut_punishment':
 						'You wince in pain when instead of feeling it slip back into your pussy, the lubed-up tip force its way into your asshole. It hurts and you try to pull away, but she grabs your hips and keeps you in place. "You''ve been a bad little girl, <<$pcs_firstname>>!" she snarls, her voice somewhere between imperious and gleeful, "and bad little girls deserve to have their asses punished." You shiver in fearful anticipation as she slowly pushes the massive dildo deeper inside.'
 						gs 'arousal', 'anal_strap', 10, 'lesbian', 'sub', 'lube'
 						gs 'stat'
+						act 'Continue':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfanal2.jpg"></center>'
+							'Her rhythm is steadily increasing, Ms. Braakman pounding your ass harder and deeper and, in turn, causing you to cry out louder. She''s starting to pant and whatever regard she displayed for your comfort is evidently gone now as she mercilessly hammers the strapon into you, going tip to root almost every time. You then realize that you don''t want her to be gentle anymore as the eroticism of the situation catches up with you. Your moans are loud, almost matching hers, as you feel a warmth pool in your belly.'
+							gs 'arousal', 'anal_strap', 10, 'lesbian', 'sub', 'lube'
+							gs 'arousal', 'end'
+							gs 'stat'
+							*nl
+							'All too soon, she cries out and goes still, nearly collapsing on your back when her orgasm hits, the strapon fully buried in your ass. You can feel her kisses on the back of your neck, a display of affection to contrast the rough anal you received, and she whispers: "My my, I really think you earned the rest of the period off." She gently pulls the strapon out of you and takes the harness off, then moves to the sinks to clean it up. "This will be our little secret, <<$pcs_firstname>>." she promises, smiling absentmindedly as she dries the dildo. After checking her appearance, she walks towards the exit and gives you one last look, a hint of desire gleaming through the cracks of her mask of authority and indifference, before she silently leaves the bathroom. You rub your ass and get dressed while your mind goes over what you just experienced, and you eventually find yourself back in your stall where you have to decide what to do with the rest of the period.'
+							if school_bunk = 0:
+								act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
+							else
+								act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
+							end
+						end
 					end
 				end
 			end

+ 0 - 1
locations/gschool_grounds.qsrc

@@ -142,7 +142,6 @@ if $ARGS[0] = 'main':
 
 	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and SchoolBlock = 0 and suspended['on'] ! 1:
 		if PCloStyle2 = 4 or Enable_sforma = 1:
-			gs 'gschool_socialchg', 'group_student_rel_change_2'
 			if hour = 6:
 				if minut < 30:
 					'It''s too early for school now.'

+ 19 - 17
locations/gschool_lessonsev1.qsrc

@@ -67,24 +67,26 @@ if $ARGS[0] = 'fiz_rand':
 		else
 			act 'Kick him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		gs 'willpower', 'misc', 'self', 'hard'
-		if will_cost <= pcs_willpwr and (grupTipe = 2 or grupTipe = 4):
-			act 'Beat his ass (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'misc', 'self', 'hard'
-				gs 'willpower', 'pay', 'self'
-				gs 'stat'
-				grupvalue[4] +=1
-				demerit += 20
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/beathisass.jpg"></center>'
-				'Your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more, his attention wanders and he doesn''t see you charging him. You bash into him, knocking him to the floor, and quickly climb on top of him. You start furiously punching him in the face, beating him senseless in front of everyone.'
-				*nl
-				'He is stunned by this sudden and vicious attack and tries to block your incoming blows, to no avail. Luckily for him, the coach arrives just in time. The coach grabs you by the back of the neck and effortlessly pulls you off of Dan with a powerful yank, causing you to stumble backwards and almost fall on your back. He then steps between the two of you, stopping you from going at it again, and turns to you. "Go to the principal''s office, NOW!" You try to protest, but he doesn''t want to hear it and points sternly at the door.'
-				'You begrudingly walk out as the coach helps Dan to his feet. Everyone is stunned or amused by your actions - some of the gopniks even look a little impressed.'
-				act 'Go to the principal''s office': gt 'gschool_office', 'principal'
+		if grupTipe = 2 or grupTipe = 4:
+			gs 'willpower', 'misc', 'self', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Beat his ass (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'misc', 'self', 'hard'
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					grupvalue[4] +=1
+					demerit += 20
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/beathisass.jpg"></center>'
+					'Your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more, his attention wanders and he doesn''t see you charging him. You bash into him, knocking him to the floor, and quickly climb on top of him. You start furiously punching him in the face, beating him senseless in front of everyone.'
+					*nl
+					'He is stunned by this sudden and vicious attack and tries to block your incoming blows, to no avail. Luckily for him, the coach arrives just in time. The coach grabs you by the back of the neck and effortlessly pulls you off of Dan with a powerful yank, causing you to stumble backwards and almost fall on your back. He then steps between the two of you, stopping you from going at it again, and turns to you. "Go to the principal''s office, NOW!" You try to protest, but he doesn''t want to hear it and points sternly at the door.'
+					'You begrudingly walk out as the coach helps Dan to his feet. Everyone is stunned or amused by your actions - some of the gopniks even look a little impressed.'
+					act 'Go to the principal''s office': gt 'gschool_office', 'principal'
+				end
+			else
+				act 'Beat his ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			act 'Beat his ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	elseif fizperand = 9:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/hanging.jpg"></center>'

+ 91 - 80
locations/gschool_socialchg.qsrc

@@ -82,10 +82,14 @@ if $ARGS[0] = 'Pavlovsk slut':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/shamewalk.jpg"></center>'
 	'As you walk down the school hallway, you notice almost everyone is eyeing you. Some sneer at you, others laugh, a few turn away in disgust. You are used to this treatment with your sexual escapades, but not to this level. No one wants to greet you and most seem to actively avoid you, you are starting to feel a bit uncomfortable at all the staring eyes. As you approach your locker, you see someone has spray painted ''Slut'' on it in big red letters. You hear someone walking up behind you before you turn around to see who it might be.'
 
-	grupvalue[1] = 0
-	grupvalue[2] = 0
+	grupvalue[1] = min(100,grupvalue[1])
+	grupvalue[2] = min(150,grupvalue[2])
 	grupvalue[3] = 0
-	grupvalue[4] = 0
+	grupvalue[4] = min(200,grupvalue[4])
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
 	grupslutwarning[1] = 0
 	grupslutwarning[2] = 0
 	grupslutwarning[3] = 0
@@ -144,7 +148,8 @@ if $ARGS[0] = 'coolkid':
 		'Vicky frowns but nods. "Suit yourself then." With that, she turns and leaves, Andrey just shakes his head at you and does the same.'
 		'Stasya gives you a once over. "I told you guys she wasn''t cool enough! What a loser!" With that, she follows the others, leaving you behind to wonder if you made the right choice.'
 
-		grupvalue[1] -= rand(300,500)
+		grupvalue[1] = rand(600,650)
+		old_grupvalue[1] = grupvalue[1]
 		gs 'gschool_socialchg', 'group_rel_change','cool kids', -5
 		gs 'stat'
 
@@ -156,13 +161,18 @@ if $ARGS[0] = 'coolkid':
 		'You nod your head. "Yes I would love to! I love hanging out with you guys!"'
 		'Vicky gives you a hug. Once she lets go, Andrey wraps an arm around your shoulder and starts leading you to your next class. "From now on, you''re one of us." Stasya gives you a friendly smile as the four of you walk to your next class.'
 		
-		grupvalue[2] -= 200
-		grupvalue[3] -= 400
-		grupvalue[4] -= 500
+		grupvalue[2] = min(rand(675,725),grupvalue[2])
+		grupvalue[3] = min(rand(625,675),grupvalue[3])
+		grupvalue[4] = min(rand(600,650),grupvalue[4])
 		
-		if grupTipe = 2: grupvalue[2] = 0
-		if grupTipe = 3: grupvalue[3] = 0
-		if grupTipe = 4: grupvalue[4] = 0
+		if grupTipe = 2: grupvalue[2] = rand(500,600)
+		if grupTipe = 3: grupvalue[3] = rand(500,600)
+		if grupTipe = 4: grupvalue[4] = rand(500,600)
+
+		old_grupvalue[1] = grupvalue[1]
+		old_grupvalue[2] = grupvalue[2]
+		old_grupvalue[3] = grupvalue[3]
+		old_grupvalue[4] = grupvalue[4]
 		
 		grupTipe = 1
 		grupTipe['joined_cool'] = 1
@@ -226,7 +236,8 @@ if $ARGS[0] = 'jock':
 		else
 			'Lina gives you a once over. "Well at least Christina will be happy." With that she follows after Lariska, leaving you behind to wonder if you made the right choice.'
 		end
-		grupvalue[2] -= rand(300,500)
+		grupvalue[2] = rand(600,650)
+		old_grupvalue[2] = grupvalue[2]
 		gs 'gschool_socialchg', 'group_rel_change','jocks', -5
 		gs 'stat'
 
@@ -237,15 +248,20 @@ if $ARGS[0] = 'jock':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinjock.jpg"></center>'
 		'You nod your head. "Yes, I would love to! I love hanging out with you guys!"'
 		'Lariska gives you a hug. "From now on you are one of us." Lina gives you a friendly smile and you all walk you to your next class.'
+
+		grupvalue[1] = min(rand(675,725),grupvalue[1])
+		grupvalue[3] = min(rand(600,650),grupvalue[3])
+		grupvalue[4] = min(rand(650,700),grupvalue[4])
 		
-		grupvalue[1] -= 200
-		grupvalue[3] -= 500
-		grupvalue[4] -= 300
-		
-		if grupTipe = 1: grupvalue[1] = 0
-		if grupTipe = 3: grupvalue[3] = 0
-		if grupTipe = 4: grupvalue[4] = 0
-		
+		if grupTipe = 1: grupvalue[1] = rand(500,600)
+		if grupTipe = 3: grupvalue[3] = rand(500,600)
+		if grupTipe = 4: grupvalue[4] = rand(500,600)
+
+		old_grupvalue[1] = grupvalue[1]
+		old_grupvalue[2] = grupvalue[2]
+		old_grupvalue[3] = grupvalue[3]
+		old_grupvalue[4] = grupvalue[4]
+
 		grupTipe = 2
 		grupTipe['joined_jock'] = 1
 		
@@ -306,7 +322,8 @@ if $ARGS[0] = 'nerd':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
 		'You shake your head. "I like hanging out with you guys, but I''m just not interested in doing a game night. Sorry."'
 		'Artem frowns then nods. "Oh, okay. Well maybe some other time then..." With that, he turns and the rest follow, looking a little disappointed. Looks like they were hoping you would join them. It makes you feel a little bad and wondering if you made the right choice.'
-		grupvalue[3] -= rand(300,500)
+		grupvalue[3] = rand(600,650)
+		old_grupvalue[3] = grupvalue[3]
 		gs 'gschool_socialchg', 'group_rel_change','nerds', -5
 		gs 'stat'
 
@@ -318,13 +335,18 @@ if $ARGS[0] = 'nerd':
 		'You nod your head. "Yes, I would love to hang out with you guys! A game night sounds like a lot of fun."'
 		'They all start speaking at once, excited about you joining them. Feofan then speaks up. "That''s great <<$pcs_nickname>>! Meet us at the community center library tonight at 20:00. See you then." With that they all start leaving and going to class, saying that they look forward to seeing you tonight.'
 		
-		grupvalue[1] -= 500
-		grupvalue[2] -= 400
-		grupvalue[4] -= 500
+		grupvalue[1] = min(rand(600,650),grupvalue[1])
+		grupvalue[2] = min(rand(625,625),grupvalue[2])
+		grupvalue[4] = min(rand(600,650),grupvalue[4])
 		
-		if grupTipe = 1: grupvalue[1] = 0
-		if grupTipe = 2: grupvalue[2] = 0
-		if grupTipe = 4: grupvalue[4] = 0
+		if grupTipe = 1: grupvalue[1] = rand(500,600)
+		if grupTipe = 2: grupvalue[2] = rand(500,600)
+		if grupTipe = 4: grupvalue[4] = rand(500,600)
+
+		old_grupvalue[1] = grupvalue[1]
+		old_grupvalue[2] = grupvalue[2]
+		old_grupvalue[3] = grupvalue[3]
+		old_grupvalue[4] = grupvalue[4]
 				
 		grupTipe = 3
 		grupTipe['joined_nerd'] = 1
@@ -385,7 +407,7 @@ if $ARGS[0] = 'gopnik':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
 		'You shake your head. "I like hanging out with you guys, but I''m just not in the partying mood tonight.""'
 		'Vitek''s eyes darken. "What, are you too good for us all of a sudden? Well fuck you then!" With that, he storms away. Lena looks at you with a derogatory stare before following her brother, leaving you behind to wonder if you made the right choice.'
-		grupvalue[4] -= rand(300,500)
+		grupvalue[4] = rand(600,650)
 		gs 'gschool_socialchg', 'group_rel_change','gopniks', -5
 		gs 'stat'
 
@@ -453,14 +475,15 @@ if $ARGS[0] = 'coolkid outcast':
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 
 	grupvalue[1] = 0
-	grupvalue[2] -= 500
-	grupvalue[3] -= 300
-	grupvalue[4] -= 100
-	
-	if grupvalue[2] < 0: grupvalue[2] = 0
-	if grupvalue[3] < 0: grupvalue[3] = 0
-	if grupvalue[4] < 0: grupvalue[4] = 0
-	
+	grupvalue[2] = min(rand(600,650),grupvalue[2])
+	grupvalue[3] = min(rand(650,700),grupvalue[3])
+	grupvalue[4] = min(rand(700,750),grupvalue[4])
+		
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
+
 	grupTipe = 5
 	grupTipe['before_outcast'] = 1
 	
@@ -481,15 +504,16 @@ if $ARGS[0] = 'jock outcast':
 	end
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	
-	grupvalue[1] -= 500
+	grupvalue[1] = min(rand(600,650),grupvalue[1])
 	grupvalue[2] = 0
-	grupvalue[3] -= 300
-	grupvalue[4] -= 200
+	grupvalue[3] = min(rand(650,700),grupvalue[3])
+	grupvalue[4] = min(rand(675,725),grupvalue[4])
+		
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
 
-	if grupvalue[1] < 0: grupvalue[1] = 0
-	if grupvalue[3] < 0: grupvalue[3] = 0
-	if grupvalue[4] < 0: grupvalue[4] = 0
-	
 	grupTipe = 5
 	grupTipe['before_outcast'] = 2
 	
@@ -506,15 +530,16 @@ if $ARGS[0] = 'nerd outcast':
 	'You try to find your friends, but most seem to be hiding or hurry off when you approach. You finally manage to catch up to Gerasim, but as you''re about to say something he turns to you. "Please go away, I can''t be seen hanging out with you. I''ve got enough problems without you making it worse. None of us want to be around you anymore." He sighs when he sees the dejected look on your face. "I''m sorry I really am, but this is your own fault. Please just leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you as he wheels himself away from you decidedly. As you look around, most of the other students either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	
-	grupvalue[1] -= 500
-	grupvalue[2] -= 300
+	grupvalue[1] = min(rand(600,650),grupvalue[1])
+	grupvalue[2] = min(rand(650,700),grupvalue[2])
 	grupvalue[3] = 0
-	grupvalue[4] -= 400
-	
-	if grupvalue[1] < 0: grupvalue[1] = 0
-	if grupvalue[2] < 0: grupvalue[2] = 0
-	if grupvalue[4] < 0: grupvalue[4] = 0
-	
+	grupvalue[4] = min(rand(625,675),grupvalue[4])
+		
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
+
 	grupTipe = 5
 	grupTipe['before_outcast'] = 3
 	
@@ -531,19 +556,20 @@ if $ARGS[0] = 'gopnik outcast':
 	'As you approach your locker, Pauline, Lera and Lena walk up next to you. Pauline looks like she''s preparing to beat you up while Lera looks at you with disgust. Pauline shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently hanging out, partying and having a good time wasn''t enough for you. Nooo, you had to become a spineless cunt afraid of her own shadow, so stay the fuck away from us or I''ll beat the shit out of you!" With that, Pauline shoves you against your locker and walks away. Lena gives you a final look of disgust and shoves you again while Lera gives you a few parting words before walking away. "You''re so pathetic even the nerds will kick your ass now." Having been publically disawoved by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	
-	grupvalue[1] -= 400
-	grupvalue[2] -= 300
-	grupvalue[3] -= 500
+	grupvalue[1] = min(rand(625,675),grupvalue[1])
+	grupvalue[2] = min(rand(650,700),grupvalue[2])
+	grupvalue[3] = min(rand(600,650),grupvalue[3])
 	grupvalue[4] = 0
-	
-	if grupvalue[1] < 0: grupvalue[1] = 0
-	if grupvalue[2] < 0: grupvalue[2] = 0
-	if grupvalue[3] < 0: grupvalue[3] = 0
-	
+		
+	old_grupvalue[1] = grupvalue[1]
+	old_grupvalue[2] = grupvalue[2]
+	old_grupvalue[3] = grupvalue[3]
+	old_grupvalue[4] = grupvalue[4]
+
 	grupTipe = 5
 	grupTipe['before_outcast'] = 4
 	
-!!	gs 'gschool_socialchg', 'group_rel_change','gopniks', -20
+	gs 'gschool_socialchg', 'group_rel_change','gopniks', -20
 	gs 'stat'
 
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
@@ -556,7 +582,8 @@ if $ARGS[0] = 'gopnik miss':
 	'Just as you approach your locker, Lena shoves you against it. "Where the fuck were you bitch? We waited almost an hour for you!"'
 	'You start to answer, but before you can even get a single word out, she shoves you again. "It doesn''t matter, we changed our mind about you. You''re not welcome. So get lost." she snarls before storming off. Maybe if you try to earn their respect again they will give you a second chance.'
 	minut += 1
-	grupvalue[4] -= 100
+	grupvalue[4] = rand(675,725)
+	old_grupvalue[4] = grupvalue[4]
 	gs 'stat'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
@@ -683,28 +710,12 @@ if $ARGS[0] = 'group_student_rel_change':
 		if npc_grupTipe['A189'] = 4 and npc_rel['A189'] >= 80: grupvalue[4] += 1
 		if npc_grupTipe['A189'] = 4 and npc_rel['A189'] <= 20: grupvalue[4] -= 1
 		grupvalue_student_day = daystart
+		if grupvalue[1] < 0: grupvalue[1] = 0
+		if grupvalue[2] < 0: grupvalue[2] = 0
+		if grupvalue[3] < 0: grupvalue[3] = 0
+		if grupvalue[4] < 0: grupvalue[4] = 0
 	end
-	if grupvalue[1] > (dailycheck_grupvalue[1] + 30): grupvalue[1] = (dailycheck_grupvalue[1] + 30)
-	if grupvalue[2] > (dailycheck_grupvalue[2] + 30): grupvalue[2] = (dailycheck_grupvalue[2] + 30)
-	if grupvalue[3] > (dailycheck_grupvalue[3] + 30): grupvalue[3] = (dailycheck_grupvalue[3] + 30)
-	if grupvalue[4] > (dailycheck_grupvalue[4] + 30): grupvalue[4] = (dailycheck_grupvalue[4] + 30)
-	if grupvalue[1] < (dailycheck_grupvalue[1] - 30): grupvalue[1] = (dailycheck_grupvalue[1] - 30)
-	if grupvalue[2] < (dailycheck_grupvalue[2] - 30): grupvalue[2] = (dailycheck_grupvalue[2] - 30)
-	if grupvalue[3] < (dailycheck_grupvalue[3] - 30): grupvalue[3] = (dailycheck_grupvalue[3] - 30)
-	if grupvalue[4] < (dailycheck_grupvalue[4] - 30): grupvalue[4] = (dailycheck_grupvalue[4] - 30)	
-	if grupvalue[1] < 0: grupvalue[1] = 0
-	if grupvalue[2] < 0: grupvalue[2] = 0
-	if grupvalue[3] < 0: grupvalue[3] = 0
-	if grupvalue[4] < 0: grupvalue[4] = 0
 end	
 
-if $ARGS[0] = 'group_student_rel_change_2':
-	if grupvalue_2_student_day ! daystart:
-		dailycheck_grupvalue[1] = grupvalue[1]
-		dailycheck_grupvalue[2] = grupvalue[2]
-		dailycheck_grupvalue[3] = grupvalue[3]
-		dailycheck_grupvalue[4] = grupvalue[4]
-	end
-end	
 
 --- gschool_socialchg ---------------------------------

+ 120 - 0
locations/gschool_socialchg1.qsrc

@@ -882,6 +882,126 @@ if $ARGS[0] = 'Chris_Lina_park':
 	act 'Leave':gt 'pav_park', 'start'
 end
 
+if $ARGS[0] = 'lariska_gm_1':
+	cla & *clr
+	menu_off = 1
+	lari_gm = daystart
+	gs 'npc_relationship', 'modify', 'A13', 'like'
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
+	if LariskaQW['story'] = 4:
+		'She sees you coming in the store behind her, smiles, and says "Hey, <<$pcs_nickname>>. Here to do some shopping?"'
+		act 'Leave the store': gt 'pav_industrial'
+		act 'Stay and shop alone': gt 'budgetclothes', 'start'
+		act 'Offer to try on clothes with Lariska': gt 'gschool_socialchg1', 'lariska_gm_2'
+	else
+		if npc_rel['A13'] >= 50 and fame['pav_slut'] < 200:
+			'She sees you coming in the store behind her, smiles, and says "Hey, <<$pcs_nickname>>. Here to do some shopping?"'
+			act 'Leave the store': gt 'pav_industrial'
+			act 'Stay and shop alone': gt 'budgetclothes', 'start'
+			act 'Offer to try on clothes with Lariska': gt 'gschool_socialchg1', 'lariska_gm_2'
+		elseif npc_rel['A13'] <= 20 and fame['pav_slut'] < 200:
+			'She sees you coming in the store behind her and frowns, but doesn''t say anything.'
+			'"Hey Lariska. Doing some shopping?"'
+			'She just looks at you, but doesn''t respond at all. It''s pretty obvious she wants nothing to do with you.'
+			act 'Leave the store': gt 'pav_industrial'
+			act 'Stay and shop alone': gt 'budgetclothes', 'start'
+		elseif fame['pav_slut'] >= 200:
+			'She sees you coming in the store behind her, and with a disgusted look on her face says "What are <i>you</i> doing here? This place doesn''t sell slutty enough clothes for you."'
+			'Your face turns red with anger, and you respond with "At least I make my own decisions. Are you even allowed to be here without Christina keeping an eye on you?"'
+			'She just sneers at you. "Go fuck yourself, slut." With that, she turns and leaves the store, obviously not wanting to shop anymore.'
+			act 'Leave the store': gt 'pav_industrial'
+			act 'Stay and shop alone': gt 'budgetclothes', 'start'
+		else
+			'She sees you coming in the store behind her, nods, and says "Hey, <<$pcs_nickname>>. Doing some shopping?"'
+			act 'Leave the store': gt 'pav_industrial'
+			act 'Stay and shop alone': gt 'budgetclothes', 'start'
+			act 'Offer to try on clothes with Lariska': gt 'gschool_socialchg1', 'lariska_gm_2'
+		end
+	end
+end
+
+if $ARGS[0] = 'lariska_gm_2':
+	cla & *clr
+	menu_off = 1
+	gs 'npc_relationship', 'modify', 'A13', 'like'
+	minut += 20
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/gm/gm_lariska_1.jpg"></center>'
+	'You and Lariska try on random clothes, emerging from your changing rooms like you were models walking down a catwalk.'
+	act 'Continue':
+		cla & *clr
+		menu_off = 1
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/gm/gm_lariska_2.jpg"></center>'
+		'Eventually you start changing in the same room, laughing and giggling as you try on the various items you picked out for each other.'
+		'At one point you catch her staring at you in the mirror, while you both are topless. You notice her nipples are hard, and checking her out, you feel yours getting hard too. Slipping an arm around her waist, you both stare at your reflections in the mirror, comparing yourselves to each other.'
+		if lariskalove < 7 and LariskaQW['story'] < 10:
+			'Eventually she gets embarrassed at the attention and turns away, her face bright red.'
+		else
+			'You smile at her through her reflection in the mirror, a suggestive look in your eyes.'
+		end
+		gs 'arousal', 'erotic_nudity', 10, 'exhibitionism'
+		gs 'stat'
+		act 'Leave the store':
+			gs 'arousal', 'end'
+			gs 'stat'
+			gt 'pav_industrial'
+		end
+		act 'Stay and shop alone':
+			gs 'arousal', 'end'
+			gs 'stat'
+			gt 'budgetclothes', 'start'
+		end
+		if lariskalove >= 7 and LariskaQW['story'] >= 10:
+			act 'Flirt with Lariska': gt 'gschool_socialchg1', 'lariska_gm_3'
+		end
+	end
+end
+
+if $ARGS[0] = 'lariska_gm_3':
+	cla & *clr
+	menu_off = 1
+	lariskalove += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/gm/gm_lariska_3.jpg"></center>'
+	'You maintain eye contact as you trail your hand down her back until you reach her panties. Soflty hooking your finger over them, you slowly drag them down until her pink pussy is exposed. Dropping your own panties, you gently push her against the mirror, taking a moment to enjoy the sight of her naked in the stand-up mirror, before pulling her into your arms and kissing her.'
+	gs 'arousal', 'erotic_nudity', 5
+	gs 'stat'
+	act 'Finger her':
+		cla & *clr
+		menu_off = 1
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/gm/gm_lariska_4.jpg"></center>'
+		'As you make out with her, you push her up against the wall and reach between her legs to rub her pussy. Her breath quickens as lust takes over and she starts exploring your body with her hands, keeping her lips locked on yours. Eventually her fingers find their way between your legs, and you both finger each other.'
+		gs 'arousal', 'vaginal_finger_give', 10, 'lesbian'
+		gs 'arousal', 'vaginal_finger', -10, 'lesbian'
+		gs 'stat'
+		act 'Keep going':
+			cla & *clr
+			menu_off = 1
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/gm/gm_lariska_5.jpg"></center>'
+			'You sit on the bench in the changing room, pulling her onto your lap while you continue to explore her mouth with your tongue. Her hips start moving, as if she was riding an imaginary cock, grinding her pussy into yours.'
+			gs 'arousal', 'trib', -8
+			gs 'stat'
+			act '69':
+				cla & *clr
+				menu_off = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/gm/gm_lariska_6.jpg"></center>'
+				'Face red with desire, Lariska stands up and pulls you off the bench and down to the floor, on your back. Straddling your bare chest, she buries her face between your legs, licking and slurping wildly. You do the same, licking her clit while thrusting your fingers inside her pussy.'
+				$orgasm_txt = 'You can tell she is getting close, her pussy is soaking wet and leaking like crazy. The sight and feel of her going wild on your clit sends you over the edge, and your body starts shaking. Your orgasm sets hers off as well, both of you writhing on the floor, attempting to keep licking your way through the others orgasm.'
+				$orgasm_or = 'custom'
+				'Exhausted, you let your head fall back while you catch your breath. You hear her panting and can feel her breath on your now sensitive lower lips as you come down in a post orgasmic bliss.'
+				'Once you catch your breath, you stand up and share a long kiss, while stroking her cheek with your hand. When you pull back from that, she seems to remember you''re in a public place and gets nervous, face red again.'
+				act 'Clean up and leave the store':
+					gs 'arousal', 'end'
+					gs 'stat'
+					gt 'pav_industrial'
+				end
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'tBella':
 	cla & *clr
 	menu_off = 1

File diff suppressed because it is too large
+ 126 - 126
locations/hookup_after.qsrc


+ 192 - 189
locations/hookup_morning.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = 'late_for_school':
 		else
 			'You need to get home and change into your uniform! You''re not sure if you have time for a shower, but you definitely <i>need</i> to get your uniform!'
 		end
-		
+
 		if hookup['continuation'] = 0:hookup['continuation'] = rand(0,2)
 		if hookup['continuation'] = 0:
 			'"Hey, where''re you going?" <<$npc_firstname[$boy]>> says, turning over and squinting at you with sleepy eyes. "What''s the rush?"'
@@ -64,7 +64,7 @@ if $ARGS[0] = 'late_for_school':
 				'"I''m gonna be late for something!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$boy]>> and your night together behind you.'
 				act'Leave':gs'hookup_after','exit'
 			end
-			
+
 			act'I''m gonna be late for school!':
 				cla & *nl
 				if PCloStyle2 = 4:
@@ -88,7 +88,7 @@ if $ARGS[0] = 'late_for_school':
 			'"Yeah?" you reply absentmindedly, looking for your purse.'
 			'"Could I see you again sometime? Take you out on a date or something?"'
 		end
-			
+
 		if hookup['continuation'] > 0:
 			act'I don''t have time for this!':
 				cla & *clr
@@ -102,7 +102,7 @@ if $ARGS[0] = 'late_for_school':
 				end
 				act'Leave':gt'hookup_after','exit'
 			end
-			
+
 			act'<i>Sure!Callme!</i>':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
@@ -133,18 +133,18 @@ if $ARGS[0] = 'wakeup':
 				'You start when the door opens and <<$npc_firstname[$boy]>> walks in holding a tray.'
 				'"Sorry about that," he grins. "You were still sleeping so I didn''t want to wake you up. I made breakfast."'
 			end
-			
+
 			act'Clingy much?':
 				cla & *clr
 				!! IMAGE HERE
 				'Geez, clingy much?'
 				act'Take the food':
 			end
-			
+
 			act'Wow, thanks!':
 				cla & *clr
 				!! IMAGE HERE
-				
+
 			end
 		else
 			'You wake up, blearily blinking and slightly confused, trying to get your bearings. You''re in someone else''s room that isn''t your own.'
@@ -167,24 +167,24 @@ if $ARGS[0] = 'wakeup':
 			act'Sneak out':
 				cla & *clr
 				!! IMAGE HERE
-				
+
 				act'Leave':gt'hookup_after','exit'
 			end
 			act'Leave your number behind':
 				cla & *clr
 				!! IMAGE HERE
-				
+
 				act'Leave':gt'hookup_after','exit'
 			end
 		end
-		
+
 		act'Look for the shower':
-			
-				
+
+
 			dynamic $showerdin
-			
+
 		end
-		
+
 		act'Wake him up with a blowjob':
 			cla & *clr
 			!! IMAGE HERE
@@ -194,40 +194,40 @@ if $ARGS[0] = 'wakeup':
 			act'Keep sucking':
 				gs 'arousal','bj',rand(2,5)
 				gs 'stat'
-				
+
 				'I''m gonna cum!'
 				act'Let him cum in your mouth':
-				
-				
+
+
 				act'Let him cum on your face':
-				
-				
+
+
 			end
-			
+
 			if pcs_vag > 0:
 				act'Let''s fuck':
 					hookup['position'] = rand(1,3)
 					if hookup['position'] = 1:
 						!! IMAGE HERE
-						
+
 					elseif hookup['position'] = 2:
-					
+
 					elseif hookup['position'] = 3:
-						
-						
+
+
 					end
 					if hookup['condom'] = 1:
 						'He starts reaching for a condom'
-						
+
 						act'Wait for him':
-							
+
 							'Impatient waiting'
-							
+
 							act'Sex':gt'hookup_morning','morning_fuck'
 						end
-						
+
 						act'Skip it!'
-							
+
 							'Skip it! I need you inside me now!'
 							if npc_condomconscious = 1:
 								'No'
@@ -238,7 +238,7 @@ if $ARGS[0] = 'wakeup':
 							act'Sex':gt'hookup_morning','morning_fuck'
 						end
 					else
-					
+
 					end
 					gt'hookup_morning','fuck'
 				end
@@ -246,13 +246,13 @@ if $ARGS[0] = 'wakeup':
 		end
 		if npc_apt_type[$boy] > 2:
 			act'Put your underwear on':
-			
+
 			end
-			
+
 			act'Go explore his place':gt'hookup_morning','explore'
-			
+
 			act'Find the kitchen':
-			
+
 		end
 	else}
 		'Turning over, you see <<$npc_firstname[$boy]>> laying next to you. He stirs as well and rolls over to face you, prying open his eyes.'
@@ -282,10 +282,10 @@ if $ARGS[0] = 'wakeup':
 					else
 						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$boy]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like. After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$boy]>> is already filling the pot with water.'
 					end
-					
+
 					act'Wait':gt'hookup_morning','coffee'
 				end
-				
+
 				act'I''ll catch up (get dressed first)':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
@@ -302,7 +302,7 @@ if $ARGS[0] = 'wakeup':
 						act'Continue':gt'hookup_morning','coffee'
 					end
 				end
-				
+
 				act'Borrow your shower?':gt'hookup_morning','shower'
 			else
 				'"Me too. Let me just get the pot going." Getting up from the bed, he steps across his tiny room to his little kitchen and starts rifling through cupboards, pulling out various coffee paraphernalia.'
@@ -324,12 +324,12 @@ if $ARGS[0] = 'wakeup':
 							'"That was great," you sigh. "But I should get going."'
 							'Hauling yourself to your feet, you clamber out of bed and start picking your clothes up from where you threw them on the floor last night.'
 							act'Get dressed':gt'hookup_morning','morning_leave'
-							
+
 							gs'hookup_morning','later_nude'
 						end
 						!! act'Doing anything later today?':
 					end
-					
+
 					act'Make small talk':
 						cla & *clr
 						minut += 2
@@ -342,12 +342,12 @@ if $ARGS[0] = 'wakeup':
 							'"That was great," you sigh. "But I should get going."'
 							'Hauling yourself to your feet, you clamber out of bed and start picking your clothes up from where you threw them on the floor last night.'
 							act'Get dressed':gt'hookup_morning','morning_leave'
-							
+
 							gs'hookup_morning','later_nude'
 						end
 					end
 				end
-				
+
 				act'Get dressed':
 					cla & *clr
 					gs'hookup_after','dress'
@@ -369,11 +369,11 @@ if $ARGS[0] = 'wakeup':
 							'"That was great," you sigh. "But I should get going."'
 							'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and turn around to grab your stuff.'
 							act'Gather your things':gt'hookup_morning','morning_leave'
-							
+
 							gs'hookup_morning','later_dressed'
-						end						
+						end
 					end
-					
+
 					act'Make small talk':
 						cla & *clr
 						minut += 2
@@ -386,16 +386,16 @@ if $ARGS[0] = 'wakeup':
 							'"That was great," you sigh. "But I should get going."'
 							'Hauling yourself to your feet, you clamber out of bed and start picking your clothes up from where you threw them on the floor last night.'
 							act'Gather your things':gt'hookup_morning','morning_leave'
-							
+
 							gs'hookup_morning','later_dressed'
 						end
 					end
 				end
-				
+
 				act'Borrow your shower?':gt'hookup_morning','shower'
 			end
 		end
-		
+
 		act'Can I use your shower?':gt'hookup_morning','shower'
 !!	end
 !!	this end is for earlyrising and latesleeping
@@ -436,7 +436,7 @@ if $ARGS[0] = 'shower':
 			end
 		elseif hookup['coffee'] = 1:
 			act'Time for coffee':gt'hookup_morning','coffee'
-			
+
 			act'Go get dressed':
 				cla & *clr
 				'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
@@ -462,16 +462,16 @@ if $ARGS[0] = 'shower':
 						'"That was great," you sigh. "But I should get going."'
 						'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and turn around to grab your stuff.'
 						act'Gather your things':gt'hookup_morning','morning_leave'
-						
+
 						gs'hookup_morning','later'
-					end	
+					end
 				end
-				
+
 				act'Have breakfast together':gt'hookup_morning','eggs'
 			end
 		elseif hookup['b_i_b'] = 1:
 			act'Join <<$npc_firstname[$boy]>> for breakfast':gt'hookup_morning','breakfast'
-			
+
 			act'Get dressed':
 				cla & *clr
 				'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
@@ -520,14 +520,14 @@ if $ARGS[0] = 'shower':
 							'"That was great," you sigh. "But I should get going."'
 							'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and turn around to grab your stuff.'
 							act'Gather your things':gt'hookup_morning','morning_leave'
-							
-							gs'hookup_morning','later' 
-						end	
+
+							gs'hookup_morning','later'
+						end
 					end
-					
+
 					act'Sure':gt'hookup_morning','breakfast'
 				end
-				
+
 			end
 		else
 			act'Dry off':
@@ -553,22 +553,22 @@ if $ARGS[0] = 'hangover':
 			cla & *nl
 			'"I desperately need coffee," you wince, rubbing your brow as if will somehow make your blindingly painful headache go away.'
 			'"Me too." <<$npc_firstname[$boy]>> says, seemingly in the same state.'
-			
+
 		end
-		
+
 		act'Can I use your shower?':
-		
-		
+
+
 		end
-		
+
 		act'I need coffee and a shower'
-		
-		
+
+
 		end
-		
+
 	else
-	
-	
+
+
 	end
 	if hookup['im_hungover'] = 0:
 		act'I''m so hungover':
@@ -585,37 +585,37 @@ if $ARGS[0] = 'explore':
 	hookup['explore'] = 1
 	if $pantyworntype ! 'none':
 		!! IMAGE HERE
-		
+
 	else
 		!! IMAGE HERE
-		
-		
+
+
 	end
-	if npc_apt_type[$boy] = 3:		
+	if npc_apt_type[$boy] = 3:
 		'End up in the kitchen'
-		
+
 	elseif npc_apt_type[$boy] = 4:
-		
+
 		'Peek into a bunch of rooms, get naked surprised by roommates.'
-		
+
 	elseif npc_apt_type[$boy] = 5:
 		'Peek into a bunch of rooms, end up in the kitchen.'
-		
+
 	elseif npc_apt_type[$boy] = 6:
 		'Peek into a bunch of rooms, they''re very high quality.'
 	end
-	
+
 
 end
 
 if $ARGS[0] = 'kitchen':
 	act'Look for some cereal':
 		cla & *clr
-		
+
 		if hookup['hangover'] = 1:
-		
+
 		else
-		
+
 		end
 		if npc_apt_type[$boy] = 1:
 			!! studio apartment
@@ -624,15 +624,15 @@ if $ARGS[0] = 'kitchen':
 			'<<$npc_firstname[$boy]>> comes out'
 		end
 	end
-	
-	
+
+
 	act'Get a glass of water':
 		cla & *clr
-		
+
 		if hookup['hangover'] = 1:
-		
+
 		else
-		
+
 		end
 		if npc_apt_type[$boy] = 1:
 			!! studio apartment
@@ -640,13 +640,13 @@ if $ARGS[0] = 'kitchen':
 		else
 			'<<$npc_firstname[$boy]>> comes out'
 		end
-		
+
 	end
-	
-	
+
+
 	act'Cook breakfast':
 		cla & *clr
-		
+
 		if hookup['hangover'] = 1:
 			'You despreately need some thing to deal with this pounding headache'
 		else
@@ -655,13 +655,13 @@ if $ARGS[0] = 'kitchen':
 		if npc_apt_type[$boy] = 4 and hookup['explore'] ! 1:
 			'<<$npc_firstname[$boy]>>''s roommates come out'
 			act'Shriek':
-			
-			
+
+
 			end
-			
+
 			act'Act casual':
-			
-			
+
+
 			end
 		else
 			if npc_apt_type[$boy] = 1:
@@ -673,13 +673,13 @@ if $ARGS[0] = 'kitchen':
 			'"Made us breakfast"'
 			act'Eat together':
 				cla & *clr
-				
+
 				!!{if npc_perv >= 70 or ($braworntype = 'none' and npc_perv >= 50):
 					'He starts coming onto you'
 					act'Stop it':
-					
+
 					end
-					
+
 					act'Let''s take this to the bedroom':gt'hookup_morning','morning_sex'
 				else}
 					act'Finish eating and clean up':
@@ -688,14 +688,14 @@ if $ARGS[0] = 'kitchen':
 						'You clean up together'
 						gt'hookup_morning','morning_leave'
 					end
-					
+
 					act'Can I borrow your shower?':
-						
+
 						dynamic $showerdin
-							
+
 						gt'hookup_morning','morning_leave'
 					end
-					
+
 					gt'hookup_morning','morning_leave'
 				!!end
 			end
@@ -743,11 +743,11 @@ if $ARGS[0] = 'coffee':
 						'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and turn around to grab your stuff.'
 					end
 					act'Gather your things':gt'hookup_morning','morning_leave'
-					
+
 					gs'hookup_morning','later'
-				end	
+				end
 			end
-			
+
 			act'Have breakfast with him':gt'hookup_morning','eggs'
 		else
 			minut += 5
@@ -757,7 +757,7 @@ if $ARGS[0] = 'coffee':
 				'You step into the kitchen and are immediately hit by the wonderful smell of coffee.'
 				'"Hey, you''re just in time. Pot just finished brewing." He pours a cup and hands it to you, which you gratefully accept.'
 			end
-			
+
 			act'Drink':
 				cla & *clr
 				minut += 2
@@ -829,11 +829,11 @@ if $ARGS[0] = 'coffee':
 					'"That was great," you sigh. "But I should get going."'
 					'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and turn around to grab your stuff.'
 					act'Gather your things':gt'hookup_morning','morning_leave'
-					
+
 					gs'hookup_morning','later'
-				end	
+				end
 			end
-			
+
 			act'Have breakfast together':gt'hookup_morning','eggs'
 		end
 	end
@@ -868,11 +868,11 @@ if $ARGS[0] = 'eggs':
 end
 
 if $ARGS[0] = 'breakfast':
-	
+
 	if hookup['morning_shower'] = 1:
-	
+
 	else
-	
+
 	end
 end
 
@@ -925,13 +925,13 @@ if $ARGS[0] = 'continuation_reponse1':
 		'"Yeah?" you reply, <<$hookup[''reaction'']>>'
 		gs'hookup_morning','continuation_reponse2'
 	end
-	
+
 	act'Me too':
 		cla
 		'"Yeah, me too," you smile, <<$hookup[''reaction'']>>'
 		gs'hookup_morning','continuation_reponse2'
 	end
-	
+
 	act'If you say so':
 		cla
 		'"If you say so," you shrug, <<$hookup[''reaction'']>>'
@@ -979,84 +979,87 @@ if $ARGS[0] = 'continuation_reponse3':
 		end
 		act'Leave':gt'hookup_after','exit'
 	end
-	
-	act'Sure':
-		cla & *clr
-		$npc_apt_hall[$boy]
-		if $clothingworntype = 'nude':
-			if hookup['continuation'] = 1:
-				!! npc_QW = 1
-				'"Sure, sounds fun," you smile.'
-				'You tell him your number while you finished getting dressed and he taps it into his phone. A few moments later, a notification pings in your messages:'
-				*nl
-				hookup['text_message'] = rand(1,2)
-				if hookup['text_message'] = 1:
-					'		<b><font color="blue">hey fuck buddy</font></b>'
-					*nl
-					'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
-				elseif hookup['text_message'] = 2:
-					*nl
-					'		<b><font color="blue">send nudes</font></b>'
-					*nl
-					'"We''ll see about that," you smirk back. "Anyways, see you around."'
-				end
-				'Your little exchange done, you wave him goodbye and head out the door.'
-			elseif hookup['continuation'] = 2:
-				!! npc_QW = 2
-				'"Yeah, I think I''d like that," you smile gently.'
-				'You tell him your number while you finished getting dressed and he taps it into his phone. A few moments later, a notification pings in your messages:'
-				*nl
-				hookup['text_message'] = rand(1,2)
-				if hookup['text_message'] = 1:
-					'		<b><font color="blue">hey cutie</font></b>'
-					*nl'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
-				elseif hookup['text_message'] = 2:
-					'		<b><font color="blue">dont forget to call :)</font></b>'
-					*nl
-					'"I won''t," you promise.'
-				end
-				'That bit of business done, you wave him goodbye and head out the door.'
-			end
-			gs'hookup_after','dress'
-		else
+
+	if arrsize('pcs_lovers') <= 2:
+		act'Sure':
+			gs 'boyfrend', 'start'
+			cla & *clr
 			$npc_apt_hall[$boy]
-			if hookup['continuation'] = 1:
-				!! npc_QW = 1
-				'"Sure, sounds fun," you smile.'
-				'Leaning against the door, you tell him your number while he taps it into his phone. A few moments later, a notification pings in your messages:'
-				*nl
-				hookup['text_message'] = rand(1,2)
-				if hookup['text_message'] = 1:
-					'		<b><font color="blue">hey fuck buddy</font></b>'
+			if $clothingworntype = 'nude':
+				if hookup['continuation'] = 1:
+					!! npc_QW = 1
+					'"Sure, sounds fun," you smile.'
+					'You tell him your number while you finished getting dressed and he taps it into his phone. A few moments later, a notification pings in your messages:'
 					*nl
-					'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
-				elseif hookup['text_message'] = 2:
-					'	<b><font color="blue">send nudes</font></b>'
+					hookup['text_message'] = rand(1,2)
+					if hookup['text_message'] = 1:
+						'		<b><font color="blue">hey fuck buddy</font></b>'
+						*nl
+						'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
+					elseif hookup['text_message'] = 2:
+						*nl
+						'		<b><font color="blue">send nudes</font></b>'
+						*nl
+						'"We''ll see about that," you smirk back. "Anyways, see you around."'
+					end
+					'Your little exchange done, you wave him goodbye and head out the door.'
+				elseif hookup['continuation'] = 2:
+					!! npc_QW = 2
+					'"Yeah, I think I''d like that," you smile gently.'
+					'You tell him your number while you finished getting dressed and he taps it into his phone. A few moments later, a notification pings in your messages:'
 					*nl
-					'"We''ll see about that," you smirk back. "Anyways, see you around."'
+					hookup['text_message'] = rand(1,2)
+					if hookup['text_message'] = 1:
+						'		<b><font color="blue">hey cutie</font></b>'
+						*nl'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
+					elseif hookup['text_message'] = 2:
+						'		<b><font color="blue">dont forget to call :)</font></b>'
+						*nl
+						'"I won''t," you promise.'
+					end
+					'That bit of business done, you wave him goodbye and head out the door.'
 				end
-				'Your little exchange done, you wave him goodbye and head out the door.'
-			elseif hookup['continuation'] = 2:
-				!! npc_QW = 2
-				'"Yeah, I think I''d like that," you smile gently.'
-				'Leaning against the door, you tell him your number while he taps it into his phone. A few moments later, a notification pings in your messages:'
-				*nl
-				hookup['text_message'] = rand(1,2)
-				if hookup['text_message'] = 1:
-					'		<b><font color="blue">hey cutie</font></b>'
+				gs'hookup_after','dress'
+			else
+				$npc_apt_hall[$boy]
+				if hookup['continuation'] = 1:
+					!! npc_QW = 1
+					'"Sure, sounds fun," you smile.'
+					'Leaning against the door, you tell him your number while he taps it into his phone. A few moments later, a notification pings in your messages:'
 					*nl
-					'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
-				elseif hookup['text_message'] = 2:
-					'		<b><font color="blue">dont forget to call :)</font></b>'
+					hookup['text_message'] = rand(1,2)
+					if hookup['text_message'] = 1:
+						'		<b><font color="blue">hey fuck buddy</font></b>'
+						*nl
+						'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
+					elseif hookup['text_message'] = 2:
+						'	<b><font color="blue">send nudes</font></b>'
+						*nl
+						'"We''ll see about that," you smirk back. "Anyways, see you around."'
+					end
+					'Your little exchange done, you wave him goodbye and head out the door.'
+				elseif hookup['continuation'] = 2:
+					!! npc_QW = 2
+					'"Yeah, I think I''d like that," you smile gently.'
+					'Leaning against the door, you tell him your number while he taps it into his phone. A few moments later, a notification pings in your messages:'
 					*nl
-					'"I won''t," you promise.'
+					hookup['text_message'] = rand(1,2)
+					if hookup['text_message'] = 1:
+						'		<b><font color="blue">hey cutie</font></b>'
+						*nl
+						'"Hey yourself," you say aloud, looking up at him. "Anyways, see you around."'
+					elseif hookup['text_message'] = 2:
+						'		<b><font color="blue">dont forget to call :)</font></b>'
+						*nl
+						'"I won''t," you promise.'
+					end
+					'That bit of business done, you wave him goodbye and head out the door.'
 				end
-				'That bit of business done, you wave him goodbye and head out the door.'
 			end
+			act'Leave':gt'hookup_after','exit'
 		end
-		act'Leave':gt'hookup_after','exit'
 	end
-	
+
 	if hookup['continuation'] = 2:
 		act'I''m not up for anything serious':
 			cla & *clr
@@ -1074,10 +1077,10 @@ if $ARGS[0] = 'continuation_reponse3':
 					'<i>Well this is awkward...</i> you think to yourself as you turn towards the door.'
 					'"I guess I''ll see you later then... or... well... not..." There''s another awkward silence. Not knowing what else to do, you just open the door and close it behind you without another word.'
 				end
-				
+
 				act'Leave':gt'hookup_after','exit'
 			end
-			
+
 			act'If it''s just a hookup...':
 				cla & *nl
 				'"If it''s just a hookup," you continue. "or something like last night, I wouldn''t mind getting together for some fun, but I''m just not interested in dating anybody."'
@@ -1095,7 +1098,7 @@ if $ARGS[0] = 'continuation_reponse3':
 						'"Uhh well, uhh... Alright... Guess I won''t see you later then..." you respond awkwardly. After giving yourself a once over, you give <<$npc_firstname[$boy]>> a strained smile and wave goodbye, quickly striding towards out the door.'
 						act'Leave':gt'hookup_after','exit'
 					end
-					
+
 					act'It''s to be expected':
 						cla & *clr
 						$npc_apt_hall[$boy]
@@ -1129,7 +1132,7 @@ if $ARGS[0] = 'later_nude':
 		'You smirk and shrug on the rest of your clothes before heading out the door.'
 		act'Leave':gt'hookup_after','exit'
 	end
-	
+
 	act'Thanks for the <<$hookup[''fun'']>>':
 		cla & *clr
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
@@ -1144,7 +1147,7 @@ if $ARGS[0] = 'later_nude':
 		'You smirk and shrug on the rest of your clothes before heading out the door.'
 		act'Leave':gt'hookup_after','exit'
 	end
-	
+
 	act'We should hook up again later':
 		cla & *clr
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
@@ -1187,7 +1190,7 @@ if $ARGS[0] = 'later_nude':
 			act'Leave':gt'hookup_after','exit'
 		end
 	end
-	
+
 	act'Maybe I could see you again sometime?':
 		cla & *clr
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
@@ -1203,7 +1206,7 @@ if $ARGS[0] = 'later_nude':
 		else
 			'"Maybe I could see you again? Maybe we could go on a date?" you say, pulling your pants up over your hips.'
 			$hookup['reaction1'] = 'your top just above your breasts ready to be pulled down'
-			$hookup['reaction2'] = 'tug your top all the way down'		
+			$hookup['reaction2'] = 'tug your top all the way down'
 		end
 		if rand(1,3) = 1:
 			'"Nah, this was a one time thing. I never fuck the same girl twice."'
@@ -1234,7 +1237,7 @@ if $ARGS[0] = 'later_nude':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'later_dressed':
 	act'We should hook up again later':
 		cla & *nl
@@ -1265,7 +1268,7 @@ if $ARGS[0] = 'later_dressed':
 			act'Leave':gt'hookup_after','exit'
 		end
 	end
-	
+
 	act'Maybe I could see you again sometime?':
 		cla & *nl
 		if $clothingworntype = 'nude':gs'hookup_after','dress'

+ 4 - 2
locations/kuhrPar.qsrc

@@ -55,9 +55,9 @@ if hour = 7 and week < 6 and indorf = 0:
 elseif hour = 7 and week > 5 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a><<$mombreak>>, and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. It seems your sister is sleeping in again. You could sit down and join them for breakfast or just grab something and go.'
 elseif hour = 18 and minut <= 30 and indorf = 0 and anyaloc ! 25:
-	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
+	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
 elseif hour = 18 and minut <= 30 and indorf = 0:
-	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
+	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
 else
 	'The kitchen is not very impressive, but it has everything your family needs. Since everyone can''t always join for family meals, <<$npc_nickname[''A29'']>> usually pre-cooks some meals and stores them in the fridge. Of course, you could also just have a snack if you''re not that hungry.'
 end
@@ -68,6 +68,8 @@ if momloc = 23: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a>
 if sdadloc = 4: '<a href="exec:gt''father''">Your stepfather</a> is here reading the paper.'
 if sdadloc = 7: '<a href="exec:gt''father''">Your stepfather</a> is here setting the table for dinner.'
 
+if week = 6 and dostupindorf = 1 and grandaQW['block'] = 0 and hour > 9 and hour < 12:'Your family is getting ready to go to <a href="exec:gt ''gadhouse'', ''to_gadukino''">Gadukino</a> to visit your great grandparents. You can go with them if you want, or stay home like Anya usually does.'
+
 if hour = 7 and breakfast_day ! daystart and indorf = 0: 
 	if PCloswimwear ! 1 and $clothingworntype ! 'nude':
 		act 'Eat breakfast with your family (0:20)': 

+ 163 - 126
locations/mother.qsrc

@@ -382,13 +382,24 @@ if $ARGS[0] = '':
 			'<center><b><font color="maroon">Your <<$npc_nickname[''A29'']>>, Natasha <<$pcs_lastname>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 
-			if npc_rel['A29'] < 80:
-				'You barely have any memories of your real father, and are curious about him. When you see your <<$npc_nickname[''A29'']>> in the kitchen you decide to ask: "<<$npc_nickname[''A29'']>>... about my real father... what was he like? What happened between you two?"'
-				'You seem to have struck a sore spot. Your <<$npc_nickname[''A29'']>>''s face saddens, and after a few seconds she replies: "<<$pcs_nickname>>, I don''t want to talk about him, it brings back too many bad memories. Just know that Vladimir, your stepfather, raised you and Anya as if they were his own daughters."'
+			if $loc = 'kuhrPar':
+				if npc_rel['A29'] < 80:
+					'You barely have any memories of your real father, and are curious about him. When you see your <<$npc_nickname[''A29'']>> in the kitchen you decide to ask: "<<$npc_nickname[''A29'']>>... about my real father... what was he like? What happened between you two?"'
+					'You seem to have struck a sore spot. Your <<$npc_nickname[''A29'']>>''s face saddens, and after a few seconds she replies: "<<$pcs_nickname>>, I don''t want to talk about him, it brings back too many bad memories. Just know that Vladimir, your stepfather, raised you and Anya as if they were his own daughters."'
+				else
+					'You barely have any memories of your real father, and are curious about him. When you see your <<$npc_nickname[''A29'']>> in the kitchen you decide to ask: "<<$npc_nickname[''A29'']>>... about my real father... what was he like? What happened between you two?"'
+					'You seem to have struck a sore spot. Your <<$npc_nickname[''A29'']>>''s face saddens, and after a few seconds she replies: "I have no idea where Mikhail is and what he does now, I haven''t seen him in many years. We went to the same school when we were young, and were dating back then... nothing serious. Things weren''t great between us, but then I got pregnant with your sister Anya. Our parents forced us to get married. We tried to make the most of it, and for a while things didn''t seem so bad. A few months after I had you, we got into a huge argument though. We decided we couldn''t live together any more, and got divorced." You can''t help but notice she won''t tell you what the argument was about, but you don''t interrupt her. It''s rare enough to get her to talk about your real father as it is.'
+					'"A year later I married Vladimir, your stepfather. We had Kolka together, but Vladimir always treated you and Anya as if they were his own daughters too. He looked after you, bathed you, told you stories at night and took you for walks whenever he could." Those memories seem to have cheered her up, and she has a serene smile on her face. "Vladimir really is a wonderful man..." she adds, while you thank her for the story.'
+				end
 			else
-				'You barely have any memories of your real father, and are curious about him. When you see your <<$npc_nickname[''A29'']>> in the kitchen you decide to ask: "<<$npc_nickname[''A29'']>>... about my real father... what was he like? What happened between you two?"'
-				'You seem to have struck a sore spot. Your <<$npc_nickname[''A29'']>>''s face saddens, and after a few seconds she replies: "I have no idea where Mikhail is and what he does now, I haven''t seen him in many years. We went to the same school when we were young, and were dating back then... nothing serious. Things weren''t great between us, but then I got pregnant with your sister Anya. Our parents forced us to get married. We tried to make the most of it, and for a while things didn''t seem so bad. A few months after I had you, we got into a huge argument though. We decided we couldn''t live together any more, and got divorced." You can''t help but notice she won''t tell you what the argument was about, but you don''t interrupt her. It''s rare enough to get her to talk about your real father as it is.'
-				'"A year later I married Vladimir, your stepfather. We had Kolka together, but Vladimir always treated you and Anya as if they were his own daughters too. He looked after you, bathed you, told you stories at night and took you for walks whenever he could." Those memories seem to have cheered her up, and she has a serene smile on her face. "Vladimir really is a wonderful man..." she adds, while you thank her for the story.'
+				if npc_rel['A29'] < 80:
+					'You barely have any memories of your real father, and are curious about him. When you see your <<$npc_nickname[''A29'']>> watching TV you decide to ask: "<<$npc_nickname[''A29'']>>... about my real father... what was he like? What happened between you two?"'
+					'You seem to have struck a sore spot. Your <<$npc_nickname[''A29'']>>''s face saddens, and after a few seconds she replies: "<<$pcs_nickname>>, I don''t want to talk about him, it brings back too many bad memories. Just know that Vladimir, your stepfather, raised you and Anya as if you were his own daughters."'
+				else
+					'You barely have any memories of your real father, and are curious about him. When you see your <<$npc_nickname[''A29'']>> watching TV you decide to ask: "<<$npc_nickname[''A29'']>>... about my real father... what was he like? What happened between you two?"'
+					'You seem to have struck a sore spot. Your <<$npc_nickname[''A29'']>>''s face saddens, and after a few seconds she replies: "I have no idea where Mikhail is and what he does now, I haven''t seen him in many years. We went to the same school when we were young, and were dating back then... nothing serious. Things weren''t great between us, but then I got pregnant with your sister Anya. Our parents forced us to get married. We tried to make the most of it, and for a while things didn''t seem so bad. A few months after I had you, we got into a huge argument though. We decided we couldn''t live together any more, and got divorced." You can''t help but notice she won''t tell you what the argument was about, but you don''t interrupt her. It''s rare enough to get her to talk about your real father as it is.'
+					'"A year later I married Vladimir, your stepfather. We had Kolka together, but Vladimir always treated you and Anya as if you were his own daughters too. He looked after you, bathed you, told you stories at night and took you for walks whenever he could." Those memories seem to have cheered her up, and she has a serene smile on her face. "Vladimir really is a wonderful man..." she adds, while you thank her for the story.'
+				end
 			end
 			act 'Continue':gt 'mother'
 		end
@@ -400,91 +411,105 @@ if $ARGS[0] = '':
 				gs 'stat'
 				'<center><b><font color="maroon">Your <<$npc_nickname[''A29'']>>, Natasha <<$pcs_lastname>></font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-				
-				'Since you were little, your grandparents in Gadukino have always been just that to you - your ''grandparents''. It''s what your <<$npc_nickname[''A29'']>> told you they are, and what they seemed very happy to be referred to as. You learned some time later that they''re actually your great-grandparents. Your real grandparents - <<$npc_nickname[''A29'']>>''s parents - died when she herself was barely more than a toddler. But she never talks about them.'
-				'Today, your <<$npc_nickname[''A29'']>> seems to be in a pretty good mood as she wipes the countertops, so you decide to ask her the question.'
-				'"<<$npc_nickname[''A29'']>>, what were your parents like?"'
-				'She stops what she''s doing and turns to you, clearly surprised by your question. "Where''s this coming from so suddenly?"'
-				'"I''m just curious. Do you remember them at all?"'
-				'<<$npc_nickname[''A29'']>> sighs, leaning back against the counter. "It was a long time ago, but I still remember a little. My mother died giving birth to me, so the most I knew of her was from photos and keepsakes she left for me. She was a very beautiful woman. Grandmother said she always dressed in colorful, flowing skirts. She caught the eye of quite a few men, before she met my father and fell in love. When I look at you, I see a little of her in your features, <<$pcs_nickname>>."'
-				'"As for my father, I lived with him until I was four. I don''t remember that much about him, but I do recall he was a tall, solid man. With a big bushy beard, and very blue eyes." She smiles, wistfully. "He was very gentle, too, and smiled a lot. He would take me for walks in the flower fields after he got home from work, hoisting me up on his shoulders wherever the grass grew too tall. Then, at night, he''d sit by the fire smoking his pipe and reading the paper, while I played until bedtime. He called me Zvonochek and I called him Papulia."'
-				'These memories are old and scant, but your <<$npc_nickname[''A29'']>>''s eyes sparkle and dance as she recalls them, almost as if she''d been transported back to that time. It''s strange to see her like this, considering the expressions you''re more used to her having, and you find yourself openly staring.'
-				'"Like many men at the time, he eventually got called to war. I don''t remember anything beyond him being there one day, and seeing him driving off in the back of a truck the next." She stops and thinks for a moment, eyes dimming. "Sometime I''m not even sure I remember that much, or if my mind has filled in the gaps over time. I do recall missing him terribly, and often wishing my grandfather would hoist me on his shoulders like Papulia did." She swallows. "He never came back home. Grandmother told me that they said he was taken prisoner by the Afghans and died in their camp, but his body was never found."'
-				'Your <<$npc_nickname[''A29'']>> turns back around and starts wiping the countertop again. You''re not sure if she''s crying or not, but she doesn''t turn around as she says "now, let''s not talk about that anymore."'
+				if $loc = 'kuhrPar':
+					'Since you were little, your grandparents in Gadukino have always been just that to you - your ''grandparents''. It''s what your <<$npc_nickname[''A29'']>> told you they are, and what they seemed very happy to be referred to as. You learned some time later that they''re actually your great-grandparents. Your real grandparents - <<$npc_nickname[''A29'']>>''s parents - died when she herself was barely more than a toddler. But she never talks about them.'
+					'Today, your <<$npc_nickname[''A29'']>> seems to be in a pretty good mood as she wipes the countertops, so you decide to ask her the question.'
+					'"<<$npc_nickname[''A29'']>>, what were your parents like?"'
+					'She stops what she''s doing and turns to you, clearly surprised by your question. "Where''s this coming from so suddenly?"'
+					'"I''m just curious. Do you remember them at all?"'
+					'<<$npc_nickname[''A29'']>> sighs, leaning back against the counter. "It was a long time ago, but I still remember a little. My mother died giving birth to me, so the most I knew of her was from photos and keepsakes she left for me. She was a very beautiful woman. Grandmother said she always dressed in colorful, flowing skirts. She caught the eye of quite a few men, before she met my father and fell in love. When I look at you, I see a little of her in your features, <<$pcs_nickname>>."'
+					'"As for my father, I lived with him until I was four. I don''t remember that much about him, but I do recall he was a tall, solid man. With a big bushy beard, and very blue eyes." She smiles, wistfully. "He was very gentle, too, and smiled a lot. He would take me for walks in the flower fields after he got home from work, hoisting me up on his shoulders wherever the grass grew too tall. Then, at night, he''d sit by the fire smoking his pipe and reading the paper, while I played until bedtime. He called me Zvonochek and I called him Papulia."'
+					'These memories are old and scant, but your <<$npc_nickname[''A29'']>>''s eyes sparkle and dance as she recalls them, almost as if she''d been transported back to that time. It''s strange to see her like this, considering the expressions you''re more used to her having, and you find yourself openly staring.'
+					'"Like many men at the time, he eventually got called to war. I don''t remember anything beyond him being there one day, and seeing him driving off in the back of a truck the next." She stops and thinks for a moment, eyes dimming. "Sometime I''m not even sure I remember that much, or if my mind has filled in the gaps over time. I do recall missing him terribly, and often wishing my grandfather would hoist me on his shoulders like Papulia did." She swallows. "He never came back home. Grandmother told me that they said he was taken prisoner by the Afghans and died in their camp, but his body was never found."'
+					'Your <<$npc_nickname[''A29'']>> turns back around and starts wiping the countertop again. You''re not sure if she''s crying or not, but she doesn''t turn around as she says "now, let''s not talk about that anymore."'
+				else
+					'Since you were little, your grandparents in Gadukino have always been just that to you - your ''grandparents''. It''s what your <<$npc_nickname[''A29'']>> told you they are, and what they seemed very happy to be referred to as. You learned some time later that they''re actually your great-grandparents. Your real grandparents - <<$npc_nickname[''A29'']>>''s parents - died when she herself was barely more than a toddler. But she never talks about them.'
+					'Today, your <<$npc_nickname[''A29'']>> seems to be in a pretty good mood as she watches TV, so you decide to ask her the question.'
+					'"<<$npc_nickname[''A29'']>>, what were your parents like?"'
+					'She stops watching and turns to you, clearly surprised by your question. "Where''s this coming from so suddenly?"'
+					'"I''m just curious. Do you remember them at all?"'
+					'<<$npc_nickname[''A29'']>> sighs, leaning back against the counter. "It was a long time ago, but I still remember a little. My mother died giving birth to me, so the most I knew of her was from photos and keepsakes she left for me. She was a very beautiful woman. Grandmother said she always dressed in colorful, flowing skirts. She caught the eye of quite a few men, before she met my father and fell in love. When I look at you, I see a little of her in your features, <<$pcs_nickname>>."'
+					'"As for my father, I lived with him until I was four. I don''t remember that much about him, but I do recall he was a tall, solid man. With a big bushy beard, and very blue eyes." She smiles, wistfully. "He was very gentle, too, and smiled a lot. He would take me for walks in the flower fields after he got home from work, hoisting me up on his shoulders wherever the grass grew too tall. Then, at night, he''d sit by the fire smoking his pipe and reading the paper, while I played until bedtime. He called me Zvonochek and I called him Papulia."'
+					'These memories are old and scant, but your <<$npc_nickname[''A29'']>>''s eyes sparkle and dance as she recalls them, almost as if she''d been transported back to that time. It''s strange to see her like this, considering the expressions you''re more used to her having, and you find yourself openly staring.'
+					'"Like many men at the time, he eventually got called to war. I don''t remember anything beyond him being there one day, and seeing him driving off in the back of a truck the next." She stops and thinks for a moment, eyes dimming. "Sometime I''m not even sure I remember that much, or if my mind has filled in the gaps over time. I do recall missing him terribly, and often wishing my grandfather would hoist me on his shoulders like Papulia did." She swallows. "He never came back home. Grandmother told me that they said he was taken prisoner by the Afghans and died in their camp, but his body was never found."'
+					'Your <<$npc_nickname[''A29'']>> turns back and starts watching TV again. "Let''s not talk about that anymore," she says, her voice sounding a bit strained.'
+				end
 				act 'Continue':gt 'mother'
 			end
 		end
 
-		act 'Ask for some new clothes':
-			*clr & cla
-			minut += 5
-			gs 'stat'
-			'<center><b><font color="maroon">Your <<$npc_nickname[''A29'']>>, Natasha <<$pcs_lastname>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-			'You wait until your <<$npc_nickname[''A29'']>> is in a good mood, and then quickly swoop in: "<<$npc_nickname[''A29'']>>, I have nothing nice to wear. Can I please have some new clothes?"'
-			if fame['pav_prostitute'] >= 100 and motherKnowWhore >= 1:
-				'Your <<$npc_nickname[''A29'']>> is outraged by the suggestion. "Really <<$pcs_nickname>>? You have lots of customers, and you''re still asking me for clothes? You should have plenty of whore money, you can afford them yourself. Besides, I don''t know where to buy clothes for a whore."'
+		if hour < 19:
+			act 'Ask for some new clothes':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><b><font color="maroon">Your <<$npc_nickname[''A29'']>>, Natasha <<$pcs_lastname>></font></b></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+				'You wait until your <<$npc_nickname[''A29'']>> is in a good mood, and then quickly swoop in: "<<$npc_nickname[''A29'']>>, I have nothing nice to wear. Can I please have some new clothes?"'
+				if fame['pav_prostitute'] >= 100 and motherKnowWhore >= 1:
+					'Your <<$npc_nickname[''A29'']>> is outraged by the suggestion. "Really <<$pcs_nickname>>? You have lots of customers, and you''re still asking me for clothes? You should have plenty of whore money, you can afford them yourself. Besides, I don''t know where to buy clothes for a whore."'
 
-				act 'Move away from her':gt $loc, $loc_arg
-			else
-				if SchoolAtestat = 0:
-					if npc_rel['A29'] >= 80:
-						if motherClotheMonth ! month:
-							'Your <<$npc_nickname[''A29'']>> lets out an exasperated sigh and throws her hands in the air. "Here we go again... <<$npc_nickname[''A29'']>>, I have nothing to wear!" she says, mocking your voice in a high pitch. You both laugh. "Alright then <<$pcs_nickname>>, let''s go see if we can find something."'
-
-							act 'Go to the store':
-								cla
-								npc_rel['A29'] = 70
-								motherClotheMonth = month
-								minut += 30
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/clothes_shopping.jpg"></center>'
-								'Going clothes shopping with your <<$npc_nickname[''A29'']>> is always an interesting experience. You never get to pick your own clothes, but she brings your clothes that she thinks would suit you and lets you try them on. You would argue but her taste in clothing is actually very good, always picking out cute outfits for you to wear that are quite trendy too. You directly go towards the changing booths, wondering what she''ll bring you this time.'
-
-								act 'Try on the clothes she brings you':
-									*clr & cla
+					act 'Move away from her':gt $loc, $loc_arg
+				else
+					if SchoolAtestat = 0:
+						if npc_rel['A29'] >= 80:
+							if motherClotheMonth ! month:
+								'Your <<$npc_nickname[''A29'']>> lets out an exasperated sigh and throws her hands in the air. "Here we go again... <<$npc_nickname[''A29'']>>, I have nothing to wear!" she says, mocking your voice in a high pitch. You both laugh. "Alright then <<$pcs_nickname>>, let''s go see if we can find something."'
+
+								act 'Go to the store':
+									cla
+									npc_rel['A29'] = 70
+									motherClotheMonth = month
+									minut += 30
 									gs 'stat'
-									loop_counter = 0
-									:markbuyclomother
-									loop_counter += 1
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/dressing_room.jpg"></center>'
-									if loop_counter = 300:
-										'After 30 minutes of trying on various outfits you are unable to find any that you either don''t already own or that you are willing to wear.'
-									else
-										numrand = rand(1, 150)
-
-										gs 'clothing_attributes', 'gm_outfits', numrand
-										!!not prostitute
-										if CloStyle = 4:jump 'markbuyclomother'
-										!!Sveta can wear it and not too revealing
-										if CloInhibit > pcs_inhib or CloInhibit > 30:jump 'markbuyclomother'
-
-										if gm_outfits[numrand] = 0:
-											gm_outfits[numrand] = 1
-											gm_outfits_h[numrand] = 50
-											gm_outfits_b[numrand] = pcs_hips
-											'<center><img <<$set_imgh>> src="images/pc/items/gm/outfits/<<numrand>>.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/clothes_shopping.jpg"></center>'
+									'Going clothes shopping with your <<$npc_nickname[''A29'']>> is always an interesting experience. You never get to pick your own clothes, but she brings your clothes that she thinks would suit you and lets you try them on. You would argue but her taste in clothing is actually very good, always picking out cute outfits for you to wear that are quite trendy too. You go straight towards the changing booths, wondering what she''ll bring you this time.'
+
+									act 'Try on the clothes she brings you':
+										*clr & cla
+										gs 'stat'
+										loop_counter = 0
+										:markbuyclomother
+										loop_counter += 1
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/dressing_room.jpg"></center>'
+										if loop_counter = 300:
+											'After 30 minutes of trying on various outfits you are unable to find any that you either don''t already own or that you are willing to wear.'
 										else
-											jump 'markbuyclomother'
+											numrand = rand(1, 150)
+
+											gs 'clothing_attributes', 'gm_outfits', numrand
+											!!not prostitute
+											if CloStyle = 4:jump 'markbuyclomother'
+											!!Sveta can wear it and not too revealing
+											if CloInhibit > pcs_inhib or CloInhibit > 30:jump 'markbuyclomother'
+
+											if gm_outfits[numrand] = 0:
+												gm_outfits[numrand] = 1
+												gm_outfits_h[numrand] = 50
+												gm_outfits_b[numrand] = pcs_hips
+												'<center><img <<$set_imgh>> src="images/pc/items/gm/outfits/<<numrand>>.jpg"></center>'
+											else
+												jump 'markbuyclomother'
+											end
 										end
-									end
 
-									'You enter a changing booth and spend 30 minutes trying on various outfits: short ones, long ones, light ones, dark ones... Then finally her eyes light up, and she beams: "This one! This one is perfect!" She buys the outfit for you, and you go back home together. You thank your <<$npc_nickname[''A29'']>> and give her a hug.'
+										'You enter a changing booth and spend 30 minutes trying on various outfits: short ones, long ones, light ones, dark ones... Then finally her eyes light up, and she beams: "This one! This one is perfect!" She buys the outfit for you, and you go back home together. You thank your <<$npc_nickname[''A29'']>> and give her a hug.'
 
-									act 'Continue':gt 'mother'
+										act 'Continue':gt 'mother'
+									end
 								end
+							else
+								'Your <<$npc_nickname[''A29'']>> sadly shakes her head: I''m sorry <<$pcs_nickname>>, our budget is limited and we already went clothes shopping this month. You''ll have to manage with what you have in your closet for a little while, maybe we can go again next month."'
+								act 'Continue':gt 'mother'
 							end
 						else
-							'Your <<$npc_nickname[''A29'']>> sadly shakes her head: I''m sorry <<$pcs_nickname>>, our budget is limited and we already went clothes shopping this month. You''ll have to manage with what you have in your closet for a little while, maybe we can go again next month."'
+							'Your <<$npc_nickname[''A29'']>> shakes her head: "I''m sorry <<$pcs_nickname>>, money is tight. We just can''t afford it right now."'
 							act 'Continue':gt 'mother'
 						end
 					else
-						'Your <<$npc_nickname[''A29'']>> shakes her head: "I''m sorry <<$pcs_nickname>>, money is tight. We just can''t afford it right now."'
+						'Your <<$npc_nickname[''A29'']>> shakes her head: "No <<$pcs_nickname>>, you''re old enough to earn your own money and buy your own clothes. Get a job if you want new clothes."'
 						act 'Continue':gt 'mother'
 					end
-				else
-					'Your <<$npc_nickname[''A29'']>> shakes her head: "No <<$pcs_nickname>>, you''re old enough to earn your own money and buy your own clothes. Get a job if you want new clothes."'
-					act 'Continue':gt 'mother'
 				end
 			end
 		end
@@ -520,19 +545,29 @@ if $ARGS[0] = '':
 				'You offer to help your <<$npc_nickname[''A29'']>> out around the house.'
 				'Your <<$npc_nickname[''A29'']>> asks you to iron some clothes. You spend an hour in the hallway ironing clothes.'
 			elseif MomPom = 6:
-				sdacharand = rand(10, 50)
-				money += sdacharand
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/grocery.jpg"></center>'
-				'You offer to help your <<$npc_nickname[''A29'']>> out around the house.'
-				'Your <<$npc_nickname[''A29'']>> asks you to run to the store, and buy some groceries. You head to the store and purchase the food, hauling the heavy bags home. The groceries cost you <<sdacharand>> <b>₽</b>, she gives you some money to cover the cost when you return home.'
-				'You have gain a few rubles for your effort.'
+				if hour < 19:
+					sdacharand = rand(10, 50)
+					money += sdacharand
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/grocery.jpg"></center>'
+					'You offer to help your <<$npc_nickname[''A29'']>> out around the house.'
+					'Your <<$npc_nickname[''A29'']>> asks you to run to the store, and buy some groceries. You head to the store and purchase the food, hauling the heavy bags home. The groceries cost you <<sdacharand>> <b>₽</b>, she gives you some money to cover the cost when you return home.'
+					'You have gain a few rubles for your effort.'
+				else
+					MomPom = 1
+					jump 'MomPom_jump'
+				end
 			elseif MomPom = 7:
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/pharmacy.jpg"></center>'
-				'You offer to help your <<$npc_nickname[''A29'']>> out around the house.'
-				'Your <<$npc_nickname[''A29'']>> asks you to go to the pharmacy, to get some medicine. Your <<$npc_nickname[''A29'']>>''s sister, Lyudmila, works there and always gives your family the medicine you need for free. Your <<$npc_nickname[''A29'']>> gave you a list of the items you need, and when you enter the pharmacy you see your aunt Luda behind the counter as always. She smiles when she recognizes you. "Hi <<$pcs_nickname>>! How are you? I hope everything is okay?"'
-				'"Hello aunt!" You greet her back, and have a chat with her before you give her list your <<$npc_nickname[''A29'']>> made. Aunt Luda quickly gathers the items your <<$npc_nickname[''A29'']>> wrote down, gathers them in a paper bag and hands the bag over to you. "Here you go, <<$pcs_nickname>>! Have a nice day, tell your <<$npc_nickname[''A29'']>> I said hi!"'
-				'You say you will and wave her goodbye. When you come home, you give your <<$npc_nickname[''A29'']>> the bag. After a few minutes you realize you forgot to pass on aunt Luda''s regards to your <<$npc_nickname[''A29'']>>, but decide to not bother now.'
+				if hour < 19:
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/pharmacy.jpg"></center>'
+					'You offer to help your <<$npc_nickname[''A29'']>> out around the house.'
+					'Your <<$npc_nickname[''A29'']>> asks you to go to the pharmacy, to get some medicine. Your <<$npc_nickname[''A29'']>>''s sister, Lyudmila, works there and always gives your family the medicine you need for free. Your <<$npc_nickname[''A29'']>> gave you a list of the items you need, and when you enter the pharmacy you see your aunt Luda behind the counter as always. She smiles when she recognizes you. "Hi <<$pcs_nickname>>! How are you? I hope everything is okay?"'
+					'"Hello aunt!" You greet her back, and have a chat with her before you give her list your <<$npc_nickname[''A29'']>> made. Aunt Luda quickly gathers the items your <<$npc_nickname[''A29'']>> wrote down, gathers them in a paper bag and hands the bag over to you. "Here you go, <<$pcs_nickname>>! Have a nice day, tell your <<$npc_nickname[''A29'']>> I said hi!"'
+					'You say you will and wave her goodbye. When you come home, you give your <<$npc_nickname[''A29'']>> the bag. After a few minutes you realize you forgot to pass on aunt Luda''s regards to your <<$npc_nickname[''A29'']>>, but decide to not bother now.'
+				else
+					MomPom = 1
+					jump 'MomPom_jump'
+				end
 			elseif MomPom = 8:
 				MomPom = 1
 				jump 'MomPom_jump'
@@ -651,7 +686,9 @@ if $ARGS[0] = '':
 		gt 'mother', 'referral_fail'
 	end
 
-	gs 'mother', 'check_workout'
+	if $loc = 'kuhrPar' or $loc = 'sitrPar':
+		gs 'mother', 'check_workout'
+	end
 end
 
 ! Called from mother and gadhouse, injects options for asking about workout sessions or starting a session
@@ -661,7 +698,7 @@ if $ARGS[0] = 'check_workout':
 	end
 
 	if (CloStyle = 5 or $clothingworntype = 'danilovich_outfits') and hour >= 6 and hour < 12 and motherQW['workout'] = 1 and motherQW['workout_day'] ! daystart:
-		if $loc = 'kuhrPar':
+		if $loc = 'kuhrPar' or $loc = 'sitrPar':
 			act 'Ask <<$npc_nickname[''A29'']>> to workout': gt 'mother', 'mother_workout_pav'
 		elseif $loc = 'gadhouse':
 			act 'Ask <<$npc_nickname[''A29'']>> to workout': gt 'mother', 'mother_workout_gad'
@@ -964,7 +1001,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'"<<$npc_nickname[''A29'']>>, I''m s-"'
 		'She slaps you hard across the face before you can finish the sentence.'
 		'"No, I don''t want to hear it. I can''t deal with you anymore. You need to leave this apartment right now! I don''t ever want to see you here again!"'
-		'She can''t really just toss you out, can she?'
+		+$OpenInnerThought+'She can''t really just toss you out, can she?'+$CloseInnerThought
 		'"But"'
 		'"Get. Out."'
 		'You run out of the apartment and slump to the floor as soon as you''re outside. What are you going to do now? Can you even afford your own apartment? You continue to sob in the same position for several minutes, too distraught to even notice if anyone else was around.'
@@ -985,7 +1022,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'You stare at the floor, only giving your <<$npc_nickname[''A29'']>> the smallest nod you can manage as a reply.'
 		'Kolka follows your example.'
 		'"How could you?" She gasps. "What were you thinking?"'
-		'You start to reply before you <<$npc_nickname[''A29'']>> cuts you off.'
+		'You start to reply before your <<$npc_nickname[''A29'']>> cuts you off.'
 		'"It doesn''t matter; you can''t stay here. You have to leave."'
 		'Your brother grabs your hand before rising to your defense. "<<$npc_nickname[''A29'']>>, that''s not fair. You can’t just kick <<$pcs_nickname>> out."'
 		'"Kolka, sweetheart. Let go of your sister''s hand right now and shut up. Now is not the time."'
@@ -1006,7 +1043,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'"<<$npc_nickname[''A29'']>>, I''m s-"'
 		'She slaps you hard across the face before you can finish the sentence.'
 		'"No, I don''t want to hear it. I can''t deal with you anymore. You need to leave this apartment right now! I don''t ever want to see you here again!"'
-		'She can''t really just toss you out, can she?'
+		+$OpenInnerThought+'She can''t really just toss you out, can she?'+$CloseInnerThought
 		'"But"'
 		'"Get. Out."'
 		'You run out of the apartment and slump to the floor as soon as you''re outside. What are you going to do now? Can you even afford your own apartment? You continue to sob in the same position for several minutes, too distraught to even notice if anyone else was around.'
@@ -1478,10 +1515,10 @@ if $ARGS[0] = 'condom_steal':
 		!! TEMPORARY PICTURE
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'You''re in the corridor as you overhear your parents talking in their bedroom, "I looked everywhere but I can''t find them anywhere..." your <<$npc_nickname[''A29'']>> lets out a dejected sigh.'
-		'"They can''t have just went up in flames..." your step-father answers...'
+		'"They can''t have just went up in flames..." your step-father answers.'
 		'"Well..." <<$npc_nickname[''A29'']>> ponders, "Have you been using several as a safety meassure?"'
-		'"No!" Vladimir answers assertivly, "Maybe it''s one of the kids that got into the stash?"'
-		'"Y-You really think so..." <<$npc_nickname[''A29'']>> gasps...'
+		'"No!" Vladimir answers assertively, "Maybe it''s one of the kids that got into the stash?"'
+		'"Y-You really think so..." <<$npc_nickname[''A29'']>> gasps.'
 		'Not wanting to get into middle of that you quietly continue on, not getting noticed by them.'
 	end
 	act 'Quietly walk away': gt $loc, $loc_arg
@@ -1549,7 +1586,7 @@ if $ARGS[0] = 'condom_find':
 						!! TEMPORARY PICTURE
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 						'You look at her with a straight face and begin to lie, "No, I haven''t had sex! I remember all the talks we had and I would never do anything to break your trust." you confidently reply.'
-						'Your <<$npc_nickname[''A29'']>> looks at you, talling you up from head to toe, "Well then since you''re so confident you won''t mind going to the doctors for a check up then?!"'
+						'Your <<$npc_nickname[''A29'']>> looks at you, tallying you up from head to toe, "Well then since you''re so confident you won''t mind going to the doctors for a check up then?!"'
 						'Deep into your lie and being your only way out you agree to go and get checked, "Fine, I''ll go get checked and then I expect an apology from you when we get the results!"'
 						'"Oh you''ll get an apology if you pass the test..." your <<$npc_nickname[''A29'']>> replies, "But until then I''m keeping you on a short leash..."'
 						'The two of you go back and forth as you decide the details and after a while your <<$npc_nickname[''A29'']>> leaves the room...'
@@ -1684,23 +1721,23 @@ if $ARGS[0] = 'dildo_find':
 					'"Fine, fine... I still don''t understand why you need so many of them..." <<$npc_nickname[''A29'']>> comments as she leaves the room.'
 				elseif dildo = 1 or middildo = 1:
 					'"I''ll give you this at least, you picked a perfect starting dildo. The size should fit someone unexperienced..." <<$npc_nickname[''A29'']>> starts talking about it.'
-					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 					'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 					'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 				elseif largedildo = 1 or bigdildo = 1:
 					'"Isn''t this a bit too big for you? It''s... a bit bigger than I expected to find if I were ever to find something like this..." <<$npc_nickname[''A29'']>> starts talking about it.'
-					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 					'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 					'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 				elseif extradildo = 1 or superdildo = 1:
 					'<<$npc_nickname[''A29'']>> starts laughing, "Well, you didn''t buy a correct one. There is now way this will fit in any hole..."'
-					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 					'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 					'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 				else
-					'"What were you thinking, <<$pcs_nickname>>?! This would ruin you forever! I forbid you to even try using this!" <<$npc_nickname[''A29'']>> is reacting out of line.'
-					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
-					'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
+					'"What were you thinking, <<$pcs_nickname>>?! This would ruin you forever! I forbid you to even try using this!" <<$npc_nickname[''A29'']>> is acting way out of line.'
+					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
+					'"Okay, okay. Just so you know I''m not too fond of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on.'
 					'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 				end
 				act 'Put away the dildo'+iif(dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 1, 's',''): gt 'bedrPar'
@@ -1726,22 +1763,22 @@ if $ARGS[0] = 'dildo_find':
 			'"Fine, fine... I still don''t understand why you need so many of them..." <<$npc_nickname[''A29'']>> comments as she leaves the room.'
 		elseif dildo = 1 or middildo = 1:
 			'"I''ll give your friend this at least, she picked the perfect starting dildo. The size should fit someone unexperienced..." <<$npc_nickname[''A29'']>> starts talking about it.'
-			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 			'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 			'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 		elseif largedildo = 1 or bigdildo = 1:
 			'"Isn''t this a bit too big for you and your friend? It''s... a bit bigger than I expected to find if I were ever to find something like this..." <<$npc_nickname[''A29'']>> starts talking about it.'
-			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 			'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 			'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 		elseif extradildo = 1 or superdildo = 1:
 			'<<$npc_nickname[''A29'']>> starts laughing, "Well, I understand why your friend gave it away, she didn''t buy a correct one. There is now way this will fit in any hole..."'
-			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 			'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 			'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 		else
 			'"What was your friend thinking, <<$pcs_nickname>>?! This would ruin anyone''s lady parts forever! I forbid you to even try using this! Who is your friend that gave you this? I need to call and tell her mother too..." <<$npc_nickname[''A29'']>> is reacting out of line.'
-			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 			'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 			'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 		end
@@ -1775,8 +1812,8 @@ if $ARGS[0] = 'plug_find':
 			'"I... have..." you meekly answer.'
 			'<<$npc_nickname[''A29'']>> sighs deeply, "Why the hell would you use a butt plug? Are you having anal sex?"'
 			'"No, no..." you swallow hard, "I just wanted to know how it feels..."'
-			'"Feel what?! How to have something shoved up your butt?!" <<$npc_nickname[''A29'']>> is clearly getting more and more upset, "I expected better than this <<$pcs_nickname>>, I''m quite disappointed to be honest..."'
-			'You stand in front of her with your head down, your cheeks are flaming red and you don''t know what to answer...'
+			'"Feel what?! How to have something shoved up your butt?!" <<$npc_nickname[''A29'']>> is clearly getting more and more upset, "I expected better than this <<$pcs_nickname>>, I''m quite disappointed to be honest."'
+			'You stand in front of her with your head down, your cheeks are flaming red and you don''t know what to answer.'
 			'"I won''t be able to stop you now that you''ve started to use it... But I better not hear about you having anal sex with the boys from around here you get it?!" <<$npc_nickname[''A29'']>> sternly tells you off.'
 			act 'Hide the butt plug again': gt 'bedrPar'
 		end
@@ -1826,10 +1863,10 @@ if $ARGS[0] = 'condom_steal':
 		!! TEMPORARY PICTURE
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'You''re in the corridor as you overhear your parents talking in their bedroom, "I looked everywhere but I can''t find them anywhere..." your <<$npc_nickname[''A29'']>> lets out a dejected sigh.'
-		'"They can''t have just went up in flames..." your step-father answers...'
+		'"They can''t have just went up in flames..." your step-father answers.'
 		'"Well..." <<$npc_nickname[''A29'']>> ponders, "Have you been using several as a safety meassure?"'
 		'"No!" Vladimir answers assertivly, "Maybe it''s one of the kids that got into the stash?"'
-		'"Y-You really think so..." <<$npc_nickname[''A29'']>> gasps...'
+		'"Y-You really think so..." <<$npc_nickname[''A29'']>> gasps.'
 		'Not wanting to get into middle of that you quietly continue on, not getting noticed by them.'
 	end
 	act 'Quietly walk away': gt $loc, $loc_arg
@@ -1847,7 +1884,7 @@ if $ARGS[0] = 'ask_mother_workout':
 		'"You know what <<$pcs_firstname>>, that sounds like it could be fun. Grab me whenever I''m home or when we''re visiting your grandparents; it''d be nice to get out into the countryside. You''d better be dressed and ready, though!"'
 	else 
 		'"No thanks <<$pcs_firstname>>, I''ll leave all that to people younger than me"'
-		'I guess I need to work at it more. Maybe get more confident about my body to be convincing, improve my relationship with her and find that something to get her to open up... you think to yourself.'
+		+$OpenInnerThought+'I guess I need to work at it more. Maybe get more confident about my body to be convincing or improve my relationship with her and find that extra something to get her to open up.'+$CloseInnerThought
 	end
 	act 'Accept her decision': gt 'mother'
 end
@@ -1860,10 +1897,10 @@ if $ARGS[0] = 'mother_workout_pav':
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	'"You ready to go work out?" You ask her.'
-	'"Ok <<$pcs_firstname>>, I''ll get ready and meet you outside"'
-	'With that you wait outside for your <<$npc_nickname[''A29'']>> to appear'
+	'"Ok <<$pcs_firstname>>, I''ll get ready and meet you outside."'
+	'With that you wait outside for your <<$npc_nickname[''A29'']>> to appear.'
 	act 'Meet her outside for a jog': gt 'mother' , 'mother_jog_pav'
-	act 'Meet her outside for Yoga': gt 'mother' , 'mother_yoga_pav'
+	act 'Meet her outside for yoga': gt 'mother' , 'mother_yoga_pav'
 end
 
 if $ARGS[0] = 'mother_workout_gad':
@@ -1874,10 +1911,10 @@ if $ARGS[0] = 'mother_workout_gad':
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	'"You ready to go work out?" You ask her.'
-	'"Ok <<$pcs_firstname>>, I''ll get ready and meet you outside"'
-	'With that you wait outside for your <<$npc_nickname[''A29'']>> to appear'
+	'"Ok <<$pcs_firstname>>, I''ll get ready and meet you outside."'
+	'With that you wait outside for your <<$npc_nickname[''A29'']>> to appear.'
 	act 'Meet her outside for a jog': gt 'mother', 'mother_jog_gad'
-	act 'Meet her outside for Yoga': gt 'mother', 'mother_yoga_gad'
+	act 'Meet her outside for yoga': gt 'mother', 'mother_yoga_gad'
 end
 	
 if $ARGS[0] = 'mother_jog_pav':
@@ -1886,7 +1923,7 @@ if $ARGS[0] = 'mother_jog_pav':
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/resident/mom/ready_run.jpg"></center>'
 	'You are waiting outside in the courtyard when you see your <<$npc_nickname[''A29'']>> appear from around the corner. She does a few stretches before announcing to you that she is ready to get moving. The two of you walk to the park, as you do you chat about a variety of things. Once you get to the park you both do a little stretching before you start jogging.'
-	act 'Get Jogging': 
+	act 'Go Jogging': 
 		*clr & cla
 		gs 'exercise', 'tier1', 60, 'run_exp'
 		fat -= rand(2,6)
@@ -1913,7 +1950,7 @@ if $ARGS[0] = 'mother_yoga_pav':
 	npc_rel['A29'] += rand(5,10)
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-	'You ask your <<$npc_nickname[''A29'']>> if she would like to do some yoga up at the park. "Of course, I''d love to give Yoga a try! I''ll just go and put on some more appropriate clothing"'
+	'You ask your <<$npc_nickname[''A29'']>> if she would like to do some yoga up at the park. "Of course, I''d love to give yoga a try! I''ll just go and put on some more appropriate clothing"'
 	act 'Meet her outside':
 		*clr & cla
 		minut += rand(2,4)
@@ -1925,8 +1962,8 @@ if $ARGS[0] = 'mother_yoga_pav':
 			minut += rand(20,30)
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/mom/pavyoga2.jpg"></center>'
-			'You and your <<$npc_nickname[''A29'']>> do some simple yoga routines together. It isn''t as pressing as when you do them by yourself, but you enjoy being able to spend time with her. Sometimes men walk by and leer at you both for a while, seeming to enjoy the free show.'
-			act 'Just see how your partner is doing': 
+			'You and your <<$npc_nickname[''A29'']>> do some simple yoga routines together. It isn''t as pressing as when you do them by yourself, but you enjoy being able to spend time with her. Sometimes men walk by and leer at you both for awhile, seeming to enjoy the free show.'
+			act 'Check on her': 
 				*clr & cla
 				minut += rand(2,4)
 				gs 'stat'
@@ -1944,9 +1981,9 @@ if $ARGS[0] = 'mother_jog_gad':
 	minut += rand(2,5)
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/resident/mom/ready_run.jpg"></center>'
-	'You go outside to wait for your <<$npc_nickname[''A29'']>> and do a little stretching whilst waiting.'
-	'Your <<$npc_nickname[''A29'']>> is ready very quickly, and she''s showing quite a lot of enthusiasm for the run. She must be looking quite forward to it, or to spending time with you.'
-	'"Well, I''m ready! Shall we set off?"'
+	'You go outside to wait for your <<$npc_nickname[''A29'']>> and do a little stretching while you wait.'
+	'Your <<$npc_nickname[''A29'']>> is ready very quickly, and she''s showing quite a lot of enthusiasm for the run. She must be looking forward to it, or spending time with you.'
+	'"Well, I''m ready! Should we set off?"'
 	act 'Let her take the lead': 
 		*clr & cla
 		gs 'exercise', 'tier1', 60, 'run_exp'
@@ -1954,7 +1991,7 @@ if $ARGS[0] = 'mother_jog_gad':
 		gs 'sweat', 'add', 5
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/resident/mom/gadrun1.jpg"></center>'
-		'Your <<$npc_nickname[''A29'']>> leads you out of the house and into the countryside. You let her take the lead as she knows the area well. This also gives you the chance to chat with her as you jog along. You talk about a variety of topics and enjoy spending the time with your <<$npc_nickname[''A29'']>>, as well as getting the chance to jog around the countryside and see all the interesting routes your <<$npc_nickname[''A29'']>> knows about and enjoys taking.'
+		'Your <<$npc_nickname[''A29'']>> leads you out of the house and into the countryside. You let her take the lead since she knows the area well. This also gives you the chance to chat with her as you jog along. You talk about a variety of topics and enjoy spending time with her, as well as getting the chance to jog around the countryside and see all the interesting routes your <<$npc_nickname[''A29'']>> knows about and enjoys taking.'
 		act 'Return Home':
 			*clr & cla
 			minut += 30
@@ -1974,20 +2011,20 @@ if $ARGS[0] = 'mother_yoga_gad':
 	npc_rel['A29'] += rand(5,10)
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-	'You ask your <<$npc_nickname[''A29'']>> if she would like to do some yoga up at your meadow nearby, reassuring her as to how secluded it is. "Of course, I''d love to give Yoga a try. I''ll just go and put on some more appropriate clothing"'
+	'You ask your <<$npc_nickname[''A29'']>> if she would like to do some yoga up at your meadow nearby, reassuring her as to how secluded it is. "Of course, I''d love to give yoga a try. I''ll just go and put on some more appropriate clothing"'
 	act 'Meet her outside':
 		*clr & cla
 		minut += rand(2,4)
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/resident/mom/gadyoga1.jpg"></center>'
-		'You see your <<$npc_nickname[''A29'']>> has put on some very light clothing and you both head off towards the meadow, chatting as you go. It is not long before you arrive and you quickly get ready to start your routine.'
+		'You see your <<$npc_nickname[''A29'']>> has put on some very light clothing and you both head off towards the meadow, chatting as you go. It''s not long before you arrive and you quickly get ready to start your routine.'
 		act 'Do some yoga':
 			*clr & cla
 			minut += rand(20,30)
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/mom/gadyoga2.jpg"></center>'
 			'You and your <<$npc_nickname[''A29'']>> do some simple yoga routines together. It isn''t as pressing as when you do them by yourself but you enjoy being able to spend time with her. The area is quite secluded and private, and you and your <<$npc_nickname[''A29'']>> are left to run your routine in peace and quiet. It is a nice experience and gives you plenty of time to talk whilst going through your poses and stretches.'
-			act 'Just see how your partner is doing': 
+			act 'Check on her': 
 				*clr & cla
 				minut += rand(2,4)
 				gs 'stat'

+ 1 - 0
locations/obkitchen.qsrc

@@ -54,6 +54,7 @@ if $args[0] = '':
 	dynamic $edaD
 	dynamic $fatdel
 	dynamic $driwater
+	dynamic $fill_bottle
 	dynamic $lekarstvo
 	dynamic $vitamin
 end

+ 1 - 1
locations/pav_aptcourtev.qsrc

@@ -505,7 +505,7 @@ if $ARGS[0] = 'events2':
 			end
 		end
 	elseif nightevents = 9:
-		if storyline ! 1 or (week = 3 and hour <= 23) or (week = 5 and hour >= 20) or (week = 6 and hour >=): jump 'reroll_jump2'
+		if storyline ! 1 or (week = 3 and hour <= 23) or (week = 5 and hour >= 20) or (week = 6 and hour >= 20): jump 'reroll_jump2'
 		if week < 6 and hour < 8: jump 'reroll_jump2'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/gopgirls.jpg"></center>'

+ 350 - 94
locations/pav_disco_coolkids.qsrc

@@ -2,6 +2,7 @@
 !2021/05/02
 
 if $ARGS[0] = 'classmates':
+	if hour < 20: gt 'pav_disco'
 	*clr & cla
 	$menu_loc = 'pav_disco_coolkids'
 	$menu_arg = 'classmates'
@@ -284,48 +285,108 @@ if $ARGS[0] = 'dimka':
 	minut += 15
 	gs 'npc_relationship', 'modify', 'A1', 'like'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
-	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-end
-
-if $ARGS[0] = 'dimka1':
 	if rand(1,4) = 1:
-		'text of him dancing'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/dimka_dance.jpg"></center>'
+		'You see Dimka out on the dance floor. He is dressed very stylishly and dances very well. He''s in the middle of a small crowd of of people, mostly girls.'
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
-			'text with different reactions to friendships levels/social groups.'
-			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			if npc_rel['A1'] >= 50:
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/dimka_dance.jpg"></center>'
+			if grupTipe = 5
+				'He ignores you and turns his back on you as you approach, shunning you.'
+			elseif npc_rel['A1'] >= 50 and fame['pav_slut'] < 250:
+				if grupTipe = 1:
+					'When Dimka sees you, he smiles warmly, making room for you in the group made up of some of the cool kids and a few others you don''t recognize. "Just the person I was hoping to see!" he says as you walk up and starts dancing with everyone around him, including you.'
+				else
+					'When Dimka sees you, he smiles warmly, making room for you in the group made up of some of the cool kids and a few others you don''t recognize. Some of them give you an odd look, obviously not sure why you''re here since you''re not part of their clique, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague." he playfully chides and you are soon dancing with the group.'
+					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+					act 'Dance with him': gt 'pav_disco_coolkids', 'dimka_dance'
+				end
+			elseif npc_rel['A1'] <= 20 or fame['pav_slut'] >= 250:
+				'"Nobody wants you here, whore. At least not yet. You might have a dick or two to suck later though." he says mockingly before turning his back and shunning you.'
+				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+			else 
+				'When Dimka sees you, he just smiles and keeps dancing. He doesn''t seem to mind you dancing next to him, but he doesn''t talk to you and instead focuses on the others.'
+				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				act 'Dance with him': gt 'pav_disco_coolkids', 'dimka_dance'
 			end
 		end
 	else
-		'text of him dancing'
-		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-		act 'Hangout with him':
-			*clr & cla
-			minut += 15
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
-			'text dance with him'
-			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			act 'Ask him to dance':
-				*clr & cla
-				minut += 15
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
-				'text with different reactions, if he likes/wants to dance with her then go dancing act will show'
-				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				if npc_rel['A1'] >= 50:
-					act 'Go dancing': gt 'pav_disco_coolkids', 'dimka_dance'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
+		'You see Dimka sitting at a table near the dance floor. He is dressed very stylishly and is in the middle of a small crowd of of people, mostly girls.'
+		if dimka_debt > 0:
+			'The first thing Dimka does as you walk up is grab you by the arm and drag you aside so no one can hear him. "Do you have my money?"'
+			if money >= dimka_debt:
+				act 'Pay your debt':
+					*clr & cla
+					money -= dimka_debt
+					dimka_debt = 0
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
+					'You nod your head and dig in your purse, pulling out the money and handing it to him. He takes his time slowly counting it out, then nods as it seems to all be there. You briefly talk back and forth as he puts the money away.'
+					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+					if dimarudorient = 1: act 'Ask for some pale lady': gt 'pav_disco_coolkids', 'dim_drugs'
+				end
+			else
+				cla
+				'You bite your lower lip nervously and look down as you shake your head. "No, just give me a little more time and I will have it. Please?" you beg him.'
+				'He sighs. "I like you <<$pcs_nickname>>, I do. But I can''t just let you slide. How about you pay me a little interest and you can pay me later?" The way he says it leaves no doubt exactly what he considers <i>interest</i>.'
+				gs 'willpower', 'sex', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'Refuse (<<will_cost>> Willpower)':
+						gs 'willpower', 'pay', 'resist'
+						gt 'pav_disco_coolkids', 'classmates'
+					end
+				else
+					act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
+				act 'Go with Dimka': gt 'pav_disco_coolkids', 'dimka_sex'
 			end
-			act 'talk about ?':
+			
+		elseif grupTipe = 5:
+			'When you get near him, he glances at some of the other cool kids and then back to you. "You get lost loser?" He looks you over and shakes his head. "Where did you get those clothes? Do you even know how to dress yourself?" Several of the others laugh at his comment. "Go away, you''re killing the mood, loser."'
+			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+		elseif npc_rel['A1'] >= 50 and fame['pav_slut'] < 200:
+			if grupTipe = 1:
+				'"Just the person I was hoping to see!" Dimka smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would have loved it out there. It really made me realize we''re wasting away out here in a place like this." You then mostly talk about the other places he has visited.'
+			else
+				'Dimka greets you with a friendly smile, making room for you in the group made up of some of the cool kids and a few others you don''t recognize. Some of them give you an odd look, obviously not sure why you''re here since you''re not part of their clique, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague." he playfully chides everyone and you are soon engaged in a conversation with Dimka.'
+			end
+			if dimarudorient = 1:act 'Ask for some pale lady': gt 'pav_disco_coolkids', 'dim_drugs'
+			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+		elseif npc_rel['A1'] <= 20 and fame['pav_slut'] < 200:
+			if grupTipe = 1:
+				'"You seem to have the wrong idea about me <<$pcs_nickname>>." Dimka holds out his hand to keep you from getting any closer. "Just because we run in the same social circle doesn''t mean we''re friends."'
+				'You can''t help but scoff and roll your eyes. "Who said I want to be friends? You just looked lonely standing over here by yourself. I was just trying to be nice." You trade a few more barbs back and forth.'
+			else
+				'Dimka looks down at you with a condescending smile. "What do you want?" he asks, maintaining his "friendly" appearance in front of everyone.'
+				'"I just wanted to say hi is all..." you reply'
+				'He looks around like this is a common burden. "Of course you did, everyone does." You try talking to him, but he acts like he is barely tolerating you, like a Tsar might a peasant in his court.'
+			end
+			if dimarudorient = 1:act 'Ask for some pale lady': gt 'pav_disco_coolkids', 'dim_drugs'
+			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+		elseif fame['pav_slut'] >= 250:
+			'Dimka sees you approaching and gives you a blank look, his gaze cold and unblinking. "Do you really think I would talk to a whore like you?" he dryly states. He continues to stare you down until you finally leave.'
+			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+		elseif (dimaRevenge = 6 and (dimaRevChoice = 3 or dimaRevChoice = 5 or dimaRevChoice = 6)) or (dimaRevenge = 7 and dimaRevChoice = 2) or (dimaRevenge = 8 and (dimaRevChoice = 1 or dimaRevChoice = 4)):
+			'Dimka glares at you as you approach. "What the fuck do you want, slut?"'
+			'You sigh. "Look, I know a lot has happened between us, but I thought we could leave it in the past and just be friends or something?"'
+			'He looks a little dumbfounded, but shrugs. "Whatever." The two of you make a little small talk, but you get the feeling he is planning something.'
+			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+		else
+			'Dimka is willing to entertain you for a bit, occasionally taking part in the conversation but letting you do most of the talking before someone calls over to him and he smiles and waves back to them. "Sorry, I hope you don''t mind." He starts heading towards them - you could quickly ask him something or just let him go.'
+			if dimarudorient = 1: act 'Ask for some pale lady': gt 'pav_disco_coolkids', 'dim_drugs'
+			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+			act 'Ask him to dance':
 				*clr & cla
 				minut += 15
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
-				!!this act I am adding in for people that want to add in specific stuff they can talk about instead of just general chat. feel free to add as many as you want.
-				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+				'"Would you like to dance?" you ask with a smile.'
+				'He hesitates for a moment before nodding. "Yeah, sure."' 
+				'The two of you then head off onto the dance floor together.'
+				act 'Go dancing': gt 'pav_disco_coolkids', 'dimka_dance'
 			end
 		end
 	end
@@ -334,32 +395,127 @@ end
 if $ARGS[0] = 'dimka_dance':
 	*clr & cla
 	minut += 15
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
-	'text dance with him'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
+	'You start dancing with him. He''s a pretty good dancer and you both enjoy dancing together for a while.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 	act 'Keep dancing':
 		*clr & cla
 		minut += 15
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
-		'text dance with him'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/dimka_dance.jpg"></center>'
+		'You continue dancing, having fun and enjoying yourself so much that you really don''t care about those that might be watching. It really is great fun.'
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Keep dancing':
 			*clr & cla
 			minut += 15
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
-			'text dance with him'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance1.jpg"></center>'
+			'The two of you dance energetically, really getting into the beat of the music. You''re having a lot of fun dancing with Dimka and you think he''s having fun dancing with you too.'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Keep dancing':
 				*clr & cla
 				minut += 15
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
-				'text dance with him, then he excuses himself to use restroom, go get drink etc.'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance2.jpg"></center>'
+				'He pulls you in close and you are soon dancing with your face only a few inches from his. You feel his hand slide down your back to just above your ass as you keep dancing together before a girl comes over and asks him to dance. She is very pretty and he looks her over and grins before looking back to you. "Sorry, but I think it''s this lovely lady''s turn." He turns and starts dancing with her, leaving you to walk off the dance floor.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			end
 		end
 	end
 end
 
+if $ARGS[0] = 'dim_drugs':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
+	'You don''t want to, but you feel miserable and everything hurts. You crave the rush that you''ve come to enjoy so much'
+	'"Please Dimka, can I have some pale lady?"'
+	'He smiles at you with a smug grin. "Sure. Do you have any money?"'
+	if money >= 420:
+		act 'Change your mind': gt 'pav_disco_coolkids', 'classmates'
+		if money >= 420: act 'Buy enough for 1 lines (420 <b>₽</b>)': palelady = 1 & gt 'pav_disco_coolkids', 'dimka_pay'
+		if money >= 840: act 'Buy enough for 2 lines (840 <b>₽</b>)': palelady = 2 & gt 'pav_disco_coolkids', 'dimka_pay'
+		if money >= 1680: act 'Buy enough for 5 lines (1680 <b>₽</b>)': palelady = 5 & gt 'pav_disco_coolkids', 'dimka_pay'
+		if money >= 3720: act 'Buy enough for 10 lines (3320 <b>₽</b>)': palelady = 10 & gt 'pav_disco_coolkids', 'dimka_pay'
+	else
+		*nl
+		'You bite your lower lip nervously and look down as you shake your head. "No, but please can you just give me some now and I can pay you back later?" you beg him.'
+		'Dimka grins. "Sure, why don''t we go somewhere quieter? You make me happy and I will make you happy. You can pay me back later."'
+		'Resolved to do anything to make the pain go away and feel happy again, you mentally sigh and follow him.'
+		act 'Change your mind': gt 'pav_disco_coolkids', 'classmates'
+		act 'Go with Dimka': gt 'pav_disco_coolkids', 'dimka_sex'
+	end
+end
+
+if $ARGS[0] = 'dimka_pay':
+	*clr & cla
+	money -= palelady * 420
+	dur += palelady
+	palelady = 0
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/shared/drugs/cocainebag.jpg"></center>'
+	'You nod your head and dig in your purse, pulling out the money and quickly handing it to him. He takes his time slowly counting it out, which seems like an eternity before he finally hands over a small baggy. You snatch it from him and then quickly leave.'
+	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+	act 'Do a line':
+		*clr & cla
+		gs 'drugs', 'cocaine'
+		'<center><img <<$set_imgh>> src="images/shared/drugs/lineschool.jpg"></center>'
+		'You leave the disco and walk down the hall, looking into rooms until you spot one that''s unlocked and empty. You glance around and when no one is looking, you duck inside and rush over to a table. You pour out a line and quickly snort it, immediately feeling the sensation of relief and pleasure rushing through your body. You spend a few moments in a stupor before heading back to the disco.'
+		act 'Go back to the disco': gt 'pav_disco'
+	end
+end
+
+if $ARGS[0] = 'dimka_sex':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/school/dimbj1.jpg"></center>'
+	'He leads you down the hall and finally stops at one of the other rooms. He opens the door and steps in, closing the door after you enter. Once inside, he pushes you up again the wall and leans in close so his face is only a few inches from yours. "Get on your knees, bitch."'
+	'You obey him and slowly sink to your knees. You don''t have to be told what to do next. You reach up and start undoing his pants.'
+	act 'Get him hard':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/school/dimbj2.jpg"></center>'
+		'You pull his limp dick free from his pants and start stroking it with your hand while sucking on his balls. You feel him getting hard in your hand.'
+		gs 'arousal', 'hj', 2, 'sub'
+		gs 'stat'
+		act 'Suck his dick':
+			*clr & cla
+			gs 'boyStat', 'A1'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/school/dimbj3.jpg"></center>'
+			'Once he''s hard, you open your mouth and take his <<dick>>cm <<$dick_girth>> dick into your mouth. You wrap your lips around his shaft and start bobbing your head back and forth on his dick. You look up at him to make sure he is enjoying it.'
+			gs 'arousal', 'bj', 5, 'sub'
+			gs 'stat'
+			act 'Keep sucking':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/school/dimbj4.jpg"></center>'
+				'As you keep sucking his cock, you wrap one of your hands around his shaft. You stroke his dick with your hand in sequence with your lips. He starts moaning, obviously enjoying it.'
+				gs 'arousal', 'bj', 5, 'sub'
+				gs 'stat'
+				act 'Finish him':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/school/dimbj5.jpg"></center>'
+					'While you are sucking his dick, he reaches down and starts stroking it himself before pulling it out of your mouth. After a few strokes, spurts of his cum start landing on your face and running down your neck. Once the last spurt lands on you, he shoves his dick back in your mouth "Suck me clean slut!" You suck the cum off his dick and the last few drops out of him.'
+					*nl
+					gs 'cum_call', 'face', 'A1'
+					gs 'arousal', 'bj', 2, 'sub'
+					gs 'arousal', 'end'
+					gs 'stat'
+					if dimka_debt > 0:
+						'He puts his dick away and buttons up his pants. "I want my money by next week." he growls before walking out, leaving you to get cleaned up on your own.'
+						act 'Go back to the disco': gt 'pav_disco'
+					else
+						dur += 1
+						dimka_debt += 2000
+						'He puts his dick away and buttons up his pants. "I want my money by next week." he growls before tossing a small baggy of white power on the floor as he walks out, leaving you to get cleaned up on your own. Not even thinking about the cum on your face, you quickly snatch up the baggy.'
+						act 'Go back to the disco': gt 'pav_disco'
+						act 'Do a line':
+							*clr & cla
+							gs 'drugs', 'cocaine'
+							'<center><img <<$set_imgh>> src="images/shared/drugs/lineschool.jpg"></center>'
+							'You get up and rush over to a table. You pour out a line and quickly snort it, immediately feeling the sensation of relief and pleasure rushing through your body. You spend a few moments in a stupor before heading back to the disco.'
+							act 'Go back to the disco': gt 'pav_disco'
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'marcus':
 	*clr & cla
 	minut += 15
@@ -387,7 +543,7 @@ if $ARGS[0] = 'marcus':
 					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				end
 			elseif fame['pav_slut'] >= 250:
-				'When he see''s you heading his direction, he moves away and starts dancing with another girl on the dance floor.'
+				'When he sees you heading in his direction, he moves away and starts dancing with another girl on the dance floor.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			else 
 				'When you get near him, he smiles but then turns and starts dancing with another girl on the dance floor that seems interested in him, completely ignoring you.'
@@ -406,7 +562,7 @@ if $ARGS[0] = 'marcus':
 				'You enjoy hearing the stories Marcus tells you about his life in America. "It''s kind of funny, I don''t think I was nearly as popular as this back home. I''m not complaining though!"'
 				'You spend the some more time asking more questions about his home life and he''s happy to tell you all about it.'
 				if hotcat >= 5:
-					'Just when it seems like you''ve run out of small talks he says "Hey, want to go dance?"'
+					'Just when it seems like you''ve run out of small talks he says "Hey, want to dance?"'
 					act 'No':
 						*clr & cla
 						gs 'stat'
@@ -430,7 +586,7 @@ if $ARGS[0] = 'marcus':
 					'"Do I know you?" Marcus asks when you try to strike up a conversation.'
 					'"Uhh... I would think so? We run in the same social circle..." you reply, but he just shrugs.'
 				else
-					'You try to strike up a conversation with Marcus, but he just ignores you for the most part and continues talking to some of the other kids.'
+					'You try to strike up a conversation with Marcus, but he just ignores you and continues talking to some of the other kids.'
 				end
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			elseif fame['pav_slut'] >= 250:
@@ -470,57 +626,59 @@ if $ARGS[0] = 'marcus_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_dance.jpg"></center>'
 	'You start dancing with him. He''s a pretty good dancer and you both enjoy dancing together for a while.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_coolkids', 'marcus_dance'
-	act 'Grind against him':
-		*clr & cla
-		gs 'fame', 'pav', 'sex', 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_grind1.jpg"></center>'
-		'You back up against him and start grinding your ass against his crotch.'
-		if hotcat >= 5:
-			'He grabs you by the hips and pulls you in closer before he starts grinding back against you and nuzzles your neck.'
-			gs 'arousal', 'foreplay', 10, 'inhibition'
-			gs 'arousal', 'end'
+	if hour >= 20:
+		act 'Keep dancing': gt 'pav_disco_coolkids', 'marcus_dance'
+		act 'Grind against him':
+			*clr & cla
+			gs 'fame', 'pav', 'sex', 1
 			gs 'stat'
-			act 'Go back to just dancing': gt 'pav_disco_coolkids', 'marcus_dance'
-			act 'Keep grinding':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_grind2.jpg"></center>'
-				'He keeps his hands firmly on your hips, pulling you tightly against him as you keep grinding your ass against him. You can feel his well endowed dick starting to get hard.'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_grind1.jpg"></center>'
+			'You back up against him and start grinding your ass against his crotch.'
+			if hotcat >= 5:
+				'He grabs you by the hips and pulls you in closer before he starts grinding back against you and nuzzles your neck.'
 				gs 'arousal', 'foreplay', 10, 'inhibition'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Makeout':
+				act 'Go back to just dancing': gt 'pav_disco_coolkids', 'marcus_dance'
+				act 'Keep grinding':
 					*clr & cla
-					minut += 15
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_kiss.jpg"></center>'
-					'He suddenly turns you around and starts kissing you passionately on the lips as you feel his hard-on pressing against your stomach. After several minutes of making out, he breaks the kiss. "Let''s go somewhere more private..."'
-					gs 'arousal', 'kiss', 5, 'inhibition'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_grind2.jpg"></center>'
+					'He keeps his hands firmly on your hips, pulling you tightly against him as you keep grinding your ass against him. You can feel his well endowed dick starting to get hard.'
+					gs 'arousal', 'foreplay', 10, 'inhibition'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Go with him': gt 'pav_discoev1', 'marcus'
-					gs 'willpower', 'sex', 'resist', 'easy'
-					if will_cost <= pcs_willpwr:
-						act 'No (<<will_cost>> Willpower)':
-							*clr & cla
-							gs 'willpower', 'pay', 'resist'
-							minut += 5
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
-							'You step back to create some space between the two of you and look around before looking to him. "I would like to, but with what we just did, if we walk off together.... Well... you know what everyone will think and then they''ll start talking about me at school and I don''t want to get a reputation. I''m sorry."'
-							'He looks disappointed at first, but then smiles. "Yeah, I get it. If you''re not comfortable, it''s not a problem. I need to get something to drink." He walks away while trying to hide his erection.'
-							act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-						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>'
-					end	
+					act 'Makeout':
+						*clr & cla
+						minut += 15
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_kiss.jpg"></center>'
+						'He suddenly turns you around and starts kissing you passionately on the lips as you feel his hard-on pressing against your stomach. After several minutes of making out, he breaks the kiss. "Let''s go somewhere more private..."'
+						gs 'arousal', 'kiss', 5, 'inhibition'
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Go with him': gt 'pav_discoev1', 'marcus'
+						gs 'willpower', 'sex', 'resist', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'No (<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'pay', 'resist'
+								minut += 5
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
+								'You step back to create some space between the two of you and look around before looking to him. "I would like to, but with what we just did, if we walk off together.... Well... you know what everyone will think and then they''ll start talking about me at school and I don''t want to get a reputation. I''m sorry."'
+								'He looks disappointed at first, but then smiles. "Yeah, I get it. If you''re not comfortable, it''s not a problem. I need to get something to drink." He walks away while trying to hide his erection.'
+								act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+							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>'
+						end	
+					end
 				end
+			else
+				'He lets you grind against him for a little bit before he steps back, grabs you by the hand and turns you around to face him. He goes back to dancing with you, but he keeps it friendly. After a few minutes he steps away and stops dancing. "I need a drink, but I had fun dancing. Maybe we can do it again later?" he asks with a smile before walking away.'
+				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			end
-		else
-			'He lets you grind against him for a little bit before he steps back, grabs you by the hand and turns you around to face him. He goes back to dancing with you, but he keeps it friendly. After a few minutes he steps away and stops dancing. "I need a drink, but I had fun dancing. Maybe we can do it again later?" he asks with a smile before walking away.'
-			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		end
 	end
 end
@@ -591,7 +749,7 @@ if $ARGS[0] = 'andrey_stasya':
 						act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 					end
 				end
-			elseif grupTipe = 5
+			elseif grupTipe = 5:
 				'When you get near them, they turn away from you and start dancing even closer together, obviously wanting nothing to do with you.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			elseif npc_rel['A147'] <= 20 or npc_rel['A139'] <= 20 and fame['pav_slut'] < 250:
@@ -676,14 +834,16 @@ end
 
 if $ARGS[0] = 'mefodiy':
 	*clr & cla
+	minut += 15
 	gs 'npc_relationship', 'modify', 'A148', 'like'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 	if rand(1,4) = 1:
 		'You see Mefodiy on the dance floor alone. He''s usually dancing with a random girl, so now''s a rare chance to dance with him.'
 		act 'Do something else': gt 'pav_disco', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 			if grupTipe = 1:
 				'You approach Mefodiy and he greets you with a warm smile. "Fancy a dance <<pcs_firstname>>?"'
 			elseif grupTipe = 2:
@@ -706,12 +866,14 @@ if $ARGS[0] = 'mefodiy':
 		act 'Hang out with him':
 			*clr & cla
 			minut += 15
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 			'You walk towards him as he spots you and turns his attention toward you.'
 			act 'Do something else': gt 'pav_disco', 'classmates'
 			act 'Ask him to dance':
 				*clr & cla
 				minut += 15
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 				if grupTipe = 1:
 					'You ask Mefodiy if he''ll join you for a dance and he greets you with a warm smile. "Of course <<pcs_firstname>>."'
@@ -729,9 +891,10 @@ if $ARGS[0] = 'mefodiy':
 					act 'Go dancing': gt 'pav_disco_coolkids', 'mefodiy_dance'
 				end
 			end
-			act 'Ask him why he never has a girlfriend':
+			act 'Ask why he never has a girlfriend':
 				*clr & cla
 				minut += 15
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 				'"Well aren''t you observant?" he says. "Truth is I''m just not in a hurry to find someone special. These things are controlled by fate. If it''s meant to happen, then it will and if not, well then I''ll have more time to meet people like you."'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -742,9 +905,10 @@ if $ARGS[0] = 'mefodiy':
 					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				end
 			end
-			act 'Ask him why he hates the gopniks':
+			act 'Ask why he hates the gopniks':
 				*clr & cla
 				minut += 15
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 				'"They used to pick on me when I was younger for being a late developer. When you''re the smallest kid in the year, bullies single you out. I was good at avoiding them, but I ended up getting cornered by a group of them one day. Vitek was feeding off the rest of them and calling me names before he punched me really hard. I fell to the floor and he walked up about to kick me in the guts when Roman stepped between us. Vitek told him to get out of the way, but Roman just stares him down.' 
 				'It looked stupid, this little guy staring up at Vitek with Dan and Vasily flanking him but they backed down. Vitek made some excuse and walked away and I was going to thank Roman, but he just walked off with the rest of them. I still don''t know why he did it, but that''s why I don''t like the gopniks."'
@@ -762,21 +926,23 @@ end
 if $ARGS[0] = 'mefodiy_dance':
 	*clr & cla
 	minut += 15
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 	'Mefodiy grabs you by the hand and leads you right into the middle of the dance floor. He''s really good, and confident enough to match your goofiest moves. He quickly adapts to your moves, making you look far better at dancing than you are.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 	act 'Keep dancing':
 		*clr & cla
 		minut += 15
 		if pcs_mood < 95: pcs_mood += 5
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 		'You continue dancing, having fun and enjoying yourself so much that you really don''t care about those that might be watching. It really is great fun.'
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Dance closer':
 			*clr & cla
 			minut += 15
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
-			if npc_rel['148'] < 50:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
+			if npc_rel['A148'] < 50:
 				'Every attempt you make to close the distance between you is brushed off or skilfully avoided. You get the hint and just dance normally.'
 			else
 				if pcs_mood < 90:
@@ -786,6 +952,7 @@ if $ARGS[0] = 'mefodiy_dance':
 				end
 				'Mefodiy is overly flirtatious in reaction to your moves. You realise it as fake, but also funny and react by being overly dramatic in your advances until both of you are too busy laughing to carry on dancing.'
 			end
+			gs 'stat'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		end
 	end
@@ -996,7 +1163,9 @@ if $ARGS[0] = 'igor_dance':
 		end
 	end
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_coolkids', 'igor_dance'
+	if hour >= 20:
+		act 'Keep dancing': gt 'pav_disco_coolkids', 'igor_dance'
+	end
 end
 
 if $ARGS[0] = 'bella':
@@ -1236,7 +1405,9 @@ if $ARGS[0] = 'sonia_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_sveta_dance.jpg"></center>'
 	'You and Sonia move out onto the dance floor and start dancing together. She seems to be really enjoying herself, laughing and dancing with lots of energy and doesn''t seem to care what anyone thinks. She just wants to have fun.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_coolkids', 'sonia_dance'
+	if hour >= 20:
+		act 'Keep dancing': gt 'pav_disco_coolkids', 'sonia_dance'
+	end
 end
 
 if $ARGS[0] = 'sonia_outcast':
@@ -1440,10 +1611,95 @@ if $ARGS[0] = 'natasha':
 	*clr & cla
 	minut += 15
 	gs 'npc_relationship', 'modify', 'A16', 'like'
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big16.jpg"></center>'
+	gs 'stat'
+	if rand(1,4) >= 3:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/natasha_dance.jpg"></center>'
+		'You see Natasha out on the dance floor. She''s wearing a somewhat nice dress, but it pales in comparison to what the other girls are wearing. She does dance fairly well though.'
+		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+		act 'Go out on the dance floor':
+			*clr & cla
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/dimka_dance.jpg"></center>'
+			if grupTipe = 5
+				'When you get near her, she gets a panicked look on her face and walks away.'
+				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+			elseif npc_rel['A16'] >= 50 and fame['pav_slut'] < 200:
+				'When Natasha sees you, she smiles warmly, waving you over. "Come dance with me, <<$pcs_nickname>>."'
+				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+				act 'Dance with her': gt 'pav_disco_coolkids', 'natasha_dance'
+			elseif npc_rel['A16'] <= 20 or fame['pav_slut'] >= 200:
+				if grupTipe = 3:
+					'Natasha isn''t really interested in dancing with you, but you persist in trying. "Hey, I''ve gotta go... do this thing. I guess I''ll see you later?" she says halfheartedly before walking away.'
+				else
+					'"Why are you even trying to dance with me? It''s not like we''re in the same social circle or something." Natasha says with a suspicious look. "So, if you could just..." She drags the last part out, expecting you to catch her drift and leave.'
+				end
+				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+			else 
+				'When Natasha sees you, she just smiles and keeps dancing. She doesn''t seem to mind dancing with you.'
+				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+				act 'Dance with her': gt 'pav_disco_coolkids', 'natasha_dance'
+			end
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big16.jpg"></center>'
+		'You see Natasha sitting at a table near the cool kids. She''s wearing a fairly nice dress, but it pales in comparison to what the other girls are wearing.'
+		if grupTipe = 5:
+			'When you get near her, she gets a panicked look on her face before she suddenly gets up and walks away.'
+			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+		elseif npc_rel['A16'] >= 50 and fame['pav_slut'] < 200:
+			if grupTipe = 3:
+				'"Hey <<$pcs_nickname>>! Have you seen this new makeup line coming out? It''s expensive, but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can''t afford nice things like this and this ends up bringing her down. You quickly change the subject and start complimenting her on her sense of style and grades and reminding her she''s a top student in school, which brings a smile to her face.'
+			else
+				'Natasha greets you with a smile as you sit down beside her. The conversation is lighthearted as you talk about your day and what goes on in the apartment complex where you both live.'
+			end
+			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+			act 'Ask her to dance':
+				*clr & cla
+				minut += 15
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big16.jpg"></center>'
+				'"Would you like to dance?" you ask with a smile.'
+				'She grins and nods her head. "Yeah, I would love to."' 
+				'The two of you then head off onto the dance floor together.'
+				act 'Go dancing': gt 'pav_disco_coolkids', 'natasha_dance'
+			end
+		elseif npc_rel['A16'] <= 20 and fame['pav_slut'] < 200:
+			if grupTipe = 3:
+				'Natasha isn''t really interested in talking to you, but you persist in trying to keep up a conversation. "Hey, I''ve gotta go... do this thing. I guess I''ll see you later?" she says halfheartedly before walking away.'
+			else
+				'"Why are you even talking to me? It''s not like we''re in the same social circle or something." Natasha says with a suspicious look. "So, if you could just..." She drags the last part out, expecting you to catch her drift and leave.'
+			end
+			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+		elseif fame['pav_slut'] >= 200:
+			'When she sees you walking over, she gives you a disgusted look. "Get away from me you disgusting slut." she says as she moves away from you.'
+			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+		else
+			'You strike up a conversation with Natasha. She seems a bit hesitant at first, but quickly engages you in some idle chatter about the other students in school and what''s been going on in Pavlovsk of late.'
+			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+			act 'Ask her to dance':
+				*clr & cla
+				minut += 15
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big16.jpg"></center>'
+				'"Would you like to dance?" you ask with a smile.'
+				'She hesitates for a moment before nodding. "Yeah, I would love to."' 
+				'The two of you then head off onto the dance floor together.'
+				act 'Go dancing': gt 'pav_disco_coolkids', 'natasha_dance'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'natasha_dance':
+	*clr & cla
+	minut += 15
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/natasha_sveta_dance.jpg"></center>'
+	'You and Natasha move out onto the dance floor and start dancing together. She seems to be really enjoying herself, laughing and dancing with lots of energy and doesn''t seem to care what anyone thinks. She just wants to have fun.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-!!	if dance = 1
-!!	else
+	if hour >= 20:
+		act 'Keep dancing': gt 'pav_disco_coolkids', 'natasha_dance'
+	end
 end
 
 --- pav_disco_coolkids ---------------------------------

+ 51 - 35
locations/pav_disco_gopniks.qsrc

@@ -582,34 +582,36 @@ if $ARGS[0] = 'radomir_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/radomir_dance1.jpg"></center>'
 	'Radomir takes you out onto the dance floor and starts dancing with you. He''s a pretty good dancer and seems very confident as he moves around the dance floor. He soon dances around behind you and you feel him moving in closer behind you.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_gopniks', 'radomir_dance'
-	act 'Grind against him':
-		*clr & cla
-		gs 'fame', 'pav', 'sex', 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/radomir_dance2.jpg"></center>'
-		'You back up against him and start grinding your ass against his crotch. He returns the favor and puts his hands on your hips as the two of you dance dirty in front of everyone. He then nuzzles your neck while whispering in your ear. "Why don''t we blow this place, so you can blow me?" He says it more like a statement than a question.'
-		gs 'arousal', 'foreplay', 10, 'inhibition'
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Go off together': gt 'pav_discoev1', 'radomir'
-		gs 'willpower', 'sex', 'resist', 'medium'
-		if will_cost <= pcs_willpwr:
-			act 'No (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'pay', 'resist'
-				minut += 5
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
-				'You pull away from him and turn around to face him. "No, I''m not that kind of girl."'
-				'He laughs. "Every girl is that kind of girl, some of them just don''t know it yet. Some come on baby."'
-				'You shake your head and start walking away. "I said no!"'
-				'You hear him laugh behind you. "You''ll be back sooner or later."'
-				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			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>'
-		end	
+	if hour >= 20:
+		act 'Keep dancing': gt 'pav_disco_gopniks', 'radomir_dance'
+		act 'Grind against him':
+			*clr & cla
+			gs 'fame', 'pav', 'sex', 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/radomir_dance2.jpg"></center>'
+			'You back up against him and start grinding your ass against his crotch. He returns the favor and puts his hands on your hips as the two of you dance dirty in front of everyone. He then nuzzles your neck while whispering in your ear. "Why don''t we blow this place, so you can blow me?" He says it more like a statement than a question.'
+			gs 'arousal', 'foreplay', 10, 'inhibition'
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Go off together': gt 'pav_discoev1', 'radomir'
+			gs 'willpower', 'sex', 'resist', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'No (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					minut += 5
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
+					'You pull away from him and turn around to face him. "No, I''m not that kind of girl."'
+					'He laughs. "Every girl is that kind of girl, some of them just don''t know it yet. Some come on baby."'
+					'You shake your head and start walking away. "I said no!"'
+					'You hear him laugh behind you. "You''ll be back sooner or later."'
+					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+				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>'
+			end	
+		end
 	end
 end
 
@@ -1033,7 +1035,9 @@ if $ARGS[0] = 'lavrenti_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/school_kids/lavrenti_dance1.jpg"></center>'
 	'Lavrenti leads you out onto the dance floor and you start dancing together. He''s a very good dancer and you can''t help but wonder if he''s had dance lessons at some point in his life. The two of you enjoy your time dancing together.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_gopniks', 'lavrenti_dance'
+	if hour >= 20:
+		act 'Keep dancing': gt 'pav_disco_gopniks', 'lavrenti_dance'
+	end
 end
 
 if $ARGS[0] = 'pauline':
@@ -1161,7 +1165,9 @@ if $ARGS[0] = 'lena_lera':
 			elseif npc_rel['A20'] >= 50 and npc_rel['A21'] >= 50 and fame['pav_slut'] < 300:		
 				'As you approach them, they smile at you and keep dancing, but make room for you to join them.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
+				if hour >= 20:
+					act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
+				end
 			elseif npc_rel['A20'] <= 20 or npc_rel['A21'] <= 20 and fame['pav_slut'] < 300:
 				'As you approach them, they give you dirty looks before turning away from you and dancing closer together, making it clear you''re not welcome.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -1171,7 +1177,9 @@ if $ARGS[0] = 'lena_lera':
 			else 
 				'As you approach them, they exchange a look and keep dancing. They don''t seem to be inviting you to join them, but also don''t seem to be turning you away either.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
+				if hour >= 20:
+					act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
+				end
 			end
 		end
 	else
@@ -1315,7 +1323,9 @@ if $ARGS[0] = 'lena_lera_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lena_lera_dance2.jpg"></center>'
 	'The three of you dance together. Lena seems interested in getting the boys attention by any means possible, even if it means dancing close with you or Lera and even trading a few kisses with Lera when some boys start paying attention. Lera on the other hand seems mostly interested in dancing with Lena and happily trades kisses with her. They don''t exclude you from dancing with them, but you don''t feel like you belong either.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
+	if hour >= 20:
+		act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
+	end
 end
 
 if $ARGS[0] = 'nush':
@@ -1338,7 +1348,9 @@ if $ARGS[0] = 'nush':
 				'You laugh. "Yeah, I''m here now slut."'
 				'She giggles. "Fuck you and shake that money maker!" The two of you dance together, surrounded by guys trying to get in on the action.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				act 'Keep dancing with her': gt 'pav_disco_gopniks', 'anushka_dance'
+				if hour >= 20:
+					act 'Keep dancing with her': gt 'pav_disco_gopniks', 'anushka_dance'
+				end
 			elseif npc_rel['A144'] <= 20 and fame['pav_slut'] < 500:
 				'You think she''s seen you as you approach, but she turns away and starts dancing with one of the guys crowding her.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -1352,7 +1364,9 @@ if $ARGS[0] = 'nush':
 				'You smile at her. "Just came to dance and have fun."'
 				'She grins. "Then shake that money maker girl!" The two of you dance together, surrounded by guys trying to get in on the action.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				act 'Keep dancing with her': gt 'pav_disco_gopniks', 'anushka_dance'
+				if hour >= 20:
+					act 'Keep dancing with her': gt 'pav_disco_gopniks', 'anushka_dance'
+				end
 			end
 		end
 	else
@@ -1714,7 +1728,9 @@ if $ARGS[0] = 'alyona_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/school_kids/alyona_dance2.jpg"></center>'
 	'The two of you dance together, but she doesn''t seem to be aware that you''re there most of the time and just dances like she''s the only one on the dance floor. She doesn''t seem to care though.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_gopniks', 'alyona_dance'
+	if hour >= 20:
+		act 'Keep dancing': gt 'pav_disco_gopniks', 'alyona_dance'
+	end
 end
 
 

+ 45 - 40
locations/pav_disco_jocks.qsrc

@@ -17,7 +17,9 @@ if $ARGS[0] = 'lazar':
 				'You move out onto the dance floor and he smiles as you approach. "Come to have a little fun, huh?"'
 				'You nod your head and join the group dancing.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				act 'Keep dancing': gt 'pav_disco_coolkids', 'lazar_dance'
+				if hour >= 20:
+					act 'Keep dancing': gt 'pav_disco_jocks', 'lazar_dance'
+				end
 			elseif grupTipe = 5:
 				'He laughs as you get close. "Get lost loser." he scoffs before turning his back on you.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -123,7 +125,9 @@ if $ARGS[0] = 'lazar_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lazar_dance1.jpg"></center>'
 	'You and Lazar start dancing together. He''s a very good dancer for a boy, likely due to his natural athletic talents and well toned body. He seems to be enjoying dancing with you as much as you like dancing with him. Several songs go by as the two of you keep dancing - he seems to have endless endurance.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_jocks', 'lazar_dance'
+	if hour >= 20:
+		act 'Keep dancing': gt 'pav_disco_jocks', 'lazar_dance'
+	end
 end
 
 if $ARGS[0] = 'ivan':
@@ -186,14 +190,11 @@ if $ARGS[0] = 'ivan':
 end
 
 if $ARGS[0] = 'fedor':
-!!{
-	if $loc = 'pav_disco' and rand (1,6) = 1:
-		*clr & cla
-		minut += 15
-		gs 'npc_relationship', 'modify', 'A5', 'like'
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
-		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	end}
+	*clr & cla
+	minut += 15
+	gs 'npc_relationship', 'modify', 'A5', 'like'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
+	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 end
 
 if $ARGS[0] = 'svyatoslav':
@@ -297,7 +298,9 @@ if $ARGS[0] = 'svyatoslav_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/svyatoslav_dance2.jpg"></center>'
 	'You and Svyatoslav start dancing. He''s a decent dancer who lacks the rhythm of some of the other boys, but makes up for in enthusiasm. The two of you dance away, not caring what the others think.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_jocks', 'svyatoslav_dance'
+	if hour >= 20:
+		act 'Keep dancing': gt 'pav_disco_jocks', 'svyatoslav_dance'
+	end
 end
 
 if $ARGS[0] = 'vanya':
@@ -380,16 +383,16 @@ if $ARGS[0] = 'albina':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
-			if (grupeTipe = 1 or grupeTipe = 2) and npc_rel[A23] >= 70:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
+			if (grupeTipe = 1 or grupeTipe = 2) and npc_rel['A23'] >= 70:
 				'You walk over to Albina and she gives you a smile. "<<$pcs_nickname>>, I didn''t know you were here! Come and dance with me!"'
-			elseif AlbQW['Friends'] = 2:
+			elseif AlbinaQW['Friends'] = 2:
 				'You walk over to Albina and she couldn''t be any happier to see you. She embraces you in a tight hug and you catch a scent of what you assume is some rather expensive perfume. "Come and dance with me, <<$pcs_nickname>>. Let''s show these amateurs what real dancing actually looks like!"'
 			else
 				'You walk over to Albina, but she scoffs and rudely dismisses you before you even get a chance to open your mouth.'
 			end
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			if (grupeTipe = 1 or grupeTipe = 2) and npc_rel[A23] >= 70 or AlbQW['Friends'] = 2:
+			if (grupeTipe = 1 or grupeTipe = 2) and npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
 				act 'Dance with her': gt 'pav_disco_jocks', 'albina_dance'
 			end
 		end
@@ -402,8 +405,8 @@ if $ARGS[0] = 'albina':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 			if grupTipe = 5:
-				'Albina just laughs loudly as you approach her. "Why are <i>you</i> here? Go hang out with the other losers somewhere else." she taunts before moving away and dancing with her friends.'
-			elseif (grupeTipe = 1 or grupeTipe = 2) and npc_rel['A23'] >= 70 or AlbQW['Friends'] = 2:	
+				'Albina just laughs loudly as you approach her. "Why are <i>you</i> here? Go hang out with the other losers somewhere else." she taunts before getting up and going to dance with her friends.'
+			elseif (grupeTipe = 1 or grupeTipe = 2) and npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:	
 				'"What''s up Albina?" you ask as you approach and take a seat next to her.'
 				'She smiles at you. "Oh you know, just letting my hair down and having some fun. What about you?"'
 				'"Same. Just enjoying the night." you reply and she smiles at you again.'
@@ -416,7 +419,7 @@ if $ARGS[0] = 'albina':
 				end
 			elseif fame['pav_slut'] >= 250:
 				'Albina seems a little surprised at your presence. "Why are <i>you</i> here? Do you enjoy all the boys wanting a piece of you like you''re just some fuck toy to them?"'
-				'Before you can react, Albina stands up and waves you aside before walking away. "You know what, I don''t fucking care. I''m sure you''ll find plenty of dicks to suck here, so why don''t you go find one or two?"'
+				'Before you can react, Albina stands up and waves you aside before walking away. "You know what, I don''t fucking care. I''m sure you''ll find plenty of dicks to suck here, so why don''t you go and find one or two?"'
 				'You could clearly hear the disappointment in her voice, but you think she also felt pity towards you at the same time.'
 			else 
 				'"Hey Albina, what''s up?" you ask as you approach.'
@@ -427,15 +430,15 @@ if $ARGS[0] = 'albina':
 				*clr & cla
 				minut += 15
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-				if (grupeTipe = 1 or grupeTipe = 2) and npc_rel['A23'] >= 70 or AlbQW['Friends'] = 2:
-				  'Albina smiles and accepts your offer to dance. She gets and grabs your hand before leading you out to the dance floor.'
+				if (grupeTipe = 1 or grupeTipe = 2) and npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
+				  'Albina smiles and accepts your offer to dance. She gets up and grabs your hand before leading you out to the dance floor.'
 					act 'Go dancing': gt 'pav_disco_jocks', 'albina_dance'
 				else
 					'Albina looks you over with a hint of contempt on her face before standing up and going to dance with her friends.'
 					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				end
 			end
-			if (grupeTipe = 1 or grupeTipe = 2) and npc_rel['A23'] >= 70 or AlbQW['Friends'] = 2:
+			if (grupeTipe = 1 or grupeTipe = 2) and npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
 				act 'Chat':
 					*clr & cla
 					minut += 15
@@ -466,19 +469,19 @@ end
 if $ARGS[0] = 'albina_dance':
 	*clr & cla
 	minut += 15
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 	'You go out onto the dance floor and start dancing with Albina.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 	act 'Keep dancing':
 		*clr & cla
 		minut += 15
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 		'You continue dancing with Albina, and you both seem to be enjoying yourselves. Albina is dancing in an ever increasingly erotic manner. She sways her hips and wiggles her ass for all to see, and seems to enjoy the attention that comes with being the best dancer present.'
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Keep dancing':
 			*clr & cla
 			minut += 15
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 			if npc_sex['A23'] >= 1:
 				'You continue to dance with Albina, who smiles at you and pulls you in closer into a seductive dance. Her tight fitting dress is accenting her curves rather well, and you find your hands roaming over her body as she erotically dances in front of you, her ass slowly grinding against you. She seemingly doesn''t care about you feeling her up and encourages you to continue.'
 			else
@@ -488,7 +491,7 @@ if $ARGS[0] = 'albina_dance':
 			act 'Keep dancing':
 				*clr & cla
 				minut += 15
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 				if npc_sex['A23'] >= 1:
 					'When the song ends, Albina looks back at you and winks. "That was hot <<$pcs_nickname>>, but I need to go and sit down for a bit and have a drink." She excuses herself and walks away with a seductive sway in her hips directed at you, leaving you standing in the middle of the dance floor feeling a little flustered.'
 				else
@@ -510,7 +513,7 @@ if $ARGS[0] = 'christina':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 			if christinaQW['subpath'] >= 2:
 				'You hesitantly approach Christina, knowing how volatile she can be.'
 				'As soon as she sees you she calls out "Hey, bitch! Get over here and dance with me."'
@@ -693,14 +696,14 @@ if $ARGS[0] = 'christina_dance':
 				!!act 'Follow her': gt '', ''
 			end
 		else
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 			minut += 15
 			gs 'stat'
 			'The two of you start dancing, separately at first, before she starts sliding closer to you. Getting behind you, she wraps an arm around your waist and begins grinding her crotch up against your ass. You dance together like this for a while.'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Keep dancing':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 				minut += 15
 				gs 'stat'
 				'Surrendering yourself to the music, you dance in sync with Christina. She holds onto you possesively, making it clear to any boys watching that you belong to her.'
@@ -711,7 +714,7 @@ if $ARGS[0] = 'christina_dance':
 			end
 		end
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 		minut += 15
 		gs 'stat'
 		if $pantyworntype = 'none' and PCloSkirt > 2:
@@ -719,7 +722,7 @@ if $ARGS[0] = 'christina_dance':
 			'You start dancing with Christina and you both have a good time, twisting in sync with the music and each other. Knowing that anybody watching will catch glimpses of your bare ass peeking out of your skirt fills you with excitement.'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Keep dancing':
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 				inhib_exp += 1
 				minut += 15
 				gs 'stat'
@@ -732,7 +735,7 @@ if $ARGS[0] = 'christina_dance':
 			'You start dancing with Christina and you both have a good time, twisting in sync with the music and each other.'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Keep dancing':
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 				minut += 15
 				gs 'stat'
 				'The two of you bounce in tune with the music, having a great time.'
@@ -753,7 +756,7 @@ if $ARGS[0] = 'lariska':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 			if npc_rel['A13'] >= 50 and fame['pav_slut'] < 200:
 				'She sees you coming and dances her way to you.'
 				'"Hey, <<$pcs_nickname>>. Dance with me."'
@@ -761,8 +764,10 @@ if $ARGS[0] = 'lariska':
 				act 'Dance with her': gt 'pav_disco_jocks', 'lariska_dance'
 			elseif npc_rel['A13'] <= 20 and fame['pav_slut'] < 200:
 				'She sees you coming over and disappears into the crowd. She apparently doesn''t like you.'
+				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			elseif fame['pav_slut'] >= 200:
 				'She takes one disgusted look at you. "Hell, no. Go suck a cock."'
+				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			else
 				'She lets you approach her, not really making any effort to encourage or avoid you. After giving you a polite smile, she continues dancing.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -832,7 +837,7 @@ if $ARGS[0] = 'lariska_dance':
 	if $pantyworntype = 'none' and PCloSkirt > 2: inhib_exp += 1
 	minut += 15
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 	'Dancing with her, you notice several guys hungrily eyeing the two of you. She doesn''t seem to be paying attention though, and you try not to think about it yourself and let loose a little.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 	act 'Keep dancing':
@@ -840,7 +845,7 @@ if $ARGS[0] = 'lariska_dance':
 		if $pantyworntype = 'none' and PCloSkirt > 2: inhib_exp += 1
 		minut += 15
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 		'As the two of you dance, she keeps sliding closer and closer to you, staring straight into your eyes. You have a funny feeling that if you weren''t surrounded by a lot of people, she was going to kiss you.'
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Keep dancing':
@@ -848,7 +853,7 @@ if $ARGS[0] = 'lariska_dance':
 			if $pantyworntype = 'none' and PCloSkirt > 2: inhib_exp += 1
 			minut += 15
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 			'She begins to rub against you, almost shyly, probably not even aware she''s doing it. You respond by grinding back, making her cheeks flush as she realizes what she was doing, surrounded by strangers.'
 			'She suddenly mumbles something about needing fresh air and runs off, much to the chagrin of the boys watching you.'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -866,7 +871,7 @@ if $ARGS[0] = 'lina':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			if npc_rel['A19'] >= 50 and fame['pav_slut'] < 200:
 				'As you get closer to Lina, she sees you and calls you out. "<<$pcs_nickname>>! Come dance with me!"'
@@ -886,7 +891,7 @@ if $ARGS[0] = 'lina':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Hang out with her':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			if npc_rel['A19'] >= 50 and fame['pav_slut'] < 200:
 				'"Hey <<$pcs_nickname>>. How''s it going?"'
@@ -966,7 +971,7 @@ if $ARGS[0] = 'lina_dance':
 	if $pantyworntype = 'none' and PCloSkirt > 2: inhib_exp += 1
 	minut += 15
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 	'You spend some time dancing with Lina. She seems to enjoy dancing, her face lit in a bright smile, even laughing when one of you tries a risky dance move.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 	act 'Keep dancing':
@@ -974,7 +979,7 @@ if $ARGS[0] = 'lina_dance':
 		if $pantyworntype = 'none' and PCloSkirt > 2: inhib_exp += 1
 		minut += 15
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 		'The two of you tear up the dance floor, having a great time. As more time passes, her dance moves get trickier, and more daring.'
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Keep dancing':
@@ -982,7 +987,7 @@ if $ARGS[0] = 'lina_dance':
 			if $pantyworntype = 'none' and PCloSkirt > 2: inhib_exp += 1
 			minut += 15
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 			'She finally gets too daring, and during one particular move, her skirt flips all the way up, giving everybody watching a good look at her rather tight panties.'
 			'She freezes, realizing everybody can see the outline of her pussy and panics. She flees the dance floor, mumbling something to you about the bathroom.'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'

+ 4 - 0
locations/pav_industrial.qsrc

@@ -73,6 +73,10 @@ else
 	*pl 'The local G&M store is currently closed. Opening hours are Monday to Friday, between 08:00 to 20:00.'
 end
 
+if (week = 7 and hour >= 14 and hour < 20) or (week = 6 and hour >= 12 and hour < 17) and lari_gm ! daystart:
+	if rand(0, 3) = 0: 'You see <a href="exec: gt ''gschool_socialchg1'',''lariska_gm_1''">Lariska</a> going inside the G&M store.'
+end
+
 act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pav_complex', 'start'
 act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
 act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'

+ 8 - 8
locations/praiders_garage.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0] = 'band_garage':
 		end
 	else
 		'<center>Five Eight Estate - Garages</center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garages.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/garages.jpg"></center>'
 		'You go to the garage and find it locked up, you can''t hear any noise from inside. It looks like no one is currently here.'
 		act 'Leave':gt 'pav_complex', 'garages'
 	end
@@ -130,7 +130,7 @@ if $ARGS[0] = 'listen_practice':
 						gs 'npc_relationship', 'modify', 'A154', 'dislike'
 						'<center><img src="images/characters/shared/headshots_main/big144.jpg"></center>'
 						'Anushka did great despite what happened and you decided to tell her. "Anushka you were great." You tell her.'
-						'She smiles to you. "Thanks <<pcs_nickname>>, but we need to do better if we want to make it."'
+						'She smiles to you. "Thanks <<$pcs_nickname>>, but we need to do better if we want to make it."'
 						'Radomir mutters "Yeah, if you would focus and stop screwing up." Which causes her to flip him off. Radomir smirks at the reaction as he grabs a beer. "Maybe later, but thanks for the offer."'
 						'Anushka gives him a dirty look and sits on the other end of the couch from Valentin. While Radomir sits down on his recliner, with Arkadi taking a seat on a upturned box.'
 						act 'leave': gt 'pav_complex', 'garages'
@@ -142,7 +142,7 @@ if $ARGS[0] = 'listen_practice':
 						gs 'npc_relationship', 'modify', 'A158', 'like'
 						'<center><img src="images/characters/shared/headshots_main/big158.jpg"></center>'
 						'Valentin did great despite what happened and you decided to tell him. "Valentin you were great." You tell him.'
-						'He smiles to you. "Thanks <<pcs_nickname>>, but we need to work out some kinks still."'
+						'He smiles to you. "Thanks <<$pcs_nickname>>, but we need to work out some kinks still."'
 						'Radomir mutters "Yeah, if the rest of you would get your act together." Which Valentin just ignores. Radomir grabs a beer and sits down on his recliner, with the rest spreading out.'
 						act 'leave': gt 'pav_complex', 'garages'
 						act 'Hangout': gt 'praiders_garage', 'hangout'
@@ -153,7 +153,7 @@ if $ARGS[0] = 'listen_practice':
 						gs 'npc_relationship', 'modify', 'A156', 'like'
 						'<center><img src="images/characters/shared/headshots_main/big156.jpg"></center>'
 						'Arkadi did great despite what happened and you decided to tell him. "Arkadi you were great." You tell him.'
-						'He nods to you. "Thanks <<pcs_nickname>>, but we still got a long ways to go."'
+						'He nods to you. "Thanks <<$pcs_nickname>>, but we still got a long ways to go."'
 						'Radomir mutters "Yeah, you keep banging and banging on your drums like a amateur..."'
 						'Which causes Arkadi to turn on Radomir. "How about I bang on you with my fists."'
 						'Valentin grabs Arkadi by the arm. "Come on leave it man, you know how he gets."'
@@ -239,7 +239,7 @@ if $ARGS[0] = 'listen_practice':
 						gs 'npc_relationship', 'modify', 'A154', 'dislike'
 						'<center><img src="images/characters/shared/headshots_main/big144.jpg"></center>'
 						'The whole band was great but you felt Anushka really did amazing. "Anushka you were amazing, the whole band did great." You tell her.'
-						'She smiles to you. "Thanks <<pcs_nickname>>, we really did tonight." With that Anushka, Valentin and Arkadi crowd the couch, while, Radomir sits on the only reclining chair. They grab some beers, all smiling and laughing as they take a seat among those listening to them practice today.'
+						'She smiles to you. "Thanks <<$pcs_nickname>>, we really did tonight." With that Anushka, Valentin and Arkadi crowd the couch, while, Radomir sits on the only reclining chair. They grab some beers, all smiling and laughing as they take a seat among those listening to them practice today.'
 						act 'leave': gt 'pav_complex', 'garages'
 						act 'Hangout': gt 'praiders_garage', 'hangout'
 					end
@@ -249,7 +249,7 @@ if $ARGS[0] = 'listen_practice':
 						gs 'npc_relationship', 'modify', 'A158', 'like'
 						'<center><img src="images/characters/shared/headshots_main/big158.jpg"></center>'
 						'The whole band was great but you felt Valentin really did amazing. "Valentin you were amazing, the whole band did great." You tell him.'
-						'He smiles to you. "Thanks <<pcs_nickname>>, we was just on tonight, in the zone, it was great." With that Anushka, Valentin and Arkadi crowd the couch, while, Radomir sits on the only reclining chair. They grab some beers, all smiling and laughing as they take a seat among those listening to them practice today.'
+						'He smiles to you. "Thanks <<$pcs_nickname>>, we was just on tonight, in the zone, it was great." With that Anushka, Valentin and Arkadi crowd the couch, while, Radomir sits on the only reclining chair. They grab some beers, all smiling and laughing as they take a seat among those listening to them practice today.'
 						act 'leave': gt 'pav_complex', 'garages'
 						act 'Hangout': gt 'praiders_garage', 'hangout'
 					end
@@ -341,7 +341,7 @@ if $ARGS[0] = 'listen_practice':
 						gs 'npc_relationship', 'modify', 'A154', 'dislike'
 						'<center><img src="images/characters/shared/headshots_main/big144.jpg"></center>'
 						'The whole band was great but you felt Anushka really did amazing. "Anushka you were amazing, the whole band did great." You tell her.'
-						'She smiles to you. "Thanks <<pcs_nickname>>, we really did tonight." With that Anushka, Valentin and Arkadi crowd the couch, while, Radomir sits on the only reclining chair. They grab some beers, all smiling and laughing as they take a seat among those listening to them practice today.'
+						'She smiles to you. "Thanks <<$pcs_nickname>>, we really did tonight." With that Anushka, Valentin and Arkadi crowd the couch, while, Radomir sits on the only reclining chair. They grab some beers, all smiling and laughing as they take a seat among those listening to them practice today.'
 						act 'leave': gt 'pav_complex', 'garages'
 						act 'Hangout': gt 'praiders_garage', 'hangout'
 					end
@@ -351,7 +351,7 @@ if $ARGS[0] = 'listen_practice':
 						gs 'npc_relationship', 'modify', 'A158', 'like'
 						'<center><img src="images/characters/shared/headshots_main/big158.jpg"></center>'
 						'The whole band was great but you felt Valentin really did amazing. "Valentin you were amazing, the whole band did great." You tell him.'
-						'He smiles to you. "Thanks <<pcs_nickname>>, we was just on tonight, in the zone, it was great." With that Anushka, Valentin and Arkadi crowd the couch, while, Radomir sits on the only reclining chair. They grab some beers, all smiling and laughing as they take a seat among those listening to them practice today.'
+						'He smiles to you. "Thanks <<$pcs_nickname>>, we was just on tonight, in the zone, it was great." With that Anushka, Valentin and Arkadi crowd the couch, while, Radomir sits on the only reclining chair. They grab some beers, all smiling and laughing as they take a seat among those listening to them practice today.'
 						act 'leave': gt 'pav_complex', 'garages'
 						act 'Hangout': gt 'praiders_garage', 'hangout'
 					end

+ 1 - 1
locations/scandalicious.qsrc

@@ -134,7 +134,7 @@ if $ARGS[0] = 'dresses':
 				end
 			end
 			i += 1
-		if i <= 50:jump 'loopscandalicious_dress'
+		if i <= 100:jump 'loopscandalicious_dress'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality1'
 end
 

+ 1 - 11
locations/sewing.qsrc

@@ -12,6 +12,7 @@ if $ARGS[0] = 'start':
 	else
 		'You have no fabric left to use as material.'
 	end
+	if pcs_sewng > 50 and tkan >= 1: 'You can resize your own clothing when viewing items in the wardrobe list <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">here</a>.'
 	act 'Leave':gt $loc, $loc_arg
 	act 'Practice sewing (0:30)':
 		minut += 30
@@ -68,17 +69,6 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	act 'Resize some of your clothes':
-		if tkan < 1:
-			msg'You don''t have any sewing materials left to do this. Maybe you should buy some more.'
-		else
-			if pcs_sewng < 50:
-				msg 'You aren''t good enough at sewing to do this.'
-			else
-				gt 'clothing', 'view_clothing_list', 'resize'
-			end
-		end
-	end
 end
 			
 --- sewing ---------------------------------

+ 3 - 3
locations/shoe_description2.qsrc

@@ -51,11 +51,11 @@ end
 
 *nl
 
-if ShoStlye = 1:
+if ShoStyle = 1:
 	'These shoes are considered stripper shoes.'
-elseif ShoStlye = 2:
+elseif ShoStyle = 2:
 	'These shoes are considered bimbo shoes.'
-elseif ShoStlye = 3:
+elseif ShoStyle = 3:
 	'These shoes are considered alternative shoes.'
 end
 

+ 1 - 1
locations/shulgahome.qsrc

@@ -25,7 +25,7 @@ elseif hour >= 16 and hour <= 19:
 	'When you ring the doorbell,<<$serg_obr>> Sergey comes to answer the door.'
 	'"Oh, hello <<$pcs_nickname>>," he shrugs. "If you''re looking for Vasily, he''s not here, and I don''t know when he''ll be back."'
 	if npc_rel['A112'] >=30: 'He offers, "You can come in anyway, if you want?"' & act 'Enter':gt 'shulgahall'
-elseif week = 5 or week = 6 and hour >= 20:
+elseif (week = 5 or week = 6) and hour >= 20:
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/serge/serge2.jpg"></center>'
 	'When you ring the doorbell,<<$serg_obr>> Sergey comes to answer the door.'
 	'"Oh, hello <<$pcs_nickname>>," he shrugs. "If you''re looking for Vasily, he''s not here. He''s probably at the disco with everyone else."'

+ 18 - 10
locations/sitrPar.qsrc

@@ -16,7 +16,11 @@ if $ARGS[0] = '':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Living Room</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
+	if momloc = 19 and sdadloc = 10:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/momvladTV.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
+	end
 	''
 	'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a>, which is near the window. In front of the TV is a <a href="exec:gt ''family'',''sofa''">sofa bed</a>, on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
 	*nl
@@ -84,10 +88,10 @@ if $ARGS[0] = '':
 			act 'leave': gt 'korrPar'
 		end
 		exit
-	elseif momloc = 19:
+	elseif momloc = 19 and sdadloc = 10:
 		!! Watches TV with Vladimir
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/momvladTV.jpg"></center>'
-		'As you walk into the living room, you see your <<$npc_nickname[''A29'']>> and Vladimir sitting on the couch watching TV, while Kolka sits in the armchair doing the same.'
+		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/momvladTV.jpg"></center>'
+		'As you walk into the living room, you see your <<$npc_nickname[''A29'']>> and Vladimir sitting on the couch watching TV.'
 		act 'leave':gt 'korrPar'
 		
 		act 'Join them':
@@ -98,13 +102,17 @@ if $ARGS[0] = '':
 			npc_rel['A29'] += 1
 			npc_rel['A34'] += 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familyTV.jpg"></center>'
-			'You move over to join them, and your <<$npc_nickname[''A29'']>> scoots away from Vladimir and pats the spot between her and him. You take a seat between them. Vlad barely even glances at you with a brief smile before he goes back to watching TV, and Kolka never even looks up. Your <<$npc_nickname[''A29'']>> pats you on the shoulder before returning her attention to the TV, apparently happy the family is spending time together.'
+			!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familyTV.jpg"></center>'
+			'You move over to join them, and your <<$npc_nickname[''A29'']>> scoots away from Vladimir and pats the spot between her and him. You take a seat between them. Vlad barely even glances at you with a brief smile before he goes back to watching TV. Your <<$npc_nickname[''A29'']>> pats you on the shoulder before returning her attention to the TV, apparently happy the family is spending time together.'
 			act 'leave':gt 'korrPar'
 			
-			act 'Keep watching':gt 'sitrPar', 'TVmom'
+			act 'Keep watching':gt 'sitrPar', 'TVfam'
 			act 'Finish watching':gt 'sitrPar', 'TVend'
-		end		
+		end
+	elseif momloc = 19:
+		!!Mom by herself watching TV
+		ocpd_room = 1
+		'As you walk into the living room, you see your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> sitting on the couch watching TV.'
 	end
 
 	if ocpd_room = 0 and breastpump = 1 and bp_unbox <= 0:
@@ -119,7 +127,7 @@ if $ARGS[0] = '':
 end
 
 
-if $ARGS[0] = 'TVmom':
+if $ARGS[0] = 'TVfam':
 	cla & *clr
 	pcs_mood += 10
 	minut += 30
@@ -127,7 +135,7 @@ if $ARGS[0] = 'TVmom':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familyTV.jpg"></center>'
 	'You continue to watch TV with the family. Everyone seems very engrossed in the program and almost never says anything, though Kolka occasionally makes a crack about what is happening, often getting shushed by Vlad or <<$npc_nickname[''A29'']>>.'
-	if momloc = 19: act'Keep watching TV with your family': gt 'sitrPar', 'TVmom'
+	if momloc = 19: act'Keep watching TV with your family': gt 'sitrPar', 'TVfam'
 	act 'Finish watching':gt 'sitrPar', 'TVend'
 end
 

+ 2 - 2
locations/soniadisco.qsrc

@@ -198,7 +198,7 @@ if $ARGS[0] = 'disco':
 		minut += 15
 		grupvalue[4] += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/gopnik/gopdrinking.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/gopdrinking.jpg"></center>'
 		'You''re not sure whether he invited you along because he wants you to come, or just because he''s afraid you would rat them out. Either way, it could be fun? You follow the guys outside, and after a few minutes, you sit down in a quiet place where several of the other gopniks already are. Vasily pours the booze, vodka as it turns out, into plastic cups and hands everyone one. Dan, Vasily and Paulina are here along with a couple of older guys you don''t know.'
 		'For the next 15 minutes, you enjoy their company, only slowly sipping the vodka and alternating it with lemonade. Sonia is not quite as careful as you and just slams down shot after shot. When the cups are empty, Vasily offers everyone a refill.'
 		gs 'willpower', 'drink', 'resist'
@@ -329,7 +329,7 @@ if $ARGS[0] = 'peerpressure':
 		if $soniadisco_peerpressuretrigger = 'cautionsonia':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/soniadrink.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/gopnik/gopdrinking.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/gopdrinking.jpg"></center>'
 		end
 	elseif soniafall = 3:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/panties1.jpg"></center>'

+ 6 - 1
locations/spellList.qsrc

@@ -632,7 +632,12 @@ if $ARGS[0] = 'act learn':
 	if pcs_mana >= 1000:
 		pcs_mana -= 1000
 		minut += 60
-		spellLearn[$ThisSpellName] += rand(1, 100/spellDifficulty)
+		!Added "* (pcs_splcstng/spellDifficulty)" - if Sveta already mastered Spellcasting skill, learning new spells should be easier, and the opposite
+		if (pcs_splcstng/spellDifficulty) > 0:
+			spellLearn[$ThisSpellName] += rand(1, 100/spellDifficulty) * (pcs_splcstng/spellDifficulty)
+		else
+			spellLearn[$ThisSpellName] += rand(1, 100/spellDifficulty)
+		end
 
 		if spellLearn[$ThisSpellName] < 100:
 			'You diligently study the spell for an hour, but cannot grasp it.'

+ 3 - 3
locations/stat.qsrc

@@ -307,7 +307,7 @@ elseif vgape > 0:
 	if vgape - (totminut - vgape[3])/vgape[4]: vgape -= 1
 	vgape[1] = vgape
 else
-	killvar 'vgape', 3
+	vgape[3] = 0
 end
 
 !!Gaping of anus recovery time
@@ -317,10 +317,10 @@ if agape > agape[1]:
 	agape = agape[1]
 elseif agape > 0:
 	if agape - (totminut - agape[3])/agape[4]: agape -= 1
-	if agape = 0: killvar 'agape', 3
+	if agape = 0: agape[3] = 0
 	agape[1] = agape
 else
-	killvar 'agape', 3
+	agape[3] = 0
 end
 
 !!Recovery from spanking - will be superseded by pain system

+ 1 - 1
locations/tatiana_lab.qsrc

@@ -753,7 +753,7 @@ if $ARGS[0] = 'saddle':
     'Finally, the controller slips from your clenching fingers as your magical climax triggers, taking your breath and self-control away and sending wave after wave of magically enhanced pleasure pulsing through your body.'
 
 	act 'Time for a lesson':
-		if tatiana_teach_escalation < 2:
+		if pcs_vag = 0 or tatiana_teach_escalation < 2:
 			if pcs_vag ! 0: tatiana_teach_escalation += 1
 			gt 'tatiana_lab', 'lesson<<tat_lesson_number>>'
 		else

+ 17 - 13
locations/treeCircle.qsrc

@@ -47,24 +47,28 @@ $EntryPoint = $ARGS[0]
 *nl
 
 ! Determine if this user can teleport at all.
+
 canTeleport = 0
 if spellKnown['teleport'] = 1:
-	'You take the fairy''s advice and get to know this circle.'
-	minut += 15
-	if pcs_mana > spellMana['teleport']:
-		canTeleport = 1
-	else
-		*nl
-		'You feel too tired to pull off a shift right now.'
-	end
+    if tpKnown[$EntryPoint] = 0:
+        'You take the fairy''s advice and get to know this circle.'
+        minut += 15
+        ! Learn the current entry point
+        tpKnown[$EntryPoint] = 1
+    end
+    if pcs_mana > spellMana['teleport']:
+        canTeleport = 1
+    else
+        *nl
+        'You feel too tired to pull off a shift right now.'
+    end
 else
-	'You can feel something strange and powerful in this place, but you can''t quite put your finger on it.  It is intriguing though, so you take your time and look the place over to try to understand it.'
-	minut += 15
+    'You can feel something strange and powerful in this place, but you can''t quite put your finger on it.  It is intriguing though, so you take your time and look the place over to try to understand it.'
+    minut += 15
+    ! Learn the current entry point
+    tpKnown[$EntryPoint] = 1
 end
 
-! Learn the current entry point
-tpKnown[$EntryPoint] = 1
-
 gs 'treeCircActs', $EntryPoint
 
 ! Setup Actions for locations when applicable

+ 1 - 1
locations/underwear.qsrc

@@ -11,7 +11,7 @@ end
 
 if $ARGS[0] = 'remove':
 	!!check for swimwear to prevent duplicate stripping stopping Sveta putting underwear on when she puts her clothes on
-	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
+	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis' and $clothingworntype ! 'nerdvana_swimsuit' and $clothingworntype ! 'nerdvana_bikinis' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
 		if $pantyworntype = 'none':
 			panty_none = 1
 		else

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