Browse Source

[fixes] moved the leave action to the top in Snpc

julzor 5 years ago
parent
commit
650d6ec992
1 changed files with 25 additions and 22 deletions
  1. 25 22
      locations/Snpc.qsrc

+ 25 - 22
locations/Snpc.qsrc

@@ -73,7 +73,7 @@ if grupTipe[numnpc] = 4:
 				act 'Decline':npc_rel[$static_num] -= 5 & gt $loc, $metka
 				
 				act 'Drink the beer':
-					cls
+					*clr & cla
 					minut += 5
 					npc_rel[$static_num] += 5
 					alko += rand(1,2)
@@ -276,11 +276,17 @@ if narkoman = 1 and npcnum = 1 and npc_rel['A1'] > 100:
 	end
 end
 
+if $loc ! 'gdkin':
+	act 'Leave': gt 'gschool_lessons', 'short_break'
+else
+	act 'Move away': gt $loc, $metka
+end
+
 !!!!!!!!!!!!!
 !!!Chat!!!
 !!!!!!!!!!!!!
 act 'Chat':
-	cls
+	*clr & cla
 
 	if $loc = 'gdkin':minut += 5
 
@@ -333,7 +339,7 @@ end
 if numnpc = 2:
 	if (pcs_dom > 0 or grupTipe = 3) and artemLernQW = 0:
 		act '"Could you help me out a bit in school?"':
-			cls
+			*clr & cla
 
 			if $loc = 'gdkin':minut += 5
 
@@ -362,13 +368,13 @@ end
 !!Ivan Prokhorov!!
 !!!!!!!!!!!!!!!!!!
 
-	if numnpc = 3:gt 'IvanEv', 'School Chat'
+if numnpc = 3:gt 'IvanEv', 'School Chat'
 
 !!!!!!!!!!!!!!!
 !!Vitek Kotov!!
 !!!!!!!!!!!!!!!
 
-	if numnpc = 9 and kotovloveqw > 0 and $loc ! 'gdkin' and NikoPayback = 2:act 'Tell him about Niko':gt 'NikoPayback', 'Vitek Help'
+if numnpc = 9 and kotovloveqw > 0 and $loc ! 'gdkin' and NikoPayback = 2:act 'Tell him about Niko':gt 'NikoPayback', 'Vitek Help'
 
 !!!!!!!!!!!!!!!!!!
 !!!Fedor Kozlov!!!
@@ -386,7 +392,7 @@ end
 if numnpc = 12:
 	if (pcs_dom > 0 or grupTipe = 3) and JuliaMilLernQW = 0 and npc_rel[$static_num] >= 80:
 		act '"Could you help me out a bit in school?"':
-			cls
+			*clr & cla
 
 			if $loc = 'gdkin':minut += 5
 
@@ -412,10 +418,11 @@ end
 !!!!!!!!!!!!!!!!!!!
 !!!Katja MEYNOLD!!!
 !!!!!!!!!!!!!!!!!!!
+
 if numnpc = 14:
 	if meynoldQW = 1:
 		act 'Thank Katja for taking you home from the disco':
-			cls
+			*clr & cla
 
 			if $loc = 'gdkin':minut += 5
 
@@ -452,7 +459,7 @@ if numnpc = 14:
 		'Katja looks at you with a smile: "<<$pcs_nickname>>, I bet you would look great with a little make-up on you! What do you say?"'
 
 		act 'Let her put makeup on you':
-			cls
+			*clr & cla
 			pcs_hairbsh = 1
 
 			if $loc = 'gdkin':minut += 5
@@ -506,7 +513,7 @@ if numnpc = 14:
 	if (npc_rel[$static_num] > 60) and (KatjaOTN > 0) and (KatjaLust > 15) :
 		!!new Katja stuff not sure where you want to put it. It should be a option when you talk to her at school or the dance where it says Chat, but add this as a option.
 		act 'Kiss Katja':
-			cls
+			*clr & cla
 			if $loc = 'gdkin':
 				minut += 1
 				gs'stat'
@@ -525,7 +532,7 @@ if numnpc = 14:
 					act 'Move away': gt $loc, $metka
 				end
 			else
-				cls
+				*clr & cla
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/<<numnpc>>.jpg"></center>'
@@ -537,7 +544,7 @@ if numnpc = 14:
 
 	if apmeet = 3 and artemIzdev = 0:
 		act 'Ask how to stop Artem and Peter''s blackmail':
-			cls
+			*clr & cla
 			if $loc = 'gdkin':minut += 5
 			artemIzdev = 1
 			gs 'stat'
@@ -571,12 +578,13 @@ if numnpc = 14:
 end
 
 !!!!!!!!!!!!!!!!!!!!!!!!!
-!!!Natasha Belova Botha!!!
+!!!Natasha Belova Botha!!
 !!!!!!!!!!!!!!!!!!!!!!!!!
+
 if numnpc = 16:
 	if pcs_dom > 0 and NatBelLernQW = 0 and npc_rel[$static_num] >= 80:
 		act '"Could you help me out a bit in school?"':
-			cls
+			*clr & cla
 
 			if $loc = 'gdkin':minut += 5
 
@@ -598,7 +606,7 @@ if numnpc = 16:
 	end
 	if natotrab > 0 and NatDolg > 0:
 		act 'Come to the bathroom with me':
-			cls
+			*clr & cla
 			minut += 5
 			natotrab += 1
 			natsub += 1
@@ -610,7 +618,7 @@ if numnpc = 16:
 			'She looks at you questioningly but doesn''t protest, as you pull her into the bathroom, past a few girls using the mirrors. You take her into a stall with you. You sit down on the toilet and pull down your panties, then spread you legs and tell her. "Down on your knees, time to pay off a little debt."'
 			'She looks a little shocked at first but then gets down on her knees and lowers her face to your crotch.'
 			act 'Further':
-				cls
+				*clr & cla
 				minut += 15
 				NatDolg -= 500
 				if npcSex[16] = 0:npcSex[16] = 1 & girl += 1
@@ -636,9 +644,10 @@ end
 !!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!Lizaveta Petrov!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!
+
 if numnpc = 31:
 	act 'Latest gossip':
-		cls
+		*clr & cla
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/31.jpg"></center>'
@@ -657,11 +666,5 @@ if numnpc = 31:
 	end
 end
 
-if $loc ! 'gdkin':
-	act 'Leave': gt 'gschool_lessons', 'short_break'
-else
-	act 'Move away': gt $loc, $metka
-end
-
 --- Snpc ---------------------------------