Merge branch 'master' of http://git.tfgamessite.com/KevinSmarts/girllife-ecv

locations/cikl

@@ -116,9 +116,19 @@ if tabletkicheck = 2:
 	end
 	tabletkishot -= 1
 end
+
 tabletkipd += tabletkipi
 tabletkipi = 0
 tabletkipt = 0
+if tabletkicheck = 1:
+	if tabletki <= 0:
+		tabletkicheck = 0
+		'You are out of birth control pills.'
+		tabletkipi = -5
+	elseif tabletki < 5:
+		'You are running out of birth control pills. You only have a few left.'
+	end
+end
 
 if tabletkicheck = 1 and tabletkichday < daystart:
 	tabletkichday = daystart

locations/lesbidomhouse1

@@ -11,8 +11,8 @@ if mistbondage = 0:
 	*clr
 	lesbiday = day
 	minut += 5
-	temp = RAND(0,3)
 	gs'stat'
+	temp = RAND(0,3)
 	if mistsexshop = 1 and hour >= 12 and hour < 17 and slavejobday ! daystart:
 		'<center><img src="images/picQW/doorlock.jpg"></center>'
 		'You rang the bell, but no one opened.'

locations/poli

@@ -133,8 +133,8 @@ if $ARGS[0] = 'start':
 										'"Give me 10000 rubles and it will will be deleted, like this never happened."'
 										'"I pay you a 3000 rubles fee."'
 										'"Lie down, think it over, but do not take too long now."'
-										act 'Pay him':dynamic $ven1
-										act 'Take the money':dynamic $ven2
+										act 'Pay him':gt 'poli', 'ven1'
+										act 'Take the money':gt 'poli', 'ven2'
 										act 'Threatened to report him':
 											cla
 											*clr
@@ -142,9 +142,9 @@ if $ARGS[0] = 'start':
 											'The doctor brings your face to his and says in a low voice.'
 											'"Listen to me, bitch! I hope you''re just joking with me, we have plenty of accidents here. Do you want to be another ''complication''?"'
 											'"Now make your choice, and we can forget everything you just said."'
-											act 'Pay him':dynamic $ven1
-											act 'Take the money':dynamic $ven2
-											act 'Run':dynamic $ven3
+											act 'Pay him':gt 'poli', 'ven1'
+											act 'Take the money':gt 'poli', 'ven2'
+											act 'Run':gt 'poli', 'ven3'
 										end
 									end
 								else
@@ -515,7 +515,7 @@ if $ARGS[0] = 'start':
 	end
 end
 
-$ven1 = {
+if $ARGS[0] = 'ven1':
 	cla
 	*clr
 	money -= 10000
@@ -524,9 +524,9 @@ $ven1 = {
     'You lie down, almost crying, in the surgery thinking it over,'
     'You know it is not fair, but you can''t allow these images to go public.'
     act 'Pay the money':gt'poli','start'
-}
+end
 
-$ven2 = {
+if $ARGS[0] = 'ven2':
 	cla
 	*clr
 	money += 3000
@@ -536,9 +536,9 @@ $ven2 = {
     'You lie down, almost crying, in the surgery thinking it over,'
     'You know it is not fair, but the money would be useful...'
     act 'Take the money':gt'poli','start'
-}
+end
 
-$ven3 = {
+if $ARGS[0] = 'ven3':
 	cla
 	*clr
 	over = 9
@@ -547,8 +547,7 @@ $ven3 = {
     'Out of fear, you run from the office.'
     'Out of nowhere came nurses and other staff. You are restrained and dragged back. Confidently, the doctor explains to the patients and visitors that you are not well in the head.'
     act 'Further':gt'gameover'
-}
-
+end
 
 if $ARGS[0] = 'drPP':
 	cla
@@ -1128,94 +1127,6 @@ if $ARGS[0] = '2':
 	end
 end
 
-$electrolysis = {
-	cls
-	minut += 120
-	leghair = 0
-	lobok = 0
-	lashair = 1
-	money -= 80000
-	gs 'stat'
-	'<center><img src="images/etogame/electrolysis.jpg"></center>'
-	'Surgeon has you strip and lie down on the table. Over next few hours you are poked with needle over and over again.'
-
-	act 'Continue':gt 'poli', 'cosmetic1'
-}
-
-$lipPlus = {
-	cls
-	minut += 60
-	lip += 1
-	money -= 25000
-	gs 'stat'
-	'<center><img src="images/etogame/cosmeticSur.jpg"></center>'
-	'Surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you to breathe in. By the time you wake up procedure is complete.'
-
-	act 'Continue':gt 'poli', 'cosmetic1'
-}
-
-$lipMin = {
-	cls
-	minut += 60
-	lip -= 1
-	money -= 25000
-	gs 'stat'
-	'<center><img src="images/etogame/cosmeticSur.jpg"></center>'
-	'Surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you to breathe in. By the time you wake up procedure is complete.'
-
-	act 'Continue':gt 'poli', 'cosmetic1'
-}
-
-$eyePlus = {
-	cls
-	minut += 60
-	glaraz += 1
-	money -= 30000
-	gs 'stat'
-	'<center><img src="images/etogame/cosmeticSur.jpg"></center>'
-	'Surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you to breathe in. By the time you wake up procedure is complete.'
-
-	act 'Continue':gt 'poli', 'cosmetic1'
-}
-
-$eyeMin = {
-	cls
-	minut += 60
-	glaraz -= 1
-	money -= 30000
-	gs 'stat'
-	'<center><img src="images/etogame/cosmeticSur.jpg"></center>'
-	'Surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you to breathe in. By the time you wake up procedure is complete.'
-
-	act 'Continue':gt 'poli', 'cosmetic1'
-}
-
-$lyposuction = {
-	cls
-	minut += 60
-	fat = 0
-	salo = 0
-	money -= 150000
-	gs 'stat'
-	'<center><img src="images/etogame/cosmeticSur.jpg"></center>'
-	'Surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you to breathe in. By the time you wake up procedure is complete.'
-
-	act 'Continue':gt 'poli', 'cosmetic1'
-}
-
-$bImplantA = {
-	cls
-	minut += 60
-	silicone = brSurTemp
-	money -= 150000
-	gs 'stat'
-	'<center><img src="images/etogame/cosmeticSur.jpg"></center>'
-	'Surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you to breathe in. By the time you wake up procedure is complete.'
-
-	act 'Continue':gt 'poli', 'cosmetic1'
-}
-
-
 
 if $ARGS[0] = 'cosmetic1':
 
@@ -1230,68 +1141,68 @@ if $ARGS[0] = 'cosmetic1':
 	''
 	''
 	if money >= 80000 and lashair = 0:
-		'<a href="exec:dynamic $electrolysis">Electrolysis treatment</a> - 80000'
+		'<a href="exec:gt ''poli'', ''electrolysis''">Electrolysis treatment</a> - 80000'
 		else
 		'Electrolysis treatment - 80000'
 	end
 	if money >= 25000 and lip <= 4:
-		'<a href="exec:dynamic $lipPlus">Lip enlargement surgery</a> - 25000'
+		'<a href="exec:gt ''poli'', ''lipPlus''">Lip enlargement surgery</a> - 25000'
 		else
 		'Lip enlargement surgery - 25000'
 	end
 	if money >= 25000 and lip ! 0:
-		'<a href="exec:dynamic $lipMin">Lip reduction surgery</a> - 25000'
+		'<a href="exec:gt ''poli'', ''lipMin''">Lip reduction surgery</a> - 25000'
 		else
 		'Lip reduction surgery - 25000'
 	end
 	if money >= 30000 and glaraz <= 3:
-		'<a href="exec:dynamic $eyePlus">Eye enlargement surgery</a> - 30000'
+		'<a href="exec:gt ''poli'', ''eyePlus''">Eye enlargement surgery</a> - 30000'
 		else
 		'Eye enlargement surgery - 30000'
 	end
 	if money >= 30000 and glaraz ! 0:
-		'<a href="exec:dynamic $eyeMin">Eye reduction surgery</a> - 30000'
+		'<a href="exec:gt ''poli'', ''eyeMin''">Eye reduction surgery</a> - 30000'
 		else
 		'Eye enlargement surgery - 30000'
 	end
 	if money >= 150000 and fat + salo ! 0:
-		'<a href="exec:dynamic $lyposuction">Lyposuction</a> - 150000'
+		'<a href="exec:gt ''poli'', ''lyposuction''">Lyposuction</a> - 150000'
 		else
 		'Lyposuction - 150000'
 	end
 	''
 	if money >= 150000 and silicone ! 0:
-		'<a href="exec:brSurTemp = 0 & stringimplant = 0 & fillimplant = 0 & dynamic $bImplantA">Remove breast implants</a> - 150000'
+		'<a href="exec:brSurTemp = 0 & stringimplant = 0 & fillimplant = 0 & gt ''poli'', ''bImplantA''">Remove breast implants</a> - 150000'
 		else
 		'Remove breast implants - 150000'
 	end
 	if money >= 150000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 10 & dynamic $bImplantA">Get small breast implants</a> - 150000'
+		'<a href="exec:brSurTemp = 10 & gt ''poli'', ''bImplantA''">Get small breast implants</a> - 150000'
 		else
 		'Get small breast implants - 150000'
 	end
 	if money >= 150000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & dynamic $bImplantA">Get medium breast implants</a> - 150000'
+		'<a href="exec:brSurTemp = 20 & gt ''poli'', ''bImplantA''">Get medium breast implants</a> - 150000'
 		else
 		'Get medium breast implants - 150000'
 	end
 	if money >= 150000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 30 & dynamic $bImplantA">Get large breast implants</a> - 150000'
+		'<a href="exec:brSurTemp = 30 & gt ''poli'', ''bImplantA''">Get large breast implants</a> - 150000'
 		else
 		'Get large breast implants - 150000'
 	end
 	if money >= 150000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 40 & dynamic $bImplantA">Get XXL breast implants</a> - 150000'
+		'<a href="exec:brSurTemp = 40 & gt ''poli'', ''bImplantA''">Get XXL breast implants</a> - 150000'
 		else
 		'Get XXL breast implants - 150000'
 	end
 	if money >= 200000 and silicone = 0 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & fillimplant = 1 & dynamic $bImplantA">Get fillable implants</a> - 200000'
+		'<a href="exec:brSurTemp = 20 & fillimplant = 1 & gt ''poli'', ''bImplantA''">Get fillable implants</a> - 200000'
 		else
 		'Get fillable implants - 200000'
 	end
 	if money >= 250000 and silicone = 0 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & stringimplant = 1 & dynamic $bImplantA">Get string implants</a> - 250000'
+		'<a href="exec:brSurTemp = 20 & stringimplant = 1 & gt ''poli'', ''bImplantA''">Get string implants</a> - 250000'
 		else
 		'Get string implants - 250000'
 	end
@@ -1307,5 +1218,93 @@ if $ARGS[0] = 'cosmetic1':
 	act 'back':gt 'poli','start'
 end
 
+if $ARGS[0] = 'electrolysis':
+	cls
+	minut += 120
+	leghair = 0
+	lobok = 0
+	lashair = 1
+	money -= 80000
+	gs 'stat'
+	'<center><img src="images/etogame/electrolysis.jpg"></center>'
+	'Surgeon has you strip and lie down on the table. Over next few hours you are poked with needle over and over again.'
+
+	act 'Continue':gt 'poli', 'cosmetic1'
+end
+
+if $ARGS[0] = 'lipPlus':
+	cls
+	minut += 60
+	lip += 1
+	money -= 25000
+	gs 'stat'
+	'<center><img src="images/etogame/cosmeticSur.jpg"></center>'
+	'Surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you to breathe in. By the time you wake up procedure is complete.'
+
+	act 'Continue':gt 'poli', 'cosmetic1'
+end
+
+if $ARGS[0] = 'lipMin':
+	cls
+	minut += 60
+	lip -= 1
+	money -= 25000
+	gs 'stat'
+	'<center><img src="images/etogame/cosmeticSur.jpg"></center>'
+	'Surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you to breathe in. By the time you wake up procedure is complete.'
+
+	act 'Continue':gt 'poli', 'cosmetic1'
+end
+
+if $ARGS[0] = 'eyePlus':
+	cls
+	minut += 60
+	glaraz += 1
+	money -= 30000
+	gs 'stat'
+	'<center><img src="images/etogame/cosmeticSur.jpg"></center>'
+	'Surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you to breathe in. By the time you wake up procedure is complete.'
+
+	act 'Continue':gt 'poli', 'cosmetic1'
+end
+
+if $ARGS[0] = 'eyeMin':
+	cls
+	minut += 60
+	glaraz -= 1
+	money -= 30000
+	gs 'stat'
+	'<center><img src="images/etogame/cosmeticSur.jpg"></center>'
+	'Surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you to breathe in. By the time you wake up procedure is complete.'
+
+	act 'Continue':gt 'poli', 'cosmetic1'
+end
+
+if $ARGS[0] = 'lyposuction':
+	cls
+	minut += 60
+	fat = 0
+	salo = 0
+	money -= 150000
+	gs 'stat'
+	'<center><img src="images/etogame/cosmeticSur.jpg"></center>'
+	'Surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you to breathe in. By the time you wake up procedure is complete.'
+
+	act 'Continue':gt 'poli', 'cosmetic1'
+end
+
+if $ARGS[0] = 'bImplantA':
+	cls
+	minut += 60
+	silicone = brSurTemp
+	money -= 150000
+	gs 'stat'
+	'<center><img src="images/etogame/cosmeticSur.jpg"></center>'
+	'Surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you to breathe in. By the time you wake up procedure is complete.'
+
+	act 'Continue':gt 'poli', 'cosmetic1'
+end
+
+
 --- poli ---------------------------------