Преглед изворни кода

oox and buttplug fix

Removed unwanted restriction on plug.
KevinSmarts пре 9 година
родитељ
комит
3384c5a668
65 измењених фајлова са 228 додато и 133 уклоњено
  1. 4 2
      locations/EvBoyBuh
  2. 2 1
      locations/EvOtelMan
  3. 2 1
      locations/Gadhouse
  4. 2 1
      locations/Gnpc
  5. 2 1
      locations/Gnpc2
  6. 1 2
      locations/HotelRoom
  7. 4 2
      locations/JuliaMilHome
  8. 3 2
      locations/Military
  9. 2 1
      locations/ParkKafe
  10. 2 1
      locations/Snpc
  11. 2 1
      locations/Terminal
  12. 2 1
      locations/WorkHosp
  13. 1 1
      locations/cum_cleanup
  14. 4 2
      locations/etoexhib
  15. 4 2
      locations/fbDormD
  16. 2 1
      locations/gkafe
  17. 6 3
      locations/gopskver
  18. 2 1
      locations/gschool
  19. 2 1
      locations/gschool2
  20. 2 1
      locations/ira
  21. 4 2
      locations/kafeM
  22. 8 4
      locations/katalkinAlko
  23. 10 5
      locations/kit_din
  24. 4 2
      locations/korrPar
  25. 2 1
      locations/kotovEv
  26. 4 2
      locations/kotovtalker
  27. 10 5
      locations/kuhrPar
  28. 2 1
      locations/lakecafe
  29. 2 1
      locations/lesbidomhouse
  30. 8 9
      locations/mitkabuh
  31. 2 1
      locations/nastja
  32. 8 4
      locations/obkitchen
  33. 2 1
      locations/office
  34. 2 1
      locations/park
  35. 6 3
      locations/party_boys
  36. 2 1
      locations/party_girls
  37. 16 8
      locations/placer_act
  38. 2 1
      locations/placer_gop_orgy
  39. 2 1
      locations/placer_house
  40. 2 1
      locations/placer_house_one
  41. 2 1
      locations/placer_sex
  42. 8 4
      locations/podezdM
  43. 2 1
      locations/reks
  44. 2 3
      locations/restoranM
  45. 2 1
      locations/saunaroom
  46. 4 2
      locations/sbReksHome
  47. 2 1
      locations/shop
  48. 4 2
      locations/shulga_room
  49. 1 2
      locations/shulgabath
  50. 6 3
      locations/shulgakuh
  51. 2 1
      locations/sister_party
  52. 4 3
      locations/sitrPar
  53. 10 5
      locations/sny
  54. 2 1
      locations/soniaDisco
  55. 1 1
      locations/stat
  56. 1 2
      locations/tanvanr
  57. 10 5
      locations/trFatherMisha
  58. 1 1
      locations/vann
  59. 1 2
      locations/vanr
  60. 1 2
      locations/vanr2x
  61. 1 2
      locations/vanrPar
  62. 2 1
      locations/vecher
  63. 2 1
      locations/vipclub
  64. 2 1
      locations/worksalon
  65. 6 3
      locations/ykuh

+ 4 - 2
locations/EvBoyBuh

@@ -171,7 +171,8 @@ if GorSlut = 0:
 	act 'Drink beer':
 		cls
 		alko += 1
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		manna += 30
 		fat += 5
@@ -668,7 +669,8 @@ if GorSlut = 1 or GorSlut = 2:
 		end
 	elseif gsboyrand > 0:
 		alko += 1
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		minut += 15
 		gs 'stat'

+ 2 - 1
locations/EvOtelMan

@@ -283,7 +283,8 @@ if DPtipe = 1:
 			cls
 			horny += 20
 			alko += 2
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			minut += 5
 			gs 'stat'

+ 2 - 1
locations/Gadhouse

@@ -79,7 +79,8 @@ act 'Eat':
 		'You don''t need any more tea.'
 	elseif water < 20:
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		'You gladly drank a cup of tea.'
 	end

+ 2 - 1
locations/Gnpc

@@ -205,7 +205,8 @@ act 'Walking through the square':
 				manna += 100
 				minut += 30
 				alko += 2
-				cumlip = 0
+				cumspclnt = 2
+				gs 'cum_cleanup'
 				fbreath = 0
 				fat += 2
 				salo += 1

+ 2 - 1
locations/Gnpc2

@@ -301,7 +301,8 @@ gs 'cum_manage'
 				act 'Go Man and drink beer':
 					cls
 					alko += 2
-					cumlip = 0
+					cumspclnt = 2
+					gs 'cum_cleanup'
 					fbreath = 0
 					minut += 3
 					horny += 5

+ 1 - 2
locations/HotelRoom

@@ -195,11 +195,10 @@ if $args[0] = 'shower1':
 
 			act 'Finish':gt $curloc
 		end
-	elseif analplug = 1 and analplugin = 0 and klismaday1 = 1 and plugday ! daystart:
+	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
 		act 'Insert a butt plug (0:05)':
 			cla
 			*clr
-			plugday = daystart
 			minut += 5
 			analplugIN = 1
 

+ 4 - 2
locations/JuliaMilHome

@@ -35,7 +35,8 @@ elseif lernHome = 0:
 			fat += 3
 			energy += 10
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			eatJulMilDay = daystart
 			gs 'stat'
@@ -57,7 +58,8 @@ elseif lernHome = 0:
 				minut += 30
 				wine = 0
 				alko += 6
-				cumlip = 0
+				cumspclnt = 2
+				gs 'cum_cleanup'
 				fbreath = 0
 				JulMilBestFrend += 1
 				horny += 10

+ 3 - 2
locations/Military

@@ -34,13 +34,14 @@ if $ARGS[0] = 'start':
 		act 'Finish':gt 'Military', 'start'
 	end
 
-	act 'There is a field kitchen':
+	act 'Get some food and drink from the field kitchen':
 		minut += 30
 		health += 10
 		manna += 20
 		energy += 20
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		gs 'stat'
 	end

+ 2 - 1
locations/ParkKafe

@@ -29,7 +29,8 @@ if $ARGS[0] = 'food':
 		'You don''t need any more tea.'
 	elseif water < 20:
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		'You gladly drank a mug of tea.'
 	end

+ 2 - 1
locations/Snpc

@@ -90,7 +90,8 @@ if grupTipe[numnpc] = 4:
 					minut += 5
 					grupNPC[numnpc] += 5
 					alko += 1
-					cumlip = 0
+					cumspclnt = 2
+					gs 'cum_cleanup'
 					fbreath = 0
 					salo += 1
 					fat += 2

+ 2 - 1
locations/Terminal

@@ -184,7 +184,8 @@ elseif trfatherQW = 3 and week = 6 and hour = 12:
 		act 'Drink':
 			cls
 			alko += 1
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			minut += 5
 			gs'stat'

+ 2 - 1
locations/WorkHosp

@@ -82,7 +82,8 @@ if $ARGS[0] = 'start':
 			'You don''t need any more tea.'
 		else
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			'You gladly drank a mug of tea.'
 		end

+ 1 - 1
locations/cum_cleanup

@@ -1,6 +1,6 @@
 # cum_cleanup
 
-temp = 0
+temp = arrsize('sparrvol')
 cumsumbod = 0
 cumsumvag = 0
 cumsumass = 0

+ 4 - 2
locations/etoexhib

@@ -196,7 +196,8 @@ if $ARGS[0] = 'pos6':
 			'You are not thirsty.'
 		elseif water < 20:
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			'You gladly drank spring water.'
 		end
@@ -1336,7 +1337,8 @@ if $ARGS[0] = 'pos37':
 			'You don''t need any more tea.'
 		elseif water < 20:
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			'You gladly drank a cup of tea.'
 		end

+ 4 - 2
locations/fbDormD

@@ -227,7 +227,8 @@ $d_fbd_drunk = {
 		cls
 		minut += 60
 		alko += 6
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		gs 'stat'
 		'Noisy group fun and buzzing like a disturbed hive. You order typed, although it passed most of the booze. <<$bname>> pours you a drink again and offers.'
@@ -263,7 +264,8 @@ $d_fbd_mass = {
 		horny += 10
 		minut += 60
 		alko += 6
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		horny += 20
 		gs 'stat'

+ 2 - 1
locations/gkafe

@@ -91,7 +91,8 @@ else
 				'You''re not thirsty, so you don''t drink the tea.'
 			elseif water < 20:
 				water += 20
-				cumlip = 0
+				cumspclnt = 2
+				gs 'cum_cleanup'
 				fbreath = 0
 				'You enjoy a nice cup of tea with your meal.'
 			end

+ 6 - 3
locations/gopskver

@@ -140,7 +140,8 @@ if kotovLoveQW > 0:
 			cls
 			minut += 15
 			alko += 1
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			fat += 2
 			salo += 1
@@ -262,7 +263,8 @@ else
 					cls
 					minut += 15
 					alko += 1
-					cumlip = 0
+					cumspclnt = 2
+					gs 'cum_cleanup'
 					fbreath = 0
 					fat += 2
 					salo += 1
@@ -283,7 +285,8 @@ else
 						cls
 						minut += 15
 						alko += 1
-						cumlip = 0
+						cumspclnt = 2
+						gs 'cum_cleanup'
 						fbreath = 0
 						fat += 2
 						salo += 1

+ 2 - 1
locations/gschool

@@ -218,7 +218,8 @@ if hour <= 8 and week < 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli =
 			cls
 			minut += 120
 			alko += 5
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			tanga = 0
 			gs 'stat'

+ 2 - 1
locations/gschool2

@@ -1376,7 +1376,8 @@ gs 'cum_manage'
 					'You don''t need any more tea.'
 				else
 					water += 20
-					cumlip = 0
+					cumspclnt = 2
+					gs 'cum_cleanup'
 					fbreath = 0
 					'You gladly drank a mug of tea.'
 				end

+ 2 - 1
locations/ira

@@ -175,7 +175,8 @@ $Party_ira_drink ={
 	cls
 	minut += 5
 	alko +=1 
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0    
 	drunk_sveta += 1
 	gs'stat'

+ 4 - 2
locations/kafeM

@@ -65,13 +65,15 @@ if $ARGS[0] = 'b':
 		'You don''t need any more tea.'
 	elseif water < 20:
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		'You gladly drank a cup of tea.'
 	end
 
 	alko += 2
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	gs 'stat'
 	'The cafe and the music started <<$boyA>> proposed to dance.'

+ 8 - 4
locations/katalkinAlko

@@ -9,13 +9,17 @@ if hour < 8:
 	exit
 end
 
-cumlip = 0
-fbreath = 0
-
 if alko < 6:
 	'You drank a glass of vodka with police. You will again pour into a glass of vodka.'
 
-	act 'drink a glass':alko += 2 & minut += 30 & gt $curloc
+	act 'drink a glass':
+		alko += 2
+		cumspclnt = 2
+		gs 'cum_cleanup'
+		fbreath = 0
+		minut += 30
+		gt $curloc
+	end
 elseif alko >= 6:
 	'You definitely tipsy and just sit on a chair.'
 end

+ 10 - 5
locations/kit_din

@@ -392,7 +392,8 @@ $pranik = {
 		manna += 100
 		energy += 20
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		fat += 50
 		frost = 0
@@ -421,7 +422,8 @@ $food = {
 	frost = 0
 	minut += 30
 	health += 10
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	'<center><img src="images/pics/food.jpg"></center>'
 
@@ -467,12 +469,14 @@ $snack = {
 	end
 
 	if water >= 20:
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		'The coffee doesn''t affect your thirst.'
 	elseif water < 20:
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		'You aren''t thirsty, so you don''t have any coffee.'
 	end
@@ -506,7 +510,8 @@ $driwater = {
 			'You don''t need any more water.'
 		else
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			'You gladly drink a glass of water.'
 		end

+ 4 - 2
locations/korrPar

@@ -172,7 +172,8 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 			elseif energy >= 20 and energy < 30:
 				if water < 20:
 					water += 20
-					cumlip = 0
+					cumspclnt = 2
+					gs 'cum_cleanup'
 					fbreath = 0
 				end
 				fat += 3
@@ -181,7 +182,8 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 			elseif energy < 20:
 				if water < 20:
 					water += 20
-					cumlip = 0
+					cumspclnt = 2
+					gs 'cum_cleanup'
 					fbreath = 0
 				end
 				energy += 20

+ 2 - 1
locations/kotovEv

@@ -74,7 +74,8 @@ elseif $loc = 'gskver':
 			cls
 			minut += 15
 			alko += 2
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			fat += 5
 			salo += 1

+ 4 - 2
locations/kotovtalker

@@ -12,7 +12,8 @@ if numnpc = 9 and grupNPC[numnpc] >= 80 and GorSlut = 0 and kotovLoveQW >= 0:
 				minut += 5
 				grupNPC[numnpc] += 5
 				alko += 2
-				cumlip = 0
+				cumspclnt = 2
+				gs 'cum_cleanup'
 				fbreath = 0
 				salo += 1
 				fat += 2
@@ -136,7 +137,8 @@ if $loc = 'gdkin':
 			minut += 5
 			grupNPC[numnpc] += 5
 			alko += 1
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			salo += 1
 			fat += 2

+ 10 - 5
locations/kuhrPar

@@ -44,7 +44,8 @@ act 'Eat a meal (0:30)':
 		'You don''t need any more tea.'
 	else
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		'You have a cup of tea, quenching your thirst.'
 	end
@@ -81,7 +82,8 @@ act 'Have a snack (0:15)':
 		'You don''t need any more tea.'
 	else
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		'You have a cup of tea, quenching your thirst.'
 	end
@@ -98,7 +100,8 @@ act 'Have a cup of tea (0:05)':
 		'You don''t need any more tea.'
 	else
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		'You have a cup of tea, quenching your thirst.'
 	end
@@ -120,7 +123,8 @@ if pranik > 0:
 		manna += 100
 		energy += 20
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		fat += 50
 		frost = 0
@@ -156,7 +160,8 @@ if edaD > 0:
 			'You don''t need any more tea.'
 		else
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			'You have a cup of tea, quenching your thirst.'
 		end

+ 2 - 1
locations/lakecafe

@@ -81,7 +81,8 @@ if $ARGS[0] = 'main':
 					'You don''t need any more tea.'
 				elseif water < 20:
 					water += 20
-					cumlip = 0
+					cumspclnt = 2
+					gs 'cum_cleanup'
 					'You gladly drank a mug of tea.'
 				end
 

+ 2 - 1
locations/lesbidomhouse

@@ -64,7 +64,8 @@ elseif temp >= 2:
 					minut += 35
 					horny += 20
 					alko += 6
-					cumlip = 0
+					cumspclnt = 2
+					gs 'cum_cleanup'
 					fbreath = 0
 					gs'stat'
 						

+ 8 - 9
locations/mitkabuh

@@ -9,7 +9,8 @@ if miraingop = 0 and alko < 8:
 		cls
 		minut += 30
 		alko += 4
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		gs 'stat'
 
@@ -1289,11 +1290,9 @@ gs 'cum_manage'
 		end
 	else
 		if temp = 0:
-			act 'To give a glass of Miroslav':
+			act 'Give a glass to Miroslav':
 				cls
 				miralko += 2
-				cumlip = 0
-				fbreath = 0
 				minut += 15
 				temp = 1
 				gs 'stat'
@@ -1307,7 +1306,8 @@ gs 'cum_manage'
 				cls
 				minut += 15
 				alko += 4
-				cumlip = 0
+				cumspclnt = 2
+				gs 'cum_cleanup'
 				fbreath = 0
 				temp = 2
 				gs 'stat'
@@ -1317,11 +1317,9 @@ gs 'cum_manage'
 			end
 		end
 		if temp = 2:
-			act 'To give a glass of Miroslav':
+			act 'Give a glass to Miroslav':
 				cls
 				miralko += RAND(3,4)
-				cumlip = 0
-				fbreath = 0
 				minut += 15
 				temp = 1
 				mirapiss = RAND(0,10)
@@ -1505,7 +1503,8 @@ gs 'cum_manage'
 				cls
 				minut += 15
 				alko += 4
-				cumlip = 0
+				cumspclnt = 2
+				gs 'cum_cleanup'
 				fbreath = 0
 				temp = 2
 				gs 'stat'

+ 2 - 1
locations/nastja

@@ -459,7 +459,8 @@ if $ARGS[0] = 'pos24':
 	manna = manna + 10
 	willpower = willpower + 10
 	alko += 2
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	water = water + 5
 	son = son + 5

+ 8 - 4
locations/obkitchen

@@ -52,7 +52,8 @@ if edahot > 0:
 			'You don''t need any more tea.'
 		else
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			'You gladly drank a mug of tea.'
 		end
@@ -71,7 +72,8 @@ if pranik > 0:
 		manna += 100
 		energy += 20
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		fat += 50
 		frost = 0
@@ -108,7 +110,8 @@ if edaD > 0:
 			'You don''t need any more tea.'
 		else
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			'You gladly drank a mug of tea.'
 
@@ -141,7 +144,8 @@ act 'Drink':
 		'You don''t need any more water.'
 	else
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		'You gladly drank a glass of water.'
 	end

+ 2 - 1
locations/office

@@ -608,7 +608,8 @@ if $ARGS[0] = 'kuh':
 
 			if water < 20:
 				water += 20
-				cumlip = 0
+				cumspclnt = 2
+				gs 'cum_cleanup'
 				fbreath = 0
 				'You gladly drank a mug of tea.'
 			end

+ 2 - 1
locations/park

@@ -260,7 +260,8 @@ if $ARGS[0] = 'luna':
 					fat += 2
 					'Finally you got something to drink, even if it''s just a bottle of lemonade.'
 					water += 20
-					cumlip = 0
+					cumspclnt = 2
+					gs 'cum_cleanup'
 					fbreath = 0
 				end
 

+ 6 - 3
locations/party_boys

@@ -3,7 +3,8 @@ if $ARGS[0] = 'drink':
 	cls
 	minut += 5
 	alko += 1
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	party_boys_drink += 1
 	gs'stat'
@@ -342,7 +343,8 @@ $party_boys_gost_drink ={
 	cls
 	minut += 5
 	alko += 1
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	party_boys_in += 1
 	gs'stat'
@@ -448,7 +450,8 @@ $party_boys_gost_drink_else ={
 	cls
 	minut += 5
 	alko +1
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	gs'stat'
 	'<center><img src="images/qwest/alter/sisterQW/ReksHome/Party_boys_party_gost_9_4.jpg"></center>'

+ 2 - 1
locations/party_girls

@@ -439,7 +439,8 @@ $party_girls_drink = {
 	cls
 	minut += 5
 	alko += 1
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	drunk_sveta +=1
 	gs'stat'

+ 16 - 8
locations/placer_act

@@ -64,7 +64,8 @@ end
 !!!!!!!!!!!!!!!
 if plact = 1:
 	alko += rand(1, 3)
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	minut += 5
 	gs 'stat'
@@ -99,7 +100,8 @@ if plact = 1:
 						cls
 						minut += 5
 						alko += 3
-						cumlip = 0
+						cumspclnt = 2
+						gs 'cum_cleanup'
 						fbreath = 0
 						gs 'stat'
 						'Together with the guys you go down the street to a shabby looking house. One of the guys opens the door and leads everyone into an apartment. The boys quickly clear the table, put out vodka and artful snacks. The vodka is poured into glasses and one of them is handed to you. You drink the cheap vodka which taste a bit little rubber and eat anchovies from a bowl.'
@@ -121,7 +123,8 @@ if plact = 1:
 							cls
 							minut += 5
 							alko += 3
-							cumlip = 0
+							cumspclnt = 2
+							gs 'cum_cleanup'
 							fbreath = 0
 							gs 'stat'
 							'You drink the cheap vodka which taste a little like rubber and eat some anchovies from a jar. Your cup is immediately filled with more vodka, and the boys try to persuade you to drink it.'
@@ -133,7 +136,8 @@ if plact = 1:
 								cls
 								minut += 5
 								alko += 3
-								cumlip = 0
+								cumspclnt = 2
+								gs 'cum_cleanup'
 								fbreath = 0
 								gs 'stat'
 								'You drink another cup of cheap vodka which still tastes like rubber and eat some more anchovies.'
@@ -156,7 +160,8 @@ if plact = 1:
 							cls
 							minut += 5
 							alko += 3
-							cumlip = 0
+							cumspclnt = 2
+							gs 'cum_cleanup'
 							fbreath = 0
 							gs 'stat'
 							'Together with the guys you go down the street to a shabby house. One of the guys opens the door and leads you all into an apartment. The boys quickly clear the table, put out vodka and artful snacks. The vodka is poured into glasses and one of them is handed to you. You drink the cheap vodka which taste a bit little rubber and eat anchovies from a bowl.'
@@ -184,7 +189,8 @@ if plact = 1:
 									cls
 									minut += 5
 									alko += 3
-									cumlip = 0
+									cumspclnt = 2
+									gs 'cum_cleanup'
 									fbreath = 0
 									gs 'stat'
 									'You drink the shot and your thoughts seem foggy and the ground is shaking and rumbling underfoot. You are helped to sit down on the dirty mattress on the floor.'
@@ -473,7 +479,8 @@ if plact = 1:
 						act 'Go with the guys':
 							cls
 							alko += 20
-							cumlip = 0
+							cumspclnt = 2
+							gs 'cum_cleanup'
 							fbreath = 0
 							minut += 30
 							gs 'stat'
@@ -489,7 +496,8 @@ if plact = 1:
 					act 'Go with the guys':
 						cls
 						alko += 20
-						cumlip = 0
+						cumspclnt = 2
+						gs 'cum_cleanup'
 						fbreath = 0
 						minut += 30
 						gs 'stat'

+ 2 - 1
locations/placer_gop_orgy

@@ -1,6 +1,7 @@
 # placer_gop_orgy
 alko += 5
-cumlip = 0
+cumspclnt = 2
+gs 'cum_cleanup'
 fbreath = 0
 gs 'stat'
 'You and <<$ev_name>> enter what is an otherwise abandoned apartment, everywhere is rubbish and dirt. The boys began to pour vodka and actively flirt with you and your friend. Soon you guys start to undress and clear a space for you and your girlfriend to lie down.'

+ 2 - 1
locations/placer_house

@@ -1,6 +1,7 @@
 # placer_house
 alko += 10
-cumlip = 0
+cumspclnt = 2
+gs 'cum_cleanup'
 fbreath = 0
 gs 'stat'
 'You come across a company apartment and continued there to drink and have fun.'

+ 2 - 1
locations/placer_house_one

@@ -1,6 +1,7 @@
 # placer_house_one
 alko += 10
-cumlip = 0
+cumspclnt = 2
+gs 'cum_cleanup'
 fbreath = 0
 gs 'stat'
 'A guy takes you to his house his home.'

+ 2 - 1
locations/placer_sex

@@ -992,7 +992,8 @@ $din_analplugin_off = {
 
 $din_drink_vodca = {
 	alko += rand(0,5)
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	*clr & cla
 	'<center><img src="images/qwest/alter/parc_ev/placer_sex2.jpg"></center>'

+ 8 - 4
locations/podezdM

@@ -54,7 +54,8 @@ if $ARGS[0] = 'kiosk':
 	act 'Drink a little':
 		cla
 		alko += 1
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		gs 'stat'
 
@@ -68,7 +69,8 @@ if $ARGS[0] = 'kiosk':
 	act 'Drink a bottle':
 		cla
 		alko += 2
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		fat += 1
 		manna += 10
@@ -246,7 +248,8 @@ if $ARGS[0] = 'grup':
 	act 'Drink a little':
 		cla
 		alko += 1
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		gs 'stat'
 
@@ -260,7 +263,8 @@ if $ARGS[0] = 'grup':
 	act 'Thump with the guys':
 		cla
 		alko += 2
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		fat += 1
 		manna += 10

+ 2 - 1
locations/reks

@@ -391,7 +391,8 @@ if $ARGS[0] = 'avto':
 		cls
 		minut += 15
 		alko += 2
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		rex += 2
 		gs 'stat'

+ 2 - 3
locations/restoranM

@@ -66,13 +66,12 @@ if $ARGS[0] = 'b':
 		'You don''t need any more tea.'
 	elseif water < 20:
 		water += 20
-		cumlip = 0
-		fbreath = 0
 		'You gladly drank a mug of tea.'
 	end
 
 	alko += 2
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	gs 'stat'
 	'After some time with food and wine, and was done with <<$boyA>> proposed to hold you.'

+ 2 - 1
locations/saunaroom

@@ -52,7 +52,8 @@ if water < 20:
 			'You don''t need any more water.'
 		elseif water < 20:
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			'You gladly drink a glass of water.'
 		end

+ 4 - 2
locations/sbReksHome

@@ -40,7 +40,8 @@ if $ARGS[0] = 'party':
 		cls
 		minut += 5
 		alko += 1
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		alkoParty += 1
 		gs'stat'
@@ -83,7 +84,8 @@ if $ARGS[0] = 'party_drink':
 	cls
 	minut += 5
 	alko += 1
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	alkoParty += 1
 	gs'stat'

+ 2 - 1
locations/shop

@@ -812,7 +812,8 @@ if $shoplocation = 'icecream':
 			manna += 500
 			water = 20
 			energy = 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			!! perkice is currently only ever referenced in stat and only then to decrement itself if > 0, so it does not currently do anything
 			!perkice += 1

+ 4 - 2
locations/shulga_room

@@ -464,7 +464,8 @@ $gang_sex_room_ev1 = {
 											cls
 											minut += 10
 											alko += 2
-											cumlip = 0
+											cumspclnt = 2
+											gs 'cum_cleanup'
 											fbreath = 0
 											gs'stat'
 											'<center><img src="images/zsoft/pod_ezd/shulgahome/bigroom/sex/1_11.jpg"></center>'
@@ -700,7 +701,8 @@ $shulga_beer = {
 		cls
 		minut += 5 
 		alko += RAND(1,2)
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		gs'stat'
 		'<center><img src="images/zsoft/pod_ezd/shulgahome/bigroom/drunk_ev/beer'+rand(1,8)+'.jpg"></center>'

+ 1 - 2
locations/shulgabath

@@ -80,11 +80,10 @@ if analplug = 1 and analplugin = 1:
 		'You bent over and took out the butt plug.'
 		act 'Finish':gt 'shulgabath'
 	end
-elseif analplug = 1 and analplugin = 0 and klismaday1= 1 and plugday ! daystart:
+elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
 	act 'Insert a butt plug (0:05)':
 		cla
 		*clr
-		plugday = daystart
 		minut += 5
 		analplugIN = 1
 		if anus < 10:anus = anus + 5

+ 6 - 3
locations/shulgakuh

@@ -82,7 +82,8 @@ $holodil = {
 			cls
 			minut += 5
 			alko += 1
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			beer_day = daystart
 			beer_count -= 1
@@ -99,7 +100,8 @@ $holodil = {
 			cls
 			minut += 1
 			alko +=2
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			vodka_day = daystart
 			vodka_count -= 1
@@ -113,7 +115,8 @@ $holodil = {
 				if vodka_count > 0:
 					minut += 1
 					alko +=2
-					cumlip = 0
+					cumspclnt = 2
+					gs 'cum_cleanup'
 					fbreath = 0
 					vodka_day = daystart
 					vodka_count -= 1

+ 2 - 1
locations/sister_party

@@ -133,7 +133,8 @@ $sister_party_drink ={
 	cls
 	minut += 5
 	alko +=1
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	drunk_sveta += 1
 	gs'stat'

+ 4 - 3
locations/sitrPar

@@ -38,7 +38,8 @@ elseif month = 12 and day = 31 and hour >= 20:
 		wipo += 1000
 		energy += 50
 		water += 50
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		gs 'stat'
 		'You sit at the festive table laid in front of the TV and celebrate the New Year with your family, the TV providing some background noise. At the table people strike up a conversation and common problems are forgotten for a while, everyone is having fun talking to each other. At midnight, everyone wishes one another a happy New Year and enjoys the champagne and fireworks outside. Your mom gives you an envelope with a greeting card and five thousand rubles. For a while you continue to watch TV, enjoying the champagne and company of your family, but after a while everyone is kind of tired and one by one they go to bed.'
@@ -63,9 +64,9 @@ elseif month = 1 and day = 1:
 				water = water +10
 			end
 			water += 20
-			cumlip = 0
 			fbreath = 0
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			salo += 1
 			fat += 3
 		end

+ 10 - 5
locations/sny

@@ -191,7 +191,8 @@ if snyqw = 1:
 				cls
 				minut += 5
 				alko += 3
-				cumlip = 0
+				cumspclnt = 2
+				gs 'cum_cleanup'
 				fbreath = 0
 				gs 'stat'
 				'<center><img src="images/qwest/alter/ev2/drunk.jpg"></center>'
@@ -314,7 +315,8 @@ elseif snyqw = 3:
 		cls
 		minut += 15
 		alko += 3
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		gs 'stat'
 		'<center><img src="images/qwest/alter/ev2/drunk.jpg"></center>'
@@ -340,7 +342,8 @@ elseif snyqw = 4:
 		cls
 		minut += 15
 		alko += 3
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		gs 'stat'
 		'<center><img src="images/qwest/alter/ev2/drunk.jpg"></center>'
@@ -366,7 +369,8 @@ elseif snyqw = 5:
 		cls
 		minut += 15
 		alko += 3
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		gs 'stat'
 		'<center><img src="images/qwest/alter/ev2/drunk.jpg"></center>'
@@ -392,7 +396,8 @@ elseif snyqw = 6:
 		cls
 		minut += 15
 		alko += 3
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		gs 'stat'
 		'<center><img src="images/qwest/alter/ev2/drunk.jpg"></center>'

+ 2 - 1
locations/soniaDisco

@@ -103,7 +103,8 @@ gs 'stat'
 act 'go thump':
 	cls
 	alko += 2
-	cumlip = 0
+	cumspclnt = 2
+	gs 'cum_cleanup'
 	fbreath = 0
 	minut += 15
 	gs 'stat'

+ 1 - 1
locations/stat

@@ -1563,7 +1563,7 @@ end
 $temp[1] = {
 	if sparridt[temp1arr] = 1:
 		temp2arr = temp1arr + 1
-		temp3arr = arrpos(#temp2arr,'sparrloc',i)
+		temp3arr = arrpos(temp2arr,'sparrloc',i)
 		if temp3arr > 0 and sparrvol[temp3arr] > 0 and sparrloc[temp3arr] = i and $sparrnam[temp3arr] ! $sparrnam[temp1arr]:
 			$cumtemp[1] = 'Multiple men'
 		else

+ 1 - 2
locations/tanvanr

@@ -125,11 +125,10 @@ if analplug = 1 and analplugin = 1:
 
 		act 'Finish':gt $curloc
 	end
-elseif analplug = 1 and analplugin = 0 and klismaday1= 1 and plugday ! daystart:
+elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
 	act 'Insert a butt plug (0:05)':
 		cla
 		*clr
-		plugday = daystart
 		minut += 5
 		analplugIN = 1
 

+ 10 - 5
locations/trFatherMisha

@@ -71,7 +71,8 @@ if trfatherMishaQW = 1:
 		end
 		if water < 20:
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 		end
 		gs'stat'
@@ -116,7 +117,8 @@ if trfatherMishaQW = 1:
 		end
 		if water < 20:
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 		end
 		gs'stat'
@@ -161,7 +163,8 @@ elseif trfatherMishaQW = 2:
 		end
 		if water < 20:
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 		end
 		gs'stat'
@@ -425,7 +428,8 @@ elseif trfatherMishaQW = 4:
 			end
 			if water < 20:
 				water += 20
-				cumlip = 0
+				cumspclnt = 2
+				gs 'cum_cleanup'
 				fbreath = 0
 			end
 			gs'stat'
@@ -461,7 +465,8 @@ elseif trfatherMishaQW = 5:
 		end
 		if water < 20:
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 		end
 		gs'stat'

+ 1 - 1
locations/vann

@@ -89,7 +89,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if analplug = 1 and analplugin = 0 and klismaday1 = 1:
+		if analplug = 1 and analplugin = 0 and klismaday = daystart:
 			act 'Insert a butt plug (0:05)':
 				cla
 				*clr

+ 1 - 2
locations/vanr

@@ -160,11 +160,10 @@ if analplug = 1 and analplugin = 1:
 
 		act 'Finish':gt $curloc
 	end
-elseif analplug = 1 and analplugin = 0 and klismaday1 = 1 and plugday ! daystart:
+elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
 	act 'Insert a butt plug (0:05)':
 		cla
 		*clr
-		plugday = daystart
 		minut += 5
 		analplugIN = 1
 

+ 1 - 2
locations/vanr2x

@@ -160,11 +160,10 @@ if analplug = 1 and analplugin = 1:
 
 		act 'Logout':gt $curloc
 	end
-elseif analplug = 1 and analplugin = 0 and klismaday1 = 1 and plugday ! daystart:
+elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
 	act 'Paste anal plug 5 min':
 		cla
 		*clr
-		plugday = daystart
 		minut = minut + 5
 		analplugIN = 1
 		if anus < 10:anus = anus + 5

+ 1 - 2
locations/vanrPar

@@ -154,11 +154,10 @@ if analplug = 1 and analplugin = 1:
 
 		act 'Finish':gt $curloc
 	end
-elseif analplug = 1 and analplugin = 0 and klismaday1= 1 and plugday ! daystart:
+elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
 	act 'Insert your butt plug (0:05)':
 		cla
 		*clr
-		plugday = daystart
 		minut += 5
 		analplugIN = 1
 

+ 2 - 1
locations/vecher

@@ -12,7 +12,8 @@ if $ARGS[0] = 'start':
 		cla
 		hour = 23
 		alko += 6
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		'You have fun, dance and Bukhaev.'
 		itrand = rand(1, 12)

+ 2 - 1
locations/vipclub

@@ -14,7 +14,8 @@ if $ARGS[0] = 'start':
 			minut += 15
 			drunk += 1
 			water += 5
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			son -= 5
 			frost = 0

+ 2 - 1
locations/worksalon

@@ -55,7 +55,8 @@ if $ARGS[0] = 'start':
 			'You don''t need any more tea.'
 		else
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			'You gladly drank a mug of tea.'
 		end

+ 6 - 3
locations/ykuh

@@ -60,7 +60,8 @@ if pranik > 0:
 		manna += 100
 		energy += 20
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		fat += 50
 		frost = 0
@@ -99,7 +100,8 @@ if edaD > 0:
 			'You don''t want to drink anymore.'
 		elseif water < 20:
 			water += 20
-			cumlip = 0
+			cumspclnt = 2
+			gs 'cum_cleanup'
 			fbreath = 0
 			'You gladly drank a mug of tea.'
 		end
@@ -131,7 +133,8 @@ act 'Drink':
 		'You are not thirsty.'
 	elseif water < 20:
 		water += 20
-		cumlip = 0
+		cumspclnt = 2
+		gs 'cum_cleanup'
 		fbreath = 0
 		'You gladly drank a glass of water.'
 	end