9 Commits 24416908cf ... 4fa913e576

Author SHA1 Message Date
  KevinSmarts 4fa913e576 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 6 years ago
  Kevin_Smarts f623feace2 Merge branch 'nyanobot/cheatMenu' of nyanobot/glife into master 6 years ago
  KevinSmarts 09af25ed61 [fixed] Having limited bimbo variable to fix a different issueit was breaking the withdrawal and making it impossible to avoid. Should be fixed now. 6 years ago
  nyanobot c4aee19f63 [fixed] set floor and ceiling on attributes and skills in the cheat menu 6 years ago
  KevinSmarts 6715bd46e3 [fixed] Event system using wrong sign so only one event fired and blocking the stay late event on payday. 6 years ago
  KevinSmarts 87da09d965 [fixed] Missing subfolder in image addresses for purchases in the sexshop 6 years ago
  KevinSmarts 5edb507696 [changed] added more tattoos from nutluck 6 years ago
  KevinSmarts 63e7a070ee [Fixes] Variable still used exhib and therefore broke exercise clothing 6 years ago
  KevinSmarts 1e98887bb6 [Fixed] Increased Andreys hours so he's still about come pay time 6 years ago

+ 26 - 1
locations/Cheatmenu_din.qsrc

@@ -644,8 +644,33 @@ $cheatmenu['tatoo'] = {
 }
 
 $cheatmenu['stats'] = {
-	gs'stat'
+	gs 'stat'
 	clr
+	
+	!Set a floor and ceiling for all attributes and skills
+	loop_index = 0
+	:attr_trim_loop
+		dynamic "
+			if <<$att_name[loop_index]>>_lvl < 0: <<$att_name[loop_index]>>_lvl = 0
+			if <<$att_name[loop_index]>>_lvlst < 0: <<$att_name[loop_index]>>_lvlst = 0
+			if <<$att_name[loop_index]>>_lvl > 100: <<$att_name[loop_index]>>_lvl = 100
+			if <<$att_name[loop_index]>>_lvlst > 100: <<$att_name[loop_index]>>_lvlst = 100
+		"
+		loop_index += 1
+		if loop_index < arrsize('$att_name'): jump 'attr_trim_loop'
+	
+	loop_index = 0
+	:skill_trim_loop
+		dynamic "
+			if <<$skl_name[loop_index]>>_lvl < 0: <<$skl_name[loop_index]>>_lvl = 0
+			if <<$skl_name[loop_index]>>_lvlst < 0: <<$skl_name[loop_index]>>_lvlst = 0
+			if <<$skl_name[loop_index]>>_lvl > 100: <<$skl_name[loop_index]>>_lvl = 100
+			if <<$skl_name[loop_index]>>_lvlst > 100: <<$skl_name[loop_index]>>_lvlst = 100
+		"
+		loop_index += 1
+		if loop_index < arrsize('$skl_name'): jump 'skill_trim_loop'
+	killvar 'loop_index'
+
 	pl'<center><a href="exec:dynamic $cheatmenu"><b>Cheat menu</b></a></center>'
 	nl
 	pl 'Strength (<<stren_lvl>>): <a href="exec:stren_lvl += 1 & stren_lvlst = stren_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:stren_lvl += 5 & stren_lvlst = stren_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:stren_lvl += 10 & stren_lvlst = stren_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:stren_lvl -= 1 & stren_lvlst = stren_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:stren_lvl -= 5 & stren_lvlst = stren_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:stren_lvl -= 10 & stren_lvlst = stren_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'

+ 113 - 113
locations/_attributes_exercise.qsrc

@@ -6,244 +6,244 @@ if ARGS[1] = 1:
 	CloThinness = 5
 	CloBra = 1
 	CloPantsShortness = 1
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 2:
 	CloQuality = 3
 	CloThinness = 5
 	CloBra = 1
 	CloPantsShortness = 1
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloExhibit = 0
+	CloInhibit = 0
 elseif ARGS[1] = 4:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 4
 	CloPantsShortness = 4
-	CloExhibit = 0
+	CloInhibit = 0
 elseif ARGS[1] = 5:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 0
+	CloInhibit = 0
 elseif ARGS[1] = 6:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 1
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 7:
 	CloQuality = 5
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 4
-	CloExhibit = 15
+	CloInhibit = 15
 elseif ARGS[1] = 8:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 9:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 2
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 1
-	CloExhibit = 5
+	CloInhibit = 5
 elseif ARGS[1] = 11:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 4
-	CloExhibit = 20
+	CloInhibit = 20
 elseif ARGS[1] = 12:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
-	CloExhibit = 15
+	CloInhibit = 15
 elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 14:
 	CloQuality = 5
 	CloThinness = 5
 	CloBra = 1
 	CloPantsShortness = 1
-	CloExhibit = 5
+	CloInhibit = 5
 elseif ARGS[1] = 15:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 5
-	CloExhibit = 15
+	CloInhibit = 15
 elseif ARGS[1] = 16:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 17:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 5
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 2
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 1
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 20:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
-	CloExhibit = 5
+	CloInhibit = 5
 elseif ARGS[1] = 21:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 22:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloExhibit = 5
+	CloInhibit = 5
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloExhibit = 5
+	CloInhibit = 5
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 25:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 1
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 26:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 6
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPanties = 1
 	CloOnePiece = 1
-	CloExhibit = 15
+	CloInhibit = 15
 elseif ARGS[1] = 28:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPanties = 1
 	CloOnePiece = 1
-	CloExhibit = 15
+	CloInhibit = 15
 elseif ARGS[1] = 29:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloExhibit = 0
+	CloInhibit = 0
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
 	CloOnePiece = 1
-	CloExhibit = 30
+	CloInhibit = 30
 elseif ARGS[1] = 31:
 	CloQuality = 3
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 5
-	CloExhibit = 25
+	CloInhibit = 25
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloExhibit = 0
+	CloInhibit = 0
 elseif ARGS[1] = 33:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloPanties = 1
 	CloOnePiece = 1
-	CloExhibit = 15
+	CloInhibit = 15
 elseif ARGS[1] = 34:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloExhibit = 15
+	CloInhibit = 15
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 5
 	CloBra = 1
 	CloPantsShortness = 1
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 36:
 	CloQuality = 5
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 1
-	CloExhibit = 15
+	CloInhibit = 15
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
-	CloExhibit = 10
+	CloInhibit = 10
 elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 40:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 4
 	CloBimbo = 1
 	CloBra = 1
@@ -251,256 +251,256 @@ elseif ARGS[1] = 41:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 5
 	CloBimbo = 1
 elseif ARGS[1] = 42:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 44:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 5
+	CloInhibit = 5
 	CloPantsShortness = 1
 elseif ARGS[1] = 45:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
-	CloExhibit = 0
+	CloInhibit = 0
 	CloPantsShortness = 1
 elseif ARGS[1] = 46:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 5
+	CloInhibit = 5
 	CloPantsShortness = 1
 elseif ARGS[1] = 47:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 5
+	CloInhibit = 5
 	CloPantsShortness = 4
 elseif ARGS[1] = 48:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 49:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 50:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 51:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 52:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 53:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 54:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 55:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 56:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 5
+	CloInhibit = 5
 	CloPantsShortness = 1
 elseif ARGS[1] = 57:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 5
+	CloInhibit = 5
 	CloPantsShortness = 1
 elseif ARGS[1] = 58:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 20
+	CloInhibit = 20
 	CloPantsShortness = 5
 elseif ARGS[1] = 59:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 2
 elseif ARGS[1] = 61:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 20
+	CloInhibit = 20
 	CloPantsShortness = 5
 	CloBimbo = 1
 elseif ARGS[1] = 62:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 5
+	CloInhibit = 5
 	CloPantsShortness = 2
 elseif ARGS[1] = 63:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 64:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 0
+	CloInhibit = 0
 	CloPantsShortness = 1
 elseif ARGS[1] = 65:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
-	CloExhibit = 5
+	CloInhibit = 5
 	CloPantsShortness = 2
 elseif ARGS[1] = 66:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 0
+	CloInhibit = 0
 	CloPantsShortness = 1
 elseif ARGS[1] = 67:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 20
+	CloInhibit = 20
 	CloPantsShortness = 5
 elseif ARGS[1] = 68:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 0
+	CloInhibit = 0
 	CloPantsShortness = 1
 elseif ARGS[1] = 69:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 5
 elseif ARGS[1] = 70:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 20
+	CloInhibit = 20
 	CloPantsShortness = 5
 elseif ARGS[1] = 71:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 6
 	CloOnePiece = 1
 elseif ARGS[1] = 72:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 2
 elseif ARGS[1] = 73:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 2
 elseif ARGS[1] = 74:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 75:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 76:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 5
+	CloInhibit = 5
 	CloPantsShortness = 1
 elseif ARGS[1] = 77:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 78:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 79:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 80:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 81:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 82:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 25
+	CloInhibit = 25
 	CloPantsShortness = 5
 	CloBimbo = 1
 	CloBra = 1
@@ -508,187 +508,187 @@ elseif ARGS[1] = 83:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 84:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 0
+	CloInhibit = 0
 	CloPantsShortness = 1
 elseif ARGS[1] = 85:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 1
 elseif ARGS[1] = 86:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 0
+	CloInhibit = 0
 	CloPantsShortness = 1
 elseif ARGS[1] = 87:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 88:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 5
+	CloInhibit = 5
 	CloPantsShortness = 1
 elseif ARGS[1] = 89:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 90:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
-	CloExhibit = 5
+	CloInhibit = 5
 	CloPantsShortness = 4
 elseif ARGS[1] = 91:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 92:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 93:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 5
 elseif ARGS[1] = 94:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 5
 elseif ARGS[1] = 95:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 5
 elseif ARGS[1] = 96:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 97:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 98:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 3
 elseif ARGS[1] = 99:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 100:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 101:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 5
 elseif ARGS[1] = 102:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 103:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 104:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 15
+	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 105:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 106:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 107:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 108:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 109:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 110:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 111:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 112:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 113:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 10
+	CloInhibit = 10
 	CloPantsShortness = 1
 
 end

+ 3 - 1
locations/andrey.qsrc

@@ -8,7 +8,9 @@ if $ARGS[0] = '':
 		'You knock on Mr. Sobulyagin''s office door and when he sees you enter, his expression hardens. "What do you want?" he asks with a scowl.'
 	end
 
-	if (hour >= 18 and (week ! 5 or young_shop_salary = 0)) or hour > 18:
+	if (young_shop_work = 1 and week = 5 and hour = 20) or (young_shop_work1 = 1 and week = 7 and hour = 15) or (young_shop_work2 = 1 and week = 5 and hour = 15):
+		gs 'andrey', 'regular'
+	elseif hour >= 20 or (week > 4 and hour >= 16):
 		msg '<center>Andrew M. Sobulyagin says goodbye and leaves. His workday has ended.</center>'
 		gt 'young_shop', 'start'
 	end

+ 4 - 7
locations/cikl.qsrc

@@ -146,12 +146,10 @@ if coatH[defaultcoat] <= 0: defaultcoat = 0
 !!Bonus from clothing and shoes
 if succubusflag = 0 and $cheatBimbo ! '<b>ON</b>':
 	if bimbocl = 1:
-		bimbocl = 0
-		bimbo += 2
+		snapshotY += 2
 	end
 	if bimbosh = 1:
-		bimbosh = 0
-		bimbo += 1
+		snapshotY += 1
 	end
 else
 	bimbocl = 0
@@ -183,8 +181,7 @@ if succubusflag = 1:
 	if bimbolevel > 0 and bimbo > 0: bimbowithdrawal = 40
 elseif bimbolevel >= 1:
 !!Checks how often sex has occured in the last 24 hours and for drops in bimbo score, for calculating withdrawal
-	bimbo += ((stat['vaginal'] + stat['bj'] + stat['anal']) - snapshotX) - 3
-	if bimbo > snapshotY:
+	if 3 > snapshotY + snapshotX - (stat['vaginal'] + stat['bj'] + stat['anal']):
 		bimbowithdrawal = 0
 	else
 		bimbowithdrawal += 1
@@ -193,7 +190,7 @@ end
 
 if bimbo < 0: bimbo = 0
 snapshotX = (stat['vaginal'] + stat['bj'] + stat['anal'])
-snapshotY = bimbo
+snapshotY = 0
 
 !!------------------------------------------------------------------------------------------------------------
 !!	Exhibitionism

+ 5 - 5
locations/lover_change.qsrc

@@ -473,7 +473,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/arms/tatarm<<tatarm>>.jpg"></center>'
 						end
 					elseif randchan = 1 and tatass = 0:
-						randchan = rand(1, 24)
+						randchan = rand(1, 25)
 						!!randchan = 21
 						if tatass = 0 and tattCount < tattPrefTmpMin:
 							tatass = randchan
@@ -482,7 +482,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/ass/tatass<<tatass>>.jpg"></center>'
 						end
 					elseif randchan = 2 and tatback = 0:
-						randchan = rand(1, 56)
+						randchan = rand(1, 61)
 						!!randchan = 2
 						if tatback = 0 and tattCount < tattPrefTmpMin:
 							tatback = randchan
@@ -502,7 +502,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/belly/tatblly<<tatblly>>.jpg"></center>'
 						end
 					elseif randchan = 4 and tatbrst = 0:
-						randchan = rand(1, 10)
+						randchan = rand(1, 11)
 						!!randchan = 8
 						if tatbrst = 0 and tattCount < tattPrefTmpMin:
 							tatbrst = randchan
@@ -538,7 +538,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/foot/tatankle<<tatankle>>.jpg"></center>'
 						end
 					elseif randchan = 8 and tatleg = 0:
-						randchan = rand(1, 37)
+						randchan = rand(1, 47)
 						!!randchan = 2
 						if tatleg = 0 and tattCount < tattPrefTmpMin:
 							tatleg = randchan
@@ -565,7 +565,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/neck/tatnck<<tatneck>>.jpg"></center>'
 						end
 					elseif randchan = 11 and tatvag = 0:
-						randchan = rand(1, 47)
+						randchan = rand(1, 53)
 						!!randchan = 6
 						if tatvag = 0 and tattCount < tattPrefTmpMin:
 							tatvag = randchan

+ 5 - 5
locations/pirsingsalon.qsrc

@@ -650,7 +650,7 @@ if $ARGS[0] = 'ass':
 		:looptatass
 		*p '<a href="exec:n = <<n>> & gt ''pirsingsalon'', ''ass_get''"><img src="images/pc/body/tattoos/ass/tatass<<n>>.jpg" height="250" /></a>'
 		n += 1
-		if n <= 24:jump 'looptatass'
+		if n <= 25:jump 'looptatass'
 		*nl
 
 	else
@@ -692,7 +692,7 @@ if $ARGS[0] = 'back':
 		:looptatback
 		*p '<a href="exec:n = <<n>> & gt ''pirsingsalon'', ''back_get''"><img src="images/pc/body/tattoos/back/tatback<<n>>.jpg" height="250" /></a>'
 		n += 1
-		if n <= 56:jump 'looptatback'
+		if n <= 61:jump 'looptatback'
 		*nl
 
 	else
@@ -776,7 +776,7 @@ if $ARGS[0] = 'breast':
 		:looptatbreast
 		*p '<a href="exec:n = <<n>> & gt ''pirsingsalon'', ''breast_get''"><img src="images/pc/body/tattoos/breasts/tatbrst<<n>>.jpg" height="250" /></a>'
 		n += 1
-		if n <= 10:jump 'looptatbreast'
+		if n <= 11:jump 'looptatbreast'
 		*nl
 
 	else
@@ -944,7 +944,7 @@ if $ARGS[0] = 'leg':
 		:looptatleg
 		*p '<a href="exec:n = <<n>> & gt ''pirsingsalon'', ''leg_get''"><img src="images/pc/body/tattoos/legs/tatleg<<n>>.jpg" height="250" /></a>'
 		n += 1
-		if n <= 37:jump 'looptatleg'
+		if n <= 47:jump 'looptatleg'
 		*nl
 
 	else
@@ -1070,7 +1070,7 @@ if $ARGS[0] = 'pubic':
 		:looptatvag
 		*p '<a href="exec:n = <<n>> & gt ''pirsingsalon'', ''vag_get''"><img src="images/pc/body/tattoos/pubic/tatvag<<n>>.jpg" height="250" /></a>'
 		n += 1
-		if n <= 47:jump 'looptatvag'
+		if n <= 53:jump 'looptatvag'
 		*nl
 
 	else

+ 13 - 13
locations/sexshop.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'start':
 				lubri += portion * 5
 				money -= portion * 300
 				minut += 5
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 				'You bought some lubricant and paid the cashier.'
 			end
 
@@ -224,7 +224,7 @@ if $ARGS[0] = 'start':
 			minut += 5
 			dildo = 1
 			money -= 800
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a dildo and paid the cashier.'
 
 			act 'Move away from the counter':gt 'sexshop', 'start'
@@ -240,7 +240,7 @@ if $ARGS[0] = 'start':
 			minut += 5
 			middildo = 1
 			money -= 850
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a 15cm long dildo and paid the cashier.'
 
 			act 'Move away from the counter':gt 'sexshop','start'
@@ -256,7 +256,7 @@ if $ARGS[0] = 'start':
 			minut += 5
 			largedildo = 1
 			money -= 900
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a 20cm long dildo and paid the cashier.'
 
 			act 'Move away from the counter':gt 'sexshop','start'
@@ -272,7 +272,7 @@ if $ARGS[0] = 'start':
 			minut += 15
 			bigdildo = 1
 			money -= 950
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a 25cm long dildo and paid the cashier.'
 
 			act 'Move away from the counter':gt 'sexshop','start'
@@ -288,7 +288,7 @@ if $ARGS[0] = 'start':
 			minut += 5
 			extradildo = 1
 			money -= 1000
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a 30cm long dildo and paid the cashier.'
 
 			act 'Move away from the counter':gt 'sexshop','start'
@@ -304,7 +304,7 @@ if $ARGS[0] = 'start':
 			minut += 5
 			superdildo = 1
 			money -= 1100
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a 35cm long dildo and paid the cashier.'
 
 			act 'Move away from the counter':gt 'sexshop','start'
@@ -320,7 +320,7 @@ if $ARGS[0] = 'start':
 			minut += 5
 			maddildo = 1
 			money -= 1200
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a 40cm long dildo and paid the cashier.'
 
 			act 'Move away from the counter':gt 'sexshop','start'
@@ -336,7 +336,7 @@ if $ARGS[0] = 'start':
 			minut += 5
 			vibrator = 1
 			money -= 800
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a vibrator and paid the cashier.'
 
 			act 'Move away from the counter':gt 'sexshop', 'start'
@@ -352,19 +352,19 @@ if $ARGS[0] = 'start':
 			minut += 5
 			strapon = 1
 			money -= 1200
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a strapon and paid the cashier.'
 
 			act 'Move away from the counter':gt 'sexshop', 'start'
 		end
-	elseif money >= 500 and strapon = 0:
+	elseif money >= 500 and strapon = 0 and dildo = 1:
 		act 'Buy a strapon harness (500 <b>₽</b>)':
 			cla
 			*clr
 			minut += 5
 			strapon = 1
 			money -= 500
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a strapon and paid the cashier.'
 
 			act 'Move away from the counter':gt 'sexshop', 'start'
@@ -380,7 +380,7 @@ if $ARGS[0] = 'start':
 			minut += 5
 			analplug = 1
 			money -= 800
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
 			'You bought a butt plug and paid the cashier.'
 
 			act 'Move away from the counter':gt 'sexshop', 'start'

+ 13 - 13
locations/young_shop.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 
 	if young_shop_work = 0 and young_shop_work1 = 0 and young_shop_work2 = 0:
 		*nl
-		'As you enter, you notice a for hire sign with a note scribbled on it that reads, "<b>The Manager Mr. Sobulyagin works weekdays from 09:00 to 18:00; Applicants should speak to him weekdays BEFORE 14:30!</b>"'
+		'As you enter, you notice a for hire sign with a note scribbled on it that reads, "<b>The Manager Mr. Sobulyagin works weekdays from 09:00 to 20:00, weekends 09:00 to 15:00; Applicants should speak to him weekdays BEFORE 14:30!</b>"'
 		if hour >= 9 and (hour < 15 or (hour = 14 and minut <= 30)) and week < 6:
 			act 'Talk to the manager':
 				minut += 1
@@ -124,27 +124,27 @@ end
 if $ARGS[0] = 'events':
 	random = rand(1, 80)
 
-	if random < 75:
+	if random > 75:
 		gs 'young_shop', '0'
-	elseif random < 70:
+	elseif random > 70:
 		gs 'young_shop', '1'
-	elseif random < 65:
+	elseif random > 65:
 		gs 'young_shop', '2'
-	elseif random < 60:
+	elseif random > 60:
 		gs 'young_shop', '3'
-	elseif random < 55:
+	elseif random > 55:
 		gs 'young_shop', '4'
-	elseif random < 55:
+	elseif random > 55:
 		gs 'young_shop', '5'
-	elseif random < 45:
+	elseif random > 45 and week ! 5 and work ! 7:
 		gs 'young_shop', '6'
-	elseif random < 40:
+	elseif random > 40:
 		gs 'young_shop', '7'
-	elseif random < 35:
+	elseif random > 35:
 		gs 'young_shop', '8'
-	elseif random < 30:
+	elseif random > 30:
 		gs 'young_shop', '9'
-	elseif random < 27:
+	elseif random > 27:
 		gs 'young_shop', '10'
 	elseif random = 27:
 		gs 'young_shop', '11'
@@ -351,7 +351,7 @@ if $ARGS[0] = '6':
 
 	act 'Stay for another hour':
 		cla
-		minut+= 70
+		minut += 70
 		young_shop_bonus += 3
 		gs 'stat'
 		'It seems that you have no choice. You can''t let down your co-workers.'