fix for GL 0.8.6

locations/mod_Ibiza.qsrc

@@ -1,7 +1,7 @@
 # mod_Ibiza
 !input mod entry point here. this will be checked on every location, please keep it clean and brief to avoid game lag
 
-if $curloc = 'club':
+if $curloc = 'city_nightclub':
 	*clr
 	gt 'mod_Ibiza_club', $ARGS[0], $ARGS[1], $ARGS[2]
 end

locations/mod_IbizaStart.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 
 	act '"Wrong girl Eric, I have no reputation."':
-		gt 'club', 'inside'
+		gt 'mod_Ibiza_club','inside'
 	end
 	act '"What?"':
 		*clr & cla
@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 		act 'We''re done':
 			*clr & cla
 			'"I''m not interested. I see what you''re getting at, but I''m really not interested. Toodles!"'
-			gt 'club', 'inside'
+			gt 'mod_Ibiza_club','inside'
 		!!ends event
 		end
 		act 'Perhaps':
@@ -97,7 +97,7 @@ if $ARGS[0] = 'start':
 							minut += 5
 							gs 'stat'
 
-							act 'Leave Eric': gt 'club', 'inside'
+							act 'Leave Eric': gt 'mod_Ibiza_club','inside'
 							!!Finish start event Ibiza trip. Then the event will begin the next Saturday. Relation with Eric +5
 						end
 					end
@@ -108,7 +108,7 @@ if $ARGS[0] = 'start':
 						minut += 2
 						gs 'stat'
 
-						act 'Leave Eric': gt 'club', 'inside'
+						act 'Leave Eric': gt 'mod_Ibiza_club','inside'
 					!!Event repeat in 30 days after. Only if repeat the next branch will be present.
 					end
 				end
@@ -133,7 +133,7 @@ if $ARGS[0] = 'another time':
 		gs 'stat'
 		ibizaQW = 4
 
-		act 'Leave Eric': gt 'club', 'inside'
+		act 'Leave Eric': gt 'mod_Ibiza_club','inside'
 		!!event finished
 	end
 	act '"Yes of course!!"':
@@ -152,7 +152,7 @@ if $ARGS[0] = 'another time':
 			minut += 2
 			gs 'stat'
 
-			act 'Leave Eric': gt 'club', 'inside'
+			act 'Leave Eric': gt 'mod_Ibiza_club','inside'
 			!!Finish start event Ibiza trip. Then the event will begin the next Saturday. Relation with Eric +5
 		end
 	end

locations/mod_Ibiza_club.qsrc

@@ -190,13 +190,14 @@ if $ARGS[0] = 'inside':
 	end
 
 	if hour <= 3 or hour >= 18:
-		act 'Use the toilet':gt 'mod_Ibiza_club', 'toi'
+		act 'Use the toilet':gt 'mod_Ibiza_nightclubToilet', 'start'
 		act 'Go to the dance floor':gt 'mod_Ibiza_club', 'dance'
 		act 'Go to the bar':gt 'mod_Ibiza_club', 'bar'
 	end
 
 	if (hour < 1 or hour >= 18) and clubwork = 1:
 		act 'Find Erik for work':
+			menu_off = 1
 			*clr & cla
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
@@ -309,8 +310,11 @@ if $ARGS[0] = 'dance':
 
 			if pcs_apprnc >= clrand:
 				pcs_horny += 1
+				gs 'npcgeneratec', 0, 'Stranger', rand((age - 1),55)
+				gs 'boystat', $npclastgenerated
+				$hookupboy = $npclastgenerated
 				gs 'boy'
-				'While you''re dancing you feel that someone is groping your ass, you turn around and see <<$boybody>> <<$boybod>> <<$boyface>>. He''s <<$boyClo>>'
+				'While you''re dancing you feel that someone is groping your ass, you turn around and see <<$boybod>>, <<$boyface>> haired guy of <<$boybody>> height. He''s <<$boyClo>>'
 
 				act 'Stop dancing':gt 'mod_Ibiza_club', 'inside'
 
@@ -337,6 +341,16 @@ if $ARGS[0] = 'dance':
 
 							if pcs_horny < 70: act 'Go to the dance floor':gt 'mod_Ibiza_club', 'dance'
 							act 'Go to Vip-room with the guy':picrand = 38 & $sexloc = 'mod_Ibiza_vipclub' & xgt 'sex', 'var'
+
+							act 'Suggest going to his place':
+								cla
+								'You lean in and whisper: "How about we have fun at your place?". His eyes light up. Before you even notice, he grabs your hand and walk you toward the exit.'
+								act 'Go with him':
+									cla
+									gs 'npcpreservec', $hookupboy
+									gt 'hookup', 'start'
+								end
+							end
 						else
 							'You''re passionately kissing the guy, while he''s continuously groping you, always dedicating one of his hands to either your tits or your ass. "Let''s go to the toilet.", he says with a smile.'
 
@@ -345,6 +359,15 @@ if $ARGS[0] = 'dance':
 
 							if pcs_horny < 70: act 'Go to the dance floor':gt 'mod_Ibiza_club', 'dance'
 							act 'Go to the toilet with a guy':gt 'mod_Ibiza_club', 'sex'
+							act 'Suggest going to his place':
+								cla
+								'You lean in and whisper: "How about we have fun at your place?". His eyes light up. Before you even notice, he grabs your hand and walk you toward the exit.'
+								act 'Go with him':
+									cla
+									gs 'npcpreservec', $hookupboy
+									gt 'hookup', 'start'
+								end
+							end
 						end
 					end
 				end
@@ -405,7 +428,7 @@ if $ARGS[0] = 'dance':
 							alexeyClubSex += 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj<<rand(29, 41)>>.jpg"></center>'
-							'You kneel down and wrap your <<$liptalk>> around his cock and you begin to suck on it. Alexei helped by moving his hips back and forth, you notice his moving is in sync to the beat of the music he''s playing. After a few minutes he groans, "You better swallow it all, I don''t want anyone to clean up our mess."'
+							'You kneel down and wrap your <<$pc_desc[''lips'']>> lips around his cock and you begin to suck on it. Alexei helped by moving his hips back and forth, you notice his moving is in sync to the beat of the music he''s playing. After a few minutes he groans, "You better swallow it all, I don''t want anyone to clean up our mess."'
 
 							gs 'arousal', 'bj', 10, 'sub'
 							gs 'stat'
@@ -421,7 +444,7 @@ if $ARGS[0] = 'dance':
 								gs 'cum_manage'
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum<<rand(34, 47)>>.jpg"></center>'
-								'Streams of sperm hit you in the mouth and began to run down your <<$liptalk>>. Alexei wiped his dick on your <<$liptalk>> and put it away in his pants.'
+								'Streams of sperm hit you in the mouth and began to run down your <<$pc_desc[''lips'']>> lips. Alexei wiped his dick on your <<$pc_desc[''lips'']>> lips and put it away in his pants.'
 								'You began greedily to swallow his warm cum and use your finger to collect the drips, that escaped your mouth, then lick your finger clean. Once you''ve swallowed every last drop, you stand up again and thank him for this tasty snack.'
 
 								gs 'arousal', 'end'
@@ -438,7 +461,7 @@ if $ARGS[0] = 'dance':
 		end
 	else
 		menu_off = 1
-		'Its getting late and the music stops, looks like it might be time to go home.'
+		'It''s getting late and the music stops, looks like it might be time to go home.'
 		act 'Leave the dance floor': gt 'mod_Ibiza_club', 'inside'
 	end
 end
@@ -468,7 +491,7 @@ if $ARGS[0] = 'bar':
 		menu_off = 1
 		temp = rand(0, 100)
 
-		if temp = 5:
+		if temp <= 5:
 			pcs_horny += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club1.jpg"></center>'
@@ -805,23 +828,21 @@ if $ARGS[0] = 'sex':
 					gs 'cum_manage'
 					'You take his cock and point it away from you. He groans as he cums and most of his cum gets splattered onto the floor, with a few drips covering your hand.'
 
-					act 'Stand up':gt 'mod_Ibiza_club', 'tou'
+					act 'Stand up':gt 'mod_Ibiza_nightclubToilet', 'clubtoilet_men'
 				end
 
 				act 'Let him cum on your face':
 					cla
-					facial += 1
 					spafinloc = 11
 					gs 'cum_manage'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/clubfacial1.jpg"></center>'
 					'You grabbed his cock and point his "gun" at your face. He groans as he cums and you can feel hot streams of semen covering your face.'
 
-					act 'Stand up':gt 'mod_Ibiza_club', 'tou'
+					act 'Stand up':gt 'mod_Ibiza_nightclubToilet', 'clubtoilet_men'
 				end
 
 				exit
 			elseif harakBoy = 2:
-				facial += 1
 				spafinloc = 11
 				gs 'cum_manage'
 				SUB += 1
@@ -829,7 +850,7 @@ if $ARGS[0] = 'sex':
 				'The bloke grabs your hair and cums on your face. You quickly close your eyes, but it''s too late, a few drips of semen make it into your eyes. It hurts a bit.'
 			end
 
-			act 'Stand up':gt 'mod_Ibiza_club', 'tou'
+			act 'Stand up':gt 'mod_Ibiza_nightclubToilet', 'clubtoilet_men'
 		end
 
 		act 'Swallow his cum':
@@ -844,7 +865,7 @@ if $ARGS[0] = 'sex':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Stand up':gt 'mod_Ibiza_club', 'tou'
+			act 'Stand up':gt 'mod_Ibiza_nightclubToilet', 'clubtoilet_men'
 		end
 	end
 
@@ -875,7 +896,7 @@ if $ARGS[0] = 'sex':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Leave cubicle':gt 'mod_Ibiza_club', 'tou'
+		act 'Leave cubicle':gt 'mod_Ibiza_nightclubToilet', 'clubtoilet_men'
 	end
 end
 
@@ -894,7 +915,7 @@ if $ARGS[0] = 'bar0':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/bar1.jpg"></center>'
-		'Her flirting works on you. You move closer to her and begin to kiss her. At first, it feels weird for you, kissing a random woman that is, but it doesn''t take long for the kissing to move for awkward to passionately..'
+		'Her flirting works on you. You move closer to her and begin to kiss her. At first, it feels weird for you, kissing a random woman that is, but it doesn''t take long for the kissing to move for awkward to passionately...'
 
 		gs 'arousal', 'kiss', 5, 'lesbian'
 		gs 'stat'
@@ -927,7 +948,7 @@ if $ARGS[0] = 'bar0':
 					pcs_horny = 0
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/bar4.jpg"></center>'
 					'You stand up and she goes down on you, starting to lick your flower and sticking two fingers into your now wet cunt. She''s very skilled with her tongue and it takes her only minutes to make you cum.'
-					'You''re blissfully smiling at her. "Thank you.", you say to her....'
+					'You''re blissfully smiling at her. "Thank you.", you say to her...'
 
 					$orgasm_or = 'yes'
 					gs 'arousal', 'cuni', 5, 'lesbian'
@@ -1025,7 +1046,7 @@ if $ARGS[0] = 'bar2':
 	guy += 1
 	'<center><b><font color="maroon">Bar</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/barminet.jpg"></center>'
-	'You bend over, unbutton his pants and take out his cock. You bite your lips in anticipation and start to suck on it with your <<$liptalk>>. He''s moaning and smiling at the fact, that a random girl at a club is giving him a header.'
+	'You bend over, unbutton his pants and take out his cock. You bite your lips in anticipation and start to suck on it with your <<$pc_desc[''lips'']>> lips. He''s moaning and smiling at the fact, that a random girl at a club is giving him a header.'
 
 	gs 'arousal', 'bj', 10, 'sub'
 	gs 'stat'
@@ -1276,7 +1297,7 @@ if $ARGS[0] = 'work':
 		end
 	elseif clubr = 1:
 		'"OK <<$pcs_nickname>>, I want you to go around the club getting people to try and hopefully switch to these spirits. You can''t go wrong here, just smile and give out free drinks."'
-		'"No need to hold back with it, the suppliers are paying and if you''re curious and want to try it, don''t its horrible. I''ll see you back here in an hour."'
+		'"No need to hold back with it, the suppliers are paying and if you''re curious and want to try it, don''t it''s horrible. I''ll see you back here in an hour."'
 		act 'Get to work':
 			*clr & cla
 			minut += 60

locations/mod_Ibiza_readme.qsrc

@@ -1,7 +1,7 @@
 # mod_Ibiza_readme
 *clr&cla
 '<center>Mod <b>Ibiza</b></center>'
-'<center>version 0.5.4 completed and checked with Girl Life version 0.8.5</center>'
+'<center>version 0.5.4 completed and checked with Girl Life version 0.8.6</center>'
 '
 
 	"Why? Why did I take "Philosophy"? I swear Prof. Avdeyev hates me.", you think.
@@ -22,8 +22,8 @@
 
 	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'
 

locations/mod_Ibiza_setup.qsrc

@@ -7,13 +7,11 @@ $mod_info[0] = 'Ibiza'
 
 $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
 
 $mod_info[2] = 'Luccia87, Lan, Blatte, Rachels'
 !2=mod author
 
-$mod_info[3] = 'Ibiza content converted by Tendaris - fixed for GL 0.8.5'
+$mod_info[3] = 'Ibiza content converted by Tendaris - fixed for GL 0.8.6'
 !3=mod description, input a short brief here.
 
 $mod_info[4] = 'Cheat and Fonts'

mod_Ibiza.qproj

@@ -8,6 +8,7 @@
     <Location name="mod_Ibiza_club"/>
     <Location name="mod_Ibiza_club2"/>
     <Location name="mod_Ibiza_vipclub"/>
+    <Location name="mod_Ibiza_nightclubToilet"/>
     <Location name="mod_IbizaStart"/>
     <Location name="mod_IbizaDay2"/>
     <Location name="mod_IbizaDay3"/>