SI Fixes: fix Gwani hostile reaction

From 970b2ee30ef3471ee01d572eb3e417819f4862c2 Mon Sep 17 00:00:00 2001
From: Malignant Manor <malignantmanor@users.noreply.github.com>
Date: Tue, 5 Jul 2016 13:23:40 -0500
Subject: [PATCH] * SI Fixes: Add correct checks for Gwani cloak/pelt hostility
 but still use   wrong checks

---
 ChangeLog                            |  4 +++
 content/sifixes/src/npcs/bwundiai.uc | 50 ++++++++++++++++++++++++++++++++++++
 content/sifixes/src/usecode.uc       |  2 ++
 3 files changed, 56 insertions(+)
 create mode 100644 content/sifixes/src/npcs/bwundiai.uc

diff --git a/ChangeLog b/ChangeLog
index 3e9911f..f22e601 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-07-05 Malignant Manor <malignantmanor@users.sourceforge.net>
+   * SI Fixes: Add correct checks for Gwani cloak/pelt hostility but still use
+     wrong checks
+
 2016-06-27 Marzo Sette Torres Junior <marzojr@yahoo.com>
    * Fixed bug #1958 "Studio: Selecting mod of a game type doesn't work if there
      are two same game".
diff --git a/content/sifixes/src/npcs/bwundiai.uc b/content/sifixes/src/npcs/bwundiai.uc
new file mode 100644
index 0000000..745517a
--- /dev/null
+++ b/content/sifixes/src/npcs/bwundiai.uc
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (C) 2016  The Exult Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * We add the correct Gwani pelt and cloak checks that give hostile reactions
+ * but still use the wrong checks
+ */
+
+extern var npcNearbyAndVisible 0x942 (var npc);
+extern var hasItemCount 0x97D (var cont, var mincount, var shapenum, var quality, var framenum);
+extern var partyUtters 0x992 (var npcnum, var partyutter, var avatarutter, var isbark);
+
+void Bwundiai object#(0x490) ()
+{
+   if (event == STARTED_TALKING) {
+       var gwani_pelt = hasItemCount(PARTY, 1, 977, QUALITY_ANY, 9); // was using frame 8
+       var gwani_cloak = hasItemCount(PARTY, 1, 227, QUALITY_ANY, 4); // was using shape 2
+       if (gwani_pelt || gwani_cloak) {
+           UI_run_schedule(BWUNDIAI);
+           UI_clear_item_say(BWUNDIAI);
+           UI_show_npc_face0(BWUNDIAI, 0);
+           say("\"Botoka na guta!\" *This creature looks at you with eyes so filled with hate that it is painful to look at them.");
+
+           if (npcNearbyAndVisible(MWAERNO)) {
+               UI_show_npc_face1(MWAERNO, 0);
+               UI_set_conversation_slot(1);
+               say("\"Umgabar fotuba na Gwani!\" *This one looks at you with eyes that are cold and feral.");
+               UI_remove_npc_face1();
+           }
+           partyUtters(IOLO, "@Avatar, they smell the Gwani pelts!@", "@They smell the Gwani pelts!@", false);
+           return;
+       }
+   }
+   Bwundiai.original();
+}
diff --git a/content/sifixes/src/usecode.uc b/content/sifixes/src/usecode.uc
index b00a658..9ea790d 100644
--- a/content/sifixes/src/usecode.uc
+++ b/content/sifixes/src/usecode.uc
@@ -74,6 +74,8 @@
 #include "npcs/iolo.uc"
 // She now really gives dried fish when asked
 #include "npcs/baiyanda.uc"
+// Add correct checks for Gwani cloak/pelt hostility but still use wrong checks
+#include "npcs/bwundiai.uc"
 // For curing Cantra, from exult/content/si
 #include "npcs/cantra.uc"
 // Fixes fur cap/misplaced item list bug
--
1.9.5.msysgit.1