Fixed Ibiza for GL 0.8.5

locations/mod_Ibiza.qsrc

@@ -25,7 +25,7 @@ if $location_type = 'public_outdoors' and ibizaQW = 2 and ibiza_leaveday + 1 < d
 			workDolg = ibiza_owed
 			ibizaQW = 3
 			money = 0
-			act 'Look around': gt 'sauna', 'saunaroom'
+			act 'Look around': gt 'city_sauna', 'saunaroom'
 		end
 end
 

locations/mod_IbizaCabin.qsrc

@@ -26,7 +26,7 @@ if $args[0] = '':
 
 	'There is a <a href="exec:gt ''bed'', ''start''">bed</a> against one wall. Next to it is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). On the other side of the bed is a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a>'
 	*nl
-	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	'You can access your <a href="exec: $wloc = iif($wloc!'''',$wloc,''default1'') & gt ''wardrobe'',$wloc ">default clothing</a> options directly.'
 	*nl
 
 
@@ -161,7 +161,6 @@ if $args[0] = 'sleep':
 	*nl
 	'You run through your regular nightly routine, not bothering to setting your alarm, you undress, and prepare for sleep:'
 	pcs_hairbsh = 0
-	cloth_vid = 0
 	pain['killer'] = 0
 	if bedPanty = 1 and $pantyworntype = 'none' and $braworntype = 'none':
 		*nl
@@ -303,7 +302,7 @@ if $ARGS[0] = 'dream':
 					'Your cabin on the yacht.'
 					'There is a <a href="exec:gt ''bed'', ''start''">bed</a> against one wall. Next to it is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). On the other side of the bed is a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a>'
 					*nl
-					'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+					'You can access your <a href="exec: $wloc = iif($wloc!'''',$wloc,''default1'') & gt ''wardrobe'',$wloc ">default clothing</a> options directly.'
 					wait 1000
 					play 'sound/knocking.mp3',30
 					*nl
@@ -329,7 +328,7 @@ if $ARGS[0] = 'dream':
 							'You look at his grin with disgust, <<$OpenPCVoice>>"I know I''m just a whore but that doesn''t give you the right to humiliate me."<<$ClosePCVoice>> you tell him off.'
 							'As you say that you notice that Christian''s mood changes, <<$OpenMaleVoice>>""Alright slut! Here I was trying to be friendly but you want to be rude instead. Well then, remove the towel, turn around and get down on all fours so I can insert the yellow pills."<<$CloseMaleVoice>>'
 							'<<$OpenPCVoice>>"Please, I beg you! It wasn''t my intention to be rude. Please don''t give me more of those! I don''t know how I survived yesterday, my pussy was pulsating the whole day. You can''t do this to me today too! At least let me take them orally, there''s no need inserting them into my vagina!"<<$ClosePCVoice>>'
-							'<<$OpenMaleVoice>>"I don''t have time to discuss this every time <<pcs_firstname>>. Remove the towel and turn around, hurry up!"<<$CloseMaleVoice>>'
+							'<<$OpenMaleVoice>>"I don''t have time to discuss this every time <<$pcs_firstname>>. Remove the towel and turn around, hurry up!"<<$CloseMaleVoice>>'
 							'Dejected you comply and remove the towel showing off your naked body for Christian.'
 							minut += 5 & gs 'stat'
 

locations/mod_IbizaDance.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'initSequence':
 		dancerun = 1
 	elseif pcs_horny < 60:
 		dancerun = 2
-	elseif pcshorny < 90:
+	elseif pcs_horny < 90:
 		dancerun = 3
 	else
 		dancerun = 4
@@ -31,9 +31,9 @@ if $ARGS[0] = 'initSequence':
 		danceParam[3] = danceParam[2] + rand(0,3)
 	elseif dancerun = 2:
 		danceParam[0] = rand(1,2)
-		danceParam[1] = dance[0] + rand(2,4)
-		danceParam[2] = dance[1] + rand(2,4)
-		danceParam[3] = dance[2] + rand(1,3)
+		danceParam[1] = danceParam[0] + rand(2,4)
+		danceParam[2] = danceParam[1] + rand(2,4)
+		danceParam[3] = danceParam[2] + rand(1,3)
 	else
 		danceParam[0] = 1
 		danceParam[1] = danceParam[0] + rand(1,2)

locations/mod_IbizaDay2.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'day two':
 			'<<$OpenFemaleVoice>>The yellow bracelets are for the employees who are dedicated mainly to serving drinks. They can refuse any request from a client but if the girl accepts they should tell someone from the security so they can read the code and later pay her for the services. The staff who wears purple bracelets, like you, dance with customers, have fun as they cheer them up and sometimes, they can serve drinks and also, you know ... fuck them if they ask. Oh, come on <<$pcs_firstname>>! It’s not a bad deal! Don''t put that face! Surely you''ll have a good time ... also if you are here I am sure that you are very open with sex, am I wrong?<<$CloseFemaleVoice>>'
 			'<<$OpenInnerThought>> «Oh my God! I''m trapped.»<<$CloseInnerThought>>'
 			'<<$OpenFemaleVoice>>"If you need to cheer up or fix your mood you can also go to someone from security and they''ll give you some cocaine. They will read your code and they will give you the drug but if you abuse it, you can do things with them you could regret it in the future. You understand that, don''t you?"<<$CloseFemaleVoice>>'
-			'<<OpenPCVoice>>"More or less"<<$ClosePCVoice>> you answer.'
+			'<<$OpenPCVoice>>"More or less"<<$ClosePCVoice>> you answer.'
 			'<<$OpenFemaleVoice>>"I was able to see on one occasion how a customer was taken by a ''Purple Girl'' to a room that was completely covered in cocaine and do it with a dog."<<$CloseFemaleVoice>>'
 			'<<$OpenInnerThought>>«What a fuck! With a dog!? Oh my God!»<<$CloseInnerThought>>'
 			'<<$OpenPCVoice>>"Wait… wait a moment Alexandra… Do you say that girl fucked with a dog?<<$ClosePCVoice>>'

locations/mod_IbizaDay5.qsrc

@@ -197,7 +197,7 @@ if $ARGS[0] = 'Yazev':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="mod/ibiza/locations/city/citycenter/nightclub/trip01/day5/yazev2.jpg"></center><br>'
 		'You and four other girls follow Yazev to one of the empty mansion rooms. He keeps eyeing you, it''s as if he can read your mind. He takes a seat in an armchair and you''re pretty sure he''s going to order you all to get naked and join in an orgy, but to your surprise...'
-		'He asks, <<$OpenMaleVoice>>"<<pcs_firstname>>, do you know how to do yoga?"<<$CloseMaleVoice>>'
+		'He asks, <<$OpenMaleVoice>>"<<$pcs_firstname>>, do you know how to do yoga?"<<$CloseMaleVoice>>'
 		'<<$OpenPCVoice>>"Yoga?"<<$ClosePCVoice>> you ask confused.'
 		'<<$OpenMaleVoice>>"Yeah, I''m just wondering if you''re flexible..."<<$CloseMaleVoice>>'
 		if bookYog > 0 :

locations/mod_IbizaGuard.qsrc

@@ -22,13 +22,9 @@ if $ARGS[0]='guard1':
 
 	act 'Sniff the cocaine and take the pill':
 		*clr & cla
-		!Add bonus positive to mood and energy.
-		!Add bonus to aroused
-		!Need a code for taking pills
 		minut += 20
-		narkcoke += 1
-		pcs_mood += 50
-		pcs_horny += 30
+		gs 'drugs', 'cocaine' & dur += 1
+		aphrodisiac_have += 1 & gs 'drugs', 'aphrodisiac'
 		'<center><video autoplay src="mod/ibiza/locations/city/citycenter/nightclub/trip01/security/cocaine1.mp4"></video></center><br>'
 		'You walk off to a dark corner and quickly sniff the cocaine. You feel your mood and energy get restored and you''re feeling euphoric.'
 		'The security guard approaches you once again, "By the way girl... I was ordered to give you this too, to help you out." he says as you''re handed a yellow pill.'
@@ -56,12 +52,8 @@ if $ARGS[0]='guard2':
 		'"Feeling better now little fox?" he asks.'
 		'"Much better!" you happily answer him as you feel the cocaine kicking in and the pills making you hornier.'
 		'"Follow me, your dear dealer needs to relieve himself with a good slut." The security guard takes you to a small booth where they usually rest. He quickly close the door behind you as you walk in and tells you to undress, "Make that whore mouth of yours work bitch!"'
-		!Add bonus positive to mood and energy.
-		!Add bonus to aroused
-		!Need a code for taking pills
-		narkcoke += 1
-		pcs_mood += 50
-		pcs_horny += 30
+		dur += 1 & gs 'drugs', 'cocaine'
+		aphrodisiac_have += 1 & gs 'drugs', 'aphrodisiac'
 		gs 'stat'
 
 		act 'Give him a blowjob':
@@ -287,8 +279,8 @@ if $ARGS[0]='guard3':
 	'<center><img <<$set_imgh>> src="mod/ibiza/locations/city/citycenter/nightclub/trip01/security/3pills.jpg"></center><br>'
 	'Not wanting to further upset him you take the two pills and your companion one. Before you swallow them maybe you could sneak one by him and just swallow one instead."'
 	minut += 20
-	narkcoke += 1
-	pcs_mood += 200
+	aphrodisiac_have += 1 & gs 'drugs', 'aphrodisiac'
+	aphrodisiac_have += 1 & gs 'drugs', 'aphrodisiac'
 
 	!Here 2 acts svaileble (branchs) Fast sneak!! And Hesitate…
 	act 'Swallow one':
@@ -406,8 +398,7 @@ if $ARGS[0]='guard4':
 				'"You said we had little time, right?" you answer him, "Next time I promise."'
 				'"Sure." he nods, "Here take this, you''ve deserved it." as he throws a small bag on the table.'
 				'You quickly sniff it all up and head back to the dance floor.'
-				narkcoke += 1
-				pcs_mood += 200
+				gs 'drugs', 'cocaine' & dur += 1
 				gs 'cum_call', 'breasts'
 
 				gs 'arousal', 'bj', 5, 'deepthroat'
@@ -455,8 +446,7 @@ if $ARGS[0]='guard4':
 							'"Why do all the men treat you like a whore when you''re having sex with them?" you ask him.'
 							'"I don''t know if the other women are treated like that <<$pcs_nickname>>. I just know you''re a whore and should be treated like one. Here take this, you''ve deserved it." as he throws a small bag on the table.'
 							'You quickly sniff it all up and head back to the dance floor.'
-							narkcoke += 1
-							pcs_mood += 200
+							gs 'drugs', 'cocaine' & dur += 1
 							gs 'cum_call', 'breasts'
 							minut += 5 & gs 'stat'
 

locations/mod_IbizaStart.qsrc

@@ -10,16 +10,15 @@
 
 if $ARGS[0] = 'start':
 !!	gs 'mod_IbizaStart', 'fonts'
-
-	IbizaTemp = max(village_slut,oldtown_slut,city_slut,pav_slut)
-	if City_slut = IbizaTemp:
+	IbizaTemp = max(fame['village_slut'],fame['pushkin_slut'],fame['city_slut'],fame['pav_slut']*3/5)
+	if fame['city_slut'] = IbizaTemp:
 		$IbizaTemp='City'
-	elseif pav_slut = IbizaTemp:
-		$IbizaTemp='Pavlovsk'
-	elseif oldtown_slut = IbizaTemp:
+	elseif fame['village_slut'] = IbizaTemp:
+		$IbizaTemp='Gadyukino'
+	elseif fame['pushkin_slut'] = IbizaTemp:
 		$IbizaTemp='Pushkino'
 	else
-		$IbizaTemp='Gadyukino'
+		$IbizaTemp='Pavlovsk'
 	end
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 	*nl
@@ -197,7 +196,7 @@ if $ARGS[0] = 'First Day':
 					'<center><img <<$set_imgh>> src="mod/ibiza/locations/city/citycenter/nightclub/trip01/day1/jet.jpg"></center>'
 					'As you arrive at the airport, you are waved through to one of the nearby strips and looking out you can see a private Jet by the hangar, it''s engines already heating up in preparation for take-off. Your mind drifts back to Eric and you suddenly remember what Eric said about his employees and wearing panties...'
 					*nl
-					if $wornpantytype ! 'none':
+					if $pantyworntype ! 'none':
 						gs 'panties', 'remove'
 						'You check that Marco''s attention is elsewhere, before quickly slipping off your panties and stuffing them in your pocket.'
 					else

locations/mod_Ibiza_club.qsrc

@@ -115,7 +115,7 @@ if $ARGS[0] = 'inside':
 	!!* Changed College diploma requirement to just being a University Student
 
 
-	if  ibizaday ! daystart and ibizaQW = 0 and rand(0,20) >= 0 and (ibizatest = 1 or (pcs_danc >= 85 and pcs_dancero >= 85 and pcs_dancpol >= 85 and pcs_inhib >= 85 and clubjob > 10 and (pav_slut >= 125 or city_slut >= 75 or oldtown_slut >= 75 or village_slut >= 75) and (fakepassport = 1 or age >= 18) and student = 1)):
+	if  ibizaday ! daystart and ibizaQW = 0 and rand(0,20) >= 0 and (ibizatest = 1 or (pcs_danc >= 85 and pcs_dancero >= 85 and pcs_dancpol >= 85 and pcs_inhib >= 85 and clubjob > 10 and (fame['pav_slut'] >= 250 or fame['city_slut'] >= 150 or fame['pushkin_slut'] >= 150 or fame['village_slut'] >= 150) and (fakepassport = 1 or age >= 18) and student = 1)):
 		ibizaday = daystart
 		gt 'mod_IbizaStart', 'start'
 	end

locations/mod_Ibiza_club2.qsrc

@@ -80,10 +80,10 @@ if $ARGS[0] = 'toilet':
 	gs 'stat'
 	'You pee sitting on the toilet and begin to wipe with toilet paper. Apparently you pressed too hard, as you feel a thrill coming from between the legs.'
 
-	gs 'arousal', 'masturbate', 3
+	gs 'arousal', 'clit_finger', 3
 	gs 'stat'
 
-	act 'Leave':gt 'mod_Ibiza_club', 'inside'
+	act 'Leave':gs 'arousal', 'end' & gt 'mod_Ibiza_club', 'inside'
 
 	act 'Caress yourself':
 		cla
@@ -98,7 +98,7 @@ if $ARGS[0] = 'toilet':
 		'The man behind the wall realises he has been caught, and giggles that you put on a great show. Suddenly the eye disappears, and 500 rubles are pushed through the hole.'
 
 		$orgasm_or = 'yes'
-		gs 'arousal', 'masturbate', 5, 'exhibitionism'
+		gs 'arousal', 'clit_finger', 5, 'exhibitionism', 'masturbate'
 		gs 'arousal', 'end'
 		gs 'stat'
 

locations/mod_Ibiza_readme.qsrc

@@ -1,21 +1,7 @@
 # mod_Ibiza_readme
-!input your mod detail readme here. you can use msg or detailed structure, just make sure to create act 'return': gt 'mod_setting'
 *clr&cla
-act 'return': gt 'mod_setting'
-
-act 'Set color fonts': gs 'mod_IbizaStart','cfonts'
-act 'Set black fonts': gs 'mod_IbizaStart','bwfonts'
-
-if ibizatest = 0:
-	act 'Cheat (set ibizatest to 1)': ibizatest = 1 & gs 'mod_Ibiza_readme'
-end
-if ibizatest = 1:
-	act 'End test': ibizatest = 0 & gs 'mod_Ibiza_readme'
-end
-
-
 '<center>Mod <b>Ibiza</b></center>'
-'<center>version 0.5.3 completed and checked with Girl Life version 0.8.3</center>'
+'<center>version 0.5.4 completed and checked with Girl Life version 0.8.5</center>'
 '
 
 	"Why? Why did I take "Philosophy"? I swear Prof. Avdeyev hates me.", you think.
@@ -31,13 +17,14 @@ end
 	Her age has to be equal or above 18 or she has to own a fake passport.
 	The PC has to be an outstanding dancer,  all Modern Dancing, Erotic Dancing and Pole Dancing have to be above 84.
 	Also, her Inhibition has to be below 16.
-	The PC has to be known as a slut in one of the districts (Pavlovsk 125, city 75, oldtown 75, village 75)
+	The PC has to be known as a slut in one of the districts (Pavlovsk 250, City 150, Pushkino 150, Village 150)
 	The event can start, when the PC will do at least ten jobs at the club.
 
 	You can cheat and set the variable ibizatest = 1, but do not mess the time. The PC has to leave to Ibiza on Saturday.
+<br>
+    Have Fun
+               rachels, Tendaris'
 
-----Have Fun
-		 rachels, Tendaris'
-
+act 'Return': gt 'mod_setting'
 
 --- mod_Ibiza_readme ---------------------------------

locations/mod_Ibiza_setup.qsrc

@@ -5,7 +5,7 @@
 $mod_info[0] = 'Ibiza'
 !0=mod name, saved to $mod_name[i] array
 
-$mod_info[1] = '05300'
+$mod_info[1] = '05400'
 !1=mod version
 !this will be displayed as version 1.2, fix3.
 !if you input 40500, will be showen as version 4.5
@@ -13,9 +13,11 @@ $mod_info[1] = '05300'
 $mod_info[2] = 'Luccia87, Lan, Blatte, Rachels'
 !2=mod author
 
-$mod_info[3] = 'Ibiza content converted by Tendaris'
+$mod_info[3] = 'Ibiza content converted by Tendaris - fixed for GL 0.8.5'
 !3=mod description, input a short brief here.
 
+$mod_info[4] = 'Cheat and Fonts'
+!4=mod options/settings link name.
 
 if $curloc = 'mod_<<$mod_info[0]>>_setup':
 	usehtml = 1

mod_Ibiza.qproj

@@ -3,6 +3,7 @@
   <Structure>
     <Location name="mod_Ibiza_setup"/>
     <Location name="mod_Ibiza_readme"/>
+    <Location name="mod_Ibiza_options"/>
     <Location name="mod_Ibiza"/>
     <Location name="mod_Ibiza_club"/>
     <Location name="mod_Ibiza_club2"/>