[Exult-cvs-logs] ./exult/content/bgkeyring/src/quests/keyring functions.uc, 1.3, 1.4 eggs.uc, 1.3, 1.4

[<ma...@us...>]

Update of /cvsroot/exult/./exult/content/bgkeyring/src/quests/keyring
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8295/src/quests/keyring

Modified Files:
	functions.uc eggs.uc 
Log Message:
content/bgkeyring/*/*: Merged in the 'Iteractions' part of Alun Bestor's
Quests & Iteractions mod into the Keyring mod. Added generic healing
services (used by all healers), Lord British's Crown Jewels and updated
the code to use newer features of UCC. Also added casting frames for all
caster NPCs and changed some crlfs to lfs.

Index: functions.uc
===================================================================
RCS file: /cvsroot/exult/./exult/content/bgkeyring/src/quests/keyring/functions.uc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- functions.uc	27 Feb 2006 16:48:28 -0000	1.3
+++ functions.uc	27 Aug 2006 19:35:31 -0000	1.4
@@ -25,15 +25,10 @@
 
 monsterStats (var monster, var stats)
 {
-	var counter;
-	var statnum;
-	var max_count;
 	var stat_value;
-
 	//IDs of the properties to set:
 	var stat_ids = [STRENGTH, DEXTERITY, INTELLIGENCE, HEALTH, COMBAT];
-
-	for (statnum in stat_ids with counter to max_count)
+	for (statnum in stat_ids)
 	{
 		//For each stat in the array, set the monster's attribute:
 		stat_value = monster->get_npc_prop(statnum + 1);
@@ -43,18 +38,15 @@
 
 monsterEquipment (var monster, var arms, var arms_quality, var pouch_content, var pouch_frames, var pouch_quantities, var pouch_qualities)
 {
-	var counter;
-	var itemnum;
-	var max_count;
 	var bag;
 	var new_obj;
 	var index;
 	
-	for (itemnum in arms with counter to max_count)
+	for (itemnum in arms with /*counter*/index)
 	{
 		//For each item in arms,
 		//increment counter:
-		index = index + 1;
+		//index = index + 1;
 		//Create the object:
 		new_obj = UI_create_new_object(itemnum);
 		//Set quality:
@@ -340,14 +332,9 @@
 {
 	//Find all nearby eggs within dist of pos:
 	var eggs = pos->find_nearby(SHAPE_EGG, dist, MASK_EGG);
-	var max;
-	var counter;
-	var egg;
-	
 	//Halt scripts for item:
 	halt_scheduled();
-	
-	for (egg in eggs with counter to max)
+	for (egg in eggs)
 	{
 		//For each egg found,
 		if (egg->get_item_frame() == 7)

Index: eggs.uc
===================================================================
RCS file: /cvsroot/exult/./exult/content/bgkeyring/src/quests/keyring/eggs.uc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- eggs.uc	27 Feb 2006 16:48:28 -0000	1.3
+++ eggs.uc	27 Aug 2006 19:35:31 -0000	1.4
@@ -20,10 +20,10 @@
  *	This source file contains usecode for ALL the eggs used in the Keyring Quest.
  *
  *	Author: Marzo Junior
- *	Last Modified: 2006-02-27
+ *	Last Modified: 2006-03-19
  */
 
-eggNoOneThere 0xBF3 ()
+eggNoOneThere ()
 {
 	if (event != EGG)
 		return;
@@ -47,7 +47,7 @@
 	}
 }
 
-eggDetectGem 0xBF4 ()
+eggDetectGem ()
 {
 	if (event != EGG)
 		return;
@@ -61,7 +61,7 @@
 	}
 }
 
-eggCreateMageAndGoonsGoons 0xBF5 ()
+eggCreateMageAndGoonsGoons ()
 {
 	if (event != EGG)
 		return;
@@ -93,7 +93,7 @@
 	}
 }
 
-eggCreateLiche 0xBF6 ()
+eggCreateLiche ()
 {
 	if (event != EGG)
 		return;
@@ -104,7 +104,7 @@
 	if ((!liche) && (getQuestState() == TOLD_ABOUT_GEM)) createLichAndGems();
 }
 
-eggLicheDialog 0xBF7 ()
+eggLicheDialog ()
 {
 	if (event != EGG)
 		return;
@@ -134,7 +134,7 @@
 		script item after 2 ticks call eggLicheDialog;
 }
 
-eggCreateSpiderEggs 0xBF8 ()
+eggCreateSpiderEggs ()
 {
 	if (event != EGG)
 		return;
@@ -163,7 +163,7 @@
 	}
 }
 
-deleteLicheEggs 0xBFA ()
+deleteLicheEggs ()
 {
 	//Count the number of gems of dispelling have been picked up:
 	var party_gems = PARTY->count_objects(SHAPE_GEM_OF_DISPELLING, QUALITY_ANY, FRAME_ANY);