Merge branch 'KnightCaptain-Skullcrusher' into master

content/bgkeyring/README

@@ -1,5 +1,5 @@
-You can obtain a full build of the BG Keyring mod at the author's website:
-http://seventowers.thefeudallands.ca/
+You can obtain a full build of the BG Keyring mod on Exult's website:
+http://exult.sourceforge.net/download.php
 
 To build it yourself, there are 4 different methods:
 
@@ -21,7 +21,7 @@ To build it yourself, there are 4 different methods:
 
 4)	The manual way: You will need UCC and ExPack to do it. You can do it in any
 	order you want, but you have to:
-	(a)	Change to the "content/sifixes/src" directory;
+	(a)	Change to the "content/bgkeyring/src" directory;
 	(b) run "expack -i *.in";
 	(c) run "ucc -o ../data/usecode usecode.uc".
 

content/sifixes/README

@@ -1,5 +1,5 @@
-You can obtain a full build of the SI Fixes mod at the author's website:
-http://seventowers.thefeudallands.ca/
+You can obtain a full build of the SI Fixes mod on Exult's website:
+http://exult.sourceforge.net/download.php
 
 To build it yourself, there are 4 different methods:
 

content/sifixes/Readme.txt

@@ -17,7 +17,7 @@ Miscellaneous fixes to Serpent Isle Usecode
 -----------------------
 Author: Marzo Sette Torres Junior
 e-mail: marzojr@taskmail.com.br
-version: 0.15.12
+version: 0.15.13
 
 	This modification fixes a few of the Usecode bugs that plague Ultima VII:
 	Serpent Isle. I have tested it *only* with Silver Seed installed; while it
@@ -30,6 +30,8 @@ version: 0.15.12
 	never know about it otherwise... The healing of Cantra was written by Jeff
 	Freedman (aka "DrCode"), and has been split into the files "npcs/cantra.uc"
 	and "items/bucketcure.uc".
+
+	Knight Captain has provided fixes to version 0.15.12 and later editions.
 
 	Everything else has been my own work, although the structure of the mod is
 	based on Alun Bestor's Quests and Iteractions mod. Many fixes were based on
@@ -178,6 +180,14 @@ version: 0.15.12
 
 6	Version history
 -------------------
+version 0.15.13 - 2016-08-08
+	- Draxinar's second riddle now spells correct correctly.
+	- Draxinar's last of four riddles now accepts the correct answer of 13.
+	  The prior accepted-but-wrong answer now gives a new unique response.
+	- Bwundiai and Mwaerno now use a fixed check for Gwani furs in the party,
+	  and the party will respond differently if two Gwani are nearby or only one.
+	- The automatons in Skullcrusher now confront the Avatar upon entry, when
+	  reaching the exit door, and approaching both sets of brass doors inside.
 version 0.15.12 - 2016-07-15
 	- The equipment scroll has been respaced and reordered to reflect the
 	  order the companions rejoin the party. Avatar, Shamino, Dupre, Iolo.

content/sifixes/src/header/si/si_externals.uc

@@ -168,6 +168,10 @@ extern void unfreezeAvatar 0x9AA ();
  */
 extern void setNewSchedules 0x9AC (var npc, var posx, var posy, var activity);
 
+// Sets a single NPC to attack the party, 
+// and changes that NPC's alignment to Evil.
+extern void attackParty 0x9AD (var npc);
+
 // Makes the NPC ask where to wait when kicked from the party
 // (or, in some cases, simply says where he will be later):
 extern void npcAskWhereToWait 0x9B4 (var npcnum);

content/sifixes/src/header/si/si_gflags.uc

@@ -266,6 +266,14 @@ enum Gorlab_swamp_townplot
 	DREAM_REALM_COMPLETE = 0x2DB
 };
 
+enum Skullcrusher_townplot
+{
+	// Yenani gave you a valuable secret, the password to open the gate to Skullcrusher.
+	KNOW_SKULLCRUSHER_PASSWORD = 613,
+	// New for SIfixes, set when the Skullcrusher automatons receive non-waiting schedules.
+	SKULLCRUSHER_AUTOMATONS = 614
+};
+
 // The quotes are from http://www.it-he.org
 enum Bane_flags
 {
@@ -297,7 +305,7 @@ enum Find_Gwenno_subplot
 	ASKED_SPEKTOR_ABOUT_GWENNO = 0xA7,
 	FREED_GWENNOS_BODY = 0x25F,
 	TALKED_TO_GWANI_ABOUT_GWENNO = 0x262,
-	BAYANDA_GAVE_BUCKET = 0x264,
+	BAIYANDA_GAVE_BUCKET = 0x264,
 	// Iolo and Gwenno are alive, sane and talked to each other:
 	IOLO_GWENNO_REUNITED = 0x275
 };
@@ -397,3 +405,45 @@ enum Teleport_storm_objects
 };
 
 const int TIME_FORMAT_24_HOURS = 0x400;
+
+enum Silver_Seed_flags
+{
+	WEARING_BELT_OF_STRENGTH = 0x2E8,
+	EXPERIENCE_FROM_BELT_OF_STRENGTH = 0x2E9,
+	USED_AMULET_OF_BALANCE = 0x2EE,
+
+	ASKED_SUROK_TOO_MUCH = 0x2F4,
+	RED_ORB_PLACED = 0x2F5,
+	PURPLE_ORB_PLACED = 0x2F6,
+	BLUE_ORB_PLACED = 0x2F7,
+	YELLOW_ORB_PLACED = 0x2F8,
+
+	KNOW_YUREL_LOVES_CHEESE = 0x2FA,
+	HAVE_AMULET_OF_BALANCE = 0x2FB,
+	HAVE_SILVER_SEED = 0x2FC,
+	KARNAX_WITNESSED_SEED_PLANTING = 0x2FD,
+	CASK_WAS_MOVED = 0x2FE,
+	ROPE_ON_WELL = 0x2FF,
+	HAVE_KEYRING = 0x300,
+
+	WEARING_GAUNTLETS_OF_QUICKNESS = 0x302,
+	HOLDING_ERINONS_AXE = 0x303,
+	EXPERIENCE_FROM_ERINONS_AXE = 0x304,
+	WAS_ASKED_LIARS_RIDDLE = 0x305,
+	WAS_ASKED_EARRINGS_RIDDLE = 0x306,
+	WAS_ASKED_LONGTOOTH_RIDDLE = 0x307,
+	WAS_ASKED_CLOTH_RIDDLE = 0x308,
+	SOLVED_LIARS_RIDDLE = 0x309,
+	SOLVED_EARRINGS_RIDDLE = 0x30A,
+	SOLVED_LONGTOOTH_RIDDLE = 0x30B,
+	SOLVED_CLOTH_RIDDLE = 0x30C,
+	MET_ISSTANAR = 0x30D,							// He is a shape, not a real NPC.
+	HAVE_PURPLE_ORB = 0x30E,
+	MET_RIEYA = 0x30F,
+	MET_DRUSILLA = 0x310,
+	MET_SOLARIA = 0x311,
+
+	PLANTED_SILVER_SEED = 0x313,
+	USED_IRON_MAIDEN = 0x314,
+	EXPERIENCE_FROM_RING_OF_REAGENTS = 0x315
+};

content/sifixes/src/header/si/si_npcs.uc

@@ -297,9 +297,9 @@ enum skullcrusher
 };
 
 // Gwani Village residents
-enum gwanni_npcs
+enum gwani_npcs
 {
-	BAYANDA = -143,
+	BAIYANDA = -143,
 	BWUNDIAI = -144,
 	MWAERNO = -145,
 	MYAURI = -146,