Преглед изворни кода

[changed] preferences initialised at the start of the sex_ev system and cleaned up at the end

anjuna krokus пре 2 месеци
родитељ
комит
2d134fc786

+ 0 - 3
locations/sex_ev_boy_pillow_talk.qsrc

@@ -679,7 +679,6 @@ if $ARGS[0] = 'boy_pube_talk_first':
 end
 
 if $ARGS[0] = 'boy_pubes_response':
-	dynamic $npc_preferences[$boy]
 	if npc_pref_values['hair_pubes_shaven'] > 0:
 		if func('pcs_has_attr', 'hairp_pubes_shaven'):
 			'"I think it''s hot," he grins. "No one likes to find a gorilla between a girl''s legs. Clean-shaven is the best."'
@@ -717,8 +716,6 @@ if $ARGS[0] = 'boy_pubes_response':
 		'"Just noting. Some girls shave, some don''t. Some guys want it one way, other guys another. Me? I don''t care if it''s more like an apple, a kiwi, or a coconut," he laughs aloud. "I just like pussy."'
 		gs 'sex_ev_pillow_talk', 'topic_route'
 	end
-	killvar '$npc_pref_traits'
-	killvar 'npc_pref_values'
 end
 
 if $ARGS[0] = 'dont_shave_like_talk':

+ 2 - 0
locations/sex_ev_leave.qsrc

@@ -167,6 +167,8 @@ if $ARGS[0] = 'ending':
 		stat['parents_home_sex'] += 1
 	end
 	killvar 'sex_ev'
+	killvar '$npc_pref_traits'
+	killvar 'npc_pref_values'
 end
 
 if $ARGS[0] = 'leaving_dialogue':

+ 0 - 6
locations/sex_ev_pillow_talk2.qsrc

@@ -89,7 +89,6 @@ if $ARGS[0] = 'fav_body_part':
 				act'Really? (insecure)':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
-					dynamic $npc_preferences[$boy]
 					if func('pcs_has_attr', 'body_tits_small'):
 						'"You really think so?" you ask, surprised. You self consciously grope yourself, saying, "You don''t think they''re too small?"'
 						if npc_pref_values['body_tits_small'] > 0:
@@ -127,8 +126,6 @@ if $ARGS[0] = 'fav_body_part':
 							'"Boobs are boobs," he says, bowing his head to kiss along the side of your breast. He grins. "And I love all boobs."'
 						end
 					end
-					killvar '$npc_pref_traits'
-					killvar 'npc_pref_values'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
 
@@ -151,7 +148,6 @@ if $ARGS[0] = 'fav_body_part':
 					act'You like ''em small?':
 						cla & *nl
 						'"These itty bitty titties?" you giggle, looking down at your modest chest. "You like small boobs?"'
-						dynamic $npc_preferences[$boy]
 						if npc_pref_values['body_tits_small'] > 0:
 							'"I love them," he grins. "Small tits are cute <i>and</i> sexy."'
 						elseif npc_pref_values['body_tits_average'] > 0:
@@ -164,8 +160,6 @@ if $ARGS[0] = 'fav_body_part':
 						else
 							'"Big melons, small apples, flat walls, I love ''em all," he grins and bows his head to kiss along the side of your breast.'
 						end
-						killvar '$npc_pref_traits'
-						killvar 'npc_pref_values'
 						gs 'sex_ev_pillow_talk2', 'small_talk'
 					end
 				elseif func('pcs_has_attr', 'body_tits_average'):

+ 10 - 5
locations/sex_ev_start.qsrc

@@ -86,7 +86,8 @@ if $ARGS[0] = 'exit_set':
 end
 
 if $ARGS[0] = 'initiate_pre':
-	gs 'boystat', $ARGS[1]
+	gs 'npcStat', $ARGS[1]
+	dynamic $npc_preferences[$npcID]
 !!	if $npc_rel_type[$boy] = 'husband' or $npc_rel_type[$boy] = 'boyfriend' or $npc_rel_type[$boy] = 'fuckbuddy':
 	if $npc_rel_type[$boy] ! '':
 		gs 'sex_ev_start', 'lover_initiate'
@@ -97,7 +98,8 @@ end
 
 if $ARGS[0] = 'boystat_init':
 	if sex_ev['boystat_done'] = 0:
-		gs 'boystat', $ARGS[1]
+		gs 'npcStat', $ARGS[1]
+		dynamic $npc_preferences[$npcID]
 		sex_ev['boystat_done'] = 1
 	end
 end
@@ -158,11 +160,13 @@ end
 
 if $ARGS[0] = 'hookup_initiate':
 	$sex_ev['type'] = 'hookup'
-	if $boy ! $npclastgenerated and $boy ! $npclastsaved:
+	if $npcID ! $npclastgenerated and $npcID ! $npclastsaved:
 		if npcgen_lastrun = 1:
-			gs 'boystat', $npclastgenerated
+			gs 'npcStat', $npclastgenerated
+			dynamic $npc_preferences[$npcID]
 		elseif npcgen_lastrun = 2:
-			gs 'boystat', $npclastsaved
+			gs 'npcStat', $npclastgenerated
+			dynamic $npc_preferences[$npcID]
 		end
 	end
 	stat['hookup'] += 1
@@ -209,6 +213,7 @@ end
 
 if $ARGS[0] = 'fb_npc_home_start':
 !!	gs 'boystat', $ARGS[1]
+!!	dymamic $npc_preferences[$npcID]
 	$sex_ev['type'] = 'booty_call'
 	if (booty_call_invite[$boy] = daystart or npc_booty_call_date[$boy] = daystart or npc_booty_call_date[$boy] = daystart) and npc_last_booty_call[$boy] ! daystart:
 		gt 'sex_ev_start', 'fb_invited_start'