Merge branch 'master' of http://git.tfgamessite.com/Ekay_Eto/girllife-ecv

glife.qproj

@@ -112,6 +112,7 @@
       <Location name="npcstatic3"/>
       <Location name="npcstatic4"/>
 	  <Location name="npcstatic5"/>
+	  <Location name="npc_intro"/>
       <Location name="saveupdater"/>
     </Folder>
     <Folder name="Combat">

locations/npc_intro

@@ -0,0 +1,54 @@
+# npc_intro
+
+! this procedure is designed for introduction of any npc either with standard or with custom description
+! ARGS[0] is ID number of npc ... required parameter
+! $ARGS[1] is an image path
+! $ARGS[2] is a color name of the title  e.g. 'red'
+! $ARGS[3] is $npc_notes replacement
+! $ARGS[4] is an additional text
+! Format: gs npc_intro, ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4]
+! Example: gs npc_intro, 23, '', 'green', '', 'Optional text here' <=== This would display Albina''s picture using the path in # npcstatic1 with her name above it in green text followed by her default description and finally, your relationship level.
+!Credit goes to rachels for coming up with the concept and initial code!!!
+
+*clear
+numnpc = args[0]
+$static_num = 'A<<numnpc>>'
+
+if $ARGS[1] = '':
+	$image_path = $npc_pic[$static_num]
+else
+	$image_path = $args[1]
+end
+
+if $args[2] = '': 
+	$titlecolor ='maroon' 
+else 
+	$titlecolor = $args[2]
+end
+
+if $args[3] = '': 
+	$description = $npc_notes[$static_num] 
+else 
+	$description = $args[3]
+end
+
+$apendix = $args[4]
+
+'<center><b><font color = <<$titlecolor>>><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>' & *nl
+if $image_path ! '':'<center><img src="<<$image_path>>"></center>' & *nl
+if $description ! '' and $description ! ' ': $description
+if $apendix ! '' and $apendix ! ' ':$apendix
+if npc_rel[$static_num] < 20:'You currently don''t get along at all with <<$npc_firstname[$static_num]>>.'
+if npc_rel[$static_num] >= 20 and npc_rel[$static_num] < 40:'You currently don''t get along very well with <<$npc_firstname[$static_num]>>.'
+if npc_rel[$static_num] >= 40 and npc_rel[$static_num] < 60:'You currently have a normal relationship with <<$npc_firstname[$static_num]>>.'
+if npc_rel[$static_num] >= 60 and npc_rel[$static_num] < 80:'You currently have a good relationship with <<$npc_firstname[$static_num]>>.'
+if npc_rel[$static_num] >= 80:'You currently have a great relationship with <<$npc_firstname[$static_num]>>.'
+
+killvar '$apendix'
+killvar '$description'
+killvar 'numnpc'
+killvar '$static_num'
+killvar '$image_path'
+
+
+--- npc_intro ---------------------------------