Przeglądaj źródła

[fixed] the npcpreservec problem (I hope)

hornguy6 2 lat temu
rodzic
commit
cb992e5c36
2 zmienionych plików z 3 dodań i 6 usunięć
  1. 0 1
      locations/hookup.qsrc
  2. 3 5
      locations/pav_disco.qsrc

+ 0 - 1
locations/hookup.qsrc

@@ -3,7 +3,6 @@
 if $ARGS[0] = 'start':
 	$location_type = 'indoors'
 	if CloDress > 0:hookup['dress'] = 1
-	gs 'npcpreservec', $npclastgenerated
 	gs 'boystat', $npclastsaved
 	gs 'clothing', 'strip'
 	gs 'underwear', 'remove'

+ 3 - 5
locations/pav_disco.qsrc

@@ -684,7 +684,6 @@ if $ARGS[0] = 'dance_partner':
 				$din_disc_dance2 = 'Dancing next to you is a drunk man in a nice suit and expensive shoes.'
 			end
 		end
-		gs 'boystat', $npclastgenerated
 		gs 'boymass', 'A'
 	elseif sozboyrand <= boynum:
 		gt 'pav_disco', 'familiar'
@@ -753,8 +752,6 @@ end
 if $ARGS[0] = 'hookup_aggressive':
 	cla & *clr
 	gs 'fame', 'pav', 'sex', 1
-	gs 'npcpreservec', $npclastgenerated
-	gs 'boystat', $npclastsaved
 	'<center><img src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
 	'"Hey, let''s go back to my place and fuck!"'
 	act 'No thanks':
@@ -784,6 +781,7 @@ if $ARGS[0] = 'hookup_aggressive':
 		'<center><img src="images/locations/pavlovsk/community/disco/outside_kiss.jpg"></center>'
 		'"That sounds nice," you say with a smile.'
 		'He leans in and gives you a quick, yet passionate kiss. "Great!" He grabs you by the arm and starts pulling you towards a nearby apartment complex, whispering obscenities in your ear along the way.'
+		gs 'npcpreservec', $npclastgenerated
 		gs 'arousal', 'kiss', 5
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -795,6 +793,7 @@ if $ARGS[0] = 'hookup_aggressive':
 		'<center><img src="images/locations/pavlovsk/community/disco/outside_kiss.jpg"></center>'
 		'"Fuck yeah, that sounds awesome." you say back to him.'
 		'He leans in and gives you a quick, yet passionate kiss. "I knew I liked you." He grabs you by the arm and starts pulling you towards a nearby apartment complex.'
+		gs 'npcpreservec', $npclastgenerated
 		gs 'arousal', 'kiss', 5
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -804,8 +803,6 @@ end
 
 if $ARGS[0] = 'hookup_nice':
 	cla & *clr
-	gs 'npcpreservec', $npclastgenerated
-	gs 'boystat', $npclastsaved
 	'<center><img src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
 	'"Hey," <<$npc_firstname[$boy]>> says. "I had a really good time dancing with you tonight and I was wondering... would you maybe want to come back to my place? I could get you a drink and maybe..."'
 	act 'Sorry':
@@ -837,6 +834,7 @@ if $ARGS[0] = 'hookup_nice':
 		'<<$npc_firstname[$boy]>> seems stunned by your straightforwardness, but eventually answers, "Yes!"'
 		'You lean in to kiss him passionately, and he returns the kiss just as enthusiastically.'
 		'"Great! Lead the way!" you say with a smile after breaking the kiss. The two of you hurry through the streets together to a nearby apartment complex.'
+		gs 'npcpreservec', $npclastgenerated
 		gs 'arousal', 'kiss', 5
 		gs 'arousal', 'end'
 		gs 'stat'