Browse Source

[fixes] Wrong location link in gschool grounds and reversed order of checks for Olu when he opens the door so that the correct ones are not missed.

KevinSmarts 4 years ago
parent
commit
0e8c3709ee
2 changed files with 32 additions and 32 deletions
  1. 2 2
      locations/gschool_grounds.qsrc
  2. 30 30
      locations/ludahome.qsrc

+ 2 - 2
locations/gschool_grounds.qsrc

@@ -150,7 +150,7 @@ if $ARGS[0] = 'main':
 				end
 			elseif hour = 7:
 				if NikoEv = 10:
-					gt 'NikoDates', 'Walk Of Shame'
+					gt 'NikoWhore', 'Walk Of Shame'
 				elseif minut <= 45:
 					act '<b>Go to class</b>': gt 'gschool_grounds', 'bulding'
 				else
@@ -170,7 +170,7 @@ if $ARGS[0] = 'main':
 					end
 				end
 			elseif hour = 8:
-				if NikoEv = 10: gt 'NikoDates', 'Walk Of Shame'
+				if NikoEv = 10: gt 'NikoWhore', 'Walk Of Shame'
 				'You missed your whole first class, hopefully no one noticed.'
 				act '<b>Rush to class</b>':	demerit += 10 & gt 'gschool_grounds', 'bulding'
 			elseif hour < 14:

+ 30 - 30
locations/ludahome.qsrc

@@ -111,36 +111,7 @@ if $ARGS[0] = 'home':
 		elseif rand(7,10) <= 9 and (week < 5 and hour >= 18 and hour <= 22) or (week > 5 and hour >= 8 and hour <= 22):
 			*clr & cla
 			'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-			if OluQW['met'] = 0:
-				OluQW['met'] = 1
-				'You stand outside your aunts apartment, knocking on the door. The door is answered by a large African man, who has a big friendly smile on his face "Hello can I help you?" He asks in heavily accented Russian.'
-				'You return his smile "Yes, is my Aunt Luda home?"'
-				'He shakes his head no "No she not home right now, you one her nieces?"'
-				'You nod "Yes I am <<$pcs_nickname>>, you must be Olu, my Aunts boyfriend. I have heard about you, nice to finally meet you."'
-				'He smiles even bigger "All good I hope. I will tell her you stopped by, it was nice meeting you."'
-				act 'Leave': gt 'pod_ezd', 'etaj_4'
-				act 'Ask if you can come in': 
-					*clr & cla
-					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-					'He pauses a moment and then nods opening the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What do you need?"'
-					!! Temporary loc measure
-					act 'I just wanted to talk': OluLoc = 5 & gt 'ludahome', 'chat_olu'
-					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
-				end
-			elseif OluQW['met'] = 1 and OluQW['talked'] = 1:
-				'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
-				'You return his smile "Is my Aunt Luda home?"'
-				'He shakes his head no "No she not home right now. Would you like to come in and talk again?"'
-				act 'Leave': gt 'pod_ezd', 'etaj_4'
-				act 'Go in and talk':
-					*clr & cla
-					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-					'He opens the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What shall we talk about?"'
-					!! Temporary loc measure
-					act 'Sit down and chat': OluLoc = 5 & gt 'ludahome', 'chat_olu'
-					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
-				end
-			elseif OluQW['sex'] = 1:
+			if OluQW['sex'] = 1:
 				'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian. When he sees it is you, his smile turns into a hungry grin as his eyes roam all over you body.'
 				'You return his smile "Is my Aunt Luda home?"'
 				'He shakes his head no "No she not home right now. We have time to have some fun, come in, come in."'
@@ -170,6 +141,35 @@ if $ARGS[0] = 'home':
 				end
 				!! Temporary loc measure
 				act 'Agree to have fun': OluLoc = 5 & gt 'olu', 'olusex1'
+			elseif OluQW['met'] = 1 and OluQW['talked'] = 1:
+				'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
+				'You return his smile "Is my Aunt Luda home?"'
+				'He shakes his head no "No she not home right now. Would you like to come in and talk again?"'
+				act 'Leave': gt 'pod_ezd', 'etaj_4'
+				act 'Go in and talk':
+					*clr & cla
+					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
+					'He opens the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What shall we talk about?"'
+					!! Temporary loc measure
+					act 'Sit down and chat': OluLoc = 5 & gt 'ludahome', 'chat_olu'
+					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
+				end
+			elseif OluQW['met'] = 0:
+				OluQW['met'] = 1
+				'You stand outside your aunts apartment, knocking on the door. The door is answered by a large African man, who has a big friendly smile on his face "Hello can I help you?" He asks in heavily accented Russian.'
+				'You return his smile "Yes, is my Aunt Luda home?"'
+				'He shakes his head no "No she not home right now, you one her nieces?"'
+				'You nod "Yes I am <<$pcs_nickname>>, you must be Olu, my Aunts boyfriend. I have heard about you, nice to finally meet you."'
+				'He smiles even bigger "All good I hope. I will tell her you stopped by, it was nice meeting you."'
+				act 'Leave': gt 'pod_ezd', 'etaj_4'
+				act 'Ask if you can come in': 
+					*clr & cla
+					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
+					'He pauses a moment and then nods opening the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What do you need?"'
+					!! Temporary loc measure
+					act 'I just wanted to talk': OluLoc = 5 & gt 'ludahome', 'chat_olu'
+					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
+				end
 			else
 				'You stand outside your aunts apartment, knocking on the door. The door is answered by a Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
 				'You return his smile "Is my Aunt Luda home?"'