From 6946aa89444b39e340cc6a5cfbdab8796523cdeb Mon Sep 17 00:00:00 2001
From: DudeMcDude <shai.sha2304@gmail.com>
Date: Fri, 12 Aug 2016 15:37:34 +0300
Subject: [PATCH] Added Tolerant Townsfolk houserules option (NPCs will
 tolerate monstrous party members when conversing)

---
 Configurator/HouseRulesWindow.xaml |   2 ++
 Configurator/IniViewModel.cs       |  32 ++++++++++++++++++++++++++++-
 TemplePlus/config/config.cpp       |   3 ++-
 TemplePlus/config/config.h         |   1 +
 TemplePlus/party.cpp               |   7 +++++++
 tpdata/tpgamefiles.dat             | Bin 138425 -> 138426 bytes
 6 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/Configurator/HouseRulesWindow.xaml b/Configurator/HouseRulesWindow.xaml
index 6be9929e1..98b84ac5a 100644
--- a/Configurator/HouseRulesWindow.xaml
+++ b/Configurator/HouseRulesWindow.xaml
@@ -20,6 +20,8 @@
             </StackPanel>
             <CheckBox VerticalAlignment="Center" Content="Allow XP overflow" IsChecked="{Binding AllowXpOverflow}" Margin="0,5,0,5" ToolTip="Allows experience points to accumulate beyond the limit of the next level."/>
             <CheckBox VerticalAlignment="Center" Content="Slower levelling" IsChecked="{Binding SlowerLevelling}" Margin="0,5,0,5" ToolTip="Adjuts the experience point curve such that you rapidly get to level 3, but level more slowly afterwards. You will be about 1-2 levels behind a normal game."/>
+            <CheckBox VerticalAlignment="Center" Content="Tolerant Townsfolk" IsChecked="{Binding TolerantTownsfolk}" Margin="0,5,0,5" ToolTip="Townsfolk will be tolerant of monstrous party members and NPCs."/>
+            <CheckBox VerticalAlignment="Center" Content="Prestige Classes (WIP preview)" IsChecked="{Binding NewClasses}" Margin="0,5,0,5" ToolTip="Enables Prestige Classes. Currently WIP!"/>
         </StackPanel>
         <Button x:Name="button" Content="Ok" HorizontalAlignment="Left" Margin="10,0,0,10" VerticalAlignment="Bottom" Width="75" Click="button_Click"/>
     </Grid>
diff --git a/Configurator/IniViewModel.cs b/Configurator/IniViewModel.cs
index e7726ae1c..72a50f2f2 100644
--- a/Configurator/IniViewModel.cs
+++ b/Configurator/IniViewModel.cs
@@ -43,6 +43,12 @@ public class IniViewModel : DependencyObject
         public static readonly DependencyProperty SlowerLevellingProperty = DependencyProperty.Register(
            "SlowerLevelling", typeof(bool), typeof(IniViewModel), new PropertyMetadata(default(bool)));
 
+        public static readonly DependencyProperty TolerantTownsfolkProperty = DependencyProperty.Register(
+          "TolerantTownsfolk", typeof(bool), typeof(IniViewModel), new PropertyMetadata(default(bool)));
+
+        public static readonly DependencyProperty NewClassesProperty = DependencyProperty.Register(
+          "NewClasses", typeof(bool), typeof(IniViewModel), new PropertyMetadata(default(bool)));
+
         public IEnumerable<HpOnLevelUpType> HpOnLevelUpTypes => Enum.GetValues(typeof (HpOnLevelUpType))
             .Cast<HpOnLevelUpType>();
 
@@ -128,7 +134,17 @@ public bool SlowerLevelling
             get { return (bool)GetValue(SlowerLevellingProperty); }
             set { SetValue(SlowerLevellingProperty, value); }
         }
-        
+
+        public bool TolerantTownsfolk
+        {
+            get { return (bool)GetValue(TolerantTownsfolkProperty); }
+            set { SetValue(TolerantTownsfolkProperty, value); }
+        }
+        public bool NewClasses
+        {
+            get { return (bool)GetValue(NewClassesProperty); }
+            set { SetValue(NewClassesProperty, value); }
+        }
 
         /// <summary>
         /// Tries to find an installation directory based on common locations and the Windows registry.
@@ -206,6 +222,18 @@ public void LoadFromIni(IniData iniData)
                 SlowerLevelling = slowerLevelling;
             }
 
+            bool tolerantTownsfolk;
+            if (bool.TryParse(tpData["tolerantNpcs"], out tolerantTownsfolk))
+            {
+                TolerantTownsfolk = tolerantTownsfolk;
+            }
+
+            bool newClasses;
+            if (bool.TryParse(tpData["newClasses"], out newClasses))
+            {
+                NewClasses = newClasses;
+            }
+
         }
 
         public void SaveToIni(IniData iniData)
@@ -241,6 +269,8 @@ public void SaveToIni(IniData iniData)
             tpData["maxLevel"] = MaxLevel.ToString();
             tpData["allowXpOverflow"] = AllowXpOverflow ? "true" : "false";
             tpData["slowerLevelling"] = SlowerLevelling ? "true" : "false";
+            tpData["newClasses"] = NewClasses? "true" : "false";
+            tpData["tolerantNpcs"] = TolerantTownsfolk? "true" : "false";
         }
     }
 
diff --git a/TemplePlus/config/config.cpp b/TemplePlus/config/config.cpp
index b23a3fcaa..36d1cdae0 100644
--- a/TemplePlus/config/config.cpp
+++ b/TemplePlus/config/config.cpp
@@ -161,7 +161,8 @@ static ConfigSetting configSettings[] = {
 	CONF_INT(msaaSamples),
 	CONF_INT(msaaQuality),
 	CONF_BOOL(showNpcStats),
-	CONF_BOOL(newClasses)
+	CONF_BOOL(newClasses),
+	CONF_BOOL(tolerantNpcs)
 };
 
 void TemplePlusConfig::Load() {
diff --git a/TemplePlus/config/config.h b/TemplePlus/config/config.h
index 4b1e9945f..47390842a 100644
--- a/TemplePlus/config/config.h
+++ b/TemplePlus/config/config.h
@@ -79,6 +79,7 @@ struct TemplePlusConfig
 	bool allowXpOverflow = false;
 	bool slowerLevelling = false;
 	bool newClasses = false; // Prestige classes and such
+	bool tolerantNpcs = false; // NPCs tolerate monster party members
 
 	std::unordered_map<std::string, VanillaSetting> vanillaSettings;
 	void AddVanillaSetting(const std::string &name, 
diff --git a/TemplePlus/party.cpp b/TemplePlus/party.cpp
index de6ae957d..1c1fa499f 100644
--- a/TemplePlus/party.cpp
+++ b/TemplePlus/party.cpp
@@ -47,6 +47,13 @@ class LegacyPartySystemHacks : TempleFix
 		SetMaxPCs((char)config.maxPCs);
 		replaceFunction(0x1002BBE0, AddToPcGroup);
 		replaceFunction(0x1002BC40, AddToNpcGroup);
+
+		// TriggersFearfulResponse
+		static BOOL(__cdecl *orgFearfulResponse)(objHndl) = replaceFunction<BOOL(__cdecl)(objHndl)>(0x10080720, [](objHndl handle){
+			if (config.tolerantNpcs)
+				return FALSE;
+			return orgFearfulResponse(handle);
+		});
 	}
 } partyHacks;
 
diff --git a/tpdata/tpgamefiles.dat b/tpdata/tpgamefiles.dat
index f2b9e8c7c9b11a83d9b2ff14e00f47bd9101aed1..1daaab5ee069a523a7aaac8a42538e8d262efbef 100644
GIT binary patch
delta 2247
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
E4_Bov4*&oF

delta 2195
zcmZ8h2~1R16n#9f!VELRFbfQz?6Rl>3<@Yv6j7*AFe(DJD##)bQJg{$mtd-vrHwIG
zcy%vEpe-(pA{MBn1`VPCs|9yNr4UKgYKawBdcObnlXQ~F%|CPQx#uo_ni?$|8!hXG
z+>55njWK6dhRO%F#fO4?XYPO1d}Pnj!5>R1Jy~f%soRA|k_OL4nSS5Vj>D#x%bd=g
z8<Gzsy8QfW$6s|jT#uc~oxQy)f&`rGTq@tNJ*g%tYTo(9^_y=-k4aeky}hpctL!mB
zh3vk9KAzgH+!o$pF&OT#?30=k=Mu+;Jjq}CdwJ2v)xL+P*{<?#nwM-jt~>B{=GeH%
zmQb3se&EQ0M;_@La|-K5Qd<)W8seOb>s6g$nyt$F$*29=a)WyAbX|Y#)e}FGyyRtN
zYHa_ye))^`DX(+t4#mW{bPh{aHV5yGFoax;Y3g-uj&6P7TsmU7;C#z^bJ)dezKy1^
z9S2Juv=<FH&z8MYm0rEPv8=y6=k>Ijo^{u=eu?g83C(iV$d=Q`W<Pa)*fwL>6z$&G
z5$@<&AJ|?qPW@)m$=b=S#RpBrCr=DjcK=W!Ey{Z3Zt%{|+IFO^uasQebiCHV?`%$a
zOXzs-tKsS_i?fLpW}%nnTv-vZxhf&<{C7{E_ZknqQ&>0#7LMPV?|CNQ)6DY^^#LnN
zJ|%=$;G1I1Bbi0<gdMk{lPKa{E9%QdO9`FI#Rv)Y=i)jE4di0Aga&Z&mV^d#(N;>Q
zb1_y*r*W}VN`1^`u~P`#<2@;z!^H{KG?I(i)^q|FcL}k{ng(&te_QiqJY>|5dybd!
zayw<zn|p4O(aBsKl+hq*JfX1OB_kx5`O2xEf(P<GBBU0-<grXSo$w#1A><x@aApVO
z)LQ^oSrQ^QC*&RLl2b1MbdeBJ4N%G?3hE<(mocP1GeS%(QXy(iM*3%9?q&s}%xo({
zssKJ?Clq3#Yhwv916a-m6k?$zu=6c^Rxl?U>MIo5ts=w?Kj>M!jhOx?TD$=V3)t5-
zXmi$wzSn@2gmf=<$%YyPum;slD71x1m7-<@e7*-WfJKdh_F#SirXSm^q?3f|4q(0o
z)5LyK(f~oz1K<e2V{BL{4kQ@W7XduV{B5bhhPPBWh7fmvBdN@2OZ|oXaG*+{Zp>sW
zR<guI8UO~e#~hR2+!gdVj42PYi7JuV3g$~NAFvFS$c)62+5z5VRVu0%(%-<-dVrPe
zp-Q|4J*sN}>X?gKbf2k(a}?9FL^XB7o#w0Q3_-;eWILF+&CaW7@c+Q)OroLg0=Q9%
z>%#~wS(t{p31B8t-{36ovK$T7akpBc5qtR(LvKaK4c4l`eEF_Vd*U##;l0dUOI@e)
zpdK>ykn!7%>qZ>GClnFGAZZ4FeQqJiwc)98pr!!sW6QPFNf4c$jt+H%M6pt>IEx{)
zb_wiftW7Ik$IdB)JV7T-6?WnzTQD01$Tck7PMo<6#(j|8z&6>@i6MM(DaJby%-)t!
zpOG*FnB;LTla)NNu7;3wH$o(=7ukZ#h`FeXRjy?^d+N#!E6iRrQ3ew?P|t@I+Kcbp
zBJ5a;dibZZ7uT5qiTePxYydKX_EG`-hiP@xHI#S3y$alkTpz}0pu&w69tdEvGR2t2
zIVKvOyN6pAxUtNrqwd)}r~)$upz{5wz&s?Q7)f27Zp=#MBw_@KT(CEQZ6s!5x%ps1
znWP!>vp&?b`J9(tEs!6x5gm0Ax_FC0a<4=N(>sX$$}t3U$S!9Y4&t9gyEP%(u%Z-p
zz=3*w%xhjy;)F2Ae(O;K3sD^VCb=oAQ_`~5d{~lTp#m04AgpH8Q5-pgun9KyvtUQ+
zEcn_bFz2&$M{(qh=<7G6ce8Rw@xDR;tUw1<tP`5yye}Jou>dVxMtvp16F0_!tPR2@
zZVI-lq1%Rxg)G1c#&9OFPSk)m1qx(KKmXNvn2{trb1UUOeJ*8J%J%g{p4s)yojvjP
QwE>G~M)_lKPWXrY7wU!(B>(^b