Browse Source

[changed] npcstat change propagation

anjuna krokus 2 months ago
parent
commit
b8a97de33a
1 changed files with 7 additions and 7 deletions
  1. 7 7
      locations/havana_crossfit.qsrc

+ 7 - 7
locations/havana_crossfit.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'box':
 		crossfit_random_choice = daystart
 	end
 
-	if $previous_record_holder ! ''  and pcs_lover < 3 and last_crossfit_workout < daystart:
+	if $previous_record_holder ! '' and last_crossfit_workout < daystart:
 		gt 'havana_crossfit', 'girlmeet'
 	end
 
@@ -115,16 +115,16 @@ if $ARGS[0] = 'girlmeet':
 	menu_off = 1
 	!! generate a girlfriend
 	gs 'npcgeneratec', 1
-	gs 'boyStat', $npclastgenerated
+	gs 'npcStat', $npclastgenerated
 	$boydesc = $previous_record_holder
-	$boyClo = 'wearing workout clothes'
+	$npcClo = 'workout clothes'
 	killvar '$previous_record_holder'
 	minut += 5
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
-	'As you enter the crossfit box, you notice <<$boybody_pref>> girl with <<$boybod_pref>> body and <<$boyface>> hair.
-	She is <<$boyClo>>'
+	'<center><img <<$set_imgh>> src="<<$npc_pic[$boy]>>"></center>'
+	'As you enter the crossfit box, you notice <<$npcheight_pref>> girl with <<$npcbuild_pref>> body and <<$npchair>> hair.
+	She is wearing <<$npcClo>>.'
 	'As she notices you, she greets you "Hi. My name is <<$boydesc>>. I heard you beat my old record, very impressive!"'
 
 	act 'Thank her':
@@ -143,7 +143,7 @@ if $ARGS[0] = 'girlmeet':
 			end
 			act 'Decline':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="<<$npc_pic[$boy]>>"></center>'
 				'"I''m sorry but I don''t feel myself attracted to you enough and I don''t want to lead you on."'
 				'<<$boydesc>> looks at you disappointed. "Oh well, I didn''t know if I had a chance but you can''t blame me for trying."'
 				'The two of you say goodbye to each other.'