3Gtq`Lb*fC>;1}8^rAKbctpP%@R&ZL+#`nc
zy~<%3%TrWRuU768raA%`_8oyXw(d&nuGD#-=s~aEBQDc(%7emET;*Z$igsH0J7~B?
zc}hH_epPu^B*g=m%f0ccgeiIyReM>ygSE7tI_dA#Zal%i4j83B0bEJXtKXtcpa;;6
zk15S`9sLJXI#s^Vyc2MxsS=?GuEjC#f&vOmoJ#v9i@CBdnj!e@epHKDdNfY{$|-;
zN{tjtv!6(&R;`?C6&09qbs%&@y?5eagGj6&VjpiM`?JN~D$1bJeyp&Jd
z3qTH!&UUB9Xx7PCb|F87
znVBki$SM?|56(EmE5?xu^`w4J4V(ZMid(jL=s(m9h-#go=?6B?@tq115RnX?>D4(%@$-TbUMu`p*|
z1r4A;H)A_(Yqmn!iHguPg9F99yD(DB<%?$bkY$@*9w=wJlY7&%rX1`n6$%o8B6%Nl
z9CLQ6u&^jGoVR5%JxY-$4q3BPP+Dt%9jT_59il@srfn`|5MwU~JJODcT5(7w%47ph
z*y*BENV`%oH3KuIGNUke-(#XNg})GK+yVl`lZg5_i}BGbzwE-xgIn!pE2j;$m^C=aoR%M1#@xWEmeskH;!wUc%@5xu~Q{hZRD<@
z@tL$eSM_8xUpyfjcqvicUZy@ie<)ZnH*yl`@Ya{jRjKN(lDsO6rWZ_GCUC!Hx$uTY
zY}>LI`y0cWt&B5TS>_0UJ`E;&`eJ7uBs-#MSZx6FA6W7W)6P)@j{^GbGTznRVs779BSTp-X_UFY0Zaz8~r
zi!PdH(XDC|bT6&HMcz{J9YW{lOc&l-UIr`O&V;Iw3m6ce9GS;9>abDtoXj`+c?zwN
z&bZi7_hY-Fv8m7VjThOBna|C*WX(;cX1P!E-keI4Q^s3i-eYI6*pxz``_i^l!9nuY
z?bU_11&I}yw8uJW?&a6ESheG_nGfd8QzREn4eo^@ot>9n&0`Zx7p&Z5W#`{v&C4`$
z5O|_4&?MKa+Grl;ZApu?!QujzTji04-7;s{3moRiiBg(3Eg5nV`;~`P9&**%@Ij${
zkQ{tWe4m)YH`6>u$SYaE=lIk~bi%`?Bo?O;yvKDRRirFnmg4xHxeag#{31RUxN(|>
zCYFd(rbbsBGPTwgz{eAiY-q}0o`ul@-r047THx==x&K?+)6!y`Xv?RwGYa{%^ccG&
zd}mMRfKL&%)oQpfN7VL7S?0*8Wf!1J;}W8Ok+~f5M7wKsesbpbQ%Pptn-`Z@rjqqM
zvdC4Uu_07$k~jj^K0+r!FT(01?9PCCiVgt3aNZ7RV;xyKgvf13cvh%k9CJ#bWT1x(
z?v)H32h0J7?;W+iUzm@@`mU~(`e=ky{?%b=h8u@d6$d;&SPm=xv95Q69+yewc{2#r
zMX?+->m~T)5QqzE3B~KKgndb+@x4~R(CIG8<&<#>O7JENJ+%Q`IAaYYOqu8cqL{;y
z@>1Rhff~
zcJn-+leRdPk7z94|Nl8@f@W@Q`LO>6-|io5ZhfWwrozqSiwhA@<0SkT7>0yRLERr2
zjEpEsq#vv>%Y?PKXp0Pn8ybbOikc!D#41{amyRMbh_@{w>?b80_Jl^lOdbj8TAM%8
z@2T;VX!D0584g3E;>Qcp@|}S=47B;%{Lsw7194)0lr&GFFOILO{y03o7v@2a3Pg)=L4zG+M+w7AcBT%BI5#|(y$|@M
zV^XjK`cEj44p>t}>+)tK(o16%oTPt*L
zK;mUopeRuaHj1iJ)`Q$}MglUg$be2zVw4|cVHja;kB6nw$DveIezM;nbkWyU8NA1W2xl5O@E%@Phog=BnRX$ps)
z-R8mszE~Ffr?zZKUzWM-^4`8po6VlBeNAFQX&gVEpMxfRz4A`+qSCV=Rf{yLn$d@Q
zJN{w;BvqCkNSb>n(jGz92qobXa}_z#EAAgDaq+M}
zF=Jb&9057}E{n@2A<_5nOI7uHk;m~WcK*Hkd$mW!w<>$MP}sxYW@MsFQ+^3z?zs-=
z;Md`wU7tDw{05rv7MaTDPw{@`==m5r%i*^+x^{r*CWSHYx=FzgWq8*#j&sLBJi7N|
zgqJY17kCPAr}w`u=o#O?pXIl;7hd>y}mick&
z;9$Xe=FYPdhinhl!;x&@I(eT-u&tYl!zZZ}X6)gYj4kFca
zE6-d!dr?CAJBs-^sf{(v;h4Z4=j4HjuvCbym$t_$bj}LfuI7cY|Gf{JWghlHw}m4}
z3HfqS!Sl1Rln2fU(N;O<{1Y{QllV>ZF!i(R(`EpP=HD(~ui1Y;?bOfYe)lu*KN14f
ACIA2c
diff --git a/Assemblies/CombatExtendedLoader.dll b/Assemblies/CombatExtendedLoader.dll
new file mode 100644
index 0000000000000000000000000000000000000000..225ee260879b2ecde093783ebb3c843b425053f3
GIT binary patch
literal 7168
zcmeHLdu&@*8UK#$I;oqwjhpnb?s3y>EK3{DdA1qrNaDC{)-+9Hr(HK7y|z!BORw+s
z?!8VE2AwxxXgnq+gang7Oh}WM1mjU@gK3+P&=3;UG=b1I(AcC&10lhvCT&8{^83!U
zwM>XoO{o?_t4$npdb;2a9y}S^bC4#LkeCQR3MJt@XIKjS$nqa
z88LpgEi-4hTFJ2sj$YJqx@Fm(mX(@Qwlu@iMh~a8qMeuV_3I-yR!vW)h{i>bjMslO
zTbu0-+M%rz38EM{jXu`_NgA#pTtpic9`OBU2K%pC1rU60K^poJtMb3zS4n1}X|Q{k
zks8DCOG_
zkT9+mT+7-JypKE5w4tbcJpm!xx(3&>HbgYCj8td_@pEI}0sAChbb<|)ZoQT~D(A4N)T&ZI-@bznV
z1?lx+non-SJ_dn*|9XXggi-Nty!`7jo7*hRn*=OoyhTeh@xY-dp?
ze8J=a+D`qG1b>J&B?PTQ4_nRTJPY;6P6~H|AE8IsTgCs=lJ(P24BgbVY;zvd(!;z|m{jw{W0}bzBEB>~yZ68{l=z7WaCHnmQ0&q|w#@
zsWa}bfz1j}-?<~u(WaQ-50G;gTiBr(Bk4OwM746f4(9vfiFj|Kw|fu-YHI?T@TmPX
z(JSa1VYEH%IfhkmS>p}dYwshX_USaef&}r>Y~MdUHj4hQpiP#In0A(x(Ljo0(}Bjd
zKThebB~k<{XR?^0_Dk%sCTe&fCN~ZwER7e@@K*2kb=X2TFPzoG^V_
zS$Gwk2)(JKzft&;YTh*pe+KrW)E#_RMO{>ot0s`|Gl7NRu)>3F8|llC>7YV1Kn4}X
zX5jY%b^%UmJn*5d=Yk#JzN@Gg>9x>3$ZS&^%O0f{17#7QCwyw_`$49DrYIg4hUT-1
z`T~|1Q_oka0Y!0Lz8zXi=TMhsz%XqCjLw5tK?R2u98>U!g2xrq6}%U)l@EGnVL=%?U6PHjR2pQc;H6Z9PYO3gSZ=8?gh=_JWO
z9QXdBh|?x|5O6y^4%kjl0`8=@0DI{I;KwNf%_Q9jc#ygQ(@J^|V2)haX+)OJV*Eq&
z6}pY?q)>%3Ce+GC`q3W2+FHJ){F-p%p$XiJXLm$;6+v@+3tZG*P;{_n>-IYaXJ&e4
z5_Efd&OSA5QGQ7oIyxPne!&}bI=nkCR
zhqH`4WjiNV>+eGm*eN7&wQ$UuwVk5Q8P?5JT4|XpJIKqVbc%+1X$wi)nl%b#N7<-P
z;D@c4Q_|EI6z10DwP+?CR5ItS79{P`qGJ^1E-5OObZfCbW~yv?MiDs#-!rm?37_lI
z>T;+m#j8O@+S4%NwrjtVQJZ?(jL?B
zCaZg?1t{cYe%#jc(uwCyv${NKxKuKYoXQK;678?`+5(=Ev(*JmsfC;@ah0f+xUOV+
zPIpQdO%wO$xrke3j@wotH4lFe=vLm84o6TkS7Z4RjO&XKryR$2mX)X)o-?RrMeU5dgl4(=-TJaE#|nKyFMC4Z5l4sZjc$r-BoV}POiw;H2W
z>$Nn+>kHDQ!`aW^E+@M*Ggjn`8lEaevg|krm2!TG=tx*@tLVlONu8pZKEK7Ax{_ZDntk*7-CTh@7%UF;biiPt5`rXqH3ojgj>0-z*|
z@_>1wgUhAbD!GQI^lhZk6qPZ?!hT>;0W?!NWw!*L>DxM-#P}H+2cNZ4G_Pjzz)RB{
zxTk3P65~c-jcw%V7<_b~;m<-hT-i6O{P#GFmf;Q$ljxm`++>HeOHLXGUxQmxjhjPK
zJSt&}x{YqduK*W3xLiis;?+QJ#m08|M0P2ug;DH$8CLVKbEOgOssx-O6Lw1|5tqfo
zL4|n^d@;bc;N>iO2R)a}L#&)Em&8s#-Iq$~C^YBs-cm~}wfnm4&vGA!K`o*zIv{oV
zI{VcuzUTGguCiG9?gu$(f?}`i*G0?ysi(HRbZ+1C@BN2Dnh=dajl>!t&CN_k724m_
z5Nd5cBw|NmN1_2{#Ztj=Og4mDV`Jb}JG_jt)+P%3${`J>A%K_xqtP`K2t=d60wGd{
z1LE4P%@h`~>1d!e_IVMjJP?RY2OC7Ru^||n#_xETM04fgD7q;6RxP4P4B#=W(p>pE
z-Zo;DZ-v>Z%6A%{{_H1@ZtHvF;mY^oqVmNnJcZ)5M^pXDw6p>3(rTxZU0QYX*~>3I
z`0dh?Wz#D=a<3)Jo}-()w8?T753z%CF=L;U*52&y-Fknnf1rD?w@)Va47Q3)U}O5E
zQGz8L9sK=6Abm}^rg2IWjiUNF;(9*lWdfUzIeKZrwwAV#%$#GNa#^oI@DXlM(6#Z2
zRA%W6v8(1K-pzK$dtfBmvLxhlj;Z_SpKAoQCN8zl;Y|a08`j?(=>)J
zZ4;o!0QdP{-RQZ{KhOK`O*}&Y^Z5NIs&@GODNx00-6#+NtGre2Q(K6HO-pSqtaGD!
z>&if?gNx%2dfv=ZrLM?nh!zT|~{vN&B(mR+~AnMw$4_heT0^|75A*vfvHipqH%mTK=xPIWpqo*)YIF0}d`DDZe!MmrxhmyIc8qxH_II#y-~a#uOhq*yiOAHkb3&ujeFe
z+lZiy{Cmryzq)!ph@+CAm9{RfKt2CEv1YUQ;?P685v!yD#4dsNqdv@MdO)qZ1ib2p
zULUx7(C6^$p+Wp~V0rwq=<(b}+oS3~jFp7%6zaTeBJVn3XG`?uWk))ZmZ6hbsek
R0PweBj~@gdwGUke{s*Wafhhn0
literal 0
HcmV?d00001
diff --git a/Source/CombatExtended/Loader/IModPart.cs b/Source/CombatExtended/Loader/IModPart.cs
new file mode 100644
index 0000000000..8e8f45580e
--- /dev/null
+++ b/Source/CombatExtended/Loader/IModPart.cs
@@ -0,0 +1,14 @@
+using System.Reflection;
+using RimWorld;
+using System.Collections.Generic;
+using Verse;
+using System;
+
+namespace CombatExtended.Loader
+{
+ public interface IModPart
+ {
+ public void PostLoad(ModContentPack content, ISettingsCE settings);
+ public Type GetSettingsType();
+ }
+}
diff --git a/Source/CombatExtended/Loader/ISettingsCE.cs b/Source/CombatExtended/Loader/ISettingsCE.cs
new file mode 100644
index 0000000000..2ce6b50033
--- /dev/null
+++ b/Source/CombatExtended/Loader/ISettingsCE.cs
@@ -0,0 +1,11 @@
+using RimWorld;
+using Verse;
+using UnityEngine;
+
+namespace CombatExtended.Loader
+{
+ public interface ISettingsCE
+ {
+ public void DoWindowContents(Listing_Standard list);
+ }
+}
From d3b3d3f3061ff05e7572c6d89020806cb3bb4922 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 00:41:31 -0700
Subject: [PATCH 08/69] Add script to find duplicate relative paths
---
DupeFinder.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 DupeFinder.py
diff --git a/DupeFinder.py b/DupeFinder.py
new file mode 100644
index 0000000000..57f689ba1a
--- /dev/null
+++ b/DupeFinder.py
@@ -0,0 +1,48 @@
+from xml.dom.minidom import parse as XMLOpen
+from twisted.python.filepath import FilePath
+import sys
+err = "-c" not in sys.argv
+
+used = {}
+mods = set()
+ModPatches = FilePath("ModPatches")
+ec = 0
+
+def process(node):
+ global ec
+ mod = c.getAttribute("IfModActive")
+ if (mod, c.firstChild.data) in mods:
+ ec += 1
+ msg = f"Mod {mod} is listed in LoadFolders.xml twice, both pointing to {c.firstChild.data}"
+ if err:
+ raise RuntimeError(msg)
+ else:
+ print(msg)
+ mods.add((mod, c.firstChild.data))
+ root = FilePath(c.firstChild.data)
+ if not ModPatches in root.parents():
+ return
+ for fd in root.walk():
+ if fd.isdir():
+ continue
+ if not fd.basename().endswith(".xml"):
+ continue
+ relative = tuple(fd.segmentsFrom(root))
+ if relative in used:
+ msg = f"Mod {mod} is trying to use {relative}, but {used[relative]} already owns that path"
+ if err:
+ raise RuntimeError(msg)
+ else:
+ ec += 1
+ print(msg)
+ used[relative] = mod
+
+with XMLOpen("LoadFolders.xml") as x:
+ v1_5 = x.getElementsByTagName("v1.5")
+ for n in v1_5:
+ for c in n.getElementsByTagName("li"):
+ if c.getAttribute("IfModActive"):
+ process(c)
+
+
+raise SystemExit(ec)
From 21202f31ca349ea3d464ed1845342de1ea65a180 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 00:41:45 -0700
Subject: [PATCH 09/69] Update makefile to not require building the loader and
change the loader name
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index d440b09473..9a4fc416fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
PUBLICIZER := /tmp/AssemblyPublicizer
-all: Assemblies/0CombatExtendedLoader.dll Assemblies/CombatExtended.dll CompatAssemblies AssembliesCompat $(PUBLICIZER)
+all: Assemblies/CombatExtended.dll CompatAssemblies AssembliesCompat $(PUBLICIZER)
$(PUBLICIZER):
git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer --depth=1 $(PUBLICIZER)
@@ -12,10 +12,10 @@ $(PUBLICIZER):
AssembliesCompat: $(PUBLICIZER)
mkdir -p AssembliesCompat
-Assemblies/0CombatExtendedLoader.dll: Source/Loader/Loader.csproj $(wildcard Source/Loader/Loader/*.cs) $(PUBLICIZER)
- python3 Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --reference /tmp/rwreference --all-libs $(DOWNLOAD_LIBS)
+Assemblies/CombatExtendedLoader.dll: Source/Loader/Loader.csproj $(wildcard Source/Loader/Loader/*.cs) $(PUBLICIZER)
+ python3 Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/CombatExtendedLoader.dll --reference /tmp/rwreference --all-libs $(DOWNLOAD_LIBS)
-Assemblies/CombatExtended.dll: Assemblies/0CombatExtendedLoader.dll Source/CombatExtended/CombatExtended.csproj $(wildcard Source/CombatExtended/*/*.cs) $(wildcard Source/CombatExtended/*/*/*.cs) $(PUBLICIZER)
+Assemblies/CombatExtended.dll: Source/CombatExtended/CombatExtended.csproj $(wildcard Source/CombatExtended/*/*.cs) $(wildcard Source/CombatExtended/*/*/*.cs) $(PUBLICIZER)
python3 Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --reference /tmp/rwreference --all-libs $(DOWNLOAD_LIBS) --publicizer $(PUBLICIZER)
From 7c35397d1be8d43a26465da388f4f4ab4c3955a6 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 00:42:07 -0700
Subject: [PATCH 10/69] Add loadfolders entries for compat assemblies
---
LoadFolders.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 504adff5f1..83a0d024f7 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -358,7 +358,6 @@
ModPatches/Rimmu-Nation - Weapons
ModPatches/RimNauts 2
ModPatches/RimSec-Security
- ModPatches/Rimsenal - Spacer Faction Pack
ModPatches/Rimsenal Xenotype Pack - Askbarn
ModPatches/RimTraits - General Traits
ModPatches/RimTraits - Medieval Talents
@@ -605,5 +604,8 @@
ModPatches/pphhyy's Lightless Empyrean
ModPatches/Vanilla Arsenal
ModPatches/Jin-Roh Kerberos Panzer Cop Armor
-
+ ModPatches/VehicleFramework
+ ModPatches/Multiplayer
+ ModPatches/SRTS
+
From d432f9e8183d4cf6ab453a3ed91526815c4aa4a9 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 00:42:24 -0700
Subject: [PATCH 11/69] Read destination of output assemblies from .csproj
files
they must be located under ModPatches
---
BuildCompat.py | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/BuildCompat.py b/BuildCompat.py
index e3470dd2ad..caf130e938 100644
--- a/BuildCompat.py
+++ b/BuildCompat.py
@@ -4,6 +4,7 @@
from subprocess import Popen
import re
import sys
+from xml.dom.minidom import parse as XMLOpen
tm = '-m' in sys.argv
@@ -37,8 +38,20 @@ def system(*cmd):
if tm and name not in sys.argv: continue
csproj = csproj.replace('\\', '/').split('/')
csproj = FilePath("Source").descendant(csproj)
- print(f"Building {name}")
output = FilePath("AssembliesCompat").child(name+".dll")
+ with XMLOpen(csproj.path) as cpath:
+ op = cpath.getElementsByTagName("OutputPath")
+ if op:
+ op = op[0].firstChild.data
+ if 'ModPatches' in op:
+ op = op.rsplit("..\\ModPatches", 1)[-1].replace('\\', '/').split('/')
+ if op:
+ od = FilePath("ModPatches").descendant(op)
+ if not od.exists():
+ od.makedirs()
+ output = od.child(name+".dll")
+
+ print(f"Building {name}")
system("python3", "Make.py", "--csproj", csproj.path, "--output", output.path, DOWNLOAD_LIBS, "--all-libs", "--publicizer", PUBLICIZER, "--", "-r:Assemblies/CombatExtended.dll")
for t in tasks:
From cc0073dc9f6ff65a04907834cc7740a1d14b13af Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 00:43:12 -0700
Subject: [PATCH 12/69] Remove references to loader, move output to ModPatches
---
Source/BetterTurretsCompat/BetterTurretsCompat.csproj | 10 ++--------
Source/CombatExtended/CombatExtended.csproj | 6 ------
Source/Loader/Loader.csproj | 2 +-
Source/MiscTurretsCompat/MiscTurretsCompat.csproj | 10 ++--------
Source/MultiplayerCompat/MultiplayerCompat.csproj | 10 ++--------
Source/SOS2Compat/SOS2Compat.csproj | 10 ++--------
Source/SRTSCompat/SRTSCompat.csproj | 10 ++--------
Source/VehiclesCompat/VehiclesCompat.csproj | 10 ++--------
8 files changed, 13 insertions(+), 55 deletions(-)
diff --git a/Source/BetterTurretsCompat/BetterTurretsCompat.csproj b/Source/BetterTurretsCompat/BetterTurretsCompat.csproj
index b37cab8275..21bb270f34 100644
--- a/Source/BetterTurretsCompat/BetterTurretsCompat.csproj
+++ b/Source/BetterTurretsCompat/BetterTurretsCompat.csproj
@@ -12,7 +12,7 @@
false
- ..\..\AssembliesCompat\
+ ..\..\ModPatches\BetterTurrets\Assemblies\
portable
true
true
@@ -20,7 +20,7 @@
true
- ..\..\AssembliesCompat\
+ ..\..\ModPatches\BetterTurrets\Assemblies\
true
none
false
@@ -34,12 +34,6 @@
-
-
- ..\..\Assemblies\0CombatExtendedLoader.dll
- False
-
-
False
diff --git a/Source/CombatExtended/CombatExtended.csproj b/Source/CombatExtended/CombatExtended.csproj
index 06d24c20c2..a64042ec2f 100644
--- a/Source/CombatExtended/CombatExtended.csproj
+++ b/Source/CombatExtended/CombatExtended.csproj
@@ -69,12 +69,6 @@
-
-
- ..\..\Assemblies\0CombatExtendedLoader.dll
- False
-
-
..\packages\Rimatomics-reference.dll
diff --git a/Source/Loader/Loader.csproj b/Source/Loader/Loader.csproj
index 5fe09601d5..0d1bf4fd3f 100644
--- a/Source/Loader/Loader.csproj
+++ b/Source/Loader/Loader.csproj
@@ -2,7 +2,7 @@
net472
- 0CombatExtendedLoader
+ CombatExtendedLoader
1.1.2.0
1.1.2.0
1.1.2
diff --git a/Source/MiscTurretsCompat/MiscTurretsCompat.csproj b/Source/MiscTurretsCompat/MiscTurretsCompat.csproj
index 12f309f64b..302cf63967 100644
--- a/Source/MiscTurretsCompat/MiscTurretsCompat.csproj
+++ b/Source/MiscTurretsCompat/MiscTurretsCompat.csproj
@@ -12,7 +12,7 @@
false
- ..\..\AssembliesCompat\
+ ..\..\ModPatches\MiscTurrets\Assemblies\
portable
true
true
@@ -20,7 +20,7 @@
true
- ..\..\AssembliesCompat\
+ ..\..\ModPatches\MiscTurrets\Assemblies\
true
none
false
@@ -39,12 +39,6 @@
False
-
-
- ..\..\Assemblies\0CombatExtendedLoader.dll
- False
-
-
..\packages\WeaponBase-reference.dll
diff --git a/Source/MultiplayerCompat/MultiplayerCompat.csproj b/Source/MultiplayerCompat/MultiplayerCompat.csproj
index c32381cb51..f26cc82d97 100644
--- a/Source/MultiplayerCompat/MultiplayerCompat.csproj
+++ b/Source/MultiplayerCompat/MultiplayerCompat.csproj
@@ -12,7 +12,7 @@
false
- ..\..\AssembliesCompat\
+ ..\..\ModPatches\Multiplayer\Assemblies\
portable
true
true
@@ -20,7 +20,7 @@
true
- ..\..\AssembliesCompat\
+ ..\..\ModPatches\Multiplayer\Assemblies\
true
none
false
@@ -34,12 +34,6 @@
-
-
- ..\..\Assemblies\0CombatExtendedLoader.dll
- False
-
-
False
diff --git a/Source/SOS2Compat/SOS2Compat.csproj b/Source/SOS2Compat/SOS2Compat.csproj
index 12ab57e780..42f86238ac 100644
--- a/Source/SOS2Compat/SOS2Compat.csproj
+++ b/Source/SOS2Compat/SOS2Compat.csproj
@@ -12,7 +12,7 @@
false
- ..\..\AssembliesCompat\
+ ..\..\ModPatches\Save Our Ship 2\Assemblies
portable
true
true
@@ -20,7 +20,7 @@
true
- ..\..\AssembliesCompat\
+ ..\..\ModPatches\Save Our Ship 2\Assemblies
true
none
false
@@ -35,12 +35,6 @@
False
-
-
- ..\..\Assemblies\0CombatExtendedLoader.dll
- False
-
-
..\packages\ShipsHaveInsides-reference.dll
diff --git a/Source/SRTSCompat/SRTSCompat.csproj b/Source/SRTSCompat/SRTSCompat.csproj
index 5abb8ba699..f712c546bf 100644
--- a/Source/SRTSCompat/SRTSCompat.csproj
+++ b/Source/SRTSCompat/SRTSCompat.csproj
@@ -12,7 +12,7 @@
false
- ..\..\AssembliesCompat\
+ ..\..\ModPatches\SRTS\Assemblies\
portable
true
true
@@ -20,7 +20,7 @@
true
- ..\..\AssembliesCompat\
+ ..\..\ModPatches\SRTS\Assemblies\
true
none
false
@@ -39,12 +39,6 @@
False
-
-
- ..\..\Assemblies\0CombatExtendedLoader.dll
- False
-
-
..\packages\SRTS-reference.dll
diff --git a/Source/VehiclesCompat/VehiclesCompat.csproj b/Source/VehiclesCompat/VehiclesCompat.csproj
index 79be0719b7..9145d8f0cf 100644
--- a/Source/VehiclesCompat/VehiclesCompat.csproj
+++ b/Source/VehiclesCompat/VehiclesCompat.csproj
@@ -12,7 +12,7 @@
false
- ..\..\AssembliesCompat\
+ ..\..\ModPatches\VehicleFramework\Assemblies\
portable
true
true
@@ -20,7 +20,7 @@
true
- ..\..\AssembliesCompat\
+ ..\..\ModPatches\VehicleFramework\Assemblies\
true
none
false
@@ -39,12 +39,6 @@
False
-
-
- ..\..\Assemblies\0CombatExtendedLoader.dll
- False
-
-
..\packages\Vehicles-reference.dll
From 5224f600c5284f990b0de27ea6312d52a3f69324 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 00:44:17 -0700
Subject: [PATCH 13/69] Removed loader functionality from
CombatExtendedLoader.dll
---
Source/Loader/Loader/IModPart.cs | 15 ---
Source/Loader/Loader/ISettingsCE.cs | 11 --
Source/Loader/Loader/Loader.cs | 179 +++-------------------------
3 files changed, 14 insertions(+), 191 deletions(-)
delete mode 100644 Source/Loader/Loader/IModPart.cs
delete mode 100644 Source/Loader/Loader/ISettingsCE.cs
diff --git a/Source/Loader/Loader/IModPart.cs b/Source/Loader/Loader/IModPart.cs
deleted file mode 100644
index f35497645a..0000000000
--- a/Source/Loader/Loader/IModPart.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Reflection;
-using RimWorld;
-using System.Collections.Generic;
-using Verse;
-using System;
-
-namespace CombatExtended.Loader
-{
- public interface IModPart
- {
- public void PostLoad(ModContentPack content, ISettingsCE settings);
- public Type GetSettingsType();
- public IEnumerable GetCompatList();
- }
-}
diff --git a/Source/Loader/Loader/ISettingsCE.cs b/Source/Loader/Loader/ISettingsCE.cs
deleted file mode 100644
index 2ce6b50033..0000000000
--- a/Source/Loader/Loader/ISettingsCE.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using RimWorld;
-using Verse;
-using UnityEngine;
-
-namespace CombatExtended.Loader
-{
- public interface ISettingsCE
- {
- public void DoWindowContents(Listing_Standard list);
- }
-}
diff --git a/Source/Loader/Loader/Loader.cs b/Source/Loader/Loader/Loader.cs
index e9a088a2c5..789b1cfd1f 100644
--- a/Source/Loader/Loader/Loader.cs
+++ b/Source/Loader/Loader/Loader.cs
@@ -10,163 +10,28 @@
namespace CombatExtended.Loader
{
- public class Loader : Mod
+ /*
+ A compiled version of this class resides in our source tree. Anyone who downloads the
+ source tree and installs it uncompiled as a mod will get a warning that they are running
+ uncompiled. During the packaging process this file is removed. If CombatExtended.dll
+ exists in the Assemblies directory, we can assume we are running a local build and omit
+ the warning.
+
+ */
+ public class UncompiledWarning : Mod
{
- /*
- This class handles loading and initializing the different components of CombatExtended.
- If the main CombatExtended.dll is unavailable, it will load an outdated one which is
- sufficient to allow the game to reach the main menu. It will then display a warning to
- the user that they are running the uncompiled git sources rather than a real CombatExtend
- release.
-
- DLLs in the main CombatExtended/Assemblies directory are automatically loaded before any
- code here is run.
-
- DLLs in CombatExtended/AssembliesCore are loaded by Loader's constructor.
-
- After all core CombatExtended assemblies are loaded, all classes implementing
- `CombatExtended.Loader.IModPart` are instantiated, and their list of required Compat modules
- is queried. These compat modules are loaded (and *their* Compat list is queried) until all
- required modules are loaded.
-
- Then each IModPart's PostLoad method is called, with an ISettingsCE if desired (or null).
- */
- public static List settingList = new List();
- private static Loader instance = null;
- private Vector2 scrollPosition;
-
- private ModContentPack content;
-
- private Assembly _loadCompatAssembly(string name)
+ public UncompiledWarning(ModContentPack content) : base(content)
{
- DirectoryInfo locationInfo = new DirectoryInfo(content.RootDir).GetDirectories("AssembliesCompat").FirstOrFallback(null);
- if (locationInfo == null)
- {
- Log.Error("Combat Extended :: Cannot find compat assembly directory");
- }
- FileInfo file = locationInfo.GetFiles(name + ".dll").FirstOrFallback(null);
- if (file == null)
- {
- Log.Error("Combat Extended :: Cannot find compat assembly for " + name);
- }
- return _loadAssembly(file);
- }
-
- private Assembly _loadAssembly(FileInfo file)
- {
- Log.Message("Combat Extended :: Loading " + file.FullName);
- byte[] rawAssembly = File.ReadAllBytes(file.FullName);
-
- Assembly assembly;
-
- FileInfo pdbFile = new FileInfo(Path.Combine(file.DirectoryName, Path.GetFileNameWithoutExtension(file.FullName)) + ".pdb");
- if (pdbFile.Exists)
- {
- assembly = AppDomain.CurrentDomain.Load(rawAssembly, File.ReadAllBytes(pdbFile.FullName));
- }
- else
- {
- assembly = AppDomain.CurrentDomain.Load(rawAssembly);
- }
- if (assembly != null)
- {
- content.assemblies.loadedAssemblies.Add(assembly);
- }
-
- return assembly;
- }
-
- public Loader(ModContentPack content) : base(content)
- {
- Loader.instance = this;
- this.content = content;
- bool found = false;
- Dictionary assemblies = new Dictionary();
-
foreach (Assembly assembly in content.assemblies.loadedAssemblies)
{
string name = assembly.GetName().Name;
- assemblies[name] = assembly;
if (name == "CombatExtended")
{
- found = true;
- }
- }
-
-
- DirectoryInfo locationInfo = new DirectoryInfo(content.RootDir).GetDirectories("AssembliesCore").FirstOrFallback(null);
- if (locationInfo != null)
- {
- foreach (FileInfo fileInfo in locationInfo.GetFiles())
- {
- if (fileInfo.Name.EndsWith(".dll"))
- {
- Assembly assembly = _loadAssembly(fileInfo);
- assemblies[assembly.GetName().Name] = assembly;
- }
+ return;
}
}
-
- Queue toProcess = new Queue(content.assemblies.loadedAssemblies);
- List modParts = new List();
- HashSet compatParts = new HashSet();
-
- while (toProcess.Any())
- {
- Assembly assembly = toProcess.Dequeue();
-
- foreach (Type t in assembly.GetTypes().Where(x => typeof(IModPart).IsAssignableFrom(x) && !x.IsAbstract))
- {
- IModPart imp = ((IModPart)t.GetConstructor(new Type[] { }).Invoke(new object[] { }));
- modParts.Add(imp);
- foreach (string compatPart in imp.GetCompatList())
- {
- if (!compatParts.Contains(compatPart))
- {
- compatParts.Add(compatPart);
- Assembly compatAssembly = _loadCompatAssembly(compatPart);
- toProcess.Enqueue(compatAssembly);
- }
- }
- }
-
- }
-
-
- foreach (IModPart modPart in modParts)
- {
- Type settingsType = modPart.GetSettingsType();
- ISettingsCE settings = null;
- if (settingsType != null)
- {
- if (typeof(ModSettings).IsAssignableFrom(settingsType))
- {
- settings = (ISettingsCE)typeof(Loader).GetMethod(nameof(Loader.GetSettings)).MakeGenericMethod(settingsType).Invoke(instance, null);
- }
- else
- {
- settings = (ISettingsCE)settingsType.GetConstructor(new Type[] { }).Invoke(new object[] { });
- }
- settingList.Add(settings);
- }
-
- modPart.PostLoad(content, settings);
-
- }
-
-
- if (!found)
- {
- Log.Error("Combat Extended :: Running uncompiled");
- LongEventHandler.QueueLongEvent(ShowUncompiledBuildWarning, "CE_LongEvent_ShowUncompiledBuildWarning", false, null);
- _loadAssembly(new DirectoryInfo(content.RootDir)
- .GetDirectories("Source")
- .FirstOrFallback(null)?
- .GetDirectories("packages")
- .FirstOrFallback(null)?.GetFiles("CombatExtended.dll")
- .FirstOrFallback(null));
- }
-
+ Log.Error("Combat Extended :: Running uncompiled");
+ LongEventHandler.QueueLongEvent(ShowUncompiledBuildWarning, "CE_LongEvent_ShowUncompiledBuildWarning", false, null);
}
public override string SettingsCategory()
@@ -174,23 +39,7 @@ public override string SettingsCategory()
return "Combat Extended";
}
- public override void DoSettingsWindowContents(Rect inRect)
- {
- Rect inner = inRect.ContractedBy(20f);
- inner.height = 800f;
- inner.x += 10f;
- Widgets.BeginScrollView(inRect, ref this.scrollPosition, inner, true);
- Listing_Standard list = new Listing_Standard();
- list.ColumnWidth = (inner.width - 17) / 2; // Subtract 17 for gap between columns
- list.Begin(inner);
-
- foreach (ISettingsCE settings in settingList)
- {
- settings.DoWindowContents(list);
- }
- list.End();
- Widgets.EndScrollView();
- }
+
//Unused method is only here for reference, the repository assembly uses it to warn users to get a compiled build.
private static void ShowUncompiledBuildWarning()
From 894259d3122afabb18cfddda7ceefb7998f89405 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 00:47:35 -0700
Subject: [PATCH 14/69] Migrate mod part init and settings management into
Controller
---
.../CombatExtended/Controller.cs | 87 +++++++++++++++----
1 file changed, 72 insertions(+), 15 deletions(-)
diff --git a/Source/CombatExtended/CombatExtended/Controller.cs b/Source/CombatExtended/CombatExtended/Controller.cs
index 797207f934..5aa5c8b94c 100644
--- a/Source/CombatExtended/CombatExtended/Controller.cs
+++ b/Source/CombatExtended/CombatExtended/Controller.cs
@@ -5,43 +5,95 @@
using RimWorld;
using Verse;
using UnityEngine;
+using System.Reflection;
+using System.IO;
using CombatExtended.HarmonyCE;
using CombatExtended.Compatibility;
using CombatExtended.Loader;
namespace CombatExtended
{
- public class Controller : IModPart
+ /*
+ This class handles initializing the different components of CombatExtended. The LoadFolders
+ system is responsible for loading the assemblies, this gives an opportunity to run any
+ post-load sanity checking, and is responsible for rendering any sub-mod settings as required.
+ */
+ public class Controller : Mod
{
+ public static List settingList = new List();
public static Settings settings;
- public static Controller instant;
+ public static Controller instance;
public static ModContentPack content;
private static Patches patches;
+ private Vector2 scrollPosition;
- public Type GetSettingsType()
+ public override void DoSettingsWindowContents(Rect inRect)
{
- return typeof(Settings);
+ Rect inner = inRect.ContractedBy(20f);
+ inner.height = 800f;
+ inner.x += 10f;
+ Widgets.BeginScrollView(inRect, ref this.scrollPosition, inner, true);
+ Listing_Standard list = new Listing_Standard();
+ list.ColumnWidth = (inner.width - 17) / 2; // Subtract 17 for gap between columns
+ list.Begin(inner);
+
+ foreach (ISettingsCE settings in settingList)
+ {
+ settings.DoWindowContents(list);
+ }
+ list.End();
+ Widgets.EndScrollView();
}
- public Controller()
+ public Controller(ModContentPack content) : base(content)
{
patches = new Patches();
+ Controller.instance = this;
+ Controller.content = content;
+ Controller.settings = GetSettings();
+ settingList.Add(Controller.settings);
+ PostLoad();
}
- public IEnumerable GetCompatList()
- {
- return patches.GetCompatList();
- }
-
- public void PostLoad(ModContentPack content, ISettingsCE settings)
+ public void PostLoad()
{
- Controller.instant = this;
- Controller.content = content;
- Controller.settings = (Settings)settings;
-
// Apply Harmony patches
HarmonyBase.InitPatches();
+ Queue toProcess = new Queue(content.assemblies.loadedAssemblies);
+ List modParts = new List();
+ while (toProcess.Any())
+ {
+ Assembly assembly = toProcess.Dequeue();
+
+ foreach (Type t in assembly.GetTypes().Where(x => typeof(IModPart).IsAssignableFrom(x) && !x.IsAbstract))
+ {
+ IModPart imp = ((IModPart)t.GetConstructor(new Type[] { }).Invoke(new object[] { }));
+ modParts.Add(imp);
+ }
+ }
+ foreach (IModPart modPart in modParts)
+ {
+ Log.Message("CE: Loading Mod Part");
+ Type settingsType = modPart.GetSettingsType();
+ ISettingsCE settings = null;
+ if (settingsType != null)
+ {
+ if (typeof(ModSettings).IsAssignableFrom(settingsType))
+ {
+ settings = (ISettingsCE)typeof(Controller).GetMethod(nameof(Controller.GetSettings)).MakeGenericMethod(settingsType).Invoke(instance, null);
+ }
+ else
+ {
+ settings = (ISettingsCE)settingsType.GetConstructor(new Type[] { }).Invoke(new object[] { });
+ }
+ settingList.Add(settings);
+ }
+
+ modPart.PostLoad(content, settings);
+
+ }
+
// Initialize loadout generator
LongEventHandler.QueueLongEvent(LoadoutPropertiesExtension.Reset, "CE_LongEvent_LoadoutProperties", false, null);
@@ -66,6 +118,11 @@ public void PostLoad(ModContentPack content, ISettingsCE settings)
}
+ public override string SettingsCategory()
+ {
+ return "Combat Extended";
+ }
+
private static void DoTutorialPopup()
{
var enableAction = new Action(() =>
From fa2850dcc50b852aa5a211bedff19643b0d12057 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 00:48:43 -0700
Subject: [PATCH 15/69] Remove GetCompatList from IPatch
---
.../CombatExtended/Compatibility/BetterTurrets.cs | 7 -------
Source/CombatExtended/Compatibility/EDShields.cs | 5 -----
Source/CombatExtended/Compatibility/IPatch.cs | 1 -
Source/CombatExtended/Compatibility/MiscTurrets.cs | 8 --------
Source/CombatExtended/Compatibility/Multiplayer.cs | 5 -----
Source/CombatExtended/Compatibility/Patches.cs | 14 --------------
.../Compatibility/ProjectRimFactory.cs | 5 -----
Source/CombatExtended/Compatibility/Rimatomics.cs | 5 -----
Source/CombatExtended/Compatibility/SOS2.cs | 5 -----
Source/CombatExtended/Compatibility/SRTS.cs | 5 -----
.../Compatibility/VanillaExpandedFramework.cs | 5 -----
.../VanillaFurnitureExpandedSecurity.cs | 5 -----
.../Compatibility/VanillaPsycastExpanded.cs | 4 ----
Source/CombatExtended/Compatibility/Vehicles.cs | 5 -----
14 files changed, 79 deletions(-)
diff --git a/Source/CombatExtended/Compatibility/BetterTurrets.cs b/Source/CombatExtended/Compatibility/BetterTurrets.cs
index f21073d1e0..dc4fee1210 100644
--- a/Source/CombatExtended/Compatibility/BetterTurrets.cs
+++ b/Source/CombatExtended/Compatibility/BetterTurrets.cs
@@ -21,12 +21,5 @@ public void Install()
{
Log.Message("Combat Extended :: Installing Better Turrets");
}
- public IEnumerable GetCompatList()
- {
- yield return "BetterTurretsCompat";
- }
-
-
-
}
}
diff --git a/Source/CombatExtended/Compatibility/EDShields.cs b/Source/CombatExtended/Compatibility/EDShields.cs
index c317515e2d..7eba51dc33 100644
--- a/Source/CombatExtended/Compatibility/EDShields.cs
+++ b/Source/CombatExtended/Compatibility/EDShields.cs
@@ -40,11 +40,6 @@ public void Install()
HitSoundDef = (SoundDef)t.GetField("HitSoundDef", BindingFlags.Static | BindingFlags.Public).GetValue(null);
}
-
- public IEnumerable GetCompatList()
- {
- yield break;
- }
public static bool CheckForCollisionBetweenCallback(ProjectileCE projectile, Vector3 from, Vector3 to)
{
/* Check if an active shield can block this projectile
diff --git a/Source/CombatExtended/Compatibility/IPatch.cs b/Source/CombatExtended/Compatibility/IPatch.cs
index 9fc08acc3a..f2d06220ce 100644
--- a/Source/CombatExtended/Compatibility/IPatch.cs
+++ b/Source/CombatExtended/Compatibility/IPatch.cs
@@ -5,6 +5,5 @@ public interface IPatch
{
public bool CanInstall();
public void Install();
- public IEnumerable GetCompatList();
}
}
diff --git a/Source/CombatExtended/Compatibility/MiscTurrets.cs b/Source/CombatExtended/Compatibility/MiscTurrets.cs
index cfa9743afd..a2f1afb484 100644
--- a/Source/CombatExtended/Compatibility/MiscTurrets.cs
+++ b/Source/CombatExtended/Compatibility/MiscTurrets.cs
@@ -21,13 +21,5 @@ public void Install()
{
Log.Message("Combat Extended :: Installing Misc Turrets");
}
-
- public IEnumerable GetCompatList()
- {
- yield return "MiscTurretsCompat";
- }
-
-
-
}
}
diff --git a/Source/CombatExtended/Compatibility/Multiplayer.cs b/Source/CombatExtended/Compatibility/Multiplayer.cs
index c4d4c05e7f..ad8ae5ce9b 100644
--- a/Source/CombatExtended/Compatibility/Multiplayer.cs
+++ b/Source/CombatExtended/Compatibility/Multiplayer.cs
@@ -23,11 +23,6 @@ public void Install()
isMultiplayerActive = true;
}
- public IEnumerable GetCompatList()
- {
- yield return "MultiplayerCompat";
- }
-
public static bool InMultiplayer
{
get
diff --git a/Source/CombatExtended/Compatibility/Patches.cs b/Source/CombatExtended/Compatibility/Patches.cs
index db520ac3a6..58cf23acbb 100644
--- a/Source/CombatExtended/Compatibility/Patches.cs
+++ b/Source/CombatExtended/Compatibility/Patches.cs
@@ -82,20 +82,6 @@ public static IEnumerable GetUsedAmmo()
}
}
- public IEnumerable GetCompatList()
- {
- foreach (IPatch patch in patches)
- {
- if (patch.CanInstall())
- {
- foreach (string s in patch.GetCompatList())
- {
- yield return s;
- }
- }
- }
- }
-
private static bool _gcbfactive = false;
public static void RegisterCollisionBodyFactorCallback(Func> f)
diff --git a/Source/CombatExtended/Compatibility/ProjectRimFactory.cs b/Source/CombatExtended/Compatibility/ProjectRimFactory.cs
index 110922d2e0..42e4d5c064 100644
--- a/Source/CombatExtended/Compatibility/ProjectRimFactory.cs
+++ b/Source/CombatExtended/Compatibility/ProjectRimFactory.cs
@@ -16,11 +16,6 @@ public void Install()
{
Building_FuelingMachine.RegisterRefuelable(typeof(Building_TurretGunCE), FindCompAmmoUser, TestAmmo, ReloadAction);
}
- public IEnumerable GetCompatList()
- {
- yield break;
- }
-
private static int TestAmmo(object compObject, Thing ammo)
{
var comp = compObject as CompAmmoUser;
diff --git a/Source/CombatExtended/Compatibility/Rimatomics.cs b/Source/CombatExtended/Compatibility/Rimatomics.cs
index d894714815..41b688629e 100644
--- a/Source/CombatExtended/Compatibility/Rimatomics.cs
+++ b/Source/CombatExtended/Compatibility/Rimatomics.cs
@@ -35,11 +35,6 @@ public void Install()
BlockerRegistry.RegisterShieldZonesCallback(Rimatomics.ShieldZonesCallback);
}
- public IEnumerable GetCompatList()
- {
- yield break;
- }
-
public static bool CheckForCollisionBetweenCallback(ProjectileCE projectile, Vector3 from, Vector3 to)
{
Map map = projectile.Map;
diff --git a/Source/CombatExtended/Compatibility/SOS2.cs b/Source/CombatExtended/Compatibility/SOS2.cs
index f61ebd4c6b..82a334d212 100644
--- a/Source/CombatExtended/Compatibility/SOS2.cs
+++ b/Source/CombatExtended/Compatibility/SOS2.cs
@@ -20,10 +20,5 @@ public void Install()
{
Log.Message("Combat Extended :: Installing SOS2");
}
-
- public IEnumerable GetCompatList()
- {
- yield return "SOS2Compat";
- }
}
}
diff --git a/Source/CombatExtended/Compatibility/SRTS.cs b/Source/CombatExtended/Compatibility/SRTS.cs
index 065e2239bd..ae593dff6a 100644
--- a/Source/CombatExtended/Compatibility/SRTS.cs
+++ b/Source/CombatExtended/Compatibility/SRTS.cs
@@ -22,11 +22,6 @@ public bool CanInstall()
}
return true;
}
- public IEnumerable GetCompatList()
- {
- yield return "SRTSCompat";
- }
-
public void Install()
{
Log.Message("Combat Extended :: Installing SRTS Expanded");
diff --git a/Source/CombatExtended/Compatibility/VanillaExpandedFramework.cs b/Source/CombatExtended/Compatibility/VanillaExpandedFramework.cs
index a3d939db83..e6cc8b18c9 100644
--- a/Source/CombatExtended/Compatibility/VanillaExpandedFramework.cs
+++ b/Source/CombatExtended/Compatibility/VanillaExpandedFramework.cs
@@ -18,11 +18,6 @@ bool IPatch.CanInstall()
return ModLister.HasActiveModWithName(ModName);
}
- IEnumerable IPatch.GetCompatList()
- {
- yield break;
- }
-
void IPatch.Install()
{
BlockerRegistry.RegisterCheckForCollisionCallback(CheckIntercept);
diff --git a/Source/CombatExtended/Compatibility/VanillaFurnitureExpandedSecurity.cs b/Source/CombatExtended/Compatibility/VanillaFurnitureExpandedSecurity.cs
index 3852571d47..41d6bdd24a 100644
--- a/Source/CombatExtended/Compatibility/VanillaFurnitureExpandedSecurity.cs
+++ b/Source/CombatExtended/Compatibility/VanillaFurnitureExpandedSecurity.cs
@@ -44,11 +44,6 @@ public void Install()
BlockerRegistry.RegisterImpactSomethingCallback(ImpactSomething);
}
- public IEnumerable GetCompatList()
- {
- yield break;
- }
-
private static bool CheckCollision(ProjectileCE projectile, IntVec3 cell, Thing launcher)
{
if (projectile.def.projectile.flyOverhead)
diff --git a/Source/CombatExtended/Compatibility/VanillaPsycastExpanded.cs b/Source/CombatExtended/Compatibility/VanillaPsycastExpanded.cs
index e0ff231ef2..e041a9ff69 100644
--- a/Source/CombatExtended/Compatibility/VanillaPsycastExpanded.cs
+++ b/Source/CombatExtended/Compatibility/VanillaPsycastExpanded.cs
@@ -20,10 +20,6 @@ public bool CanInstall()
return ModLister.HasActiveModWithName(ModName);
}
- public IEnumerable GetCompatList()
- {
- yield break;
- }
public void Install()
{
diff --git a/Source/CombatExtended/Compatibility/Vehicles.cs b/Source/CombatExtended/Compatibility/Vehicles.cs
index 59efb1b7ff..9330f8a77d 100644
--- a/Source/CombatExtended/Compatibility/Vehicles.cs
+++ b/Source/CombatExtended/Compatibility/Vehicles.cs
@@ -23,11 +23,6 @@ public bool CanInstall()
}
return true;
}
- public IEnumerable GetCompatList()
- {
- yield return "VehiclesCompat";
- }
-
public void Install()
{
From e29cf60438971b5db19752dae2e205b487256708 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 01:16:15 -0700
Subject: [PATCH 16/69] Support ' escapes pointing to directories with '
in the name
---
DupeFinder.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/DupeFinder.py b/DupeFinder.py
index 57f689ba1a..6b871d378b 100644
--- a/DupeFinder.py
+++ b/DupeFinder.py
@@ -11,15 +11,16 @@
def process(node):
global ec
mod = c.getAttribute("IfModActive")
- if (mod, c.firstChild.data) in mods:
+ dp = c.firstChild.data.replace(''', "'")
+ if (mod, dp) in mods:
ec += 1
msg = f"Mod {mod} is listed in LoadFolders.xml twice, both pointing to {c.firstChild.data}"
if err:
raise RuntimeError(msg)
else:
print(msg)
- mods.add((mod, c.firstChild.data))
- root = FilePath(c.firstChild.data)
+ mods.add((mod, dp))
+ root = FilePath(dp)
if not ModPatches in root.parents():
return
for fd in root.walk():
From 409b9ee6233aaca827cfd8dba453867d7fc75748 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 01:33:05 -0700
Subject: [PATCH 17/69] remove old comment
---
Source/Loader/Loader/Loader.cs | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Source/Loader/Loader/Loader.cs b/Source/Loader/Loader/Loader.cs
index 789b1cfd1f..f9fada4428 100644
--- a/Source/Loader/Loader/Loader.cs
+++ b/Source/Loader/Loader/Loader.cs
@@ -39,9 +39,6 @@ public override string SettingsCategory()
return "Combat Extended";
}
-
-
- //Unused method is only here for reference, the repository assembly uses it to warn users to get a compiled build.
private static void ShowUncompiledBuildWarning()
{
Log.Error("You are running CE Uncompiled. See https://github.com/CombatExtended-Continued/CombatExtended#development-version for details");
From 3af2ecc560dc9447d150eba867e31d8c48c9c916 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 01:41:08 -0700
Subject: [PATCH 18/69] remove tabs
---
Source/CombatExtended/CombatExtended/Controller.cs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Source/CombatExtended/CombatExtended/Controller.cs b/Source/CombatExtended/CombatExtended/Controller.cs
index 5aa5c8b94c..ab2295ccef 100644
--- a/Source/CombatExtended/CombatExtended/Controller.cs
+++ b/Source/CombatExtended/CombatExtended/Controller.cs
@@ -74,7 +74,7 @@ public void PostLoad()
}
foreach (IModPart modPart in modParts)
{
- Log.Message("CE: Loading Mod Part");
+ Log.Message("CE: Loading Mod Part");
Type settingsType = modPart.GetSettingsType();
ISettingsCE settings = null;
if (settingsType != null)
@@ -118,10 +118,10 @@ public void PostLoad()
}
- public override string SettingsCategory()
- {
- return "Combat Extended";
- }
+ public override string SettingsCategory()
+ {
+ return "Combat Extended";
+ }
private static void DoTutorialPopup()
{
From e59de80d25428c12cab49f6112fe97ae8593d814 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 01:57:16 -0700
Subject: [PATCH 19/69] Remove duplicate lines
---
LoadFolders.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/LoadFolders.xml b/LoadFolders.xml
index d675e41cfa..44f2362b6c 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -604,8 +604,6 @@
ModPatches/pphhyy Expanded Scythers
ModPatches/pphhyy Sanguinary Animals
ModPatches/pphhyy's Lightless Empyrean
- ModPatches/Vanilla Arsenal
- ModPatches/Jin-Roh Kerberos Panzer Cop Armor
ModPatches/VehicleFramework
ModPatches/Multiplayer
ModPatches/SRTS
From 6275e410048ef349a8eb616d91a4710062ded8da Mon Sep 17 00:00:00 2001
From: SamaelGray <56392968+SamaelGray@users.noreply.github.com>
Date: Sat, 3 Aug 2024 18:33:49 +0330
Subject: [PATCH 20/69] Sangh spine stats tweak
---
Biotech/Patches/AbilityDefs/Abilities_Biotech.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Biotech/Patches/AbilityDefs/Abilities_Biotech.xml b/Biotech/Patches/AbilityDefs/Abilities_Biotech.xml
index c3ae2eaf79..ae216b0db6 100644
--- a/Biotech/Patches/AbilityDefs/Abilities_Biotech.xml
+++ b/Biotech/Patches/AbilityDefs/Abilities_Biotech.xml
@@ -16,9 +16,9 @@
RangedStab
30
- 20
- 6
- 8
+ 15
+ 14
+ 21
From 225572fb3b40c75dafc1a3e78d0ab8fd6ce08bd2 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 19:18:06 -0700
Subject: [PATCH 21/69] Consider all targets under the content root instead of
ModPatches only
---
DupeFinder.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/DupeFinder.py b/DupeFinder.py
index 6b871d378b..5368665cf2 100644
--- a/DupeFinder.py
+++ b/DupeFinder.py
@@ -5,7 +5,7 @@
used = {}
mods = set()
-ModPatches = FilePath("ModPatches")
+ContentRoot = FilePath(".")
ec = 0
def process(node):
@@ -21,7 +21,7 @@ def process(node):
print(msg)
mods.add((mod, dp))
root = FilePath(dp)
- if not ModPatches in root.parents():
+ if not ContentRoot in root.parents():
return
for fd in root.walk():
if fd.isdir():
From 8622f0dc119e017238cb9a15c4601a823ea8a472 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 19:17:51 -0700
Subject: [PATCH 22/69] Fall back to CE's package id if there is no IfModActive
attribute
---
DupeFinder.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/DupeFinder.py b/DupeFinder.py
index 5368665cf2..6f72188e8c 100644
--- a/DupeFinder.py
+++ b/DupeFinder.py
@@ -11,6 +11,8 @@
def process(node):
global ec
mod = c.getAttribute("IfModActive")
+ if not mod:
+ mod = "CETeam.CombatExtended"
dp = c.firstChild.data.replace(''', "'")
if (mod, dp) in mods:
ec += 1
From dbbec9b79c5e0f71c8aa46225dfd9d7d729d81f7 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 19:17:16 -0700
Subject: [PATCH 23/69] Fix typo in SRTS id
---
LoadFolders.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 44f2362b6c..14518719fd 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -606,6 +606,6 @@
ModPatches/pphhyy's Lightless Empyrean
ModPatches/VehicleFramework
ModPatches/Multiplayer
- ModPatches/SRTS
+ ModPatches/SRTS
From cc42d067fb9b88ad5cc96898eda3c38195edc4db Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 19:58:59 -0700
Subject: [PATCH 24/69] Give the path of conflicting files relative to the
content root
instead of package id of the offending files.
---
DupeFinder.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/DupeFinder.py b/DupeFinder.py
index 6f72188e8c..aad7dcaeb5 100644
--- a/DupeFinder.py
+++ b/DupeFinder.py
@@ -32,13 +32,13 @@ def process(node):
continue
relative = tuple(fd.segmentsFrom(root))
if relative in used:
- msg = f"Mod {mod} is trying to use {relative}, but {used[relative]} already owns that path"
+ msg = f"""Relative paths collision found: {str.join("/", fd.segmentsFrom(ContentRoot))} overrides {str.join("/", used[relative].segmentsFrom(ContentRoot))}"""
if err:
raise RuntimeError(msg)
else:
ec += 1
print(msg)
- used[relative] = mod
+ used[relative] = fd
with XMLOpen("LoadFolders.xml") as x:
v1_5 = x.getElementsByTagName("v1.5")
From 0ef38615f3527370855f242ebeaff6b9742011cf Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 20:09:13 -0700
Subject: [PATCH 25/69] Force all paths to be relative
---
DupeFinder.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/DupeFinder.py b/DupeFinder.py
index aad7dcaeb5..07fa8cf38d 100644
--- a/DupeFinder.py
+++ b/DupeFinder.py
@@ -22,7 +22,7 @@ def process(node):
else:
print(msg)
mods.add((mod, dp))
- root = FilePath(dp)
+ root = FilePath("./" + dp)
if not ContentRoot in root.parents():
return
for fd in root.walk():
From ff1adffd07d8ab898f37a20ade3690fc9fd74124 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 3 Aug 2024 20:09:22 -0700
Subject: [PATCH 26/69] Process all nodes, even if they don't have a mod id
---
DupeFinder.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/DupeFinder.py b/DupeFinder.py
index 07fa8cf38d..6fa58f875f 100644
--- a/DupeFinder.py
+++ b/DupeFinder.py
@@ -44,8 +44,7 @@ def process(node):
v1_5 = x.getElementsByTagName("v1.5")
for n in v1_5:
for c in n.getElementsByTagName("li"):
- if c.getAttribute("IfModActive"):
- process(c)
+ process(c)
raise SystemExit(ec)
From e0de0dc96b337ebf2fd41c8bec1b93158df1c6b6 Mon Sep 17 00:00:00 2001
From: ViralReaction <136116069+ViralReaction@users.noreply.github.com>
Date: Thu, 8 Aug 2024 22:00:27 -0600
Subject: [PATCH 27/69] Initial Update MO 1.5
---
About/About.xml | 1 -
.../Medieval Overhaul/Recipes_Grenades.xml | 42 +-
.../BodyDefs/MO_CE_Patch_Body_Golem.xml | 157 +++
.../BodyDefs/MO_CE_Patch_Body_Griffon.xml | 159 +++
.../BodyDefs/MO_CE_Patch_Body_Humanlike.xml | 257 +++++
.../BodyDefs/MO_CE_Patch_Body_Lindwurm.xml | 162 +++
.../BodyDefs/MO_CE_Patch_Body_Schrat.xml | 160 +++
.../Patches/Medieval Overhaul/MO_Races.xml | 987 ------------------
.../PawnKindDefs/MO_Pawns_Cultists.xml | 150 +++
.../{ => PawnKindDefs}/MO_Pawns_Medieval.xml | 0
.../PawnKindDefs/MO_Pawns_Settlement.xml | 61 ++
.../MO_Siege_Ballistas.xml | 0
.../MO_Siege_Misc.xml | 0
.../MO_Siege_Scorpio.xml | 0
.../MO_Siege_Trebuchet.xml | 0
.../ThingDefs_Items/MO_Drugs.xml | 13 +
.../{ => ThingDefs_Items}/MO_Items.xml | 0
.../{ => ThingDefs_Items}/MO_Materials.xml | 413 +-------
.../{ => ThingDefs_Misc}/MO_Apparel_Armor.xml | 0
.../MO_Apparel_Helmets.xml | 0
.../{ => ThingDefs_Misc}/MO_Apparel_Misc.xml | 4 -
.../ThingDefs_Misc/MO_Apparel_Packs.xml | 184 ++++
.../Shields}/MO_Shields.xml | 0
.../Weapons}/MO_Weapons_Grenades.xml | 79 ++
.../Weapons}/MO_Weapons_Melee.xml | 10 +-
.../Weapons}/MO_Weapons_Ranged.xml | 0
.../ThingDefs_Races/MO_CE_Patch_Cobra.xml | 62 ++
.../MO_CE_Patch_Constrictor.xml | 53 +
.../ThingDefs_Races/MO_CE_Patch_Daer.xml | 107 ++
.../MO_CE_Patch_Deathstinger.xml | 65 ++
.../ThingDefs_Races/MO_CE_Patch_Direboar.xml | 102 ++
.../ThingDefs_Races/MO_CE_Patch_Direwolf.xml | 115 ++
.../ThingDefs_Races/MO_CE_Patch_FarmGroup.xml | 115 ++
.../ThingDefs_Races/MO_CE_Patch_Ghoul.xml | 278 +++++
.../ThingDefs_Races/MO_CE_Patch_Golem.xml | 227 ++++
.../ThingDefs_Races/MO_CE_Patch_Gryphon.xml | 145 +++
.../ThingDefs_Races/MO_CE_Patch_Hyena.xml | 106 ++
.../ThingDefs_Races/MO_CE_Patch_Lindwurm.xml | 92 ++
.../ThingDefs_Races/MO_CE_Patch_Mimic.xml | 236 +++++
.../MO_CE_Patch_Northern_Boar.xml | 76 ++
.../ThingDefs_Races/MO_CE_Patch_Rox.xml | 91 ++
.../ThingDefs_Races/MO_CE_Patch_Schrat.xml | 53 +
.../MO_CE_Patch_Schrat_Sapling.xml | 53 +
.../ThingDefs_Races/MO_CE_Patch_Troll.xml | 159 +++
.../ThingDefs_Races/MO_CE_Patch_Unhold.xml | 137 +++
.../ThingDefs_Races/MO_CE_Patch_Webknecht.xml | 113 ++
46 files changed, 3839 insertions(+), 1385 deletions(-)
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Golem.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Griffon.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Humanlike.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Lindwurm.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Schrat.xml
delete mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Races.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Cultists.xml
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => PawnKindDefs}/MO_Pawns_Medieval.xml (100%)
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Settlement.xml
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Buildings}/MO_Siege_Ballistas.xml (100%)
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Buildings}/MO_Siege_Misc.xml (100%)
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Buildings}/MO_Siege_Scorpio.xml (100%)
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Buildings}/MO_Siege_Trebuchet.xml (100%)
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Items/MO_Drugs.xml
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Items}/MO_Items.xml (100%)
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Items}/MO_Materials.xml (51%)
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Misc}/MO_Apparel_Armor.xml (100%)
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Misc}/MO_Apparel_Helmets.xml (100%)
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Misc}/MO_Apparel_Misc.xml (96%)
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Packs.xml
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Misc/Shields}/MO_Shields.xml (100%)
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Misc/Weapons}/MO_Weapons_Grenades.xml (80%)
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Misc/Weapons}/MO_Weapons_Melee.xml (99%)
rename ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/{ => ThingDefs_Misc/Weapons}/MO_Weapons_Ranged.xml (100%)
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Cobra.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Constrictor.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Daer.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Deathstinger.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Direboar.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Direwolf.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_FarmGroup.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Ghoul.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Golem.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Gryphon.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Hyena.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Lindwurm.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Mimic.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Northern_Boar.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Rox.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Schrat.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Schrat_Sapling.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Troll.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Unhold.xml
create mode 100644 ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Webknecht.xml
diff --git a/About/About.xml b/About/About.xml
index 8531d84751..a80bf1d021 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -69,7 +69,6 @@
AveryTheKitty.XenohumansAnthromorphs
PRF.Materials
Ryflamer.Rimcraft.Scenarios
- DankPyon.Medieval.Overhaul
RimOfMadness.Vampires
sgc.moreutilitypacks
OskarPotocki.VFE.Pirates
diff --git a/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Recipes_Grenades.xml b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Recipes_Grenades.xml
index 77414778a3..edfcc59bec 100644
--- a/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Recipes_Grenades.xml
+++ b/ModPatches/Medieval Overhaul/Defs/Medieval Overhaul/Recipes_Grenades.xml
@@ -2,13 +2,13 @@
- MakeFireBomb
+ DankPyon_MakeFireBomb
make fire bombs x10
Craft 10 fire bombs.
Making fire bombs.
1200
- CraftingSpot
+ DankPyon_AlchemyBench
DankPyon_Gunpowder
@@ -41,13 +41,13 @@
- MakeSmokeBomb
+ DankPyon_MakeSmokeBomb
make smoke bombs x10
Craft 10 smoke bombs.
Making smoke bombs.
1200
- CraftingSpot
+ DankPyon_AlchemyBench
DankPyon_Gunpowder
@@ -89,13 +89,13 @@
- MakeSmokeFlashBomb
+ DankPyon_MakeSmokeFlashBomb
make smoke bombs x10
Craft 10 smoke bombs.
Making smoke bombs.
1200
- CraftingSpot
+ DankPyon_AlchemyBench
DankPyon_Gunpowder
@@ -135,5 +135,35 @@
10
+
+
+ DankPyon_MakeAcidFlask
+ make acid flask x10
+ Craft 10 acid flasks.
+ Making acid flasks.
+ 1200
+
+ DankPyon_AlchemyBench
+
+ DankPyon_Gunpowder
+
+
+
+
+ DankPyon_LindwurmBlood
+
+
+ 20
+
+
+
+
+ DankPyon_LindwurmBlood
+
+
+
+ 10
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Golem.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Golem.xml
new file mode 100644
index 0000000000..c88e40b528
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Golem.xml
@@ -0,0 +1,157 @@
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/groups
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart
+
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemNeck"]/groups
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemNeck"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemNeck"]/parts/li[def="DankPyon_GolemHead"]/groups
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemNeck"]/parts/li[def="DankPyon_GolemHead"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemShoulder"]/groups
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemShoulder"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemShoulder"]/parts/li[def="DankPyon_GolemArm"]/groups
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemShoulder"]/parts/li[def="DankPyon_GolemArm"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemShoulder"]/parts/li[def="DankPyon_GolemArm"]/parts/li[def="DankPyon_GolemHand"]/groups
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemShoulder"]/parts/li[def="DankPyon_GolemArm"]/parts/li[def="DankPyon_GolemHand"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemLeg"]/groups
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemLeg"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemLeg"]/parts/li[def="DankPyon_GolemFoot"]/groups
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemLeg"]/parts/li[def="DankPyon_GolemFoot"]
+
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemNeck"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemNeck"]/parts/li[def="DankPyon_GolemHead"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemShoulder"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemShoulder"]/parts/li[def="DankPyon_GolemArm"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemShoulder"]/parts/li[def="DankPyon_GolemArm"]/parts/li[def="DankPyon_GolemHand"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemShoulder"]/parts/li[def="DankPyon_GolemArm"]/parts/li[def="DankPyon_GolemHand"]/parts/li[def="DankPyon_GolemFinger"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemLeg"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_Golem"]/corePart/parts/li[def="DankPyon_GolemLeg"]/parts/li[def="DankPyon_GolemFoot"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Griffon.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Griffon.xml
new file mode 100644
index 0000000000..4812600941
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Griffon.xml
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/groups
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/groups
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Tail"]/groups
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Tail"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Neck"]/groups
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Neck"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]/groups
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Leg"]/groups
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Leg"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]/groups
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear left paw"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]/groups
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Leg"]/parts/li[customLabel="rear right paw"]
+
+
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Tail"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Neck"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Leg"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_GriffonBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Humanlike.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Humanlike.xml
new file mode 100644
index 0000000000..6bbb6b1e60
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Humanlike.xml
@@ -0,0 +1,257 @@
+
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="left arm"]/groups
+
+ LeftArm
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel="right arm"]/groups
+
+ RightArm
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[customLabel="left shoulder"]/groups
+
+ LeftShoulder
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[customLabel="right shoulder"]/groups
+
+ RightShoulder
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Ribcage"]/coverage
+
+ 0.07
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Pelvis"]/coverage
+
+ 0.05
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Stomach"]/coverage
+
+ 0.05
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Heart"]/coverage
+
+ 0.04
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Lung"]/coverage
+
+ 0.055
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Kidney"]/coverage
+
+ 0.03
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Liver"]/coverage
+
+ 0.06
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Neck"]/coverage
+
+ 0.055
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def="Brain"]/coverage
+
+ 0.9
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Eye"]/coverage
+
+ 0.05
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/coverage
+
+ 0.05
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/coverage
+
+ 0.08
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Shoulder"]/coverage
+
+ 0.085
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Clavicle"]/coverage
+
+ 0.06
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Humerus"]/coverage
+
+ 0.15
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Radius"]/coverage
+
+ 0.15
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Femur"]/coverage
+
+ 0.15
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Tibia"]/coverage
+
+ 0.15
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Neck"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Shoulder"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="Finger"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Leg"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_AlpBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Lindwurm.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Lindwurm.xml
new file mode 100644
index 0000000000..e2cf64cc74
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Lindwurm.xml
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/groups
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="DankPyon_LindwurmTail"]/groups
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="DankPyon_LindwurmTail"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="DankPyon_LindwurmNeck"]/groups
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="DankPyon_LindwurmNeck"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="DankPyon_LindwurmNeck"]/parts/li[def="SnakeHead"]/groups
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="DankPyon_LindwurmNeck"]/parts/li[def="SnakeHead"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="DankPyon_LindwurmNeck"]/parts/li[def="SnakeHead"]/parts/li[def="SnakeMouth"]/groups
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="DankPyon_LindwurmNeck"]/parts/li[def="SnakeMouth"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="Shoulder"]/groups
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="Shoulder"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="FrontClaw"]/groups
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="FrontClaw"]
+
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="DankPyon_LindwurmTail"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="DankPyon_LindwurmNeck"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="DankPyon_LindwurmNeck"]/parts/li[def="SnakeHead"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="DankPyon_LindwurmNeck"]/parts/li[def="SnakeHead"]/parts/li[def="SnakeMouth"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="Shoulder"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_LindwurmBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="FrontClaw"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Schrat.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Schrat.xml
new file mode 100644
index 0000000000..b8de0104b5
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/BodyDefs/MO_CE_Patch_Body_Schrat.xml
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/groups
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalNeck"]/groups
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalNeck"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalShoulder"]/groups
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalShoulder"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalLeg"]/groups
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalLeg"]
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]
+
+
+
+
+
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalNeck"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalShoulder"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="Scyther"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalLeg"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
+ Defs/BodyDef[defName="DankPyon_SchratBody"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups
+
+ CoveredByNaturalArmor
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Races.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Races.xml
deleted file mode 100644
index bfb1cc90ff..0000000000
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Races.xml
+++ /dev/null
@@ -1,987 +0,0 @@
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Hampshire" or defName="DankPyon_Gloucestershire"]/statBases
-
- 0.07
- 0.06
- 0.08
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Hampshire" or defName="DankPyon_Gloucestershire"]/tools
-
-
-
-
- Bite
-
- 6
- 1.5
- 0.7
- Teeth
- 0.04
- 0.5
-
-
- head
-
- Blunt
-
- 6
- 2.12
- HeadAttackTool
- 0.2
- 2
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Hampshire" or defName="DankPyon_Gloucestershire"]
-
-
- Quadruped
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Ravelder" or defName="DankPyon_Angus"]/statBases
-
- 0.08
- 0.13
- 0.22
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Ravelder" or defName="DankPyon_Angus"]/tools
-
-
-
-
- Bite
-
- 4
- 1
- 0.7
- Teeth
- 0.4
-
-
- head
-
- Blunt
-
- 16
- 2.12
- 0.2
- HeadAttackTool
- 6
-
-
- horns
-
- Stab
-
- 21
- 2.0
- 0.65
- Male
- HeadAttackTool
- 0.25
- 6
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Ravelder" or defName="DankPyon_Angus"]
-
-
- Quadruped
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Rox"]/statBases
-
- 0.06
- 0.41
- 0.48
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Rox"]/tools
-
-
-
- horn
-
- Stab
-
- 30
- 2.52
- 0.4
- HornAttackTool_2
- 1.5
- 15
-
-
- left foot
-
- Blunt
-
- 22
- 2.13
- FrontLeftLeg
- 14.640
-
-
- right foot
-
- Blunt
-
- 22
- 2.13
- FrontRightLeg
- 14.640
-
-
-
- Bite
-
- 19
- 1.62
- Teeth
- 0.09
- 2.016
-
-
- head
-
- Blunt
-
- 11
- 2.52
- HeadAttackTool
- 0.2
- 6
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Rox"]
-
-
- Quadruped
-
-
-
-
-
- Defs/PawnKindDef[defName="DankPyon_Rox"]/combatPower
-
- 375
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Direwolf"]
-
-
- Quadruped
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Direwolf"]/statBases/MoveSpeed
-
- 7
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Direwolf"]/statBases
-
- 0.075
- 0.05
- 0.21
- 0.20
- 0.09
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Direwolf"]/tools
-
-
-
- left claw
-
- Scratch
-
- 11
- 1.19
- FrontLeftPaw
-
-
-
- Stun
- 20
-
-
-
- 2.250
- 0.75
-
-
- right claw
-
- Scratch
-
- 11
- 1.19
- FrontRightPaw
-
-
-
- Stun
- 20
-
-
-
- 2.250
- 0.75
-
-
-
- Bite
-
- 24
- 1.46
- Teeth
-
-
-
- Stun
- 20
-
-
-
- 2
- 1.6
- 8.863
-
-
- head
-
- Blunt
-
- 4
- 3.2
- HeadAttackTool
- 0.2
- 1.225
-
-
-
-
-
-
- Defs/PawnKindDef[defName="DankPyon_Direwolf"]/combatPower
-
- 140
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Hyena"]
-
-
- Quadruped
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Hyena"]/statBases/MoveSpeed
-
- 6.25
- 0.26
- 0.09
- 0.05
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Hyena"]/tools
-
-
-
- left claw
-
- Scratch
-
- 6
- 0.8
- FrontLeftPaw
-
-
-
- Stun
- 20
-
-
-
- 0.450
- 0.07
-
-
- right claw
-
- Scratch
-
- 6
- 0.8
- FrontRightPaw
-
-
-
- Stun
- 20
-
-
-
- 0.450
- 0.07
-
-
-
- Bite
-
- 21
- 1.73
- Teeth
-
-
-
- Stun
- 20
-
-
-
- 0.55
- 4.225
-
-
- head
-
- Blunt
-
- 1
- 1.26
- HeadAttackTool
- 0.2
- 0.250
-
-
-
-
-
-
- Defs/PawnKindDef[defName="DankPyon_Hyena"]/combatPower
-
- 80
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Daer"]/statBases
-
- 0.14
- 0.27
- 0.3
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Daer"]/tools
-
-
-
-
- Bite
-
- 30
- 2.6
- Teeth
- 0.5
-
-
-
- Stun
- 14
-
-
-
- 1.8
- 12
-
-
- left claw
-
- Scratch
-
- 21
- 2
- FrontLeftPaw
-
-
-
- Stun
- 7
-
-
-
- 0.45
- 7
-
-
- right claw
-
- Scratch
-
- 21
- 2
- FrontRightPaw
-
-
-
- Stun
- 7
-
-
-
- 0.45
- 7
-
-
- head
-
- Blunt
-
- 18
- 2.44
- HeadAttackTool
- true
- 0.2
- 3.5
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Daer"]
-
-
- Quadruped
-
-
-
-
-
- Defs/PawnKindDef[defName="DankPyon_Daer"]/combatPower
-
- 300
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DireBoar"]/statBases
-
- 0.12
- 0.33
- 0.34
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DireBoar"]/tools
-
-
-
- tusk
-
- Scratch
- Stab
-
- 21
- 2.6
- TuskAttackTool
- 0.01
- 1.250
-
-
-
- Bite
-
- 20
- 2.6
- Teeth
- 0.5
- 0.02
- 0.6
-
-
-
- Stun
- 14
-
-
-
-
-
- left hoof
-
- Blunt
- Poke
-
- 5
- 1
- FrontLeftLeg
- 2.250
-
-
- right hoof
-
- Blunt
- Blunt
-
- 5
- 1
- FrontRightLeg
- 2.250
-
-
- head
-
- Blunt
-
- 6
- 0.92
- HeadAttackTool
- 0.2
- 2.5
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DireBoar"]
-
-
- Quadruped
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Schrat"]/statBases
-
- 0.12
- 0.14
- 0.22
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Schrat"]/tools
-
-
-
- left fist
-
- Blunt
-
- 21
- 2
- LeftHand
- 4
- true
-
-
- right fist
-
- Blunt
-
- 21
- 2
- RightHand
- 4
- true
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Schrat"]
-
-
- Humanoid
-
-
-
-
-
-
-
- Defs/ThingDef[@Name="DankPyon_LargeCobraBase"]/statBases
-
- 0.19
- 0.18
- 0.17
-
-
-
-
- Defs/ThingDef[@Name="DankPyon_LargeCobraBase"]/tools
-
-
-
- venom-fangs
-
- ToxicBite
-
- 14
- 1.8
- 0.25
- 0.20
- Mouth
-
-
-
- Stun
- 14
-
-
-
-
-
- head
-
- Blunt
-
- 3
- 2
- 0.2
- 0.2
- HeadAttackTool
- true
-
-
-
-
-
-
- Defs/ThingDef[@Name="DankPyon_LargeCobraBase"]
-
-
- Serpentine
-
-
-
-
-
-
- Defs/ThingDef[@Name="DankPyon_GiantConstrictorBase"]/statBases
-
- 0.23
- 0.12
- 0.15
-
-
-
-
- Defs/ThingDef[@Name="DankPyon_GiantConstrictorBase"]/tools
-
-
-
-
- Bite
-
- 24
- 2
- Mouth
- 2.26
- 1.49
-
-
- head
-
- Blunt
-
- 7
- 0.92
- 0.2
- 0.3
- HeadAttackTool
- true
-
-
-
-
-
-
- Defs/ThingDef[@Name="DankPyon_GiantConstrictorBase"]
-
-
- Serpentine
-
-
-
-
-
-
- Defs/ThingDef[@Name="DankPyon_LindwurmBase"]/statBases
-
- 0.20
- 0.25
- 0.08
-
-
-
-
- Defs/ThingDef[@Name="DankPyon_LindwurmBase"]/tools
-
-
-
-
- Bite
-
- 32
- 2.6
- Mouth
- 0.5
- 2.7
-
-
- head
-
- Blunt
-
- 4
- 0.97
- HeadAttackTool
- 0.2
- 0.823
-
-
- left claw
-
- Scratch
-
- 23
- 2
- FrontLeftClaws
- 0.18
- 0.823
-
-
- right claw
-
- Scratch
-
- 23
- 2
- FrontRightClaws
- 0.18
- 0.823
-
-
- tail
-
- Blunt
-
- 28
- 4
- DankPyon_TailAttackTool
-
-
-
- Stun
- 14
-
-
-
- 0.9
-
-
-
-
-
-
- Defs/ThingDef[@Name="DankPyon_LindwurmBase"]
-
-
- Birdlike
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Deathstinger"]/statBases/MoveSpeed
-
- 5.1
- 0.22
- 0.03
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Deathstinger"]/tools
-
-
-
- mandibles
-
- Bite
-
- 9
- 1.5
- Mouth
- 0.24
- 0.5
-
-
- head
-
- Blunt
-
- 1
- 1.26
- HeadAttackTool
- 0.2
- 0.250
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Deathstinger"]/statBases/ArmorRating_Blunt
-
- 2.25
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Deathstinger"]/statBases/ArmorRating_Sharp
-
- 0.7
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Deathstinger"]/race/baseHealthScale
-
- 0.5
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_NorthernBoar"]
-
-
- Quadruped
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_NorthernBoar"]/statBases
-
- 0.15
- 0.14
- 0.14
-
-
-
-
- Defs/ThingDef[defName="DankPyon_NorthernBoar"]/tools
-
-
-
- tusk
-
- Cut
-
- 11
- 1.89
- TuskAttackTool
- 0.1
- 1.5
-
-
- tusk
-
- Stab
-
- 7
- 1.41
- 0.65
- TuskAttackTool_2
- 0.2
- 2.940
-
-
-
- Bite
-
- 8.7
- 1.57
- 0.6
- Teeth
- 0.08
- 0.75
-
-
- head
-
- Blunt
-
- 6
- 2.12
- HeadAttackTool
- 0.2
- 2
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Cultists.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Cultists.xml
new file mode 100644
index 0000000000..82967c8f56
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Cultists.xml
@@ -0,0 +1,150 @@
+
+
+
+
+
+ Defs/PawnKindDef[defName="DanyPyon_Cultist_Acolyte_Melee"]
+
+
+
+ 100
+ 350
+
+
+ KiteShield
+ HeaterShield
+ Buckler
+
+ 0.15
+
+
+
+
+
+ Defs/PawnKindDef[defName="DanyPyon_Cultist_Adept_Melee"]
+
+
+
+ 100
+ 350
+
+
+ KiteShield
+ HeaterShield
+ Buckler
+
+ 0.35
+
+
+
+
+
+ Defs/PawnKindDef[defName="DanyPyon_Cultist_HighPriest_Melee"]
+
+
+
+ 200
+ 600
+
+
+ HeaterShield
+ KiteShield
+
+ 0.65
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="DanyPyon_Cultist_Acolyte_Ranged"]
+
+
+
+ 15
+ 30
+
+
+
+ 50
+ 150
+
+
+ NeolithicMeleeBasic
+ MedievalMeleeDecent
+
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="DanyPyon_Cultist_Adept_Ranged"]
+
+
+
+ 12
+ 20
+
+
+
+ 100
+ 200
+
+
+ NeolithicMeleeBasic
+ MedievalMeleeDecent
+
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="DanyPyon_Cultist_HighPriest_Ranged"]
+
+
+
+ 15
+ 20
+
+
+
+ 100
+ 1200
+
+
+ MedievalMeleeDecent
+
+
+
+
+
+
+
+ Defs/PawnKindDef[
+ defName="DanyPyon_Cultist_Acolyte_Ranged" or
+ defName="DanyPyon_Cultist_Adept_Ranged" or
+ defName="DanyPyon_Cultist_HighPriest_Ranged"]
+
+
+ CE_Apparel_TribalBackpack
+ DankPyon_Apparel_Quiver
+
+
+
+
+
+ Defs/PawnKindDef[defName="DanyPyon_Cultist_Adept_Ranged" or defName="DanyPyon_Cultist_HighPriest_Ranged"]/weaponTags
+
+ CE_XBow
+
+
+
+
+ Defs/PawnKindDef[defName="DanyPyon_Cultist_Acolyte_Ranged"]/weaponTags
+
+ CE_Bow
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Pawns_Medieval.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Medieval.xml
similarity index 100%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Pawns_Medieval.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Medieval.xml
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Settlement.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Settlement.xml
new file mode 100644
index 0000000000..ade804b8bf
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Settlement.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+ Defs/PawnKindDef[@Name="DankPyon_SettlementKnight"]
+
+
+
+ 100
+ 350
+
+
+ KiteShield
+ HeaterShield
+ Buckler
+
+ 0.40
+
+
+
+
+
+
+ Defs/PawnKindDef[@Name="DankPyon_SettlementArcher"]
+
+
+
+ 20
+ 45
+
+
+
+ 50
+ 150
+
+
+ NeolithicMeleeBasic
+ MedievalMeleeDecent
+
+
+
+
+
+
+
+ Defs/PawnKindDef[@Name="DankPyon_SettlementArcher"]/apparelRequired
+
+ CE_Apparel_TribalBackpack
+
+
+
+
+ Defs/PawnKindDef[@Name="DankPyon_SettlementArcher"]/weaponTags
+
+ CE_XBow
+ CE_Bow
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Ballistas.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Buildings/MO_Siege_Ballistas.xml
similarity index 100%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Ballistas.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Buildings/MO_Siege_Ballistas.xml
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Misc.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Buildings/MO_Siege_Misc.xml
similarity index 100%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Misc.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Buildings/MO_Siege_Misc.xml
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Scorpio.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Buildings/MO_Siege_Scorpio.xml
similarity index 100%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Scorpio.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Buildings/MO_Siege_Scorpio.xml
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Trebuchet.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Buildings/MO_Siege_Trebuchet.xml
similarity index 100%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Siege_Trebuchet.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Buildings/MO_Siege_Trebuchet.xml
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Items/MO_Drugs.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Items/MO_Drugs.xml
new file mode 100644
index 0000000000..a8355b3bbb
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Items/MO_Drugs.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ Defs/HediffDef[defName="DankPyon_High_BattleElixir"]/stages/li[1]
+
+
+ -0.5
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Items.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Items/MO_Items.xml
similarity index 100%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Items.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Items/MO_Items.xml
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Materials.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Items/MO_Materials.xml
similarity index 51%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Materials.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Items/MO_Materials.xml
index b180679448..80b6afea03 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Materials.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Items/MO_Materials.xml
@@ -87,195 +87,83 @@
-
-
+
- Defs/ThingDef[defName="Leather_Plain"]/statBases/StuffPower_Armor_Sharp
+ Defs/ThingDef[defName="Leather_Patch"]/statBases/StuffPower_Armor_Sharp
0.08
- Defs/ThingDef[defName="Leather_Plain"]/statBases/StuffPower_Armor_Blunt
+ Defs/ThingDef[defName="Leather_Patch"]/statBases/StuffPower_Armor_Blunt
0.055
-
-
- Defs/ThingDef[defName="Leather_Bear"]/statBases/StuffPower_Armor_Sharp
-
- 0.12
-
-
-
-
- Defs/ThingDef[defName="Leather_Bear"]/statBases/StuffPower_Armor_Blunt
-
-
-
- Defs/ThingDef[defName="Leather_Bear"]/statBases
-
- 0.08
-
-
-
-
- Defs/ThingDef[defName="Leather_Light"]/statBases/StuffPower_Armor_Sharp
-
- 0.03
-
-
-
-
- Defs/ThingDef[defName="Leather_Light"]/statBases/StuffPower_Armor_Blunt
-
- 0.02
-
-
-
+
- Defs/ThingDef[defName="Leather_Bluefur"]/statBases/StuffPower_Armor_Sharp
+ Defs/ThingDef[defName="DankPyon_Leather_Rawhide"]/statBases/StuffPower_Armor_Sharp
- 0.09
+ 0.08
- Defs/ThingDef[defName="Leather_Bluefur"]/statBases/StuffPower_Armor_Blunt
-
- 0.06
-
-
-
-
- Defs/ThingDef[defName="Leather_Lizard"]/statBases/StuffPower_Armor_Sharp
+ Defs/ThingDef[defName="DankPyon_Leather_Rawhide"]/statBases/StuffPower_Armor_Blunt
- 0.08
+ 0.055
-
- Defs/ThingDef[defName="Leather_Lizard"]/statBases/StuffPower_Armor_Blunt
-
- 0.06
-
+
+ Defs/ThingDef[defName="DankPyon_Leather_Rawhide"]/statBases/StuffPower_Armor_Heat
-
+
- Defs/ThingDef[defName="Leather_Rhinoceros"]/statBases/StuffPower_Armor_Sharp
+ Defs/ThingDef[defName="DankPyon_Leather_DireBoar"]/statBases/StuffPower_Armor_Sharp
0.14
-
-
- Defs/ThingDef[defName="Leather_Rhinoceros"]/statBases/StuffPower_Armor_Blunt
-
- Defs/ThingDef[defName="Leather_Rhinoceros"]/statBases
+ Defs/ThingDef[defName="DankPyon_Leather_DireBoar"]/statBases
0.1
-
- Defs/ThingDef[defName="Leather_Bird"]/statBases/StuffPower_Armor_Sharp
+ Defs/ThingDef[defName="DankPyon_Leather_Direwolf"]/statBases/StuffPower_Armor_Sharp
- 0.06
-
-
-
-
- Defs/ThingDef[defName="Leather_Bird"]/statBases/StuffPower_Armor_Blunt
-
- 0.04
-
-
-
-
-
- Defs/ThingDef[defName="Leather_Human"]/statBases/StuffPower_Armor_Sharp
-
- 0.06
-
-
-
-
- Defs/ThingDef[defName="Leather_Human"]/statBases/StuffPower_Armor_Blunt
-
- 0.04
+ 0.14
-
-
- Defs/ThingDef[defName="Leather_Patch"]/statBases/StuffPower_Armor_Sharp
+
+ Defs/ThingDef[defName="DankPyon_Leather_Direwolf"]/statBases
- 0.08
+ 0.1
- Defs/ThingDef[defName="Leather_Patch"]/statBases/StuffPower_Armor_Blunt
+ Defs/ThingDef[defName="DankPyon_Leather_Hyena"]/statBases/StuffPower_Armor_Sharp
- 0.055
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_Leather_Rawhide"]/statBases/StuffPower_Armor_Sharp
-
- 0.08
+ 0.12
-
- Defs/ThingDef[defName="DankPyon_Leather_Rawhide"]/statBases/StuffPower_Armor_Blunt
+
+ Defs/ThingDef[defName="DankPyon_Leather_Hyena"]/statBases
- 0.055
+ 0.08
-
- Defs/ThingDef[defName="DankPyon_Leather_Rawhide"]/statBases/StuffPower_Armor_Heat
-
-
-
-
Defs/ThingDef[defName="DankPyon_Leather_Rox" or defName="DankPyon_Leather_Daer" or defName="DankPyon_Leather_Lindwurm"]/statBases/StuffPower_Armor_Sharp
@@ -493,244 +381,7 @@
- Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/tools
-
-
-
-
- Blunt
-
- 2
- 0.99
- 0.288
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DarkWoodLog"]
-
-
- 0.2
- 1
- 0.13
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases
-
- 0.07
- 1.33
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/StuffPower_Armor_Sharp
-
- 0.15
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/StuffPower_Armor_Blunt
-
- 0.3
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/StuffPower_Armor_Heat
-
- 0.025
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/SharpDamageMultiplier
-
- 0.7
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/statBases/BluntDamageMultiplier
-
- 0.5
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DarkWoodLog"]/stuffProps/statFactors
-
- 0.3
- 0.3
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/tools
-
-
-
-
- Blunt
-
- 2
- 0.99
- 0.288
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]
-
-
- 0.2
- 1
- 0.13
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases
-
- 0.07
- 1.33
-
-
-
-
- Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/StuffPower_Armor_Sharp
-
- 0.15
-
-
-
-
- Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/StuffPower_Armor_Blunt
-
- 0.3
-
-
-
-
- Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/StuffPower_Armor_Heat
-
- 0.025
-
-
-
-
- Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/SharpDamageMultiplier
-
- 0.7
-
-
-
-
- Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/statBases/BluntDamageMultiplier
-
- 0.5
-
-
-
-
- Defs/ThingDef[defName="DankPyon_ElvenWoodLog"]/stuffProps/statFactors
-
- 0.3
- 0.3
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/tools
-
-
-
-
- Blunt
-
- 2
- 0.99
- 0.288
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DryadWoodLog"]
-
-
- 0.2
- 1
- 0.13
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases
-
- 0.07
- 1.33
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/StuffPower_Armor_Sharp
-
- 0.15
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/StuffPower_Armor_Blunt
-
- 0.3
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/StuffPower_Armor_Heat
-
- 0.025
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/SharpDamageMultiplier
-
- 0.7
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/statBases/BluntDamageMultiplier
-
- 0.5
-
-
-
-
- Defs/ThingDef[defName="DankPyon_DryadWoodLog"]/stuffProps/statFactors
-
- 0.3
- 0.3
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/tools
+ Defs/ThingDef[defName="DankPyon_RawDarkWood"]/tools
@@ -746,7 +397,7 @@
- Defs/ThingDef[defName="DankPyon_AncientWoodLog"]
+ Defs/ThingDef[defName="DankPyon_RawDarkWood"]
0.2
@@ -757,7 +408,7 @@
- Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases
+ Defs/ThingDef[defName="DankPyon_RawDarkWood"]/statBases
0.07
1.33
@@ -765,42 +416,42 @@
- Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/StuffPower_Armor_Sharp
+ Defs/ThingDef[defName="DankPyon_RawDarkWood"]/statBases/StuffPower_Armor_Sharp
0.15
- Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/StuffPower_Armor_Blunt
+ Defs/ThingDef[defName="DankPyon_RawDarkWood"]/statBases/StuffPower_Armor_Blunt
0.3
- Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/StuffPower_Armor_Heat
+ Defs/ThingDef[defName="DankPyon_RawDarkWood"]/statBases/StuffPower_Armor_Heat
0.025
- Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/SharpDamageMultiplier
+ Defs/ThingDef[defName="DankPyon_RawDarkWood"]/statBases/SharpDamageMultiplier
0.7
- Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/statBases/BluntDamageMultiplier
+ Defs/ThingDef[defName="DankPyon_RawDarkWood"]/statBases/BluntDamageMultiplier
0.5
- Defs/ThingDef[defName="DankPyon_AncientWoodLog"]/stuffProps/statFactors
+ Defs/ThingDef[defName="DankPyon_RawDarkWood"]/stuffProps/statFactors
0.3
0.3
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Armor.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Armor.xml
similarity index 100%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Armor.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Armor.xml
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Helmets.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Helmets.xml
similarity index 100%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Helmets.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Helmets.xml
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Misc.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Misc.xml
similarity index 96%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Misc.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Misc.xml
index ad4f3a9e54..e2146bad45 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Apparel_Misc.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Misc.xml
@@ -170,10 +170,6 @@
-
- Defs/ThingDef[defName="DankPyon_Apparel_DirewolfPelt" or defName="DankPyon_Apparel_HyenaPelt"]/equippedStatOffsets/MoveSpeed
-
-
Defs/ThingDef[defName="DankPyon_Apparel_DirewolfPelt" or defName="DankPyon_Apparel_HyenaPelt"]/statBases
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Packs.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Packs.xml
new file mode 100644
index 0000000000..3318080267
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Packs.xml
@@ -0,0 +1,184 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_FlashPotBelt"]/costList
+
+
+ 5
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_FlashPotBelt"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoCountToRefill
+
+ 1
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_FlashPotBelt"]/verbs
+
+
+
+ throw flash pot
+ CombatExtended.Verb_LaunchProjectileStaticCE
+ true
+ True
+ 0.8
+ 10
+ 3
+ true
+ ThrowGrenade
+ GunTail_Medium
+ 0
+ true
+
+ true
+
+ true
+ DankPyon_Proj_PotFlash
+ Combat_RangedFire_Thrown
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_FirePotBelt"]/costList
+
+
+ 5
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_FirePotBelt"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoCountToRefill
+
+ 1
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_FirePotBelt"]/verbs
+
+
+
+ throw flash pot
+ CombatExtended.Verb_LaunchProjectileStaticCE
+ true
+ True
+ 0.8
+ 10
+ 3
+ true
+ ThrowGrenade
+ GunTail_Medium
+ 0
+ true
+
+ true
+
+ true
+ DankPyon_Proj_PotFire
+ Combat_RangedFire_Thrown
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_SmokePotBelt"]/costList
+
+
+ 5
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_SmokePotBelt"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoCountToRefill
+
+ 1
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_SmokePotBelt"]/verbs
+
+
+
+ throw flash pot
+ CombatExtended.Verb_LaunchProjectileStaticCE
+ true
+ True
+ 0.8
+ 10
+ 3
+ true
+ ThrowGrenade
+ GunTail_Medium
+ 0
+ true
+
+ true
+
+ true
+ DankPyon_Proj_PotSmoke
+ Combat_RangedFire_Thrown
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_AcidFlaskBelt"]/costList
+
+
+ 5
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_AcidFlaskBelt"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoCountToRefill
+
+ 1
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_AcidFlaskBelt"]/verbs
+
+
+
+ throw flash pot
+ CombatExtended.Verb_LaunchProjectileStaticCE
+ true
+ True
+ 0.8
+ 10
+ 3
+ true
+ ThrowGrenade
+ GunTail_Medium
+ 0
+ true
+
+ true
+
+ true
+ DankPyon_Proj_AcidFlask
+ Combat_RangedFire_Thrown
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Shields.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml
similarity index 100%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Shields.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Grenades.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Grenades.xml
similarity index 80%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Grenades.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Grenades.xml
index 9bb65e12a6..8ad06cac51 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Grenades.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Grenades.xml
@@ -323,5 +323,84 @@
CE_OneHandedWeapon
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Proj_AcidFlask"]/projectile
+
+
+ 2.5
+ DankPyon_LindwurmAcidBurn
+ 100
+ 10
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Weapon_AcidFlask"]/costList
+
+
+
+ Defs/ThingDef[defName="DankPyon_Weapon_AcidFlask"]
+
+ CombatExtended.AmmoThing
+ First
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Weapon_AcidFlask"]
+ Class
+ CombatExtended.AmmoDef
+
+
+
+ Defs/ThingDef[defName="DankPyon_Weapon_AcidFlask"]/comps
+
+
+ 2.5
+ Stun
+ 0.7
+ True
+ 60~100
+
+
+
+
+
+ DankPyon_Weapon_AcidFlask
+
+ 0.6
+ 1.8
+ 3
+ 1
+ 1.0
+
+
+ throw flash pot
+ CombatExtended.Verb_ShootCEOneUse
+ true
+ 10
+ 3
+ 1.8
+ 4
+ true
+ ThrowMolotovCocktail
+
+ true
+
+ DankPyon_Proj_AcidFlask
+ true
+
+
+ CE_OneHandedWeapon
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Melee.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Melee.xml
similarity index 99%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Melee.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Melee.xml
index d31952919f..433c7e7002 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Melee.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Melee.xml
@@ -2025,13 +2025,11 @@
- Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pitchfork"]
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_Pitchfork"]/equippedStatOffsets
-
- 0.44
- 1.33
- 0.5
-
+ 0.44
+ 1.33
+ 0.5
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Ranged.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Ranged.xml
similarity index 100%
rename from ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/MO_Weapons_Ranged.xml
rename to ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Ranged.xml
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Cobra.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Cobra.xml
new file mode 100644
index 0000000000..cdcfab0413
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Cobra.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+ Defs/ThingDef[@Name="DankPyon_LargeCobraBase"]/statBases
+
+ 0.19
+ 0.18
+ 0.17
+
+
+
+
+ Defs/ThingDef[@Name="DankPyon_LargeCobraBase"]/tools
+
+
+
+ venom-fangs
+
+ ToxicBite
+
+ 14
+ 1.8
+ 0.25
+ 0.20
+ Mouth
+
+
+
+ Stun
+ 14
+
+
+
+
+
+ head
+
+ Blunt
+
+ 3
+ 2
+ 0.2
+ 0.2
+ HeadAttackTool
+ true
+
+
+
+
+
+
+ Defs/ThingDef[@Name="DankPyon_LargeCobraBase"]
+
+
+ Serpentine
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Constrictor.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Constrictor.xml
new file mode 100644
index 0000000000..7375777b00
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Constrictor.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+ Defs/ThingDef[@Name="DankPyon_GiantConstrictorBase"]/statBases
+
+ 0.23
+ 0.12
+ 0.15
+
+
+
+
+ Defs/ThingDef[@Name="DankPyon_GiantConstrictorBase"]/tools
+
+
+
+
+ Bite
+
+ 24
+ 2
+ Mouth
+ 2.26
+ 1.49
+
+
+ head
+
+ Blunt
+
+ 7
+ 0.92
+ 0.2
+ 0.3
+ HeadAttackTool
+ true
+
+
+
+
+
+
+ Defs/ThingDef[@Name="DankPyon_GiantConstrictorBase"]
+
+
+ Serpentine
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Daer.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Daer.xml
new file mode 100644
index 0000000000..369a42b0f8
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Daer.xml
@@ -0,0 +1,107 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Daer"]/statBases
+
+ 0.14
+ 0.27
+ 0.3
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Daer"]/tools
+
+
+
+
+ Bite
+
+ 30
+ 2.6
+ Teeth
+ 0.5
+
+
+
+ Stun
+ 14
+
+
+
+ 1.8
+ 12
+
+
+ left claw
+
+ Scratch
+
+ 21
+ 2
+ FrontLeftPaw
+
+
+
+ Stun
+ 7
+
+
+
+ 0.45
+ 7
+
+
+ right claw
+
+ Scratch
+
+ 21
+ 2
+ FrontRightPaw
+
+
+
+ Stun
+ 7
+
+
+
+ 0.45
+ 7
+
+
+ head
+
+ Blunt
+
+ 18
+ 2.44
+ HeadAttackTool
+ true
+ 0.2
+ 3.5
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Daer"]
+
+
+ Quadruped
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_Daer"]/combatPower
+
+ 300
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Deathstinger.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Deathstinger.xml
new file mode 100644
index 0000000000..f021123902
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Deathstinger.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Deathstinger"]/statBases/MoveSpeed
+
+ 5.1
+ 0.22
+ 0.03
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Deathstinger"]/tools
+
+
+
+ mandibles
+
+ Bite
+
+ 9
+ 1.5
+ Mouth
+ 0.24
+ 0.5
+
+
+ head
+
+ Blunt
+
+ 1
+ 1.26
+ HeadAttackTool
+ 0.2
+ 0.250
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Deathstinger"]/statBases/ArmorRating_Blunt
+
+ 2.25
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Deathstinger"]/statBases/ArmorRating_Sharp
+
+ 0.7
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Deathstinger"]/race/baseHealthScale
+
+ 0.5
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Direboar.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Direboar.xml
new file mode 100644
index 0000000000..a14a74461e
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Direboar.xml
@@ -0,0 +1,102 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_DireBoar"]/statBases
+
+ 0.12
+ 0.33
+ 0.34
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_DireBoar"]/tools
+
+
+
+ tusk
+
+ Scratch
+ Stab
+
+ 21
+ 2.6
+ TuskAttackTool
+ 0.01
+ 1.250
+
+
+
+ Bite
+
+ 20
+ 2.6
+ Teeth
+ 0.5
+ 0.02
+ 0.6
+
+
+
+ Stun
+ 14
+
+
+
+
+
+ left hoof
+
+ Blunt
+ Poke
+
+ 5
+ 1
+ FrontLeftLeg
+ 2.250
+
+
+ right hoof
+
+ Blunt
+ Blunt
+
+ 5
+ 1
+ FrontRightLeg
+ 2.250
+
+
+ head
+
+ Blunt
+
+ 6
+ 0.92
+ HeadAttackTool
+ 0.2
+ 2.5
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_DireBoar"]
+
+
+ Quadruped
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_Daer"]/combatPower
+
+ 140
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Direwolf.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Direwolf.xml
new file mode 100644
index 0000000000..f0824a4f1a
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Direwolf.xml
@@ -0,0 +1,115 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Direwolf"]
+
+
+ Quadruped
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Direwolf"]/statBases/MoveSpeed
+
+ 7
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Direwolf"]/statBases
+
+ 0.075
+ 0.05
+ 0.21
+ 0.20
+ 0.09
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Direwolf"]/tools
+
+
+
+ left claw
+
+ Scratch
+
+ 11
+ 1.19
+ FrontLeftPaw
+
+
+
+ Stun
+ 20
+
+
+
+ 2.250
+ 0.75
+
+
+ right claw
+
+ Scratch
+
+ 11
+ 1.19
+ FrontRightPaw
+
+
+
+ Stun
+ 20
+
+
+
+ 2.250
+ 0.75
+
+
+
+ Bite
+
+ 24
+ 1.46
+ Teeth
+
+
+
+ Stun
+ 20
+
+
+
+ 2
+ 1.6
+ 8.863
+
+
+ head
+
+ Blunt
+
+ 4
+ 3.2
+ HeadAttackTool
+ 0.2
+ 1.225
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_Direwolf"]/combatPower
+
+ 140
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_FarmGroup.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_FarmGroup.xml
new file mode 100644
index 0000000000..6aaafc035b
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_FarmGroup.xml
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Hampshire" or defName="DankPyon_Gloucestershire"]/statBases
+
+ 0.07
+ 0.06
+ 0.08
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Hampshire" or defName="DankPyon_Gloucestershire"]/tools
+
+
+
+
+ Bite
+
+ 6
+ 1.5
+ 0.7
+ Teeth
+ 0.04
+ 0.5
+
+
+ head
+
+ Blunt
+
+ 6
+ 2.12
+ HeadAttackTool
+ 0.2
+ 2
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Hampshire" or defName="DankPyon_Gloucestershire"]
+
+
+ Quadruped
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Ravelder" or defName="DankPyon_Angus"]/statBases
+
+ 0.08
+ 0.13
+ 0.22
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Ravelder" or defName="DankPyon_Angus"]/tools
+
+
+
+
+ Bite
+
+ 4
+ 1
+ 0.7
+ Teeth
+ 0.4
+
+
+ head
+
+ Blunt
+
+ 16
+ 2.12
+ 0.2
+ HeadAttackTool
+ 6
+
+
+ horns
+
+ Stab
+
+ 21
+ 2.0
+ 0.65
+ Male
+ HeadAttackTool
+ 0.25
+ 6
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Ravelder" or defName="DankPyon_Angus"]
+
+
+ Quadruped
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Ghoul.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Ghoul.xml
new file mode 100644
index 0000000000..1952bdad99
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Ghoul.xml
@@ -0,0 +1,278 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Ghoul_Stage_One" or defName="DankPyon_Ghoul_Stage_Two" or defName="DankPyon_Ghoul_Stage_Three"]
+
+
+ Humanoid
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Ghoul_Stage_One"]/statBases/MoveSpeed
+
+ 5
+ 0.22
+ 0.03
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Ghoul_Stage_One"]/tools
+
+
+
+ left claw
+
+ Scratch
+
+ 5
+
+
+
+ Stun
+ 14
+
+
+
+ 2
+ LeftHand
+ 1
+ 0.5
+ true
+
+
+ right claw
+
+ Scratch
+
+ 5
+
+
+
+ Stun
+ 14
+
+
+
+ 2
+ RightHand
+ 1
+ 0.5
+ true
+
+
+ teeth
+
+ Bite
+
+ 9
+
+
+
+ Stun
+ 14
+
+
+
+ 1.5
+ Mouth
+ 0.24
+ 0.5
+
+
+ head
+
+ Blunt
+
+ 1
+ 1.26
+ HeadAttackTool
+ 0.2
+ 0.250
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Ghoul_Stage_Two"]/statBases/MoveSpeed
+
+ 5
+ 0.22
+ 0.03
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Ghoul_Stage_Two"]/tools
+
+
+
+ left claw
+
+ Scratch
+
+ 8
+
+
+
+ Stun
+ 14
+
+
+
+ 2
+ LeftHand
+ 1
+ 1
+ true
+
+
+ right claw
+
+ Scratch
+
+ 8
+
+
+
+ Stun
+ 14
+
+
+
+ 2
+ RightHand
+ 1
+ 1
+ true
+
+
+ teeth
+
+ Bite
+
+ 15
+
+
+
+ Stun
+ 14
+
+
+
+ 1.5
+ Mouth
+ 2
+ 0.5
+
+
+ head
+
+ Blunt
+
+ 1
+ 1.26
+ HeadAttackTool
+ 0.2
+ 0.250
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Ghoul_Stage_Three"]/statBases/MoveSpeed
+
+ 5
+ 0.22
+ 0.03
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Ghoul_Stage_Three"]/tools
+
+
+
+ left claw
+
+ Scratch
+
+ 18
+
+
+
+ Stun
+ 14
+
+
+
+ 2
+ LeftHand
+ 1.5
+ 2
+ true
+
+
+ right claw
+
+ Scratch
+
+ 18
+
+
+
+ Stun
+ 14
+
+
+
+ 2
+ RightHand
+ 1.5
+ 2
+ true
+
+
+ teeth
+
+ Bite
+
+ 24
+
+
+
+ Stun
+ 14
+
+
+
+ 1.5
+ Mouth
+ 3.5
+ 0.5
+
+
+ head
+
+ Blunt
+
+ 1
+ 1.26
+ HeadAttackTool
+ 0.2
+ 0.250
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Golem.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Golem.xml
new file mode 100644
index 0000000000..dd66967743
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Golem.xml
@@ -0,0 +1,227 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Iron"]
+
+
+ Humanoid
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Iron"]/comps
+
+
+ 1000
+ true
+ 1250
+ 5
+ false
+
+ 5
+
+ 300
+ 200
+ false
+ 100
+ 0.75
+ 3
+ 1
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Iron"]/statBases
+
+ 0
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Iron"]/statBases/ArmorRating_Sharp
+
+ 3.4
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Iron"]/statBases/ArmorRating_Blunt
+
+ 5.1
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Iron"]/tools
+
+
+
+ left fist
+
+ Blunt
+
+ 32
+ 3
+ LeftHand
+ 16
+ true
+
+
+ right fist
+
+ Blunt
+
+ 32
+ 3
+ RightHand
+ 16
+ true
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Gold"]/statBases/ArmorRating_Sharp
+
+ 1.2
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Gold"]/statBases/ArmorRating_Blunt
+
+ 3
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Gold"]/tools
+
+
+
+ left fist
+
+ Blunt
+
+ 21
+ 2.5
+ LeftHand
+ 16
+ true
+
+
+ right fist
+
+ Blunt
+
+ 21
+ 2.5
+ RightHand
+ 16
+ true
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Steel"]/statBases/ArmorRating_Sharp
+
+ 4
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Steel"]/statBases/ArmorRating_Blunt
+
+ 6
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Steel"]/tools
+
+
+
+ left fist
+
+ Blunt
+
+ 32
+ 3
+ LeftHand
+ 16
+ true
+
+
+ right fist
+
+ Blunt
+
+ 32
+ 3
+ RightHand
+ 16
+ true
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Silver"]/statBases/ArmorRating_Sharp
+
+ 1.6
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Silver"]/statBases/ArmorRating_Blunt
+
+ 3.6
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Golem_Silver"]/tools
+
+
+
+ left fist
+
+ Blunt
+
+ 21
+ 2
+ LeftHand
+ 8
+ true
+
+
+ right fist
+
+ Blunt
+
+ 21
+ 2
+ RightHand
+ 8
+ true
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Gryphon.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Gryphon.xml
new file mode 100644
index 0000000000..3a9409cb7c
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Gryphon.xml
@@ -0,0 +1,145 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Griffon"]/statBases
+
+ 0.1
+ 0.82
+ 0.48
+ 0.6
+
+
+
+
+ Defs/ThingDef[defName="Thrumbo"]/statBases/ArmorRating_Blunt
+
+ 21
+
+
+
+
+ Defs/ThingDef[defName="Thrumbo"]/statBases/ArmorRating_Sharp
+
+ 14
+
+
+
+
+ Defs/ThingDef[defName="Thrumbo"]/statBases/ArmorRating_Heat
+
+ 0.6
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Griffon"]/tools
+
+
+
+ left claw
+
+ Scratch
+
+ 22
+ 2.13
+ FrontLeftPaw
+
+
+
+ Stun
+ 21
+
+
+
+ 4
+ 14.640
+
+
+ right claw
+
+ Scratch
+
+ 22
+ 2.13
+ FrontRightPaw
+
+
+
+ Stun
+ 21
+
+
+
+ 4
+ 14.640
+
+
+ beak
+
+ Bite
+
+ 46
+ 2.52
+ Beak
+
+
+
+ Stun
+ 21
+
+
+
+ 0.5
+ 6
+ 16
+
+
+ head
+
+ Blunt
+
+ 11
+ 2.52
+ HeadAttackTool
+ 0.2
+ 6
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Griffon"]
+
+
+ Birdlike
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Griffon"]/comps
+
+ Defs/ThingDef[defName="DankPyon_Griffon"]
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Griffon"]/comps
+
+
+ 3000
+ true
+ 600
+ 5
+ 0.75
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Hyena.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Hyena.xml
new file mode 100644
index 0000000000..809bb76ff2
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Hyena.xml
@@ -0,0 +1,106 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Hyena"]
+
+
+ Quadruped
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Hyena"]/statBases/MoveSpeed
+
+ 6.25
+ 0.26
+ 0.09
+ 0.05
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Hyena"]/tools
+
+
+
+ left claw
+
+ Scratch
+
+ 6
+ 0.8
+ FrontLeftPaw
+
+
+
+ Stun
+ 20
+
+
+
+ 0.450
+ 0.07
+
+
+ right claw
+
+ Scratch
+
+ 6
+ 0.8
+ FrontRightPaw
+
+
+
+ Stun
+ 20
+
+
+
+ 0.450
+ 0.07
+
+
+
+ Bite
+
+ 21
+ 1.73
+ Teeth
+
+
+
+ Stun
+ 20
+
+
+
+ 0.55
+ 4.225
+
+
+ head
+
+ Blunt
+
+ 1
+ 1.26
+ HeadAttackTool
+ 0.2
+ 0.250
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_Hyena"]/combatPower
+
+ 80
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Lindwurm.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Lindwurm.xml
new file mode 100644
index 0000000000..606909faa5
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Lindwurm.xml
@@ -0,0 +1,92 @@
+
+
+
+
+
+ Defs/ThingDef[@Name="DankPyon_LindwurmBase"]/statBases
+
+ 0.20
+ 0.25
+ 0.08
+
+
+
+
+ Defs/ThingDef[@Name="DankPyon_LindwurmBase"]/tools
+
+
+
+
+ Bite
+
+ 32
+ 2.6
+ Mouth
+ 0.5
+ 2.7
+
+
+ head
+
+ Blunt
+
+ 4
+ 0.97
+ HeadAttackTool
+ 0.2
+ 0.823
+
+
+ left claw
+
+ Scratch
+
+ 23
+ 2
+ FrontLeftClaws
+ 0.18
+ 0.823
+
+
+ right claw
+
+ Scratch
+
+ 23
+ 2
+ FrontRightClaws
+ 0.18
+ 0.823
+
+
+ tail
+
+ Blunt
+
+ 28
+ 4
+ DankPyon_TailAttackTool
+
+
+
+ Stun
+ 14
+
+
+
+ 0.9
+
+
+
+
+
+
+ Defs/ThingDef[@Name="DankPyon_LindwurmBase"]
+
+
+ Birdlike
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Mimic.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Mimic.xml
new file mode 100644
index 0000000000..c4672538db
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Mimic.xml
@@ -0,0 +1,236 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_RusticMimic"]/statBases
+
+ 0.16
+ 0.23
+ 0.18
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_RusticMimic"]/statBases/ArmorRating_Blunt
+
+ 4
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_RusticMimic"]/statBases/ArmorRating_Sharp
+
+ 2
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_RusticMimic"]/tools
+
+
+
+ left side
+
+ Blunt
+
+ 22
+ 1.3
+ FrontLeftPaw
+
+
+
+ Stun
+ 21
+
+
+
+ 0.5
+ 5
+
+
+ right side
+
+ Blunt
+
+ 22
+ 1.3
+ FrontRightPaw
+
+
+
+ Stun
+ 21
+
+
+
+ 0.5
+ 5
+
+
+
+ Bite
+
+ 33
+ 2.0
+ Teeth
+
+
+
+ Stun
+ 21
+
+
+
+ 1.25
+ 9.5
+
+
+ head
+
+ Blunt
+
+ 12
+ 2.22
+ HeadAttackTool
+ 0.2
+ 4.235
+
+
+ mouth
+
+ DankPyon_Swallow
+
+ 10
+ 2
+ Teeth
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_RusticMimic"]
+
+
+ Quadruped
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_RoyalMimic"]/statBases
+
+ 0.16
+ 0.23
+ 0.18
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_RoyalMimic"]/statBases/ArmorRating_Blunt
+
+ 6
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_RoyalMimic"]/statBases/ArmorRating_Sharp
+
+ 2
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_RoyalMimic"]/tools
+
+
+
+ left side
+
+ Blunt
+
+ 24
+ 1.3
+ FrontLeftPaw
+
+
+
+ Stun
+ 21
+
+
+
+ 6.5
+
+
+ right side
+
+ Blunt
+
+ 24
+ 1.3
+ FrontRightPaw
+
+
+
+ Stun
+ 21
+
+
+
+ 6.5
+
+
+
+ Bite
+
+ 42
+ 2.0
+ Teeth
+
+
+
+ Stun
+ 21
+
+
+
+ 4
+ 12
+
+
+ head
+
+ Blunt
+
+ 12
+ 2.22
+ HeadAttackTool
+ 0.2
+ 4.235
+
+
+ mouth
+
+ DankPyon_Swallow
+
+ 10
+ 2
+ Teeth
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_RoyalMimic"]
+
+
+ Quadruped
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Northern_Boar.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Northern_Boar.xml
new file mode 100644
index 0000000000..404b8c4a7f
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Northern_Boar.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_NorthernBoar"]
+
+
+ Quadruped
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_NorthernBoar"]/statBases
+
+ 0.15
+ 0.14
+ 0.14
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_NorthernBoar"]/tools
+
+
+
+ tusk
+
+ Cut
+
+ 11
+ 1.89
+ TuskAttackTool
+ 0.1
+ 1.5
+
+
+ tusk
+
+ Stab
+
+ 7
+ 1.41
+ 0.65
+ TuskAttackTool_2
+ 0.2
+ 2.940
+
+
+
+ Bite
+
+ 8.7
+ 1.57
+ 0.6
+ Teeth
+ 0.08
+ 0.75
+
+
+ head
+
+ Blunt
+
+ 6
+ 2.12
+ HeadAttackTool
+ 0.2
+ 2
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Rox.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Rox.xml
new file mode 100644
index 0000000000..9e5ff4ac83
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Rox.xml
@@ -0,0 +1,91 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Rox"]/statBases
+
+ 0.06
+ 0.41
+ 0.48
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Rox"]/tools
+
+
+
+ horn
+
+ Stab
+
+ 30
+ 2.52
+ 0.4
+ HornAttackTool_2
+ 1.5
+ 15
+
+
+ left foot
+
+ Blunt
+
+ 22
+ 2.13
+ FrontLeftLeg
+ 14.640
+
+
+ right foot
+
+ Blunt
+
+ 22
+ 2.13
+ FrontRightLeg
+ 14.640
+
+
+
+ Bite
+
+ 19
+ 1.62
+ Teeth
+ 0.09
+ 2.016
+
+
+ head
+
+ Blunt
+
+ 11
+ 2.52
+ HeadAttackTool
+ 0.2
+ 6
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Rox"]
+
+
+ Quadruped
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_Rox"]/combatPower
+
+ 375
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Schrat.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Schrat.xml
new file mode 100644
index 0000000000..6e2cf3f4bb
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Schrat.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Schrat"]/statBases
+
+ 0.12
+ 0.14
+ 0.22
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Schrat"]/tools
+
+
+
+ left fist
+
+ Blunt
+
+ 21
+ 2
+ LeftHand
+ 4
+ true
+
+
+ right fist
+
+ Blunt
+
+ 21
+ 2
+ RightHand
+ 4
+ true
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Schrat"]
+
+
+ Humanoid
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Schrat_Sapling.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Schrat_Sapling.xml
new file mode 100644
index 0000000000..3375c9ccb4
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Schrat_Sapling.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Schrat_Sapling"]/statBases
+
+ 0.12
+ 0.14
+ 0.22
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Schrat_Sapling"]/tools
+
+
+
+ left fist
+
+ Blunt
+
+ 8
+ 2
+ LeftHand
+ 1.25
+ true
+
+
+ right fist
+
+ Blunt
+
+ 8
+ 2
+ RightHand
+ 1.25
+ true
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Schrat_Sapling"]
+
+
+ Humanoid
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Troll.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Troll.xml
new file mode 100644
index 0000000000..e9720cb851
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Troll.xml
@@ -0,0 +1,159 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_AncientTroll"]/statBases
+
+ 0.22
+ 0.58
+ 0.99
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_AncientTroll"]/tools
+
+
+
+ left claw
+
+ Scratch
+
+ 19
+ 1.45
+ 0.7
+ LeftHand
+
+
+
+ Stun
+ 14
+
+
+
+ 3.5
+ 12
+
+
+ left fist
+
+ Demolish
+
+ 19
+ 1.45
+ LeftHand
+ 0.7
+
+
+
+ Stun
+ 14
+
+
+
+ 3.5
+ 12
+
+
+ right claw
+
+ Scratch
+
+ 26
+ 1.45
+ RightHand
+ 0.7
+
+
+
+ Stun
+ 14
+
+
+
+ 20
+
+
+ right fist
+
+ Demolish
+
+ 30
+ 1.45
+ RightHand
+ 0.7
+
+
+
+ Stun
+ 14
+
+
+
+ 20
+
+
+
+ Bite
+
+ 35
+ 1.6
+ Teeth
+ 0.5
+
+
+
+ Stun
+ 14
+
+
+
+ 3
+ 20
+
+
+ tusks
+
+ Stab
+
+ 24
+ 1.6
+ Teeth
+
+
+
+ Stun
+ 14
+
+
+
+ 12
+ 3
+ 0.15
+
+
+ head
+
+ Blunt
+
+ 14
+ 1.8
+ HeadAttackTool
+ 8
+ 0.2
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_AncientTroll"]
+
+
+ Humanoid
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Unhold.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Unhold.xml
new file mode 100644
index 0000000000..164777b2e3
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Unhold.xml
@@ -0,0 +1,137 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Unhold"]/statBases
+
+ 0.18
+ 0.33
+ 0.33
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Unhold"]/tools
+
+
+
+ left claw
+
+ Scratch
+
+ 22
+ 1.7
+ LeftHand
+
+
+
+ Stun
+ 14
+
+
+
+ 1.75
+ 14
+
+
+ left fist
+
+ Demolish
+
+ 22
+ 2.5
+ LeftHand
+
+
+
+ Stun
+ 14
+
+
+
+ 1.75
+ 14
+
+
+ right claw
+
+ Scratch
+
+ 22
+ 1.7
+ RightHand
+
+
+
+ Stun
+ 14
+
+
+
+ 1.8
+ 14
+
+
+ right fist
+
+ Demolish
+
+ 22
+ 2.5
+ RightHand
+
+
+
+ Stun
+ 14
+
+
+
+ 1.75
+ 14
+
+
+
+ Bite
+
+ 22
+ 1.95
+ Teeth
+ 0.7
+
+
+
+ Stun
+ 14
+
+
+
+ 2
+ 10
+
+
+ head
+
+ Blunt
+
+ 11
+ 2
+ HeadAttackTool
+ 8
+ 0.2
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Unhold"]
+
+
+ Humanoid
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Webknecht.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Webknecht.xml
new file mode 100644
index 0000000000..0d98918a5b
--- /dev/null
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Races/MO_CE_Patch_Webknecht.xml
@@ -0,0 +1,113 @@
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Webknecht"]/statBases
+
+ 0.13
+ 0.15
+ 0.2
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Webknecht"]/statBases
+
+ 2
+ 2
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Webknecht"]/tools
+
+
+
+ left first leg
+
+ Scratch
+
+ 14
+ 1.2
+ FrontLeftLeg
+ 0.4
+ 3
+
+
+ right first leg
+
+ Scratch
+
+ 14
+ 1.2
+ FrontRightLeg
+ 0.4
+ 3
+
+
+
+ ToxicBite
+
+ 23
+ 1.65
+ Mouth
+
+
+
+ Stun
+ 20
+
+
+
+ 3
+ 6
+
+
+ head
+
+ Blunt
+
+ 10
+ 1.65
+ HeadAttackTool
+ 1
+ 0.2
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Webknecht"]
+
+
+ QuadrupedLow
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Webknecht"]/comps
+
+ Defs/ThingDef[defName="DankPyon_Webknecht"]
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Webknecht"]/comps
+
+
+ 975
+ true
+ 600
+ 5
+ 0.5
+
+
+
+
+
\ No newline at end of file
From 918158db1561e52156b3686de55df24cb8ec7d70 Mon Sep 17 00:00:00 2001
From: SamaelGray <56392968+SamaelGray@users.noreply.github.com>
Date: Fri, 9 Aug 2024 15:05:04 +0330
Subject: [PATCH 28/69] MO Barbarians patch
---
LoadFolders.xml | 5 +-
.../PawnKinds/PawnKinds_Barbarians.xml | 183 +++++
.../ThingDefs_Misc/Apparel/BarbArmors.xml | 394 +++++++++
.../ThingDefs_Misc/Apparel/BarbClothes.xml | 38 +
.../ThingDefs_Misc/Apparel/BarbHeadgear.xml | 321 ++++++++
.../Shields/BarbarianBannerShields.xml | 312 ++++++++
.../Shields/BarbarianMetalShields.xml | 159 ++++
.../Shields/BarbarianRoundShields.xml | 159 ++++
.../Shields/BarbarianTallShields.xml | 174 ++++
.../Weapons/MeleeMedievalBarbarians.xml | 749 ++++++++++++++++++
.../ThingDefs_Misc/Weapons/ThrownWeapons.xml | 225 ++++++
.../ThingDefs_Races/Races_Animal_CowGroup.xml | 92 +++
SupportedThirdPartyMods.md | 1 +
13 files changed, 2810 insertions(+), 2 deletions(-)
create mode 100644 ModPatches/Medieval Overhaul Barbarians/PawnKinds/PawnKinds_Barbarians.xml
create mode 100644 ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Apparel/BarbArmors.xml
create mode 100644 ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Apparel/BarbClothes.xml
create mode 100644 ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Apparel/BarbHeadgear.xml
create mode 100644 ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianBannerShields.xml
create mode 100644 ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianMetalShields.xml
create mode 100644 ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianRoundShields.xml
create mode 100644 ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianTallShields.xml
create mode 100644 ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Weapons/MeleeMedievalBarbarians.xml
create mode 100644 ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Weapons/ThrownWeapons.xml
create mode 100644 ModPatches/Medieval Overhaul Barbarians/ThingDefs_Races/Races_Animal_CowGroup.xml
diff --git a/LoadFolders.xml b/LoadFolders.xml
index b6958f1e03..77fd7f2fc6 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -288,6 +288,7 @@
ModPatches/Medicine Supplements (Continued)
ModPatches/Medieval Medicines 1.4 Medieval Overhaul Edition
ModPatches/Medieval Overhaul
+ ModPatches/Medieval Overhaul: Barbarians
ModPatches/Medieval Tailor
ModPatches/Megafauna
ModPatches/Melee Animation
@@ -563,7 +564,7 @@
ModPatches/Vanilla Storytellers Expanded - Winston Waves
ModPatches/Vanilla Vehicles Expanded
ModPatches/Vanilla Vehicles Expanded - Tier 3
- ModPatches/Vanilla Vehicles Expanded - Upgrades
+ ModPatches/Vanilla Vehicles Expanded - Upgrades
ModPatches/Vanilla Weapons Expanded
ModPatches/Vanilla Weapons Expanded - Coilguns
ModPatches/Vanilla Weapons Expanded - Frontier
@@ -608,4 +609,4 @@
ModPatches/pphhyy Sanguinary Animals
ModPatches/pphhyy's Lightless Empyrean
-
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul Barbarians/PawnKinds/PawnKinds_Barbarians.xml b/ModPatches/Medieval Overhaul Barbarians/PawnKinds/PawnKinds_Barbarians.xml
new file mode 100644
index 0000000000..628a61d4c6
--- /dev/null
+++ b/ModPatches/Medieval Overhaul Barbarians/PawnKinds/PawnKinds_Barbarians.xml
@@ -0,0 +1,183 @@
+
+
+
+
+
+ Defs/PawnKindDef[
+ defName="pphhyy_Barbarian_Thrall" or
+ defName="pphhyy_Barbarian_MarauderShield" or
+ defName="pphhyy_Barbarian_WarriorShield" or
+ defName="pphhyy_Barbarian_ChosenShield" or
+ defName="pphhyy_Barbarian_WarlordFactionLeader"
+ ]/modExtensions/li[@Class="VFECore.PawnKindDefExtension"]
+
+
+
+
+
+ Defs/PawnKindDef[defName="pphhyy_Barbarian_Thrall"]
+
+
+
+ 12
+ 20
+
+
+
+ 10
+ 50
+
+
+ NeolithicMeleeBasic
+
+
+
+ 0
+ 600
+
+
+ pphhyy_Barbarian_BarbRoundShield1
+
+ 1
+
+
+
+
+
+ Defs/PawnKindDef[defName="pphhyy_Barbarian_Thrall"]
+
+
+ CE_Apparel_TribalBackpack
+ DankPyon_Apparel_Quiver
+
+
+
+
+
+ Defs/PawnKindDef[defName="pphhyy_Barbarian_MarauderShield"]
+
+
+
+ 3
+ 4
+
+
+
+ 25
+ 75
+
+
+ NeolithicMeleeBasic
+ NeolithicMeleeDecent
+
+
+
+ 0
+ 600
+
+
+ pphhyy_Barbarian_BarbRoundShield1
+
+ 1
+
+
+
+
+
+ Defs/PawnKindDef[defName="pphhyy_Barbarian_MarauderShield" or defName="pphhyy_Barbarian_WarriorShield" or defName="pphhyy_Barbarian_ChosenShield"]
+
+
+ CE_Apparel_TribalBackpack
+
+
+
+
+
+ Defs/PawnKindDef[defName="pphhyy_Barbarian_WarriorShield"]
+
+
+
+ 3
+ 4
+
+
+
+ 100
+ 200
+
+
+ NeolithicMeleeBasic
+ NeolithicMeleeDecent
+
+
+
+ 100
+ 600
+
+
+ pphhyy_Barbarian_BarbRoundShield1
+ pphhyy_Barbarian_BarbRoundShield2
+ pphhyy_Barbarian_BarbTallShield1
+
+ 1
+
+
+
+
+
+ Defs/PawnKindDef[defName="pphhyy_Barbarian_ChosenShield"]
+
+
+
+ 3
+ 4
+
+
+
+ 100
+ 200
+
+
+ NeolithicMeleeBasic
+ NeolithicMeleeDecent
+
+
+
+ 100
+ 600
+
+
+ pphhyy_Barbarian_BarbRoundShield1
+ pphhyy_Barbarian_BarbRoundShield2
+ pphhyy_Barbarian_BarbRoundShield3
+ pphhyy_Barbarian_BarbTallShield1
+ pphhyy_Barbarian_BarbTallShield2
+ pphhyy_Barbarian_BarbTallShield3
+ pphhyy_Barbarian_BarbMetalShield1
+
+ 1
+
+
+
+
+
+ Defs/PawnKindDef[defName="pphhyy_Barbarian_WarlordFactionLeader"]
+
+
+
+ 100
+ 600
+
+
+ pphhyy_Barbarian_BarbMetalShield1
+ pphhyy_Barbarian_BarbMetalShield2
+ pphhyy_Barbarian_BarbMetalShield3
+
+ 0.50
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Apparel/BarbArmors.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Apparel/BarbArmors.xml
new file mode 100644
index 0000000000..78c686da13
--- /dev/null
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Apparel/BarbArmors.xml
@@ -0,0 +1,394 @@
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbLeatherCoat"]/statBases
+
+ 18
+ 4
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbLeatherCoat"]/statBases/ArmorRating_Sharp
+
+ 1.2
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbLeatherCoat"]/statBases/ArmorRating_Blunt
+
+ 0.8
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbLeatherCoat"]/equippedStatOffsets/MoveSpeed
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbLeatherCoatII"]/statBases
+
+ 18
+ 4
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbLeatherCoatII"]/statBases/ArmorRating_Sharp
+
+ 1.26
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbLeatherCoatII"]/statBases/ArmorRating_Blunt
+
+ 0.84
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbLeatherCoatII"]/equippedStatOffsets/MoveSpeed
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_Mail" or defName="pphhyy_Barbarian_Scale"]/statBases
+
+ 30
+ 12
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_Mail" or defName="pphhyy_Barbarian_Scale"]/statBases/Mass
+
+ 9
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_Mail" or defName="pphhyy_Barbarian_Scale"]/equippedStatOffsets
+
+ -0.10
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_Mail" or defName="pphhyy_Barbarian_Scale"]/statBases/ArmorRating_Sharp
+
+ 1.9
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_Mail" or defName="pphhyy_Barbarian_Scale"]/statBases/ArmorRating_Blunt
+
+ 2.9
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_Mail" or defName="pphhyy_Barbarian_Scale"]/equippedStatOffsets/MoveSpeed
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_MailII" or defName="pphhyy_Barbarian_ScaleII"]/statBases
+
+ 30
+ 12
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_MailII" or defName="pphhyy_Barbarian_ScaleII"]/statBases/Mass
+
+ 9.5
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_MailII" or defName="pphhyy_Barbarian_ScaleII"]/equippedStatOffsets
+
+ -0.10
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_MailII" or defName="pphhyy_Barbarian_ScaleII"]/statBases/ArmorRating_Sharp
+
+ 2.2
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_MailII" or defName="pphhyy_Barbarian_ScaleII"]/statBases/ArmorRating_Blunt
+
+ 3.3
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_MailII" or defName="pphhyy_Barbarian_ScaleII"]/equippedStatOffsets/MoveSpeed
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneArmor"]/statBases
+
+ 18
+ 4
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneArmor"]/statBases/Mass
+
+ 6
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneArmor"]/statBases/ArmorRating_Sharp
+
+ 1.5
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneArmor"]/statBases/ArmorRating_Blunt
+
+ 0.9
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneArmorII"]/statBases
+
+ 18
+ 4.5
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneArmorII"]/statBases/Mass
+
+ 6.5
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneArmorII"]/statBases/ArmorRating_Sharp
+
+ 1.65
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneArmorII"]/statBases/ArmorRating_Blunt
+
+ 1.0
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneArmorIII"]/statBases
+
+ 18
+ 5
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneArmorIII"]/statBases/Mass
+
+ 7
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneArmorIII"]/statBases/ArmorRating_Sharp
+
+ 1.8
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneArmorIII"]/statBases/ArmorRating_Blunt
+
+ 1.15
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ChosenMail" or defName="pphhyy_Barbarian_ChosenScale"]/statBases
+
+ 100
+ 10
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ChosenMail" or defName="pphhyy_Barbarian_ChosenScale"]/equippedStatOffsets
+
+ -0.15
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ChosenMail" or defName="pphhyy_Barbarian_ChosenScale"]/statBases/ArmorRating_Sharp
+
+ 2.55
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ChosenMail" or defName="pphhyy_Barbarian_ChosenScale"]/statBases/ArmorRating_Blunt
+
+ 3.9
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ChosenMail" or defName="pphhyy_Barbarian_ChosenScale"]/equippedStatOffsets/MoveSpeed
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ChosenMailII" or defName="pphhyy_Barbarian_ChosenScaleII" or defName="pphhyy_Barbarian_WarlordArmor" or defName="pphhyy_Barbarian_WarlordArmorII"]/statBases
+
+ 100
+ 12
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ChosenMailII" or defName="pphhyy_Barbarian_ChosenScaleII" or defName="pphhyy_Barbarian_WarlordArmor" or defName="pphhyy_Barbarian_WarlordArmorII"]/equippedStatOffsets
+
+ -0.15
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ChosenMailII" or defName="pphhyy_Barbarian_ChosenScaleII" or defName="pphhyy_Barbarian_WarlordArmor"]/statBases/ArmorRating_Sharp
+
+ 2.7
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ChosenMailII" or defName="pphhyy_Barbarian_ChosenScaleII" or defName="pphhyy_Barbarian_WarlordArmor"]/statBases/ArmorRating_Blunt
+
+ 4.1
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ChosenMailII" or defName="pphhyy_Barbarian_ChosenScaleII" or defName="pphhyy_Barbarian_WarlordArmor" or defName="pphhyy_Barbarian_WarlordArmorII"]/equippedStatOffsets/MoveSpeed
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_WarlordArmorII"]/statBases/ArmorRating_Sharp
+
+ 3.0
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_WarlordArmorII"]/statBases/ArmorRating_Blunt
+
+ 4.5
+
+
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_ChosenMail" or
+ defName="pphhyy_Barbarian_ChosenMailII" or
+ defName="pphhyy_Barbarian_ChosenScale" or
+ defName="pphhyy_Barbarian_ChosenScaleII" or
+ defName="pphhyy_Barbarian_WarlordArmor" or
+ defName="pphhyy_Barbarian_WarlordArmorII"]
+
+
+
+
+
+ 0.70
+
+ Neck
+
+
+
+ 0.70
+
+ Neck
+
+
+
+ 0.90
+
+ Leg
+
+
+
+
+ 0.90
+
+ Leg
+
+
+
+
+ 0.80
+
+ Arm
+
+
+
+
+ 0.80
+
+ Arm
+
+
+
+
+ 0.60
+
+ Hand
+
+
+
+
+ 0.60
+
+ Hand
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Apparel/BarbClothes.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Apparel/BarbClothes.xml
new file mode 100644
index 0000000000..c623bb9d20
--- /dev/null
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Apparel/BarbClothes.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbTribal" or defName="pphhyy_Barbarian_LeatherShirt"]/statBases
+
+ 5
+ 2
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbTribal" or defName="pphhyy_Barbarian_LeatherShirt"]/statBases/StuffEffectMultiplierArmor
+
+ 4
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedChain"]/statBases
+
+ 10
+ 3
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedChain"]/statBases/StuffEffectMultiplierArmor
+
+ 2
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Apparel/BarbHeadgear.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Apparel/BarbHeadgear.xml
new file mode 100644
index 0000000000..d4478e1132
--- /dev/null
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Apparel/BarbHeadgear.xml
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneHelm" or defName="pphhyy_Barbarian_BoneHelmII" or defName="pphhyy_Barbarian_BoneHelmIII"]/statBases
+
+ 6
+ 1
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneHelm"]/statBases/ArmorRating_Sharp
+
+ 1.4
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneHelm"]/statBases/ArmorRating_Blunt
+
+ 2.15
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneHelmII"]/statBases/ArmorRating_Sharp
+
+ 1.5
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneHelmII"]/statBases/ArmorRating_Blunt
+
+ 2.25
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneHelmIII"]/statBases/ArmorRating_Sharp
+
+ 1.54
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneHelmIII"]/statBases/ArmorRating_Blunt
+
+ 2.36
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BearHeaddress" or defName="pphhyy_Barbarian_BearHeaddressII"]/statBases
+
+ 2
+ 1
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BearHeaddress" or defName="pphhyy_Barbarian_BearHeaddressII"]/statBases/StuffEffectMultiplierArmor
+
+ 7
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BearHeaddressII"]/statBases/ArmorRating_Sharp
+
+ 0.25
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BearHeaddressII"]/statBases/ArmorRating_Blunt
+
+ 0.5
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_HeadBand"]/statBases
+
+ 2
+ 0.5
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_HeadBand"]/statBases/StuffEffectMultiplierArmor
+
+ 2
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_MetalHelm" or defName="pphhyy_Barbarians_SpikedCap"]/statBases
+
+ 4
+ 1
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_MetalHelm" or defName="pphhyy_Barbarians_SpikedCap"]/statBases/ArmorRating_Sharp
+
+ 2.3
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_MetalHelm" or defName="pphhyy_Barbarians_SpikedCap"]/statBases/ArmorRating_Blunt
+
+ 3.5
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_MetalHelmII" or defName="pphhyy_Barbarians_SpikedCapII"]/statBases/ArmorRating_Sharp
+
+ 2.42
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_MetalHelmII" or defName="pphhyy_Barbarians_SpikedCapII"]/statBases/ArmorRating_Blunt
+
+ 3.7
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_MetalHelmIII"]/statBases/ArmorRating_Sharp
+
+ 2.7
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_MetalHelmIII"]/statBases/ArmorRating_Blunt
+
+ 4.05
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_ChosenAntler" or defName="pphhyy_Barbarians_ChosenHorn" or defName="pphhyy_Barbarians_ChosenSpike"]/statBases
+
+ 7
+ 2
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_ChosenAntler" or defName="pphhyy_Barbarians_ChosenHorn" or defName="pphhyy_Barbarians_ChosenSpike"]/apparel/bodyPartGroups
+
+
+ FullHead
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_ChosenAntler" or defName="pphhyy_Barbarians_ChosenHorn" or defName="pphhyy_Barbarians_ChosenSpike"]/equippedStatOffsets
+
+ -0.4
+ -2
+ -0.20
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_ChosenAntler" or defName="pphhyy_Barbarians_ChosenHorn" or defName="pphhyy_Barbarians_ChosenSpike"]/statBases/ArmorRating_Sharp
+
+ 3.0
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_ChosenAntler" or defName="pphhyy_Barbarians_ChosenHorn" or defName="pphhyy_Barbarians_ChosenSpike"]/statBases/ArmorRating_Blunt
+
+ 4.55
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_ChosenAntlerII" or defName="pphhyy_Barbarians_ChosenHornII" or defName="pphhyy_Barbarians_ChosenSpikeII" or defName="pphhyy_Barbarians_WarlordHelm"]/statBases
+
+ 7
+ 2
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_ChosenAntlerII" or defName="pphhyy_Barbarians_ChosenHornII" or defName="pphhyy_Barbarians_ChosenSpikeII" or defName="pphhyy_Barbarians_WarlordHelm"]/apparel/bodyPartGroups
+
+
+ FullHead
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_ChosenAntlerII" or defName="pphhyy_Barbarians_ChosenHornII" or defName="pphhyy_Barbarians_ChosenSpikeII" or defName="pphhyy_Barbarians_WarlordHelm"]/equippedStatOffsets
+
+ -0.4
+ -2
+ -0.20
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_ChosenAntlerII" or defName="pphhyy_Barbarians_ChosenHornII" or defName="pphhyy_Barbarians_ChosenSpikeII" or defName="pphhyy_Barbarians_WarlordHelm"]/statBases/ArmorRating_Sharp
+
+ 3.15
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_ChosenAntlerII" or defName="pphhyy_Barbarians_ChosenHornII" or defName="pphhyy_Barbarians_ChosenSpikeII" or defName="pphhyy_Barbarians_WarlordHelm"]/statBases/ArmorRating_Blunt
+
+ 4.8
+
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarians_ChosenAntlerIII" or
+ defName="pphhyy_Barbarians_ChosenHornIII" or
+ defName="pphhyy_Barbarians_ChosenSpikeIII" or
+ defName="pphhyy_Barbarians_WarlordHelmII" or
+ defName="pphhyy_Barbarians_WarlordHelmIII"]/statBases
+
+ 8
+ 2.5
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarians_ChosenAntlerIII" or
+ defName="pphhyy_Barbarians_ChosenHornIII" or
+ defName="pphhyy_Barbarians_ChosenSpikeIII" or
+ defName="pphhyy_Barbarians_WarlordHelmII" or
+ defName="pphhyy_Barbarians_WarlordHelmIII"]/apparel/bodyPartGroups
+
+
+ FullHead
+
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarians_ChosenAntlerIII" or
+ defName="pphhyy_Barbarians_ChosenHornIII" or
+ defName="pphhyy_Barbarians_ChosenSpikeIII" or
+ defName="pphhyy_Barbarians_WarlordHelmII" or
+ defName="pphhyy_Barbarians_WarlordHelmIII"]/equippedStatOffsets
+
+ -0.4
+ -2
+ -0.20
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarians_ChosenAntlerIII" or
+ defName="pphhyy_Barbarians_ChosenHornIII" or
+ defName="pphhyy_Barbarians_ChosenSpikeIII" or
+ defName="pphhyy_Barbarians_WarlordHelmII"]/statBases/ArmorRating_Sharp
+
+ 3.5
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarians_ChosenAntlerIII" or
+ defName="pphhyy_Barbarians_ChosenHornIII" or
+ defName="pphhyy_Barbarians_ChosenSpikeIII" or
+ defName="pphhyy_Barbarians_WarlordHelmII"]/statBases/ArmorRating_Blunt
+
+ 5.25
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_WarlordHelmIII"]/statBases/ArmorRating_Sharp
+
+ 3.7
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarians_WarlordHelmIII"]/statBases/ArmorRating_Blunt
+
+ 5.5
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianBannerShields.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianBannerShields.xml
new file mode 100644
index 0000000000..aed22fc70e
--- /dev/null
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianBannerShields.xml
@@ -0,0 +1,312 @@
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_BarbBannerI" or
+ defName="pphhyy_Barbarian_BarbBannerII" or
+ defName="pphhyy_Barbarian_BarbBannerIII" or
+ defName="pphhyy_Barbarian_BarbBannerIV"]
+
+
+
+
+ Defs
+
+
+
+ pphhyy_Barbarian_BarbBannerI
+ Barbarian Banner I
+ The barbarian banner is a fierce and intimidating symbol, crafted from a sturdy wooden shield and adorned with the skulls and horns of defeated foes. The banner is mounted on a tall standard, and is sure to strike fear into the hearts of any who behold it. The skull and bones design on the banner represents the ferocity and power of the barbarian tribe, and serves as a warning to all who would dare to challenge them.
+ Medieval
+
+ Shields/BarbBannerI
+ Graphic_Single
+
+
+ 200
+ 2
+ 10
+ 4
+ 1.0
+
+
+ -0.25
+ 0.1
+ -0.05
+ -0.5
+ -0.25
+ -0.15
+ -0.1
+ 0.5
+
+
+
+ TribalShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/BarbBannerI
+ CutoutComplex
+ ApparelBody
+
+ 2.5
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
+
+
+
+
+
+
+ Hands
+
+
+
+
+ Armor
+
+
+
+
+ pphhyy_Barbarian_BarbBannerII
+ Barbarian Banner II
+ The barbarian banner is a fierce and intimidating symbol, crafted from a sturdy wooden shield and adorned with the skulls and horns of defeated foes. The banner is mounted on a tall standard, and is sure to strike fear into the hearts of any who behold it. The skull and bones design on the banner represents the ferocity and power of the barbarian tribe, and serves as a warning to all who would dare to challenge them.
+ Medieval
+
+ Shields/BarbBannerII
+ Graphic_Single
+
+
+ 200
+ 2
+ 10
+ 4
+ 1.0
+
+
+ -0.25
+ 0.1
+ -0.05
+ -0.5
+ -0.25
+ -0.15
+ -0.1
+ 0.5
+
+
+
+ TribalShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/BarbBannerII
+ CutoutComplex
+ ApparelBody
+
+ 2.5
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
+
+
+
+
+
+
+ Hands
+
+
+
+
+ Armor
+
+
+
+
+ pphhyy_Barbarian_BarbBannerIII
+ Barbarian Banner III
+ The barbarian banner is a fierce and intimidating symbol, crafted from a sturdy wooden shield and adorned with the skulls and horns of defeated foes. The banner is mounted on a tall standard, and is sure to strike fear into the hearts of any who behold it. The skull and bones design on the banner represents the ferocity and power of the barbarian tribe, and serves as a warning to all who would dare to challenge them.
+ Medieval
+
+ Shields/BarbBannerIII
+ Graphic_Single
+
+
+ 200
+ 2
+ 10
+ 4
+ 1.0
+
+
+ -0.25
+ 0.1
+ -0.05
+ -0.5
+ -0.25
+ -0.15
+ -0.1
+ 0.5
+
+
+
+ TribalShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/BarbBannerIII
+ CutoutComplex
+ ApparelBody
+
+ 2.5
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
+
+
+
+
+
+
+ Hands
+
+
+
+
+ Armor
+
+
+
+
+ pphhyy_Barbarian_BarbBannerIV
+ Barbarian Banner IV
+ The barbarian banner is a fierce and intimidating symbol, crafted from a sturdy wooden shield and adorned with the skulls and horns of defeated foes. The banner is mounted on a tall standard, and is sure to strike fear into the hearts of any who behold it. The skull and bones design on the banner represents the ferocity and power of the barbarian tribe, and serves as a warning to all who would dare to challenge them.
+ Medieval
+
+ Shields/BarbBannerIV
+ Graphic_Single
+
+
+ 200
+ 2
+ 10
+ 4
+ 1.0
+
+
+ -0.25
+ 0.1
+ -0.05
+ -0.5
+ -0.25
+ -0.15
+ -0.1
+ 0.5
+
+
+
+ TribalShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/BarbBannerIV
+ CutoutComplex
+ ApparelBody
+
+ 2.5
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
+
+
+
+
+
+
+ Hands
+
+
+
+
+ Armor
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianMetalShields.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianMetalShields.xml
new file mode 100644
index 0000000000..23d41cdcd1
--- /dev/null
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianMetalShields.xml
@@ -0,0 +1,159 @@
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_MetalShield" or defName="pphhyy_Barbarian_MetalShieldII" or defName="pphhyy_Barbarian_MetalShieldIII"]
+
+
+
+ Defs
+
+
+
+ pphhyy_Barbarian_MetalShield
+ Barbarian Metal Shield
+ A Metal shield looted from the battlefield.
+ Medieval
+
+ Shields/Barbarian_MetalShield
+ Graphic_Single
+ CutoutComplex
+
+
+ 125
+ 7
+ 8
+ 5
+ 6
+
+
+ -0.2
+ -1
+ -0.15
+ -0.08
+ -0.25
+ -0.05
+ 1.0
+
+
+ Child, Adult
+
+ pphhyy_Barbarian_BarbMetalShield1
+
+
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+
+
+
+
+ Armor
+
+
+
+
+ pphhyy_Barbarian_MetalShieldII
+ Barbarian Metal Shield II
+ A Metal shield looted from the battlefield.
+ Medieval
+
+ Shields/Barbarian_MetalShieldII
+ Graphic_Single
+ CutoutComplex
+
+
+ 125
+ 7
+ 8
+ 5
+ 6
+
+
+ -0.2
+ -1
+ -0.15
+ -0.08
+ -0.25
+ -0.05
+ 1.0
+
+
+ Child, Adult
+
+ pphhyy_Barbarian_BarbMetalShield2
+
+
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+
+
+
+
+ Armor
+
+
+
+
+ pphhyy_Barbarian_MetalShieldIII
+ Barbarian Metal Shield III
+ A Metal shield looted from the battlefield.
+ Medieval
+
+ Shields/Barbarian_MetalShieldIII
+ Graphic_Single
+ CutoutComplex
+
+
+ 125
+ 7
+ 8
+ 5
+ 6
+
+
+ -0.2
+ -1
+ -0.15
+ -0.08
+ -0.25
+ -0.05
+ 1.0
+
+
+ Child, Adult
+
+ pphhyy_Barbarian_BarbMetalShield3
+
+
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+
+
+
+
+ Armor
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianRoundShields.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianRoundShields.xml
new file mode 100644
index 0000000000..3686adf1f5
--- /dev/null
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianRoundShields.xml
@@ -0,0 +1,159 @@
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RoundShield" or defName="pphhyy_Barbarian_RoundShieldII" or defName="pphhyy_Barbarian_RoundShieldIII"]
+
+
+
+ Defs
+
+
+
+ pphhyy_Barbarian_RoundShield
+ Barbarian Round Shield
+ A Round shield looted from the battlefield.
+ Medieval
+
+ Shields/Barbarian_RoundShield
+ Graphic_Single
+ CutoutComplex
+
+
+ 150
+ 4.5
+ 7
+ 5
+ 4.0
+
+
+ -0.2
+ -1
+ -0.15
+ -0.08
+ -0.25
+ -0.05
+ 1.0
+
+
+ Child, Adult
+
+ pphhyy_Barbarian_BarbRoundShield1
+
+
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+
+
+
+
+ Armor
+
+
+
+
+ pphhyy_Barbarian_RoundShieldII
+ Barbarian Round Shield II
+ A Round shield looted from the battlefield.
+ Medieval
+
+ Shields/Barbarian_RoundShieldII
+ Graphic_Single
+ CutoutComplex
+
+
+ 150
+ 4.5
+ 7
+ 5
+ 4.0
+
+
+ -0.2
+ -1
+ -0.15
+ -0.08
+ -0.25
+ -0.05
+ 1.0
+
+
+ Child, Adult
+
+ pphhyy_Barbarian_BarbRoundShield2
+
+
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+
+
+
+
+ Armor
+
+
+
+
+ pphhyy_Barbarian_RoundShieldIII
+ Barbarian Round Shield III
+ A Round shield looted from the battlefield.
+ Medieval
+
+ Shields/Barbarian_RoundShieldIII
+ Graphic_Single
+ CutoutComplex
+
+
+ 150
+ 4.5
+ 7
+ 5
+ 4.0
+
+
+ -0.2
+ -1
+ -0.15
+ -0.08
+ -0.25
+ -0.05
+ 1.0
+
+
+ Child, Adult
+
+ pphhyy_Barbarian_BarbRoundShield3
+
+
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+
+
+
+
+ Armor
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianTallShields.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianTallShields.xml
new file mode 100644
index 0000000000..08858f2232
--- /dev/null
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianTallShields.xml
@@ -0,0 +1,174 @@
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_TallShield" or defName="pphhyy_Barbarian_TallShieldII" or defName="pphhyy_Barbarian_TallShieldIII"]
+
+
+
+ Defs
+
+
+
+ pphhyy_Barbarian_TallShield
+ Barbarian Tall Shield
+ A Tall shield looted from the battlefield.
+ Medieval
+
+ Shields/Barbarian_TallShield
+ Graphic_Single
+ CutoutComplex
+
+
+ 150
+ 5
+ 8
+ 5
+ 3.0
+
+
+ -0.25
+ -3
+ -0.4
+ -0.2
+ -0.5
+ -0.2
+ 1.0
+
+
+ Child, Adult
+
+ pphhyy_Barbarian_BarbTallShield1
+
+
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+ FullHead
+
+
+ Legs
+
+ true
+
+
+
+ Armor
+
+
+
+
+ pphhyy_Barbarian_TallShieldII
+ Barbarian Tall Shield II
+ A Tall shield looted from the battlefield.
+ Medieval
+
+ Shields/Barbarian_TallShieldII
+ Graphic_Single
+ CutoutComplex
+
+
+ 150
+ 5
+ 8
+ 5
+ 3.0
+
+
+ -0.25
+ -3
+ -0.4
+ -0.2
+ -0.5
+ -0.2
+ 1.0
+
+
+ Child, Adult
+
+ pphhyy_Barbarian_BarbTallShield2
+
+
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+ FullHead
+
+
+ Legs
+
+ true
+
+
+
+ Armor
+
+
+
+
+ pphhyy_Barbarian_TallShieldIII
+ Barbarian Tall Shield III
+ A Tall shield looted from the battlefield.
+ Medieval
+
+ Shields/Barbarian_TallShieldIII
+ Graphic_Single
+ CutoutComplex
+
+
+ 150
+ 5
+ 8
+ 5
+ 3.0
+
+
+ -0.25
+ -3
+ -0.4
+ -0.2
+ -0.5
+ -0.2
+ 1.0
+
+
+ Child, Adult
+
+ pphhyy_Barbarian_BarbTallShield3
+
+
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+ FullHead
+
+
+ Legs
+
+ true
+
+
+
+ Armor
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Weapons/MeleeMedievalBarbarians.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Weapons/MeleeMedievalBarbarians.xml
new file mode 100644
index 0000000000..e983506651
--- /dev/null
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Weapons/MeleeMedievalBarbarians.xml
@@ -0,0 +1,749 @@
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneClub"]/statBases
+
+ 4
+ 0.3
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneClub"]
+
+
+ 0.33
+ 0.3
+ 0.2
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneClub"]/weaponTags
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneClub"]
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneClub"]/weaponTags
+
+ CE_Sidearm_Tribal
+ CE_OneHandedWeapon
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BoneClub"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 4
+ 0.33
+ 1.78
+ 1
+ Handle
+
+
+ head
+
+ Blunt
+
+ 9
+ 3.1
+ 3.5
+ Head
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ClawClub"]/statBases
+
+ 4
+ 0.15
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ClawClub"]
+
+
+ 0.67
+ 0.15
+ 0.2
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ClawClub"]/weaponTags
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ClawClub"]
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ClawClub"]/weaponTags
+
+ CE_Sidearm_Tribal
+ CE_OneHandedWeapon
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_ClawClub"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 4
+ 0.33
+ 1.78
+ 1
+ Handle
+
+
+ edge
+
+ Cut
+
+ 9
+ 0.33
+ 3.1
+ 0.36
+ 1.5
+ Head
+
+
+ head
+
+ Blunt
+
+ 9
+ 3.1
+ 3.5
+ Head
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_GreatBoneClub"]/statBases
+
+ 14
+ 0.5
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_GreatBoneClub"]/statBases/Mass
+
+ 3.2
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_GreatBoneClub"]
+
+
+ 1.6
+ 0.38
+ 0.25
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_GreatBoneClub"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 5
+ 0.33
+ 2.01
+ 0.48
+ Handle
+
+
+ head
+
+ Blunt
+
+ 25
+ 2.59
+ 9.25
+ Head
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_GreatSkullMace"]/statBases
+
+ 16
+ 0.5
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_GreatSkullMace"]/statBases/Mass
+
+ 3.5
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_GreatSkullMace"]
+
+
+ 1.65
+ 0.38
+ 0.22
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_GreatSkullMace"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 5
+ 0.33
+ 2.01
+ 1.6
+ Handle
+
+
+ head
+
+ Blunt
+
+ 38
+ 2.59
+ 16.384
+ Head
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedSword"]/statBases
+
+ 6
+ 0.25
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedSword"]
+
+
+ 0.15
+ 0.30
+ 0.25
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedSword"]/weaponTags
+
+ CE_OneHandedWeapon
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedSword"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 3
+ 1.59
+ 0.05
+ 0.8
+ Handle
+
+
+ edge
+
+ Cut
+
+ 22
+ 1.34
+ 0.956
+ 0.48
+ Edge
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedClaymore"]/statBases
+
+ 12
+ 0.70
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedClaymore"]/statBases/Mass
+
+ 3
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedClaymore"]
+
+
+ 0.15
+ 0.4
+ 0.50
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedClaymore"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 5
+ 1.69
+ 0.05
+ 0.8
+ Handle
+
+
+ point
+
+ Stab
+
+ 24
+ 1.98
+ 0.50
+ 0.8
+ 1.90
+ Point
+
+
+ edge
+
+ Cut
+
+ 48
+ 2.86
+ 0.45
+ 3.592
+ 0.58
+ Edge
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedAxe"]/statBases
+
+ 9.5
+ 0.20
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedAxe"]/statBases/Mass
+
+ 1.75
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedAxe"]
+
+
+ 0.04
+ 0.15
+ 0.24
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedAxe"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 3
+ 1.66
+ 0.10
+ 0.75
+ Handle
+
+
+ edge
+
+ Cut
+
+ 28
+ 2.47
+ 4.69
+ 1.21
+ Edge
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedBattleAxe"]/statBases
+
+ 7
+ 0.35
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedBattleAxe"]/statBases/Mass
+
+ 3
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedBattleAxe"]
+
+
+ 0.30
+ 0.3
+ 0.23
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedBattleAxe"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 4
+ 1.3
+ 0.1
+ 0.8
+ Shaft
+
+
+ edge
+
+ Cut
+
+ 37
+ 2.18
+ 9.6
+ 0.95
+ Edge
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedGlaive"]/statBases
+
+ 7
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedGlaive"]/statBases/Mass
+
+ 2.75
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedGlaive"]/tools
+
+
+
+ shaft
+
+ Poke
+
+ 3
+ 1.3
+ 0.1
+ 0.8
+ Shaft
+
+
+ point
+
+ Stab
+
+ 15
+ 1.95
+ 3.6
+ 2.32
+ Point
+
+
+ edge
+
+ Cut
+
+ 35
+ 2.48
+ 9.6
+ 0.95
+ Edge
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedMace"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 2
+ 0.33
+ 1.59
+ 0.625
+ Handle
+
+
+ head
+
+ Blunt
+
+ 14
+ 1.9
+ 4.5
+ Head
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedMace"]/statBases
+
+ 3.5
+ 0.24
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedMace"]
+
+
+ 0.38
+ 0.22
+ 0.2
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedMace"]/weaponTags
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedMace"]
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedMace"]/weaponTags
+
+ CE_OneHandedWeapon
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedSkullMace"]/statBases
+
+ 4
+ 0.24
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedSkullMace"]
+
+
+ 0.42
+ 0.24
+ 0.2
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedSkullMace"]/weaponTags
+
+ CE_OneHandedWeapon
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedSkullMace"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 2
+ 1.59
+ 0.10
+ 0.625
+ Handle
+
+
+ head
+
+ Blunt
+
+ 15
+ 2.1
+ 5.0
+ Head
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedGreatSkullMace"]/statBases
+
+ 16
+ 0.46
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedGreatSkullMace"]/statBases/Mass
+
+ 3.3
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedGreatSkullMace"]
+
+
+ 1.6
+ 0.32
+ 0.19
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedGreatSkullMace"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 5
+ 0.33
+ 2.01
+ 1.6
+ Handle
+
+
+ head
+
+ Blunt
+
+ 38
+ 2.7
+ 16.384
+ Head
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Weapons/ThrownWeapons.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Weapons/ThrownWeapons.xml
new file mode 100644
index 0000000000..ebca26e072
--- /dev/null
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Weapons/ThrownWeapons.xml
@@ -0,0 +1,225 @@
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedJavalin"]
+
+
+
+
+
+ Defs
+
+
+
+ pphhyy_Barbarian_RustedJavalin
+ rusted javelins
+ Rusted Javalin
+
+ Weapons/Ranged/Barbarian_RustedJavalin
+ Graphic_Single
+ 1.5
+
+ Interact_BeatFire
+
+ 5.0
+ 0.45
+ 1.5
+ 2.5
+ 4.5
+ 2.25
+ 1
+ 0.36
+
+
+ 0.17
+ 0.5
+ 0.57
+
+ 30
+ 25
+
+ NeolithicRangedHeavy
+ CE_Pila
+ CE_OneHandedWeapon
+ pphhyy_Barbarian_BarbThrown
+
+
+ Ranged
+
+ All
+
+
+ CombatExtended.Verb_ShootCEOneUse
+ true
+ pphhyy_RustedJavalin_Thrown_CE
+ 0.8
+ 9
+
+
+
+
+ shaft
+
+ Blunt
+
+ 5
+ 1.73
+ 1.44
+ Shaft
+
+
+ point
+
+ Stab
+
+ 10
+ 1.49
+ 1.5
+ 1.32
+ 0.49
+ Point
+
+
+ Javelin
+
+
+
+ pphhyy_RustedJavalin_Thrown_CE
+ javelin (thrown)
+
+ Weapons/Ranged/projectiles/Barbarian_RustedJavalin
+ Graphic_Single
+ 1.5
+
+
+ 13
+ 14
+ 6.54
+ 2.75
+ 0.5
+ pphhyy_Barbarian_RustedJavalin
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedThrowingAxe"]
+ ParentName
+ BaseWeapon
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedThrowingAxe"]
+
+
+ WeaponsRanged
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedThrowingAxe"]/weaponTags
+
+ CE_OneHandedWeapon
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedThrowingAxe"]
+
+ Medieval
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedThrowingAxe"]/statBases
+
+
+ 0.45
+ 1.0
+ 2.0
+ 1.5
+ 0.75
+ 1.5
+
+ 25
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedThrowingAxe"]/verbs
+
+
+
+ CombatExtended.Verb_ShootCEOneUse
+ true
+ pphhyy_RustedThrowingAxe_Thrown_CE
+ 1.2
+ 12
+ Interact_BeatFire
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RustedThrowingAxe"]/tools
+
+
+
+ handle
+
+ Blunt
+
+ 2
+ 0.33
+ 1.4
+ 0.375
+ Handle
+
+
+ edge
+
+ Cut
+
+ 13
+ 2.18
+ 1.5
+ 0.92
+ Edge
+
+
+
+
+
+
+ Defs
+
+
+
+ pphhyy_RustedThrowingAxe_Thrown_CE
+ thrown axe
+
+ Weapons/Ranged/projectiles/Barbarian_RustedThrowingAxe
+ Graphic_Flicker
+
+
+ Cut
+ 13
+ 18
+ 1.1
+ 22
+ 0.60
+ pphhyy_Barbarian_RustedThrowingAxe
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Races/Races_Animal_CowGroup.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Races/Races_Animal_CowGroup.xml
new file mode 100644
index 0000000000..3b4a2b79b8
--- /dev/null
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Races/Races_Animal_CowGroup.xml
@@ -0,0 +1,92 @@
+
+
+
+
+ Defs/ThingDef[defName="pphyy_NorthernHorse"]
+
+
+ Quadruped
+
+
+
+
+
+ Defs/ThingDef[defName="pphyy_NorthernHorse"]/statBases/MoveSpeed
+
+ 6
+ 0.15
+ 0.37
+ 0.24
+
+
+
+
+ Defs/ThingDef[defName="pphyy_NorthernHorse"]/tools
+
+
+
+ left hoof
+
+ Blunt
+
+ 11
+ 1.37
+ FrontLeftLeg
+ 3.938
+
+
+ left hoof
+
+ Poke
+
+ 11
+ 1.37
+ FrontLeftLeg_2
+ 3.938
+
+
+ right hoof
+
+ Blunt
+
+ 11
+ 1.37
+ FrontRightLeg
+ 3.938
+
+
+ right hoof
+
+ Poke
+
+ 11
+ 1.37
+ FrontRightLeg_2
+ 3.938
+
+
+
+ Bite
+
+ 5
+ 1.97
+ 0.5
+ Teeth
+ 1.5
+
+
+ head
+
+ Blunt
+
+ 6
+ 2.12
+ HeadAttackTool
+ 0.2
+ 2
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index 54c0a111cf..0294f06f19 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -306,6 +306,7 @@ Medieval Medicines 1.4 Medieval Overhaul Edition |
Medical Supplements |
Medical System Expansion |
Medieval Overhaul |
+Medieval Overhaul: Barbarians |
Medieval Tailor |
Megafauna |
Melee Animation |
From cfda837253d03992ef02d0f33cd8b0f4dde52704 Mon Sep 17 00:00:00 2001
From: ViralReaction <136116069+ViralReaction@users.noreply.github.com>
Date: Fri, 9 Aug 2024 13:01:28 -0600
Subject: [PATCH 29/69] More MO Weapons
---
.../Weapons/MO_Weapons_Melee.xml | 122 ++++++++++++++++++
1 file changed, 122 insertions(+)
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Melee.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Melee.xml
index 433c7e7002..59ab14b1d3 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Melee.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Melee.xml
@@ -2658,5 +2658,127 @@
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_BlacksmithHammer"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 2
+ 0.33
+ 1.59
+ 0.625
+ Handle
+
+
+ head
+
+ Blunt
+
+ 15
+ 1.9
+ 5.625
+ Head
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_BlacksmithHammer"]/statBases
+
+ 3.5
+ 0.24
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_BlacksmithHammer"]
+
+
+ 0.42
+ 0.24
+ 0.2
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_BlacksmithHammer"]/weaponTags
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_BlacksmithHammer"]
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_BlacksmithHammer"]/weaponTags
+
+ CE_OneHandedWeapon
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_ButcherCleaver"]/tools
+
+
+
+ edge
+
+ Cut
+
+ 15
+ 1.2
+ 1.33
+ 0.656
+ 0.43
+ Edge
+
+
+ handle
+
+ Poke
+
+ 1
+ 1.26
+ 0.250
+ Handle
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_ButcherCleaver"]/statBases
+
+ 1
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_ButcherCleaver"]/equippedStatOffsets
+
+ 0.4
+ 0.15
+ 0.05
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_ButcherCleaver"]/weaponTags
+
+ CE_OneHandedWeapon
+
+
\ No newline at end of file
From 18ad0769a08630914c62bfdbc248c3208f01546a Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Fri, 9 Aug 2024 21:24:27 -0400
Subject: [PATCH 30/69] Remove NewRatkin Patch
---
LoadFolders.xml | 1 -
.../Defs/NewRatkinPlus/Ammo/Flechette.xml | 58 --
.../NewRatkinPlus/Ammo/RKBallistaBolt.xml | 270 -------
.../Defs/NewRatkinPlus/Ammo/RKCannonShell.xml | 108 ---
.../ThingDef_Misc/AmmoCategories.xml | 27 -
.../NewRatkinPlus/Bodies/Bodies_Ratkin.xml | 172 -----
.../PawnKindDefs/PawnKinds_Ratkin.xml | 209 -----
.../NewRatkinPlus/Scenarios/Scenarios.xml | 58 --
.../ThingDef_Misc/Ratkin_Apparel.xml | 555 -------------
.../Ratkin_Buildings_Security.xml | 223 ------
.../ThingDef_Misc/Ratkin_MeleeWeapons.xml | 730 ------------------
.../ThingDef_Misc/Ratkin_RangedWeapons.xml | 501 ------------
.../ThingDefs_Races/Race_KingHamster.xml | 60 --
.../ThingDefs_Races/Race_Rakinlike.xml | 118 ---
.../ThingDefs_Races/Race_Rotti.xml | 82 --
SupportedThirdPartyMods.md | 1 -
Textures/ThirdParty/Ratkin/FLCH/FLCH_a.png | Bin 1247 -> 0 bytes
Textures/ThirdParty/Ratkin/FLCH/FLCH_b.png | Bin 5735 -> 0 bytes
Textures/ThirdParty/Ratkin/FLCH/FLCH_c.png | Bin 3755 -> 0 bytes
19 files changed, 3173 deletions(-)
delete mode 100644 ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/Flechette.xml
delete mode 100644 ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKBallistaBolt.xml
delete mode 100644 ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKCannonShell.xml
delete mode 100644 ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/ThingDef_Misc/AmmoCategories.xml
delete mode 100644 ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Bodies/Bodies_Ratkin.xml
delete mode 100644 ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/PawnKindDefs/PawnKinds_Ratkin.xml
delete mode 100644 ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Scenarios/Scenarios.xml
delete mode 100644 ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Apparel.xml
delete mode 100644 ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Buildings_Security.xml
delete mode 100644 ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_MeleeWeapons.xml
delete mode 100644 ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_RangedWeapons.xml
delete mode 100644 ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_KingHamster.xml
delete mode 100644 ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rakinlike.xml
delete mode 100644 ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rotti.xml
delete mode 100644 Textures/ThirdParty/Ratkin/FLCH/FLCH_a.png
delete mode 100644 Textures/ThirdParty/Ratkin/FLCH/FLCH_b.png
delete mode 100644 Textures/ThirdParty/Ratkin/FLCH/FLCH_c.png
diff --git a/LoadFolders.xml b/LoadFolders.xml
index b6958f1e03..2f405c1b67 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -328,7 +328,6 @@
ModPatches/Nearmare Race
ModPatches/Neclose Race
ModPatches/New Mech - Mini-Miner
- ModPatches/NewRatkinPlus
ModPatches/Nihal
ModPatches/Not Only Just A Cannon
ModPatches/Nukes
diff --git a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/Flechette.xml b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/Flechette.xml
deleted file mode 100644
index e8cb087180..0000000000
--- a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/Flechette.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
- Ammo_65x50mmSRArisaka_FLCH
- 6.5x50mmSR Arisaka cartridge (Flechette)
-
- ThirdParty/Ratkin/FLCH
- Graphic_StackCount
-
-
- 0.1
-
- Flechette
-
-
-
-
- Bullet_65x50mmSRArisaka_FLCH
- 6.5x50mmSR Arisaka cartridge (Flechette)
-
- Fragment
- 17
- 3
- 53.96
-
-
-
-
-
- MakeAmmo_65x50mmSRArisaka_FLCH
- make 500 65x50mm Arisaka Flechette rounds.
- Craft 65x50mm Arisaka Flechette rounds.
- Making 65x50mm Arisaka Flechette rounds.
-
-
-
-
- Steel
-
-
- 24
-
-
-
-
- Steel
-
-
-
- 500
-
- FlechetteBullet
- 2800
-
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKBallistaBolt.xml b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKBallistaBolt.xml
deleted file mode 100644
index 8e36eb4aeb..0000000000
--- a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKBallistaBolt.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-
-
-
- AmmoBallistaBolts
- Ballista Bolts
- AmmoNeolithic
-
-
-
-
-
- AmmoSet_RKBallistaBolt
- Ballista Bolt
-
- Projectile_RKBallistaBolt
- Projectile_RKBallistaBolt_Bodkin
- Projectile_RKBallistaBolt_Fire
-
-
-
-
-
-
- Heavy bolt designed to be fired from a ratkin ballista.
-
- 2.00
- 7.50
- 1
-
-
- AmmoBallistaBolts
-
- 75
- Medieval
-
-
-
- Ammo_RKBallistaBolt
- Ballista Bolt
-
- Things/Item/Resource/Ballista_Bolt_Normal
- Graphic_StackCount
-
-
- 7.5
-
- RKBallistaBolt
-
-
-
- Ammo_RKBallistaBolt_Bodkin
- Ballista Bodkin Bolt
-
- Things/Item/Resource/Ballista_Bolt_AP
- Graphic_StackCount
-
-
- 9.5
-
- RKBallistaBolt_AP
-
-
-
- Ammo_RKBallistaBolt_Fire
- Flaming Ballista Bolt
-
- Things/Item/Resource/Ballista_Bolt_HE
- Graphic_StackCount
-
-
- 10.5
-
- RKBallistaBolt_Fire
-
-
-
-
-
- CombatExtended.BulletCE
-
- 45
-
-
-
-
- Projectile_RKBallistaBolt_Bodkin
- Ballista Bolt
-
- Things/Projectile/Ballista_Bolt_Normal
- Graphic_Single
-
-
- Stab
- 10
- 12.5
- 8
- 0.6
- Ammo_RKBallistaBolt
-
-
-
-
- Projectile_RKBallistaBolt
- Ballista Bodkin Bolt
-
- Things/Projectile/Ballista_Bolt_AP
- Graphic_Single
-
-
- Stab
- 19
- 12.5
- 4
- 0.3
- Ammo_RKBallistaBolt_Bodkin
-
-
-
-
- Projectile_RKBallistaBolt_Fire
- Ballista Bodkin Bolt
- CombatExtended.Projectile_FireTrail
-
- Things/Projectile/Ballista_Bolt_HE
- Graphic_Single
-
-
- 1.5
- 15
- Flame
- 12.5
- 4
- FilthPrometheum
- 1
-
-
-
-
-
-
- MakeRKBallistaBolt
- make ballista bolt
- Craft ballista bolt.
- Making ballista bolt.
-
-
-
-
- WoodLog
-
-
- 5
-
-
-
-
- Steel
-
-
- 15
-
-
- 2300
-
-
- WoodLog
- Steel
-
-
-
- 5
-
-
- FueledSmithy
- ElectricSmithy
- RK_FueledSmithy
- RK_ElectricSmithy
-
-
-
-
- MakeRKBallistaBodkinBolt
- make ballista bodkin bolt
- Craft ballista bodkin bolt.
- Making ballista bodkin bolt.
-
-
-
-
- WoodLog
-
-
- 5
-
-
-
-
- Steel
-
-
- 12
-
-
- 3500
-
-
- WoodLog
- Steel
-
-
-
- 5
-
-
- FueledSmithy
- ElectricSmithy
- RK_FueledSmithy
- RK_ElectricSmithy
-
-
-
-
- MakeRKBallistaFireBolt
- make flaming ballista bolt
- Craft flaming ballista bolt.
- Making flaming ballista bolt.
-
-
-
-
- WoodLog
-
-
- 10
-
-
-
-
- Prometheum
-
-
- 2
-
-
-
-
- Steel
-
-
- 8
-
-
- 5000
-
-
- WoodLog
- Steel
-
-
-
- 5
-
-
- FueledSmithy
- ElectricSmithy
- RK_FueledSmithy
- RK_ElectricSmithy
-
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKCannonShell.xml b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKCannonShell.xml
deleted file mode 100644
index 77d5bd216b..0000000000
--- a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKCannonShell.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
- Ammo_RKCannonShell
- Ratkin Cannon Balls
- AmmoMedieval
-
-
-
-
-
- AmmoSet_RKCannonBall
- Cannon Ball
-
- Projectile_RKCannonBall
-
-
-
-
-
-
- Simple solid shot, designed for ratkin cannons.
-
- 13.6
- 8.31
- 1
-
-
- Ammo_RKCannonShell
-
- 25
- Medieval
-
-
-
- Ammo_RKCannonBall
- Cannon Ball
-
- Things/Item/Resource/Big_mouse
- Graphic_StackCount
- (0.6,0.6)
-
-
- 54.7
-
- CannonBall
-
-
-
-
-
- CombatExtended.BulletCE
-
- 45
-
-
-
-
- Projectile_RKCannonBall
- Cannon Ball
-
- Things/Projectile/Big_mouse
- (0.6,0.6)
- Graphic_Single
- TransparentPostLight
-
-
- Bullet
- 337
- 17856.08
- 8
-
-
-
-
-
-
- MakeRKCannonBall
- make Cannon 5 Balls
- Craft Cannon Ball x5.
- Making Cannon Ball.
-
-
-
-
- Steel
-
-
- 138
-
-
- 13800
-
-
- Steel
-
-
-
- 5
-
-
- FueledSmithy
- ElectricSmithy
- RK_FueledSmithy
- RK_ElectricSmithy
-
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/ThingDef_Misc/AmmoCategories.xml b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/ThingDef_Misc/AmmoCategories.xml
deleted file mode 100644
index e8ba24ecaa..0000000000
--- a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/ThingDef_Misc/AmmoCategories.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
- RK_CrossbowBolt
- Bolt
-
-
-
- Flechette
- Flechette
-
-
-
- RKBallistaBolt
- Ballista Bolt
-
-
-
- RKBallistaBolt_Fire
- Flaming Ballista Bolt
-
-
-
- RKBallistaBolt_AP
- Ballista Bodkin Bolt
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Bodies/Bodies_Ratkin.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Bodies/Bodies_Ratkin.xml
deleted file mode 100644
index c5a485a574..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Bodies/Bodies_Ratkin.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "left arm"]/groups
-
- LeftArm
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[customLabel = "right arm"]/groups
-
- RightArm
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[customLabel="left shoulder"]/groups
-
- LeftShoulder
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[customLabel="right shoulder"]/groups
-
- RightShoulder
-
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Ribcage"]/coverage
-
- 0.06
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Pelvis"]/coverage
-
- 0.05
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Stomach"]/coverage
-
- 0.05
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Heart"]/coverage
-
- 0.03
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Lung"]/coverage
-
- 0.0525
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Kidney"]/coverage
-
- 0.03
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Liver"]/coverage
-
- 0.055
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Neck"]/coverage
-
- 0.05
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Skull"]/parts/li[def = "Brain"]/coverage
-
- 0.9
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Eye"]/coverage
-
- 0.05
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Ear"]/coverage
-
- 0.05
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def = "Nose"]/coverage
-
- 0.08
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Shoulder"]/coverage
-
- 0.085
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Clavicle"]/coverage
-
- 0.06
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def="Humerus"]/coverage
-
- 0.15
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def="Shoulder"]/parts/li[def = "Arm"]/parts/li[def="Radius"]/coverage
-
- 0.15
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Leg"]/parts/li[def="Femur"]/coverage
-
- 0.15
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Leg"]/parts/li[def="Tibia"]/coverage
-
- 0.15
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Neck"]/parts/li[def = "Head"]/parts/li[customLabel="left ear"]/coverage
-
- 0.09
-
-
-
-
- Defs/BodyDef[defName = "Ratkin"]/corePart/parts/li[def = "Neck"]/parts/li[def = "Head"]/parts/li[customLabel="right ear"]/coverage
-
- 0.09
-
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/PawnKindDefs/PawnKinds_Ratkin.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/PawnKindDefs/PawnKinds_Ratkin.xml
deleted file mode 100644
index 5ac1f5d944..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/PawnKindDefs/PawnKinds_Ratkin.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-
- Defs/PawnKindDef[
- defName="RatkinColonist" or
- defName="RatkinNoble" or
- defName="RatkinServant" or
- defName="RatkinCombatant" or
- defName="RatkinEliteGuardener" or
- defName="RatkinMercenary" or
- defName="RatkinKnight" or
- defName="RatkinKnightCommander" or
- defName="RatkinPriest" or
- defName="RatkinMerchant" or
- defName="RatkinMercenaryLight" or
- defName="RatkinMurderer" or
- defName="RatkinVagabond" or
- defName="RatkinDemonMan" or
- defName="RatkinEliteSoldier" or
- defName="RatkinSoldier"
- ]/apparelTags
-
- RK_Loadbearing
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinCombatant"]
-
-
-
- 8
- 12
-
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinMercenary"]
-
-
-
- 4
- 6
-
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinMerchant"]
-
-
-
- 4
- 6
-
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinSoldier"]
-
-
-
- 4
- 6
-
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinSubject"]
-
-
-
- 4
- 6
-
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinEliteGuardener"]
-
-
-
- 6
- 8
-
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinMurderer"]
-
-
-
- 2
- 6
-
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinVagabond"]
-
-
-
- 2
- 6
-
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinMercenaryLight"]
-
-
-
- 4
- 6
-
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinEliteSoldier"]
-
-
-
- 4
- 6
-
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinDemonMan"]/weaponTags
-
-
- GrenadeDestructive
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinDemonMan"]
-
-
-
- 8
- 12
-
-
-
-
- 6
- 10
-
- 0.7
-
- 375
- 825
-
-
- RK_Rifle
- CE_AI_Grenade
-
-
-
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RatkinPettyThief"]
-
-
-
- 2
- 4
-
-
-
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Scenarios/Scenarios.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Scenarios/Scenarios.xml
deleted file mode 100644
index 6758df3203..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Scenarios/Scenarios.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
- Defs/ScenarioDef[defName="RK_Scenario"]/scenario/parts
-
-
- StartingThing_Defined
- Ammo_CrossbowBolt_Stone
- 60
-
-
- StartingThing_Defined
- Ammo_65x50mmSRArisaka_FMJ
- 60
-
-
-
-
-
- Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter
-
- Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter/thingDefs
-
- Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]
-
- Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter/thingDefs/li["Steel"]
-
- Steel
-
-
-
- Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter/thingDefs
-
- Steel
-
-
-
-
- Defs/FactionDef[@Name="RK_PlayerFactionBase"]/apparelStuffFilter
-
-
- Steel
-
-
-
-
-
- Defs/FactionDef[@Name="RK_PlayerFactionBase"]
-
-
-
- Steel
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Apparel.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Apparel.xml
deleted file mode 100644
index d98aa3f12b..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Apparel.xml
+++ /dev/null
@@ -1,555 +0,0 @@
-
-
-
-
-
-
-
- Defs/ThingDef[@Name="RK_ApparelBase"]/statBases
-
- 1
- 1
- 2
-
-
-
-
- Defs/ThingDef[
- defName="RK_ApronSkirt" or
- defName="RK_SummerDress" or
- defName="RK_Cardigan" or
- defName="RK_WorkerWear" or
- defName="RK_ResearchGown" or
- defName="RK_ExplorerWear" or
- defName="RK_ChefSuit" or
- defName="RK_GaurdenUniform" or
- defName="RK_WinterRobe" or
- defName="RK_FlatColorCoat" or
- defName="RK_SistersDerss" or
- defName="RK_SantaRobe"
- ]/statBases/StuffEffectMultiplierArmor
-
-
-
-
- Defs/ThingDef[defName="RK_GaurdenUniform"]/statBases
-
- 8
- 6
-
-
-
-
- Defs/ThingDef[defName="RK_GaurdenUniform"]/statBases/ArmorRating_Sharp
-
- 0.75
-
-
-
-
- Defs/ThingDef[defName="RK_GaurdenUniform"]/statBases/ArmorRating_Blunt
-
- 2
-
-
-
-
-
- Defs/ThingDef[defName="RK_WinterRobe"]/statBases
-
- 6
- 4
- 4
-
-
-
-
-
- Defs/ThingDef[defName="RK_Cardigan"]/statBases
-
- 4
- 1
- 5
-
-
-
-
-
- Defs/ThingDef[defName="RK_FlatColorCoat"]/statBases
-
- 5
- 1
- 5
-
-
-
-
-
- Defs/ThingDef[defName="RK_WhiteCoat"]/statBases
-
- 6
- 4
-
-
-
-
- Defs/ThingDef[defName="RK_WhiteCoat"]/statBases/ArmorRating_Sharp
-
- 8
- 0.60
-
-
-
-
- Defs/ThingDef[defName="RK_WhiteCoat"]/statBases/ArmorRating_Blunt
-
- 1
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_CrossBack"]/statBases
-
- 2
- 1
-
-
-
-
- Defs/ThingDef[defName="RK_CrossBack"]/equippedStatOffsets
-
-
- 20
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_Backpack"]/statBases
-
- 3
-
-
-
-
- Defs/ThingDef[defName="RK_Backpack"]/equippedStatOffsets
-
-
- 30
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_OutdoorBackpack"]/statBases
-
- 6
- 1
-
-
-
-
- Defs/ThingDef[defName="RK_OutdoorBackpack"]/equippedStatOffsets
-
-
- 40
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_Sack"]/statBases
-
- 10
-
-
-
-
- Defs/ThingDef[defName="RK_Sack"]/equippedStatOffsets
-
-
- 50
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_SantaSack"]/statBases
-
- 6
- 2
-
-
-
-
- Defs/ThingDef[defName="RK_SantaSack"]/equippedStatOffsets
-
-
- 60
-
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_BulletProofHelmet"]/statBases
-
- 4
- 1
-
-
-
-
- Defs/ThingDef[defName="RK_BulletProofHelmet"]/statBases/StuffEffectMultiplierArmor
-
- 4
-
-
-
-
- Defs/ThingDef[defName="RK_BulletProofHelmet"]/statBases/ArmorRating_Sharp
-
- 1
-
-
-
-
-
- Defs/ThingDef[defName="RK_OrderUniform"]/statBases/Mass
-
- 16
- 10
- 10
-
-
-
-
- Defs/ThingDef[defName="RK_OrderUniform"]/statBases/StuffEffectMultiplierArmor
-
- 4
-
-
-
-
- Defs/ThingDef[defName="RK_OrderUniform"]/statBases/ArmorRating_Sharp
-
- 5.75
-
-
-
-
- Defs/ThingDef[defName="RK_OrderUniform"]/statBases/ArmorRating_Blunt
-
- 7.875
-
-
-
-
-
- Defs/ThingDef[defName="RK_BattleSuit"]/statBases
-
- 60
- 12
-
-
-
-
- Defs/ThingDef[defName="RK_BattleSuit"]/statBases/StuffEffectMultiplierArmor
-
-
-
- Defs/ThingDef[defName="RK_BattleSuit"]/statBases/ArmorRating_Sharp
-
- 16
-
-
-
-
- Defs/ThingDef[defName="RK_BattleSuit"]/statBases/ArmorRating_Blunt
-
- 36
-
-
-
-
- Defs/ThingDef[defName="RK_BattleSuit"]/equippedStatOffsets
-
-
- 30
- 0.50
- 0.15
-
-
-
-
-
- Defs/ThingDef[defName="RK_BattleSuit"]/apparel/bodyPartGroups
-
- Hands
- Feet
-
-
-
-
-
- Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/statBases
-
- 5
- 1
-
-
-
-
- Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/equippedStatOffsets
-
- -0.1
- 0.1
- -1
-
-
-
-
- Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/statBases/StuffEffectMultiplierArmor
-
-
-
- Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/statBases/ArmorRating_Sharp
-
- 13
-
-
-
-
- Defs/ThingDef[defName="RK_Mask" or defName="RK_MaskB"]/statBases/ArmorRating_Blunt
-
- 32
-
-
-
-
-
- Defs/ThingDef[defName="RK_Plate"]/statBases
-
- 80
- 8
-
-
-
-
- Defs/ThingDef[defName="RK_Plate"]/statBases/StuffEffectMultiplierArmor
-
- 2.1
-
-
-
-
- Defs/ThingDef[defName="RK_Plate"]/apparel/bodyPartGroups
-
- Hands
- Feet
-
-
-
-
-
- Defs/ThingDef[defName="RK_PlateHelmA" or
- defName="RK_PlateHelmB" or
- defName="RK_PlateHelmC"]/statBases
-
- 5
- 1
-
-
-
-
- Defs/ThingDef[defName="RK_PlateHelmA" or
- defName="RK_PlateHelmB" or
- defName="RK_PlateHelmC"]/statBases/StuffEffectMultiplierArmor
-
- 2.1
-
-
-
-
- Defs/ThingDef[defName="RK_PlateHelmA" or
- defName="RK_PlateHelmB" or
- defName="RK_PlateHelmC"]/equippedStatOffsets
-
- -0.4
- -2
-
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_WoodenShield"]/statBases
-
- 7
- 4
-
-
-
-
- Defs/ThingDef[defName="RK_WoodenShield"]/statBases/ArmorRating_Sharp
-
- 1.2
-
-
-
-
- Defs/ThingDef[defName="RK_WoodenShield"]/statBases/ArmorRating_Blunt
-
- 1.75
-
-
-
-
- Defs/ThingDef[defName="RK_WoodenShield"]/equippedStatOffsets
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyShield"]/statBases/Mass
-
- 8
- 14
- 8
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyShield"]/statBases/StuffEffectMultiplierArmor
-
- 6
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyShield"]/statBases/ArmorRating_Sharp
-
- 1
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyShield"]/statBases/ArmorRating_Blunt
-
- 1.5
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyShield"]/equippedStatOffsets
-
- -0.2
- -1
- -0.30
- -0.16
- -0.25
- -0.05
- 1.0
-
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyShield_Big"]/statBases/Mass
-
- 12
- 18
- 10
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyShield_Big"]/statBases/StuffEffectMultiplierArmor
-
- 5
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyShield_Big"]/statBases/ArmorRating_Sharp
-
- 2
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyShield_Big"]/statBases/ArmorRating_Blunt
-
- 3
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyShield_Big"]/equippedStatOffsets/MeleeHitChance
-
- -0.3
- -1.2
- -0.40
- -0.40
- -0.50
- -0.05
- 1.0
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyShield" or defName="RK_WoodenShield" or defName="RK_HeavyShield_Big"]/apparel/layers
-
-
- Shield
-
-
-
-
-
-
- Defs/ThingDef[
- defName="RK_SantaSack" or
- defName="RK_Backpack" or
- defName="RK_CrossBack" or
- defName="RK_OutsideBackpack" or
- defName="RK_Sack"
- ]/apparel/tags
-
- RK_Loadbearing
-
-
-
-
-
- Defs/ThingDef[
- defName="RK_SantaSack" or
- defName="RK_Backpack" or
- defName="RK_CrossBack" or
- defName="RK_OutsideBackpack" or
- defName="RK_Sack"
- ]/apparel/layers
-
-
- Backpack
-
-
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Buildings_Security.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Buildings_Security.xml
deleted file mode 100644
index c6f100f216..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Buildings_Security.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/thingClass
-
- CombatExtended.Building_TurretGunCE
-
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/inspectorTabs
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/statBases/AccuracyTouch
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/statBases/AccuracyShort
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/statBases/AccuracyMedium
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/statBases/AccuracyLong
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding"]/building/turretBurstCooldownTime
-
- 1
-
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/building
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/comps/li[@Class="CompProperties_ChangeableProjectile"]
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/statBases/AccuracyTouch
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/statBases/AccuracyShort
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/statBases/AccuracyMedium
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon"]/statBases/AccuracyLong
-
-
-
- Defs/ThingDef[defName = "RK_Turret_Ballista_Strait"]
-
-
-
-
-
-
- RK_Turret_Ballista_Strait
-
- 16.5
- 20
- 1
- 0.04
- 0.96
- 1
-
-
- CombatExtended.Verb_ShootCE
- true
- Projectile_RKBallistaBolt
- 2.1
- 44
- BallistaShot
- 12
-
-
- 1
- 8
- AmmoSet_RKBallistaBolt
-
-
-
-
- TurretGun
-
-
-
-
- Defs/ThingDef[defName="BallistaBolt_Normal"]
-
-
-
- Defs/ThingDef[defName="BallistaBolt_AP"]
-
-
-
- Defs/ThingDef[defName="BallistaBolt_Heavy"]
-
-
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/thingClass
-
- CombatExtended.Building_TurretGunCE
-
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/inspectorTabs
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/statBases/AccuracyTouch
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/statBases/AccuracyShort
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/statBases/AccuracyMedium
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/statBases/AccuracyLong
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/costList/Chemfuel
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryBuilding_Cannon"]/building/turretBurstCooldownTime
-
- 1
-
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/building
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/comps/li[@Class="CompProperties_ChangeableProjectile"]
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/statBases/AccuracyTouch
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/statBases/AccuracyShort
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/statBases/AccuracyMedium
-
-
-
- Defs/ThingDef[@Name = "RK_BaseArtilleryWeapon_Cannon"]/statBases/AccuracyLong
-
-
-
- Defs/ThingDef[defName = "RK_Turret_Cannon_Strait"]
-
-
-
-
-
-
- RK_Turret_Cannon_Strait
-
- 20
- 20
- 1
- 0.26
- 1.55
- 3
-
-
- CombatExtended.Verb_ShootCE
- true
- Projectile_RKCannonBall
- 4.9
- 75
- RKCannonShot
- 12
-
-
- 1
- 14
- AmmoSet_RKCannonBall
-
-
-
-
- TurretGun
-
-
-
-
-
- Defs/ThingDef[defName="Bullet_Big_mouse"]
-
-
-
- Defs/ThingDef[defName="Big_mouse"]
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_MeleeWeapons.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_MeleeWeapons.xml
deleted file mode 100644
index 38340817aa..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_MeleeWeapons.xml
+++ /dev/null
@@ -1,730 +0,0 @@
-
-
-
-
- Defs/ThingDef[defName="RK_Axe"]/tools
-
-
-
- handle
-
- Poke
-
- 3
- 1.59
- 0.10
- 0.625
- Handle
-
-
- edge
-
- Cut
-
- 17
- 3.52
- 0.30
- 2.025
- 0.68
- Edge
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_Axe"]/statBases
-
- 3.5
- 0.15
-
-
-
-
- Defs/ThingDef[defName="RK_Axe"]/equippedStatOffsets
-
- 0.10
- 0.15
- 0.20
-
-
-
-
- Defs/ThingDef[defName="RK_Axe"]/weaponTags
-
- CE_OneHandedWeapon
-
-
-
-
-
- Defs/ThingDef[defName="RK_Cleaver"]/tools
-
-
-
- edge
-
- Cut
-
- 15
- 1.2
- 1.33
- 0.656
- 0.43
- Edge
-
-
- handle
-
- Poke
-
- 1
- 1.26
- 0.250
- Handle
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_Cleaver"]/statBases
-
- 3
-
-
-
-
- Defs/ThingDef[defName="RK_Cleaver"]/equippedStatOffsets
-
- 0.2
- 0.35
- 0.2
-
-
-
-
- Defs/ThingDef[defName="RK_Cleaver"]/weaponTags
-
- CE_OneHandedWeapon
-
-
-
-
-
- Defs/ThingDef[defName="RK_TwoHanded"]/tools
-
-
-
- handle
-
- Poke
-
- 3
- 1.6
- 0.10
- 0.65
- Handle
-
-
- point
-
- Stab
-
- 13
- 1.6
- 0.60
- 0.65
- 1.45
- Point
-
-
- edge
-
- Cut
-
- 33
- 1.43
- 0.30
- 2.106
- 0.53
- Edge
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_TwoHanded"]/statBases
-
- 7
- 1.13
-
-
-
-
- Defs/ThingDef[defName="RK_TwoHanded"]
-
-
- 0.77
- 0.85
- 0.37
-
-
-
-
-
- Defs/ThingDef[defName="RK_TwoHanded"]/statBases/Mass
-
- 1.3
-
-
-
-
-
- Defs/ThingDef[defName="RK_Fork"]/tools
-
-
-
- shaft
-
- Blunt
-
- 4
- 1.5
- 0.15
- 1.352
- Shaft
-
-
- shaft
-
- Poke
-
- 2
- 2.11
- 0.05
- 0.512
- Point
-
-
- head
-
- Stab
-
- 15
- 1.3
- 1.00
- 1.352
- 0.31
- Head
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_Fork"]/statBases
-
- 7
- 2
-
-
-
-
- Defs/ThingDef[defName="RK_Fork"]/equippedStatOffsets
-
- 0.16
- 1.5
- 0.8
-
-
-
-
-
- Defs/ThingDef[defName="RK_Hockey"]/tools
-
-
-
- shaft
-
- Blunt
-
- 7
- 1.35
- 0.15
- 2.25
- Shaft
-
-
- shaft
-
- Poke
-
- 4
- 1.78
- 0.05
- 1
- Point
-
-
- edge
-
- Cut
-
- 18
- 3
- 1.44
- 0.48
- Blade
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_Hockey"]/statBases
-
- 1.68
- 8
-
-
-
-
- Defs/ThingDef[defName="RK_Hockey"]/equippedStatOffsets
-
-
- 0.17
- 1.45
- 0.9
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_Dagger"]/tools
-
-
-
- handle
-
- Poke
-
- 1
- 1.26
- 0.250
- Handle
-
-
- blade
-
- Cut
-
- 10
- 1.18
- 0.36
- 0.32
- Blade
-
-
- point
-
- Stab
-
- 11
- 1.26
- 1.33
- 0.25
- 0.42
- Point
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_Dagger"]/statBases
-
- 1
- 0.15
-
-
-
-
- Defs/ThingDef[defName="RK_Dagger"]
-
-
- 0.5
- 0.15
- 0.05
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_OneHanded"]/tools
-
-
-
- handle
-
- Poke
-
- 2
- 1.44
- 0.425
- Handle
-
-
- point
-
- Stab
-
- 27
- 1.44
- 0.425
- 0.48
- Point
-
-
- edge
-
- Cut
-
- 20
- 1.34
- 1.33
- 0.956
- 0.43
- Edge
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_OneHanded"]/statBases
-
- 3.5
- 0.35
-
-
-
-
- Defs/ThingDef[defName="RK_OneHanded"]/weaponTags
-
- CE_OneHandedWeapon
-
-
-
-
- Defs/ThingDef[defName="RK_OneHanded"]
-
-
- 0.2
- 0.35
- 0.2
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_LongSword"]
-
-
-
-
- Defs/ThingDef[defName="RK_MagicWand"]/costList/Chemfuel
-
- 1
-
-
-
-
- Defs/ThingDef[defName="RK_MagicWand"]/tools
-
-
-
- edge
-
- Kaboom
-
- 5
- 5.625
- 1.5
-
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_LightLance"]/tools
-
-
-
- shaft
-
- Blunt
-
- 4
- 1.67
- 0.15
- 1.224
- Shaft
-
-
- shaft
-
- Poke
-
- 2
- 2.14
- 0.05
- 0.544
- Point
-
-
- head
-
- Stab
-
- 17
- 1.43
- 1.00
- 1.224
- 0.84
- Head
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_LightLance"]/statBases
-
- 1.88
- 7
-
-
-
-
- Defs/ThingDef[defName="RK_LightLance"]/equippedStatOffsets
-
-
- 0.2
- 1.41
- 0.8
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyLance"]/tools
-
-
-
- shaft
-
- Blunt
-
- 6
- 1.83
- 0.15
- 1.8
- Shaft
-
-
- shaft
-
- Poke
-
- 3
- 2.36
- 0.05
- 0.8
- Point
-
-
- head
-
- Stab
-
- 14
- 1.57
- 1.00
- 1.8
- 1.2
- Head
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyLance"]/statBases/Mass
-
- 1.28
- 7
- 5
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyLance"]/equippedStatOffsets
-
-
- 0.2
- 0.98
- 0.8
-
-
-
-
-
- Defs/ThingDef[defName="RK_HeavyLance"]/stuffCategories/li[.="Metallic"]
-
- Metallic_Weapon
-
-
-
-
-
- Defs/ThingDef[defName="RK_Gunlance_NormalType" or defName="RK_Gunlance_SpreadType"]/tools
-
-
-
- handle
-
- Poke
-
- 3
- 1.9
- 0.10
- 0.65
- Handle
-
-
- point
-
- Stab
-
- 16
- 1.6
- 0.60
- 3
- 1.9
- Point
-
-
- edge
-
- Cut
-
- 38
- 2.1
- 0.30
- 4.106
- 0.90
- Edge
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_Gunlance_NormalType" or defName="RK_Gunlance_SpreadType"]/statBases/Mass
-
- 1.28
- 7
- 8
-
-
-
-
- Defs/ThingDef[defName="RK_Gunlance_NormalType" or defName="RK_Gunlance_SpreadType"]/equippedStatOffsets
-
-
- 0.2
- 0.98
- 0.8
-
-
-
-
-
- Defs/ThingDef[defName="RK_Gunlance_NormalType" or defName="RK_Gunlance_SpreadType"]/stuffCategories/li[.="Metallic"]
-
- Metallic_Weapon
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_StrawberryBeer"]/tools
-
-
-
-
- Blunt
-
- 2
- 2.22
- 1.33
- 0.338
- Base
-
-
- neck
-
- Poke
-
- 1
- 3.33
- 0.150
- Neck
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_StrawberryBeer"]/statBases
-
- 0.33
-
-
-
-
- Defs/ThingDef[defName="RK_StrawberryBeer"]
-
-
- 0.1
- 0.33
- 0.07
-
-
-
-
-
- Defs/ThingDef[defName="RK_StrawberryBeer"]/weaponTags
-
- Defs/ThingDef[defName="RK_StrawberryBeer"]
-
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_StrawberryBeer"]/weaponTags
-
- CE_OneHandedWeapon
-
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_RangedWeapons.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_RangedWeapons.xml
deleted file mode 100644
index 8edf4c8cdc..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_RangedWeapons.xml
+++ /dev/null
@@ -1,501 +0,0 @@
-
-
-
-
- Defs/ThingDef[defName="RK_Rifle" or defName="RK_SniperRifle" or defName="RK_FlechetteRifle" or defName="RK_FlechetteSniperRifle" or defName="RK_Rifle_line"]/tools
-
-
-
- stock
-
- Blunt
-
- 6
- 2.09
- 1.5
- 1.82
- Stock
-
-
- bayonet
-
- Stab
-
- 17
- 1.38
- 1.08
- 0.72
- Muzzle
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_Crossbow" or defName="RK_EnhanceCrossBow" or defName="RK_AutoCrossBow"]/tools
-
-
-
- stock
-
- Blunt
-
- 8
- 1.55
- 1.5
- 2.755
- Stock
-
-
- barrel
-
- Blunt
-
- 5
- 2.02
- 1.630
- Barrel
-
-
- muzzle
-
- Poke
-
- 8
- 1.55
- 2.755
- Muzzle
-
-
-
-
-
-
-
- RK_Crossbow
-
- 1
- 0.5
- 1.2
- 7.5
- 0.1
- 2400
-
-
- CombatExtended.Verb_ShootCE
- true
- Projectile_CrossbowBolt_Stone
- 1
- 20
- Bow_Small
-
-
- 40
- 20
-
-
- 1
- 7
- AmmoSet_CrossbowBolt
-
-
- AimedShot
-
-
- RK_1TierRange
- RK_Crossbow
- RK_Weapon
- RK_RangeWeapon
- RK_Combatant
- CE_Bow
-
-
-
-
-
- RK_EnhanceCrossBow
-
- 1
- 0.4
- 1.4
- 9.00
- 0.1
- 2600
-
-
- CombatExtended.Verb_ShootCE
- true
- Projectile_CrossbowBolt_Stone
- 1
- 28
- Bow_Large
-
-
- 1
- 9
- AmmoSet_CrossbowBolt
-
-
- AimedShot
-
-
- RK_1TierRange
- RK_Crossbow
- RK_Weapon
- RK_RangeWeapon
- RK_Combatant
- CE_Bow
-
-
-
-
-
- RK_AutoCrossBow
-
- 0.9
- 0.5
- 1.2
- 6.5
- 1.2
- 7500
-
-
- CombatExtended.Verb_ShootCE
- true
- Projectile_CrossbowBolt_Stone
- 1
- 18
- Bow_Large
-
-
- true
- 6
- 1.7
- AmmoSet_CrossbowBolt
-
-
- AimedShot
-
-
- RK_1TierRange
- RK_Crossbow
- RK_Weapon
- RK_RangeWeapon
- RK_Combatant
- CE_Bow
-
-
-
-
-
- Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_65x50mmSRArisaka"]/ammoTypes
-
- Bullet_65x50mmSRArisaka_FLCH
-
-
-
-
- RK_Rifle
-
- 3.30
- 1.17
- 1
- 0.07
- 1.30
- 9.66
- 12000
-
-
- 30
- 55
- 1
-
-
- CombatExtended.Verb_ShootCE
- true
- Bullet_65x50mmSRArisaka_FMJ
- 1.1
- 55
- Rifle
- GunTail_Heavy
- 9
-
-
- 5
- 4.3
- AmmoSet_65x50mmSRArisaka
-
-
- AimedShot
-
-
- RK_3TierWeapon
- RK_2TierWeapon
- RK_Rifle
- RK_Weapon
- RK_RangeWeapon
- RK_Combatant
- CE_AI_Rifle
-
-
-
-
-
- RK_Rifle_line
-
- 3.30
- 1.00
- 1
- 0.14
- 1.22
- 9
- 9500
-
-
- 45
- 10
- 1
-
-
- CombatExtended.Verb_ShootCE
- true
- Bullet_12Gauge_Buck
- 0.6
- 16
- FlechetteRifle
- GunTail_Heavy
- 9
-
-
- 5
- true
- 0.85
- AmmoSet_12Gauge
-
-
-
-
-
-
-
-
-
- RK_SniperRifle
-
- 3.6
- 1.17
- 2.24
- 0.07
- 1.37
- 9.86
- 15000
-
-
- 30
- 70
- 2
-
-
- CombatExtended.Verb_ShootCE
- true
- Bullet_65x50mmSRArisaka_FMJ
- 1.3
- 68
- Rifle
- GunTail_Heavy
- 9
-
-
- 5
- 4.3
- AmmoSet_65x50mmSRArisaka
-
-
- AimedShot
-
-
- RK_3TierWeapon
- RK_2TierWeapon
- RK_Rifle
- RK_Weapon
- RK_RangeWeapon
- RK_Combatant
- CE_AI_Rifle
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_FlechetteRifle" or defName="RK_FlechetteSniperRifle"]
-
-
-
-
- Defs/ThingDef[defName="RK_PrototypePulseRifle"]/verbs
-
-
-
- RK_PrototypePulseRifle
-
- 3.5
- 0.4
- 1.05
- 0.08
- 1.20
- 9.00
- 40000
-
-
- 1.51
- CombatExtended.Verb_ShootCE
- true
- Bullet_6x24mmCharged
- 1.0
- 48
- 5
- 6
- Shot_ChargeRifle
- GunTail_Medium
- 9
-
-
- 20
- 4.5
- AmmoSet_6x24mmCharged
-
-
- 4
- TRUE
- AimedShot
-
-
- CE_AI_Rifle
-
- ChargedShot
-
-
-
- Defs/ThingDef[defName="RK_PrototypePulseRifle"]/tools
-
-
-
- stock
-
- Blunt
-
- 6
- 2.09
- 1.5
- 1.82
- Stock
-
-
- barrel
-
- Blunt
-
- 3
- 3.86
- 0.96
- Barrel
-
-
- muzzle
-
- Poke
-
- 6
- 1.79
- 1.82
- Muzzle
-
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_BFR"]/verbs
-
-
-
- RK_BFR
-
- 10.5
- 0.48
- 3.5
- 0.02
- 2.10
- 16.8
-
-
- CombatExtended.Verb_ShootCE
- true
- Bullet_50BMG_FMJ
- 1.5
- 85
- 1
- PrototypePulse
- GunTail_Heavy
- 12
-
-
- 8
- 2.6
- AmmoSet_50BMG
-
-
- AimedShot
-
-
- CE_AI_Rifle
-
-
-
-
- Defs/ThingDef[defName="RK_BFR"]/tools
-
-
-
- stock
-
- Blunt
-
- 6
- 2.09
- 1.5
- 1.82
- Stock
-
-
- barrel
-
- Blunt
-
- 3
- 3.86
- 0.96
- Barrel
-
-
- muzzle
-
- Poke
-
- 6
- 1.79
- 1.82
- Muzzle
-
-
-
-
-
-
- Defs/ThingDef[defName="RK_Rifle" or defName="RK_SniperRifle" or defName="RK_FlechetteRifle" or defName="RK_FlechetteSniperRifle" or defName="RK_Rifle_line"]/weaponTags
-
- NoSwitch
-
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_KingHamster.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_KingHamster.xml
deleted file mode 100644
index 9f23fd0352..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_KingHamster.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
- Defs/ThingDef[defName="RK_KingHamster"]
-
-
- Quadruped
-
-
-
-
-
- Defs/ThingDef[defName="RK_KingHamster"]/statBases/MoveSpeed
-
- 4.5
-
-
-
-
- Defs/ThingDef[defName="RK_KingHamster"]/statBases
-
- 0.19
- 0.14
- 0.15
-
-
-
-
- Defs/ThingDef[defName="RK_KingHamster"]/tools
-
-
-
-
- Bite
-
- 20
- 1.87
- Teeth
- 2
- 3.6
- 0.04
-
-
- head
-
- Blunt
-
- 20
- 3
- HeadAttackTool
- true
- 0.2
- 8
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rakinlike.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rakinlike.xml
deleted file mode 100644
index 5834ba5d3a..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rakinlike.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
- Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]
-
-
- Humanoid
-
-
-
-
-
-
- Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/statBases
-
- 0.95
- 1
-
-
-
-
- Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/statBases/MeleeDodgeChance
-
- 1.05
-
-
-
-
- Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/tools
-
-
-
- left fist
-
- Blunt
-
- 1
- 1.26
- LeftHand
- 0.250
-
-
- right fist
-
- Blunt
-
- 1
- 1.26
- RightHand
- 0.250
-
-
- teeth
-
- Bite
-
- 5
- 1.32
- Teeth
- 0.2
- 0.03
- 0.02
-
-
- head
-
- Blunt
-
- 2
- 4.49
- Teeth
- 0.1
- 0.5
-
-
-
-
-
-
-
- Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/comps
-
- Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]
-
-
-
- CombatExtended.CompPawnGizmo
-
-
-
-
-
-
- Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/comps
-
-
-
- CombatExtended.CompPawnGizmo
-
-
-
-
-
-
-
-
-
- Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/alienRace/raceRestriction/weaponList/li[.="RK_LongSword"]
-
-
-
- Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/alienRace/raceRestriction/weaponList/li[.="RK_FlechetteRifle"]
-
-
-
- Defs/AlienRace.ThingDef_AlienRace[defName="Ratkin" or defName="Ratkin_Su"]/alienRace/raceRestriction/weaponList/li[.="RK_FlechetteSniperRifle"]
-
-
\ No newline at end of file
diff --git a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rotti.xml b/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rotti.xml
deleted file mode 100644
index 8bdc822600..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rotti.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
- Defs/ThingDef[defName="Rotti"]
-
-
- QuadrupedLow
-
-
-
-
-
- Defs/ThingDef[defName="Rotti"]/statBases/MoveSpeed
-
- 3.9
-
-
-
-
- Defs/ThingDef[defName="Rotti"]/statBases
-
- 0.23
- 0
- 0
-
-
-
-
- Defs/ThingDef[defName="Rotti"]/tools
-
-
-
- left claw
-
- Scratch
-
- 1
- 2.01
- FrontLeftPaw
- 0.01
- 0.015
-
-
- right claw
-
- Scratch
-
- 1
- 2.01
- FrontRightPaw
- 0.01
- 0.015
-
-
-
- Bite
-
- 3
- 0.84
- Teeth
- 2
- 0.02
- 0.144
-
-
- head
-
- Blunt
-
- 1
- 3
- HeadAttackTool
- true
- 0.2
- 0.125
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index 54c0a111cf..ab3c5a7928 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -351,7 +351,6 @@ Nanosuit |
Nearmare Race |
Neclose Race |
New Mech: Mini-Miner |
-NewRatkinPlus |
Ni'Hal |
Nukes |
Nyaron Race |
diff --git a/Textures/ThirdParty/Ratkin/FLCH/FLCH_a.png b/Textures/ThirdParty/Ratkin/FLCH/FLCH_a.png
deleted file mode 100644
index 974a1ea1729ccb1586ebe6e0a03aedd66d95e73a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1247
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=3dtTpz6=aistgPb%?u1b{{!il
z3=E|P3=FRl7#OT(FffScPl`Y422{&g;1OBOz`)H7!i>2rE!%;D5+$w?CBgY=CFO}l
zsSE{)nRz98d8s7|CVGZ?W`F%SUobGRIC{D`hE&8oo$=OxYO2if^AAhvt<@bkjzxVyUn;VxiKlXXek2w8z`qxY2zxz7WHBEC~>Kl+L9CC|g
zs+l7;W?jK|m55{fE501VtIQic5_@-L{E6-LjHkP^zRIE9n
zd(dLq)i$r(KCVtCu5UY8B_Q(shn_I?BuD11xbnA5p8uk`l4+CCp>tX@Oh5N6y|>0cV5Qr)J(AWbE)Q0I
z>eNlJ>#lyVZ_Qk=#IY@BzEnvHM(nFz#PHcN@IYbyHT4xC%0ir9PkV6BFs^>J!Thx_
z(8g$ux4U|_G@P-%T>mMpw#m!%Qd47m>XCJCD_1gIv$MUg>2T`j+1Xz?wYD0Z|NWn<
zVtJnJqqVLXD`We_yTmM5RqCIAw`QCg^@Q`;TmI#@7QL|8$f?Ud&(+m)UG#zbCwXSC
zW}Oa4oL_v+lgNb*3202(hQa4-9wL@F`
zueh)}2-q!Hdsp;D
zO+9xMzfJqC>z_81rEZHppnq~re89@1@l5M@t~?C#S3NiPX4|%7OjnMJEmoRk#p%;_
z_9{^S9N~nVC4%vMM+){8Tl?*e?r6?`vUt@O#qA7}6N|Sl2;zP&2~@y&T`zp``y9?&
z{p%es-##s%9s5Kq!6;{)SV&f3@PXcoX+1UD#Km{VyX?v3o%MQJ;``J5yIE&Iyk_Bk
zxA&qNPkmG`_j50S>7o~YTnh^E7lCSj81v-odg)Z|H;(n&qYnsaDwOgYY}gqUu(Gwd
z(Y~fs!g+eqCZ?{rOnp~Qaoxy_WehD6)^Yp2@v0wV^%|{&CjxBtH+%1`Td|pmZ|_Wf
z)+K(8(fb<=H4m(5xVJ88j%8HGVN>sbua}&ptl$50MKKH4fZiPD%|E4d~YvFMC*XJgib&qkwCL*47N}
z8tWbUfetm=b{S@@CwwogW16IWKrpTOJ0k(T-@i<63N>Tio?|nFJ4;S;g}o
z3{#_84nMq*DmnK*x6h+xF@Ibo4>N(%(JB|Eg>wQlBGlrgo>cFRsaV-_^IlIs-i$g;
cfa4$gVnru)53BxqV1dKn>FVdQ&MBb@0HC%jMgRZ+
diff --git a/Textures/ThirdParty/Ratkin/FLCH/FLCH_b.png b/Textures/ThirdParty/Ratkin/FLCH/FLCH_b.png
deleted file mode 100644
index a5818a26a3e0f455a1ae7f0b6480c30fb8881470..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5735
zcmZ`*byQT{yFS!Vl7e(fNDmAprNmG}mxMGDf`oJr-Q8UhN~3_p&@iG%GoT<1(k&r%
zx%a2v{nlOU{;~I7XRov0=Y603obx_W8fppzc+_|R01zlC%4yxLPyc)1fbQmZb}sXG
z3#N^20L0#n>$^iiPXWN+8vr(A06=050H}ssCBi%b
z0PnG#tgMEHt&^LRtF4nWqmryFqw{MgYdeP*0HBD>OZU{#nSKy4g7EYy`U*zZ3ZHN5
z0>*t)OrYkORA!Gb2qA*?OvUIVP`PYoMU6iAmymrjz=D?mzdLUgSj(OFd6VZ$P|mvA&{{P;+z5d#+@D{o$Ezd(0d;m8dVni1xDPMgIve^XeS|-
zaaNFhPSktzroZJu)c84xhGi^#(w*~Zz%KS9JQBvS%YNhA5~q%HFk^uC5@$+`>+QbC
zwM}>FGHXcA!Q)}pN1?-{M-Ym$z7f(wG&DtY&P43bPw6%QSu;=-oW~i{v5V$BgqRpt
z595I%=36*X!&CYhOgw4+8QfF&OATylX^1TrQkq>9Yd8e9Nc|DbG33&WOa*RZ_Mjbv
zPmF2KBp?^G%0#Yse>`G{5oATwBHf`uOorPpgG)?AD&swBT|vni@~+6Ig6cQD7;auf
z&C`%kW7~V#;QL0glgR@nrihZvnSDao*)3RJ}o
zn)wwPWcZDsMta@gck*=d?u9;@BAS*J29pYcRMn9vh1o*HD9Hw<+k;kO;~+PP0@O&t0f#K~tPlYTs{sxiXx_4nxu&o-_1(eyI`?#QwxFuT541Z=2sLb8ys*j`3?H=q
zg8G!7PFKn#$dgUM6Q-vuu0~UaFe?7gXNPMuc*V!jtBjy7Gy9uyOE5x-YwW
zhG&X;`U2|$$E^lhX<<2WMPg~4=~8jekk*#gY-v>~6qdk;D97R2;s9~f=t@+~)QXnB
zsah>ct17~s;jPB
z^b)ZJ-wMudGORG{FwFTb>mDp7D`|pwj!^K|lZE!GKU6P)uH>_sq!eXUv^;yS?rH)v
z;(BghsaK9lZOU!R@Tl>KImMuBhz}X2&I9EcwNe^~J2vb|{h;xw%MUXtHi?^e_t#(0
zDyZyK4;%$vnZ4?Q*n%nfS*XOQtf`wQ?swf_67DJH?|h$$rj_b
zuNQO%CT9f~KFpqYLL?#S265kbTpL>2EqGF;MkO+Apo7E3nuQ^m;TkkT~P
zg@&ou-<5kgQSVSML#1C}f|V&Vs>e{nD4HsDgU-hK4d`GAf0g6DzZ^b(x*^o-?#^o&KC2Avis<{`#yTix4
z!o1thhg+Cy=xd-g7>)vtMUGRB33F3(_veh}Y$UlQP(HcGa=yR4_Ks)|wT>*jg?zvI
z7<*X@XuGDb8hzevG`2}}g}Cy(d~$D;Q2+jcB_kV{
zv5xIPDbY^DM8g!!D#~`Qc(6_UGjTlevPi6`XEYx?ShrEPUU%U31GD`Z{pzeUtUGF%YHo^Ein&Xz&Xp~E
z$r34B$?GZCDMYM+%DC!wu>R74vi#M-gJf@n-DkURb|IU;H^Vkd>>W@$29PgjOCm3x
zQdJ7HV(N^I=yYl*e1wXo+Z7n3T(EI*Z_72g3G=l*QQ))j9k#0R-D|ejv^TK#J<>TA
zUW==CHGI}dZ^+QxVH5H@Jec4XvU|V#KA|(w+}pE?ecREO6{3-kGrbR#EcGoH
znq!@Ea>%lybEIgO>8K@X-99#dd)IOixtuiq;3ITKz+dq9M%@1M&h3{%4%JR2jpPg%
z$WUZ{0K?_=flI-PBs(R$Vc_UhQB&Ty$t0Tls@sqUn@79{)Po@ZMC#kbtJxnnC1VK@
zYH#!3J?8OkJ-N4}(w(Jl<2o{&2YVvoDz$XwrLHn^jZZ@1_zQGO`23{B>mvEG6yIOX
z--d72SjxSB{qtaDY-Qdwcdh%0(Mj{I)uHw!eC;XHy>i=Fq{_*Sh?hYEvI=&)Dck-E
zYi@TmZbK}eE;?@<Jy%fN!52FF&zBN9CQ0uzHqiUbaU;$D!NWM3l|u$OCJOf%&k7cae{_+Kw$>&aqlb7Er^IPC83bop%d_xq7q(Ikmo|RV%Z3mty
z_y+s+`&>^p0yb_ojt{%bC)EpXurM-@uUh*yChiO;uCtkdwwv)A+r}^s_fU~)sqZ_Z|3pYkVUVdKTYc<@ByO-URjLb%eW7azJsJ|+q9AKS#K#8f_f>=}RWEmML(7zk
z#aJD?9s{r!9muOZX$`|Vvmo=MV~WgIv4T9Psxd(&o$@{cQEW51d#~o(v$C_ZD~gMQ
z@$m3$f3&*uO-xL1NJ-ISU8i~H3|dv$9a@L|6VcaqzTMmH{J^}`c?n%eP*B6sk+=GJ
zOERj;AmrBc_jLdnC;%A?Ii|EXoTDnTORi9hqH!kd%I7m_&tzj`yVu*>J2^fsGu!M`
zo|{Yi`O6nb)Ths%nOUN1v7cB4pVxzVZc=TtS>90ZlKbIK}*b3&zF9j*gWm
zY_1Nbtlvudo{l!XnpI&wIzGmo<}qrD)zZ>(VD9L~B$mt6OOO7OEY%|Q?-SoPkKN)J
z3cm4~nM@KXF)?LiJYC5OGGU^t3z(Xk8Y@%HQL)!Y_%tek3{@>Gm^lxFFC^ZlcgGf|
zRTlqAA5^$+@sh@x7qVb&yVMh=V_;y{3hYT4q9p?ZNTjL&A-#lR&{H_7*3>B(Xn6nr
zMf162N`KdfhKHknh$g6`UdP&_&F0UB{PwZ7E+Yxj4BVebtPdB6xo_z*j|wDW`VE|k
zd+Zce8#Ryb{b+mJ*qC-l&MW&3D3gQX1<7AZ(CrI)ui}ID2I6Skj@MON18+MnX6NQq
zTwGk(NbIL;O3lEEHY52$)jb~gA3$mYFt?bSn*cGl4PpX9!fX`eVpd8!+9U!;P?dCw
z!v#YPjXUT94bIYaMIG#sSnTT0z#}#PEWJDT^2h0ttA%i>-7!$x;}`>75*U|&+MZ(->B&r`e*@v
z9XSQXL=Xn{#@1A28JC3DK^F@;?&kJ($;I){9Jx28rCCtYfr#UuBif#xB2$x-nQuu$
zm`sm(Q~pmx#74RPsu^4svbVKW+|VGfwYkafNzT>1JzYD2@IBi&TtSuzEkZ&s{iITG
zs))tK#qDlyt_O&~tVfhJHVAE(J(xoK3g0du
ze5YB^d6qw?ag~j@(jFI1qEOb!2FAv(j0SnMl|TJ&iC{cbM|x6{Ii?IPrmTj)KZ0ro
zFhrC0QgKow1oex1?v0ixBn&a));(C%FI)T2+-&LR6?hc1`GJGg%21N|kG3iRm{kq<
zcIflxfT*B*GW@O2baknU6r=ODcR#|@(HVYUmclZIRN#6c2AIJ~k@4|_EZYmTG--C`
zW`>eFe{>+G-?m!KS=`=3`rSZBiJ}+uq{gRa
z>GQxC+RmH@kCeP%#I@a`JRJL3AKbUX-?#Ez$Ve0oHY8|EAr1a_v^1Z?cDYx-Mf<07
z1(oVp(up+XHQ9AN@6|bTzaAL+XcqR}F$mMFC8i#Ift8(oBD%`qyFq8c18l7{WM`|GTpER^4%@E^wX2z|9oAW$SBBdu%!1u9v0IEnK_Vxf
zEM0p
z(^z8<>*KfUH`dXZhOW%HY;wwHKr@qU3B~A+QSUW%%GTezJ8D+{#>VG3(~$di{A@kwu)H
zJD%(Wi)J3FNMYCa1jI6$@kbdgWVwtnOBZ^n?N3L0E9iX3ZW{qLYVw5icCMp7o9s=Kd${b1m`B*z*-r#O&Z!jOY*vicX5Pl|0%i+Wqoj3nDj}U#
zes>`MV(y1Qc9vR)o(XQ#A+zFrQMx<8p;GGy=b9DzmWFvfe+0e(;QMgck(o+8&NHuZ
zYN^7H3uhLNBO(-_E4_E(gA!BW*R
z>9)map%2+W2E>MVo%Eb~)#{kpY*AaOAJOQlc5QBw^K!n%?0<(epn3tyOH=+UWinIbe^T<5fFLd^!O2
zvc6{I`3h-623j}|IjUB|{(_NL{pjoXvACF&v9faCZSg4);xvi*<=zfc?Wvz)rYh#y
z&rmiK!r8qdoRPOrUcH
z43s5i3t(Nhgd@v(zXS8J4c^+&vlJ(okgl-1hOa{6*4Eb7_=99tm_|}T+HlI)6kSAjq!^~h$>@+m3|Pa%V@|!e&SlQQo$Q}yH%tr
zuB^e>_+f|tGMqR;61`od>t-J;>K$z7uJOlMP-5}%^72MvnyC}<0JwEVX6Fk5cfZ`S
znmtAWf&@)ux2B=?f_fVlO+{m493DQtD!Ma0+`b+bDw{Njc@^9pqX(`gpfD7`*2y3TxQiKpq<28mCI(}Zy}%|
zQ2xUHnLb#m=KwV$Z^Ej!y1MF@mGOo0+iiGFa45HF$6W5UtY~uILXb76ERCP*PhG>o
zU|EavVc(033wm}-_JmV~8UK(A=3~}%Lf4>fj1ifE0q2!rJk=CAcjY-a15oSmdMnm?
nZ-4!NjOzd6Zf$m+&IbZk-kXJQqidhtd2~PtswP(>V;1~hyVAvo
diff --git a/Textures/ThirdParty/Ratkin/FLCH/FLCH_c.png b/Textures/ThirdParty/Ratkin/FLCH/FLCH_c.png
deleted file mode 100644
index 31eebc014367f5e77559ea7a8be08b814a5ca1b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3755
zcmV;c4pi}pP)004R=
z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XO000XO0qqCC
zEC2ui7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%hhNHvLWs=l}o?4M{{nRCr$HnpsR8
z*BQqR*X;Xh@MYg@cC#6S*>||?7=zg^n*kdeyu>?B@Pdgg$FXBuS=*$Q+LtIzoAjZ|
z()O)+s4DfTeQ2vjX{1(aqo!^4n6Kae_@3*TI|pCW5LD?R{WQ#(J2U71pYMEUnc2jD
zZZ3|p(3MaYx)RDlS3+6nN+=6m31y)xp)7PIl!dN@ve1=K7P=D3!f%5Jrj0pZV~nY1
z@|ajgbGu2Ew10z-U
z{9jQPt_2SUPw^m&eVN7nj{i4^b9387q2a-lnUhB8St*p3o4oSj~`!
z@jmk&^Cknc7Ma7$J_cqbGI$WGI%`oDK8#d1H#aK_y~Bck&HG<4h6)CS1W?Mh1S+X0
zppLzbG%?#xQ}crlW#3o_b@ewv$ka>Q+!ekZHbN`{{TN?;VY;w>WI4XzSbBY
z2Ko$w9r0v7W5kI*KHe*{$HxeaPW98Vvomz|(mb7fVwR4bo2DaY_S4*{2|9dooDQ8B
zql3q-bl}(s%^V%3=_5l*LF)=|yM
z;i(?lKR3vNC+PUX0XlPWjuw`V(&E(J%g=d0^JS57{{3d4ysk5({YMOQ{?_prA25iqsH1U?=
zKkpN?!hMY#n%}aG%~%1pZJInKF3i6!M#K6RBx$Jp5v6Y8UT>>{r&x^rKieX
zsnG*_?N~YM<4F!obgFN<4h-$@7WY;iTMN*^n$~7OP*4zsgoIFfe!L)~Ac69CZ>NgJ
zLTc)&5D@_b#t!xgq$vmHCusWc80{PFQdVXy>>KZ(=I$!xvDIj_)QGL6tByK)o5XhO
z)~%vT)acWTRlv>P#ND3{U7
zSLpoX3v~F%G(X8!LuH)-1L|7Kl*hC*TB_;fsS|Yl>UBDDY>o$2HB{G9PP;1dC@Vje
zf`fwv8htvkj-dTlFd}Rq4wTg7($2~(Dkw`AqO*#Ul!h!WUZ9tre}!JS`x4!K=6Skx
z<1SriLynv{WRDUwCq&QSWS8hxRic0}z@koc)s3Y>=$SL8>BjY&bd$Mz`#Bn$uu^h*
z3`NI>(w5j@vGw)!y`Rt@Xw(VTg6#hT<{ykOATY$Aw#G$LY3&YS1h&Oh*;G`KX$Pj{
zm2MN!vbeZN-+l4>^yKnYIy85X|NovaWO90p3d=L7s(Gi#D{?#`n~&BU2*+{cfYzQ`
zAsGESy1LfxdTQ%w5dT-y71Ql!?$V8?Zqn5BB;C1nhx!M4$($HY32D)kni)swxk*BY
z4XINnT7qHX3k-#Yg^3;@B_%~{F$6a8csw;Djta{%Xh%t!hysBB5gF1T81NiF{qyI~
zlXYTHh=1|9muX^Z)DSH)uaq|wP-AB~bqzEM(J({imVRr8Xv+|dr=C}wK`9xr_9uLo
z4S4$LTQo4#PfJTnG(0jOL~DU28&a!IxWvr-fua8Xe%iBV4<#lh+KG&e6c^!H9M!j#
zQ+r>Xs5k`R=_4v&z|d$vUA%aS&YnBNqOJ7oofnxG=)mlL+Etw+qCiHADz~5vrXtxQ
z(KhhCwq+;S1xvOjgo&s8CXyyP9Q5Vh$LwW~0#BoPf
z%PqJjq9VT}U5Jf}3!#{#2uj*+7KTW16O-dY{OG8aTHBi`yI`A6JV1SINUb{Iz@6!3
z{)6z}zkk0SX+%*`5v8W43M1m;;>gd>Ps|V#Qp}XQGfg~M2r92H;N(e|9lQQ5fDUJikH>SziQ
z7%1}ysBJB=_X6n3RKgw=)X#?0s}m2rm{%EUYim;)AQ>4Mq1xJ7%F4>Xu@vZ{IC?1%$u083C;UnRzKnVUG%Q*^qj5;sLt9Ut-=oF)^VOt_9Ix
zwOVOtXh=jwMn(o3;BBvbW9yCw{dLn0DzlXXh_A8i5`(6_*4F!puA|JJOy%$J8yHaA
zvM~{WMaSP`z@QSm8XX-S)X>mCX0w@sc)TDhFT{6Vy^qZZc?02w()lUydq)
zG@z!rbVCdXXWqy7Uy2(T7@(%6Ch@ejqP5^S3lKY^mtIM7v5Fye4Oqww4l$C!J1EhGT
z25e9-ki~q8{#}Yirbot?`=GkI+HOE^Z?D||cauA17d@!FGXpReaAtta0UOl|v@-XS
zlauXYtE#GWJ;Lztun;TvJ3BkYeqCLixVRh$f%P`vVG)p)mB4cp9!4vUNl-rsQh0D!pt!%|aV^khL+aIu
z2ZI;`6ciK)ap>b~YHI9arC^vK_gh
z`kWfjt2F@OjvOGx0(5!Wq-e2NgaMczgm7in+kn+Zf{wyBWwp|#nqw3e8LShnh4nc#
zpo3YF24IATwk^d17=mfC+;47f76xFwZHqZr0QCQrm6f9FlVunqzyJ)M5Plny19Di5gK)9kJw;(*{s!R^*5=dztO4Fj
zPfr)(&;+ywpf`X4Fh-U^Jn;7Rro=R}ZX&Z@2B2JP!1n9}gK%kxm#2q8xP-MiHK3UJ
z3X>X$L;tT$g3b&`NZl&t_OkNpVSu&?$RwDMveh8m*T<6084W<%=Li3cUj
zmmC2rYc&At?Md5X>=g&!mI2W*;Y#6`&Qwr%sE(JyvEAzPwOLx#{05305(mV_FM=NP60VkfQBk@Y`4FXm_E}faLA5h#K+5h>d7QX+W*XWcmctT4?~fxqbWg
ziT`CcD8~WXCV)>+QZgRQ1i`}$z=8-~qhTcoYXVppvFxc9y@)oEsz!obPkQH#69(b8
zm+N%~pjQeA@`Z4%_#ZR)h)QWdH}e@1nlu0-J?+pJ-6Cdya$g#NsW6{Qfx-S{j^A>>
zqA)<>U;x0P2%b3B1z`wQgB(|eRZRf*`NdC98iYS%GbAoKntc7ewW7ab@HH7ewbSa=
z?ErjchA+Rq#u7LLV&a1}0Vx>&V?99b%hjOJ&`^0Z9pNFKIwQ2=9);Bmc=yf648m_M
z)lw<%YwrJV=4nQTyd#DJj0676tl(9ce7f4M5bJ;16=OLRM&ji2KH0q4bTS~w?^PdP
zufLc~Zia6F@u^#AL=eTNL{oNQs^N({vYG+!ym8zh{N`oe^1kg}hybi`Icn5mCGIzR8qiWg!|Y25tGem^*LfFz?&hg
z4EHftxpF_}?cbTt@!cKX03q4oZ4eA8EG(q7v^0u}iXtyBFWmHR%xd8#2ni3&jff7t
z&fDL3`+9xKWwOF{ym)XE867IJ_s;Tckti$bizs79vX}znH*dW@ZxB9h&7;V0Z+V?|
zMp*|9%0d7m0+}=hPt?j>VBTgEKHwzzF&ptE?<2$!DR{DYpV-gfT-7y|#HW~J%<++n
z5m6!U1qS>5%Vg4h&?xZo@}$5ZzZGvbMwb2TwZp3k$9IiQjPiaCC<|8uA5BIw$qYgZ
zHyLM6Gx$C?jKQll)wz$%uBzOSq-`Y%g&2NTTOC6Mj
z|5w0}tb&xW(D0zQc>hlflC(^&*nZ47YwN3_EOaH5g|39M(3MaYx)RDl7h#jze*vQy
V-_~f5;LZR5002ovPDHLkV1lsA1!w>O
From c8e688849f1605bca8806779e58f8b4c497f261a Mon Sep 17 00:00:00 2001
From: ViralReaction <136116069+ViralReaction@users.noreply.github.com>
Date: Fri, 9 Aug 2024 20:51:10 -0600
Subject: [PATCH 31/69] Duplicate node
---
.../ThingDefs_Misc/Weapons/MO_Weapons_Melee.xml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Melee.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Melee.xml
index 59ab14b1d3..a711ad20c3 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Melee.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Weapons/MO_Weapons_Melee.xml
@@ -2698,13 +2698,11 @@
- Defs/ThingDef[defName="DankPyon_MeleeWeapon_BlacksmithHammer"]
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_BlacksmithHammer"]/equippedStatOffsets
-
- 0.42
- 0.24
- 0.2
-
+ 0.42
+ 0.24
+ 0.2
From d085662a39c843b1a84f2536ef2be5977585592c Mon Sep 17 00:00:00 2001
From: ViralReaction <136116069+ViralReaction@users.noreply.github.com>
Date: Fri, 9 Aug 2024 21:12:16 -0600
Subject: [PATCH 32/69] Add new shields
---
.../ThingDefs_Misc/Shields/MO_Shields.xml | 49 ++++++++++++++++++-
1 file changed, 47 insertions(+), 2 deletions(-)
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml
index 8136cca3bd..ba9543e3c1 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml
@@ -41,7 +41,7 @@
- Defs/ThingDef[defName="DankPyon_Shield" or defName="DankPyon_ShieldKite" or defName="DankPyon_ShieldHeater" or defName="DankPyon_ShieldHeater_Amboise" or defName="DankPyon_ShieldHeater_Soren" or defName="DankPyon_ShieldHeater_Oswin" or defName="DankPyon_ShieldHeater_Hesse" ]/comps/li[@Class="VFECore.CompProperties_Shield"]
+ Defs/ThingDef[defName="DankPyon_Shield" or defName="DankPyon_ShieldKite" or defName="DankPyon_ShieldHeater" or defName="DankPyon_ShieldHeater_Amboise" or defName="DankPyon_ShieldHeater_Soren" or defName="DankPyon_ShieldHeater_Oswin" or defName="DankPyon_ShieldHeater_Hesse" or defName="DankPyon_ShieldLiving" or defName="DankPyon_ShieldLindwurm"]/comps/li[@Class="VFECore.CompProperties_Shield"]
@@ -62,7 +62,7 @@
- Defs/ThingDef[ defName="DankPyon_Shield" or defName="DankPyon_ShieldKite" or defName="DankPyon_ShieldHeater" or @Name="DankPyon_ShieldHeaterBase"
+ Defs/ThingDef[defName="DankPyon_Shield" or defName="DankPyon_ShieldKite" or defName="DankPyon_ShieldHeater" or @Name="DankPyon_ShieldHeaterBase" or defName="DankPyon_ShieldLiving" or defName="DankPyon_ShieldLindwurm"
]/statBases
8
@@ -116,4 +116,49 @@
2.85
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldLiving"]/statBases/ArmorRating_Sharp
+
+ 3
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldLiving"]/statBases/ArmorRating_Blunt
+
+ 6
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldLiving"]/statBases/ArmorRating_Heat
+
+ 0.25
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldLindwurm"]/statBases/ArmorRating_Sharp
+
+ 3.5
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldLindwurm"]/statBases/ArmorRating_Blunt
+
+ 6
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldLindwurm"]/statBases/ArmorRating_Heat
+
+ 0.35
+
+
+
\ No newline at end of file
From 39216160ce282940dfab1f6a91a31c1f506ac60d Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Sat, 10 Aug 2024 00:20:20 -0400
Subject: [PATCH 33/69] wip patch
---
.../pphhyy Demigryph/Demigryph_Banners.xml | 440 ++++------
.../pphhyy Demigryph/Demigryph_Shields.xml | 827 ++++++++----------
2 files changed, 520 insertions(+), 747 deletions(-)
diff --git a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Banners.xml b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Banners.xml
index a9cd4ad4c7..2e34e39311 100644
--- a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Banners.xml
+++ b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Banners.xml
@@ -9,63 +9,98 @@
+
+
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_BannerBase"]
+ ParentName
+ ArmorSmithableBase
+
+
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_BannerBase"]/thingClass
+
+ CombatExtended.Apparel_Shield
+
+
+
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_BannerBase"]/apparel
+
+
+ false
+ false
+
+ LeftHand
+
+
+ Shield
+
+
+
+ Armor
+
+
+
+
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_BannerBase"]/equippedStatOffsets
+
+ -0.15
+ -0.85
+ -0.1
+ -0.06
+ -0.03
+
+
+
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_BannerBase"]/tools
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Shields.xml b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Shields.xml
index 8aaadbab6a..a9a2e5b7b6 100644
--- a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Shields.xml
+++ b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Shields.xml
@@ -9,482 +9,387 @@
+
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_ShieldBase"]
+ ParentName
+ ArmorSmithableBase
+
+
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_ShieldBase"]/thingClass
+
+ CombatExtended.Apparel_Shield
+
+ Shields
+
+ CE_Shields
+
+
+
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_ShieldBase"]/apparel
+
+
+ false
+ false
+
+ LeftShoulder
+
+
+ Shield
+
+
+
+ Armor
+
+
+
+
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_ShieldBase"]/equippedStatOffsets
+
+
+ -0.2
+ -1
+ -0.15
+ -0.08
+ -0.25
+ -0.05
+ 1.0
+
+
+
+
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_ShieldBase"]/tools
+
+
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_ShieldBase"]/weaponTags
+
+
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_ShieldBase"]/equippedAngleOffset
+
+
+
Defs/ThingDef[
- defName="pphhyy_Human_DemigyryphShield" or
- defName="pphhyy_Human_DemigyryphRaiderShield" or
- defName="pphhyy_Human_DemigyryphGildedShield" or
- defName="pphhyy_Human_DemigyryphHunterShield" or
- defName="pphhyy_Human_DemigyryphChampionShield"]
-
+ defName="pphhyy_Human_DemigyryphShield" or
+ defName="pphhyy_Human_DemigyryphRaiderShield" or
+ defName="pphhyy_Human_DemigyryphGildedShield" or
+ defName="pphhyy_Human_DemigyryphHunterShield" or
+ defName="pphhyy_Human_DemigyryphChampionShield"
+ ]/comps/li[@Class="VFECore.CompProperties_Shield"]
-
- Defs
+
+ Defs/ThingDef[
+ defName="pphhyy_Human_DemigyryphShield" or
+ defName="pphhyy_Human_DemigyryphRaiderShield" or
+ defName="pphhyy_Human_DemigyryphGildedShield" or
+ defName="pphhyy_Human_DemigyryphHunterShield" or
+ defName="pphhyy_Human_DemigyryphChampionShield"
+ ]
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+
+
+
+
-
- pphhyy_Human_DemigyryphShield
- Demigyryph Shield
- A Cavalry shield made from metal materials.
- Medieval
-
- Weapons/DemigyryphShield/DemigyryphShield
- Graphic_Single
-
- 30
-
- Metallic
-
-
- 6000
- 200
- 10
- 12
- 8
- 7.0
-
-
- Smithing
-
- ElectricSmithy
- FueledSmithy
- DankPyon_Anvil
-
-
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
-
-
- pphhyy_DemigyryphShield
- DemigyryphShield
-
-
-
- CombatExtended.PawnRenderNode_Apparel
- CombatExtended.PawnRenderNodeWorker_Drafted
- Weapons/DemigyryphShield/DemigyryphShield
- CutoutComplex
- ApparelBody
-
- 0.6
-
- 80
-
-
- -5
- (0, 0, -0.1)
- 30
-
-
- -30
-
-
- -5
- (0.15, 0, -0.1)
-
-
- (0.15, 0, -0.1)
-
-
-
-
-
-
-
-
- Hands
- Arms
- Shoulders
- Torso
- Neck
-
-
-
-
- Armor
-
-
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphShield"]/statBases/StuffEffectMultiplierArmor
+
+ 7
+ 12
+ 8
+
+
-
- pphhyy_Human_DemigyryphRaiderShield
- Demigyryph Raider Shield
- A Cavalry shield made from metal materials and skulls, perfect for Raider knights.
- Medieval
-
- Weapons/DemigyryphRaiderShield/DemigyryphRaiderShield
- Graphic_Single
-
- 50
-
- Metallic
-
-
- 2
-
-
- 8000
- 300
- 12
- 12
- 8
- 8.0
-
-
- PlateArmor
-
- ElectricSmithy
- FueledSmithy
- DankPyon_Anvil
-
-
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
-
-
- pphhyy_DemigyryphShield
- DemigyryphRaiderShield
-
-
-
- CombatExtended.PawnRenderNode_Apparel
- CombatExtended.PawnRenderNodeWorker_Drafted
- Weapons/DemigyryphRaiderShield/DemigyryphRaiderShield
- CutoutComplex
- ApparelBody
-
- 0.6
-
- 80
-
-
- -5
- (0, 0, -0.1)
- 30
-
-
- -30
-
-
- -5
- (0.15, 0, -0.1)
-
-
- (0.15, 0, -0.1)
-
-
-
-
-
-
-
-
- Hands
- Arms
- Shoulders
- Torso
- Neck
-
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphShield"]
+
+
+
+ pphhyy_DemigyryphShield
+ DemigyryphShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Weapons/DemigyryphShield/DemigyryphShield
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
-
-
- Armor
-
-
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphRaiderShield"]/statBases/StuffEffectMultiplierArmor
+
+ 8
+ 12
+ 8
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphRaiderShield"]/statBases/Mass
+
+ 3
+
+
-
- pphhyy_Human_DemigyryphGildedShield
- Demigyryph Gilded Shield
- A Cavalry shield made from metal materials and gold, worn by wealthy Knights to desplay status.
- Medieval
-
- Weapons/DemigyryphGildedShield/DemigyryphGildedShield
- Graphic_Single
-
- 50
-
- Metallic
-
-
- 15
-
-
- 8000
- 300
- 12
- 12
- 8
- 8.0
-
-
- PlateArmor
-
- ElectricSmithy
- FueledSmithy
- DankPyon_Anvil
-
-
-
- 0.25
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
-
-
- pphhyy_DemigyryphShield
- DemigyryphGildedShield
-
-
-
- CombatExtended.PawnRenderNode_Apparel
- CombatExtended.PawnRenderNodeWorker_Drafted
- Weapons/DemigyryphGildedShield/DemigyryphGildedShield
- CutoutComplex
- ApparelBody
-
- 0.6
-
- 80
-
-
- -5
- (0, 0, -0.1)
- 30
-
-
- -30
-
-
- -5
- (0.15, 0, -0.1)
-
-
- (0.15, 0, -0.1)
-
-
-
-
-
-
-
-
- Hands
- Arms
- Shoulders
- Torso
- Neck
-
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphRaiderShield"]
+
+
+
+ pphhyy_DemigyryphShield
+ DemigyryphRaiderShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Weapons/DemigyryphRaiderShield/DemigyryphRaiderShield
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
-
-
- Armor
-
-
+
+
+
+
-
- pphhyy_Human_DemigyryphHunterShield
- Demigyryph Hunter Shield
- A Cavalry shield made from metal materials and Demigryph Trophies.
- Medieval
-
- Weapons/DemigyryphHunterShield/DemigyryphHunterShield
- Graphic_Single
-
- 50
-
- Metallic
-
-
- 4
-
-
- 10000
- 400
- 12
- 12
- 8
- 8.0
-
-
- PlateArmor
-
- ElectricSmithy
- FueledSmithy
- DankPyon_Anvil
-
-
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
-
-
- pphhyy_DemigyryphShield
- DemigyryphHunterShield
-
-
-
- CombatExtended.PawnRenderNode_Apparel
- CombatExtended.PawnRenderNodeWorker_Drafted
- Weapons/DemigyryphHunterShield/DemigyryphHunterShield
- CutoutComplex
- ApparelBody
-
- 0.6
-
- 80
-
-
- -5
- (0, 0, -0.1)
- 30
-
-
- -30
-
-
- -5
- (0.15, 0, -0.1)
-
-
- (0.15, 0, -0.1)
-
-
-
-
-
-
-
-
- Hands
- Arms
- Shoulders
- Torso
- Neck
-
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphGildedShield"]/statBases/StuffEffectMultiplierArmor
+
+ 8
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphGildedShield"]/statBases/Mass
+
+ 3
+ 12
+ 8
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphGildedShield"]
+
+
+
+ pphhyy_DemigyryphShield
+ DemigyryphGildedShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Weapons/DemigyryphGildedShield/DemigyryphGildedShield
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
-
-
- Armor
-
-
+
+
+
+
-
- pphhyy_Human_DemigyryphChampionShield
- Demigyryph Champion Shield
- A Cavalry shield made from metal materials, worn by veteran demigryph knights.
- Medieval
-
- Weapons/DemigyryphChampionShield/DemigyryphChampionShield
- Graphic_Single
-
- 50
-
- Metallic
-
-
- 8000
- 300
- 12
- 12
- 8
- 8.0
-
-
- PlateArmor
-
- ElectricSmithy
- FueledSmithy
- DankPyon_Anvil
-
-
-
- 0.10
- 0.25
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
-
-
- pphhyy_DemigyryphShield
- DemigyryphChampionShield
-
-
-
- CombatExtended.PawnRenderNode_Apparel
- CombatExtended.PawnRenderNodeWorker_Drafted
- Weapons/DemigyryphChampionShield/DemigyryphChampionShield
- CutoutComplex
- ApparelBody
-
- 0.6
-
- 80
-
-
- -5
- (0, 0, -0.1)
- 30
-
-
- -30
-
-
- -5
- (0.15, 0, -0.1)
-
-
- (0.15, 0, -0.1)
-
-
-
-
-
-
-
-
- Hands
- Arms
- Shoulders
- Torso
- Neck
-
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphHunterShield"]/statBases/StuffEffectMultiplierArmor
+
+ 8
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphHunterShield"]/statBases/Mass
+
+ 3.5
+ 12
+ 8
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphHunterShield"]
+
+
+
+ pphhyy_DemigyryphShield
+ DemigyryphHunterShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Weapons/DemigyryphHunterShield/DemigyryphHunterShield
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
-
-
- Armor
-
-
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphChampionShield"]/statBases/StuffEffectMultiplierArmor
+
+ 8
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphChampionShield"]/statBases/Mass
+
+ 3.5
+ 12
+ 8
+
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphChampionShield"]
+
+
+
+ pphhyy_DemigyryphShield
+ DemigyryphChampionShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Weapons/DemigyryphChampionShield/DemigyryphChampionShield
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
+
+
+
From 0930bcd13dd4e72a0835bc99af7a9bb35781857e Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Sat, 10 Aug 2024 06:58:38 -0400
Subject: [PATCH 34/69] Final fixes and adjustments
---
.../pphhyy Demigryph/Demigryph_Banners.xml | 176 +++++++++---------
.../pphhyy Demigryph/Demigryph_Shields.xml | 76 +++-----
2 files changed, 115 insertions(+), 137 deletions(-)
diff --git a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Banners.xml b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Banners.xml
index 2e34e39311..b051b28b54 100644
--- a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Banners.xml
+++ b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Banners.xml
@@ -10,28 +10,21 @@
-
Defs/ThingDef[@Name="pphhyy_Demigryph_BannerBase"]
ParentName
ArmorSmithableBase
-
- Defs/ThingDef[@Name="pphhyy_Demigryph_BannerBase"]/thingClass
-
- CombatExtended.Apparel_Shield
-
-
-
-
- Defs/ThingDef[@Name="pphhyy_Demigryph_BannerBase"]/apparel
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_BannerBase"]
+ CombatExtended.Apparel_Shield
false
false
- LeftHand
+ LeftShoulder
Shield
@@ -43,8 +36,8 @@
-
- Defs/ThingDef[@Name="pphhyy_Demigryph_BannerBase"]/equippedStatOffsets
+
+ Defs/ThingDef[@Name="pphhyy_Demigryph_BannerBase"]/equippedStatOffsets/ShootingAccuracyPawn
-0.15
-0.85
@@ -59,7 +52,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Shields.xml b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Shields.xml
index a9a2e5b7b6..e0433eec9b 100644
--- a/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Shields.xml
+++ b/ModPatches/pphhyy Demigryph/Patches/pphhyy Demigryph/Demigryph_Shields.xml
@@ -47,17 +47,15 @@
- Defs/ThingDef[@Name="pphhyy_Demigryph_ShieldBase"]/equippedStatOffsets
+ Defs/ThingDef[@Name="pphhyy_Demigryph_ShieldBase"]/equippedStatOffsets/ShootingAccuracyPawn
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
+ -0.2
+ -1
+ -0.15
+ -0.08
+ -0.25
+ -0.05
+ 1.0
@@ -74,6 +72,7 @@
+
Defs/ThingDef[
defName="pphhyy_Human_DemigyryphShield" or
@@ -106,8 +105,9 @@
-
- Defs/ThingDef[defName="pphhyy_Human_DemigyryphShield"]/statBases/StuffEffectMultiplierArmor
+
+
+ Defs/ThingDef[defName="pphhyy_Human_DemigyryphShield"]/statBases
7
12
@@ -145,10 +145,10 @@
-5
- (0.15, 0, -0.1)
+ (0.15, 0, -0.15)
- (0.15, 0, -0.1)
+ (0.15, 0, -0.15)
@@ -158,19 +158,14 @@
-
- Defs/ThingDef[defName="pphhyy_Human_DemigyryphRaiderShield"]/statBases/StuffEffectMultiplierArmor
-
- 8
- 12
- 8
-
-
Defs/ThingDef[defName="pphhyy_Human_DemigyryphRaiderShield"]/statBases/Mass
3
+ 8
+ 12
+ 8
@@ -204,10 +199,10 @@
-5
- (0.15, 0, -0.1)
+ (0.15, 0, -0.15)
- (0.15, 0, -0.1)
+ (0.15, 0, -0.15)
@@ -217,12 +212,6 @@
-
- Defs/ThingDef[defName="pphhyy_Human_DemigyryphGildedShield"]/statBases/StuffEffectMultiplierArmor
-
- 8
-
-
Defs/ThingDef[defName="pphhyy_Human_DemigyryphGildedShield"]/statBases/Mass
@@ -230,6 +219,7 @@
3
12
8
+ 8
@@ -263,10 +253,10 @@
-5
- (0.15, 0, -0.1)
+ (0.15, 0, -0.15)
- (0.15, 0, -0.1)
+ (0.15, 0, -0.15)
@@ -276,12 +266,6 @@
-
- Defs/ThingDef[defName="pphhyy_Human_DemigyryphHunterShield"]/statBases/StuffEffectMultiplierArmor
-
- 8
-
-
Defs/ThingDef[defName="pphhyy_Human_DemigyryphHunterShield"]/statBases/Mass
@@ -289,6 +273,7 @@
3.5
12
8
+ 8
@@ -322,10 +307,10 @@
-5
- (0.15, 0, -0.1)
+ (0.15, 0, -0.15)
- (0.15, 0, -0.1)
+ (0.15, 0, -0.15)
@@ -335,12 +320,6 @@
-
- Defs/ThingDef[defName="pphhyy_Human_DemigyryphChampionShield"]/statBases/StuffEffectMultiplierArmor
-
- 8
-
-
Defs/ThingDef[defName="pphhyy_Human_DemigyryphChampionShield"]/statBases/Mass
@@ -348,6 +327,7 @@
3.5
12
8
+ 8
@@ -381,10 +361,10 @@
-5
- (0.15, 0, -0.1)
+ (0.15, 0, -0.15)
- (0.15, 0, -0.1)
+ (0.15, 0, -0.15)
From bf21440c184736cc0f33f80aa0bd758d4b1fafa3 Mon Sep 17 00:00:00 2001
From: SamGray <56392968+SamaelGray@users.noreply.github.com>
Date: Sat, 10 Aug 2024 20:54:32 +0330
Subject: [PATCH 35/69] CG HEDP ammo ammoClass fix
---
Defs/Ammo/Rocket/84x246mmR.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Defs/Ammo/Rocket/84x246mmR.xml b/Defs/Ammo/Rocket/84x246mmR.xml
index 126c4ee406..67cba896b0 100644
--- a/Defs/Ammo/Rocket/84x246mmR.xml
+++ b/Defs/Ammo/Rocket/84x246mmR.xml
@@ -122,7 +122,7 @@
3.3
8.35
- GrenadeHE
+ GrenadeHEDP
Bullet_84x246mmR_HEDP
@@ -920,4 +920,4 @@
-
\ No newline at end of file
+
From d93fe7e5a1b344bb6587891bcf76b5cc6e8d61d3 Mon Sep 17 00:00:00 2001
From: SamaelGray <56392968+SamaelGray@users.noreply.github.com>
Date: Sun, 11 Aug 2024 00:32:24 +0330
Subject: [PATCH 36/69] misc housekeeping
---
Defs/Ammo/Rocket/84x246mmR.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Defs/Ammo/Rocket/84x246mmR.xml b/Defs/Ammo/Rocket/84x246mmR.xml
index 67cba896b0..7ad598bdc5 100644
--- a/Defs/Ammo/Rocket/84x246mmR.xml
+++ b/Defs/Ammo/Rocket/84x246mmR.xml
@@ -155,6 +155,7 @@
7.31
BuckShot
+ 0.5
20
@@ -430,8 +431,8 @@
5
18
- 26.7
-
+ 17.8
+
@@ -920,4 +921,4 @@
-
+
\ No newline at end of file
From 313835043f2dca2280912d04de7a931640b4cfe6 Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Sun, 11 Aug 2024 12:12:08 +0800
Subject: [PATCH 37/69] make Stunstick one handed
---
.../Patches/Pulse Weaponry/RangedSpacer.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
index 3a8aa23aac..7d6ec35845 100644
--- a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
@@ -65,6 +65,24 @@
+
+ Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/weaponTags
+
+ Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/weaponTags
+
+ CE_Sidearm_Melee
+ CE_OneHandedWeapon
+
+
+
Defs/ThingDef[defName = "DV_PulseSMG" or defName = "DV_PulseSuppressor"]/tools
From 1bd1589dfecd8ec592f6fb6965534a4c3d6c0c79 Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Sun, 11 Aug 2024 12:20:38 +0800
Subject: [PATCH 38/69] Reduce cost
---
.../Patches/Pulse Weaponry/RangedSpacer.xml | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
index 7d6ec35845..0d9a11d417 100644
--- a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
@@ -70,11 +70,11 @@
Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]
-
+
-
+
Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/weaponTags
@@ -82,6 +82,14 @@
CE_OneHandedWeapon
+
+
+
+ Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/costList/ComponentSpacer
+
+ 1
+
+
Defs/ThingDef[defName = "DV_PulseSMG" or defName = "DV_PulseSuppressor"]/tools
From 916945145c808d89f1473ca6042f7a22bff35253 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Sun, 11 Aug 2024 04:32:52 -0400
Subject: [PATCH 39/69] Adjust armor values
---
LoadFolders.xml | 2 +-
.../Patches/Titan Vehicles/Avenger.xml | 68 ++-----------------
.../Patches/Titan Vehicles/Conquistador.xml | 38 ++++-------
.../Patches/Titan Vehicles/Warchief.xml | 28 ++++----
4 files changed, 33 insertions(+), 103 deletions(-)
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 8e9b815e37..55fad88a5b 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -403,7 +403,7 @@
ModPatches/Thog's Armor
ModPatches/Thrumbo Plushie
ModPatches/Thrumkin
- Modpatches/Titan Vehicles
+ Modpatches/Titan Vehicles
ModPatches/Toolmetrics Redux
ModPatches/TouhouStyle
ModPatches/Tribal Warrior Set
diff --git a/ModPatches/Titan Vehicles/Patches/Titan Vehicles/Avenger.xml b/ModPatches/Titan Vehicles/Patches/Titan Vehicles/Avenger.xml
index ef50a1e470..c5f971a7de 100644
--- a/ModPatches/Titan Vehicles/Patches/Titan Vehicles/Avenger.xml
+++ b/ModPatches/Titan Vehicles/Patches/Titan Vehicles/Avenger.xml
@@ -6,14 +6,14 @@
Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/statBases/ArmorRating_Blunt
- 40
+ 24
Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/statBases/ArmorRating_Sharp
- 20
+ 12
@@ -27,14 +27,14 @@
Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="LeftWing"]/armor/ArmorRating_Blunt
- 45
+ 16
Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="LeftWing"]/armor/ArmorRating_Sharp
- 25
+ 8
@@ -48,14 +48,14 @@
Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="RightWing"]/armor/ArmorRating_Blunt
- 45
+ 16
Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="RightWing"]/armor/ArmorRating_Sharp
- 25
+ 8
@@ -65,20 +65,6 @@
90
-
-
- Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="LeftLandingWheel"]/armor/ArmorRating_Blunt
-
- 10
-
-
-
-
- Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="LeftLandingWheel"]/armor/ArmorRating_Sharp
-
- 6
-
-
Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="RightLandingWheel"]/health
@@ -87,40 +73,12 @@
-
- Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="RightLandingWheel"]/armor/ArmorRating_Blunt
-
- 10
-
-
-
-
- Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="RightLandingWheel"]/armor/ArmorRating_Sharp
-
- 6
-
-
-
Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="RearLeftLandingWheel"]/health
90
-
-
- Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="RearLeftLandingWheel"]/armor/ArmorRating_Blunt
-
- 10
-
-
-
-
- Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="RearLeftLandingWheel"]/armor/ArmorRating_Sharp
-
- 6
-
-
Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="RearRightLandingWheel"]/health
@@ -129,18 +87,4 @@
-
- Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="RearRightLandingWheel"]/armor/ArmorRating_Blunt
-
- 10
-
-
-
-
- Defs/Vehicles.VehicleDef[defName="JAHV_Avenger"]/components/li[key="RearRightLandingWheel"]/armor/ArmorRating_Sharp
-
- 6
-
-
-
\ No newline at end of file
diff --git a/ModPatches/Titan Vehicles/Patches/Titan Vehicles/Conquistador.xml b/ModPatches/Titan Vehicles/Patches/Titan Vehicles/Conquistador.xml
index 2c0103a56c..b999e87f6a 100644
--- a/ModPatches/Titan Vehicles/Patches/Titan Vehicles/Conquistador.xml
+++ b/ModPatches/Titan Vehicles/Patches/Titan Vehicles/Conquistador.xml
@@ -79,14 +79,14 @@
Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/statBases/ArmorRating_Blunt
- 125
+ 120
Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/statBases/ArmorRating_Sharp
- 85
+ 40
@@ -100,14 +100,14 @@
Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/components/li[key="Bow"]/armor/ArmorRating_Blunt
- 150
+ 60
Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/components/li[key="Bow"]/armor/ArmorRating_Sharp
- 95
+ 20
@@ -121,14 +121,14 @@
Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/components/li[key="Port"]/armor/ArmorRating_Blunt
- 150
+ 60
Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/components/li[key="Port"]/armor/ArmorRating_Sharp
- 95
+ 20
@@ -142,14 +142,14 @@
Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/components/li[key="Starbord"]/armor/ArmorRating_Blunt
- 150
+ 60
Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/components/li[key="Starbord"]/armor/ArmorRating_Sharp
- 95
+ 20
@@ -163,14 +163,14 @@
Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/components/li[key="Stern"]/armor/ArmorRating_Blunt
- 150
+ 60
Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/components/li[key="Stern"]/armor/ArmorRating_Sharp
- 95
+ 20
@@ -184,14 +184,14 @@
Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/components/li[key="Rudder"]/armor/ArmorRating_Blunt
- 150
+ 60
Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/components/li[key="Rudder"]/armor/ArmorRating_Sharp
- 95
+ 20
@@ -201,19 +201,5 @@
280
-
-
- Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/components/li[key="hydrogen condenser"]/armor/ArmorRating_Blunt
-
- 150
-
-
-
-
- Defs/Vehicles.VehicleDef[defName="JAHV_Conquistador"]/components/li[key="hydrogen condenser"]/armor/ArmorRating_Sharp
-
- 95
-
-
diff --git a/ModPatches/Titan Vehicles/Patches/Titan Vehicles/Warchief.xml b/ModPatches/Titan Vehicles/Patches/Titan Vehicles/Warchief.xml
index a6d1772e7d..4e6b95e76b 100644
--- a/ModPatches/Titan Vehicles/Patches/Titan Vehicles/Warchief.xml
+++ b/ModPatches/Titan Vehicles/Patches/Titan Vehicles/Warchief.xml
@@ -131,8 +131,8 @@
UI/Gizmos/FireRate_Burst
- 15
- 30
+ 10
+ 15
60
4
Auto
@@ -167,14 +167,14 @@
Defs/Vehicles.VehicleDef[defName="JASV_Warchief"]/statBases/ArmorRating_Blunt
- 110
+ 48
Defs/Vehicles.VehicleDef[defName="JASV_Warchief"]/statBases/ArmorRating_Sharp
- 70
+ 20
@@ -188,14 +188,14 @@
Defs/Vehicles.VehicleDef[defName="JASV_Warchief"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt
- 120
+ 170
Defs/Vehicles.VehicleDef[defName="JASV_Warchief"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp
- 80
+ 85
@@ -209,14 +209,14 @@
Defs/Vehicles.VehicleDef[defName="JASV_Warchief"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt
- 100
+ 140
Defs/Vehicles.VehicleDef[defName="JASV_Warchief"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp
- 75
+ 70
@@ -230,14 +230,14 @@
Defs/Vehicles.VehicleDef[defName="JASV_Warchief"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt
- 100
+ 140
Defs/Vehicles.VehicleDef[defName="JASV_Warchief"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp
- 75
+ 70
@@ -251,14 +251,14 @@
Defs/Vehicles.VehicleDef[defName="JASV_Warchief"]/components/li[key="RoofArmorPlating"]/armor/ArmorRating_Blunt
- 110
+ 52
Defs/Vehicles.VehicleDef[defName="JASV_Warchief"]/components/li[key="RoofArmorPlating"]/armor/ArmorRating_Sharp
- 80
+ 26
@@ -272,14 +272,14 @@
Defs/Vehicles.VehicleDef[defName="JASV_Warchief"]/components/li[key="Roof"]/armor/ArmorRating_Blunt
- 100
+ 32
Defs/Vehicles.VehicleDef[defName="JASV_Warchief"]/components/li[key="Roof"]/armor/ArmorRating_Sharp
- 75
+ 16
From 29bac52bb5c33ada3e7aa947fdd81a2ba0f3ee39 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Sun, 11 Aug 2024 04:36:03 -0400
Subject: [PATCH 40/69] Housekeeping
---
LoadFolders.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 55fad88a5b..4c0758b40f 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -403,7 +403,7 @@
ModPatches/Thog's Armor
ModPatches/Thrumbo Plushie
ModPatches/Thrumkin
- Modpatches/Titan Vehicles
+ Modpatches/Titan Vehicles
ModPatches/Toolmetrics Redux
ModPatches/TouhouStyle
ModPatches/Tribal Warrior Set
From d3b5bf8e0ae77dee12bf0d40ab9c8c984e46045e Mon Sep 17 00:00:00 2001
From: SamaelGray <56392968+SamaelGray@users.noreply.github.com>
Date: Sun, 11 Aug 2024 13:45:27 +0330
Subject: [PATCH 41/69] Shield patch refactor
Not tested.
---
.../Shields/BarbarianBannerShields.xml | 522 ++++++++----------
.../Shields/BarbarianMetalShields.xml | 356 +++++++-----
.../Shields/BarbarianRoundShields.xml | 356 +++++++-----
.../Shields/BarbarianTallShields.xml | 234 +++++++-
4 files changed, 893 insertions(+), 575 deletions(-)
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianBannerShields.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianBannerShields.xml
index aed22fc70e..628f7c4625 100644
--- a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianBannerShields.xml
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianBannerShields.xml
@@ -1,311 +1,257 @@
+
+ Defs/ThingDef[@Name="pphhyy_BaseShield"]
+ ParentName
+ ArmorSmithableBase
+
+
+
+ Defs/ThingDef[@Name="pphhyy_BaseShield"]
+
+ CombatExtended.Apparel_Shield
+
+ false
+ false
+
+ LeftShoulder
+
+
+ Shield
+
+
+
+ Armor
+
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_BarbBannerI" or
+ defName="pphhyy_Barbarian_BarbBannerII" or
+ defName="pphhyy_Barbarian_BarbBannerIII" or
+ defName="pphhyy_Barbarian_BarbBannerIV"]/equippedStatOffsets
+
+
+ -0.25
+ 0.1
+ -0.05
+ -0.5
+ -0.25
+ -0.15
+ -0.1
+ 0.5
+
+
+
+
Defs/ThingDef[
defName="pphhyy_Barbarian_BarbBannerI" or
defName="pphhyy_Barbarian_BarbBannerII" or
defName="pphhyy_Barbarian_BarbBannerIII" or
- defName="pphhyy_Barbarian_BarbBannerIV"]
-
+ defName="pphhyy_Barbarian_BarbBannerIV"]/tools
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_BarbBannerI" or
+ defName="pphhyy_Barbarian_BarbBannerII" or
+ defName="pphhyy_Barbarian_BarbBannerIII" or
+ defName="pphhyy_Barbarian_BarbBannerIV"]/comps/li[@Class="VFECore.CompProperties_Shield"]
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_BarbBannerI" or
+ defName="pphhyy_Barbarian_BarbBannerII" or
+ defName="pphhyy_Barbarian_BarbBannerIII" or
+ defName="pphhyy_Barbarian_BarbBannerIV"]
+
+
+
+ Hands
+
+
+
- Defs
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_BarbBannerI" or
+ defName="pphhyy_Barbarian_BarbBannerII" or
+ defName="pphhyy_Barbarian_BarbBannerIII" or
+ defName="pphhyy_Barbarian_BarbBannerIV"]/statBases
+ 1
+ 10
+ 4
+
+
-
- pphhyy_Barbarian_BarbBannerI
- Barbarian Banner I
- The barbarian banner is a fierce and intimidating symbol, crafted from a sturdy wooden shield and adorned with the skulls and horns of defeated foes. The banner is mounted on a tall standard, and is sure to strike fear into the hearts of any who behold it. The skull and bones design on the banner represents the ferocity and power of the barbarian tribe, and serves as a warning to all who would dare to challenge them.
- Medieval
-
- Shields/BarbBannerI
- Graphic_Single
-
-
- 200
- 2
- 10
- 4
- 1.0
-
-
- -0.25
- 0.1
- -0.05
- -0.5
- -0.25
- -0.15
- -0.1
- 0.5
-
-
-
- TribalShield
-
-
-
- CombatExtended.PawnRenderNode_Apparel
- CombatExtended.PawnRenderNodeWorker_Drafted
- Shields/BarbBannerI
- CutoutComplex
- ApparelBody
-
- 2.5
-
- 80
-
-
- -5
- (0, 0, -0.1)
- 30
-
-
- -30
-
-
- -5
- (0.15, 0, -0.1)
-
-
- (0.15, 0, -0.1)
-
-
-
-
-
-
-
-
- Hands
-
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbBannerI"]
+
+
+
+ TribalShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/BarbBannerI
+ CutoutComplex
+ ApparelBody
+
+ 1.3
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
-
-
- Armor
-
-
+
+
+
+
-
- pphhyy_Barbarian_BarbBannerII
- Barbarian Banner II
- The barbarian banner is a fierce and intimidating symbol, crafted from a sturdy wooden shield and adorned with the skulls and horns of defeated foes. The banner is mounted on a tall standard, and is sure to strike fear into the hearts of any who behold it. The skull and bones design on the banner represents the ferocity and power of the barbarian tribe, and serves as a warning to all who would dare to challenge them.
- Medieval
-
- Shields/BarbBannerII
- Graphic_Single
-
-
- 200
- 2
- 10
- 4
- 1.0
-
-
- -0.25
- 0.1
- -0.05
- -0.5
- -0.25
- -0.15
- -0.1
- 0.5
-
-
-
- TribalShield
-
-
-
- CombatExtended.PawnRenderNode_Apparel
- CombatExtended.PawnRenderNodeWorker_Drafted
- Shields/BarbBannerII
- CutoutComplex
- ApparelBody
-
- 2.5
-
- 80
-
-
- -5
- (0, 0, -0.1)
- 30
-
-
- -30
-
-
- -5
- (0.15, 0, -0.1)
-
-
- (0.15, 0, -0.1)
-
-
-
-
-
-
-
-
- Hands
-
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbBannerI"]
+
+
+
+ TribalShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/BarbBannerII
+ CutoutComplex
+ ApparelBody
+
+ 1.3
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
-
-
- Armor
-
-
+
+
+
+
-
- pphhyy_Barbarian_BarbBannerIII
- Barbarian Banner III
- The barbarian banner is a fierce and intimidating symbol, crafted from a sturdy wooden shield and adorned with the skulls and horns of defeated foes. The banner is mounted on a tall standard, and is sure to strike fear into the hearts of any who behold it. The skull and bones design on the banner represents the ferocity and power of the barbarian tribe, and serves as a warning to all who would dare to challenge them.
- Medieval
-
- Shields/BarbBannerIII
- Graphic_Single
-
-
- 200
- 2
- 10
- 4
- 1.0
-
-
- -0.25
- 0.1
- -0.05
- -0.5
- -0.25
- -0.15
- -0.1
- 0.5
-
-
-
- TribalShield
-
-
-
- CombatExtended.PawnRenderNode_Apparel
- CombatExtended.PawnRenderNodeWorker_Drafted
- Shields/BarbBannerIII
- CutoutComplex
- ApparelBody
-
- 2.5
-
- 80
-
-
- -5
- (0, 0, -0.1)
- 30
-
-
- -30
-
-
- -5
- (0.15, 0, -0.1)
-
-
- (0.15, 0, -0.1)
-
-
-
-
-
-
-
-
- Hands
-
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbBannerI"]
+
+
+
+ TribalShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/BarbBannerIII
+ CutoutComplex
+ ApparelBody
+
+ 1.3
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
-
-
- Armor
-
-
+
+
+
+
-
- pphhyy_Barbarian_BarbBannerIV
- Barbarian Banner IV
- The barbarian banner is a fierce and intimidating symbol, crafted from a sturdy wooden shield and adorned with the skulls and horns of defeated foes. The banner is mounted on a tall standard, and is sure to strike fear into the hearts of any who behold it. The skull and bones design on the banner represents the ferocity and power of the barbarian tribe, and serves as a warning to all who would dare to challenge them.
- Medieval
-
- Shields/BarbBannerIV
- Graphic_Single
-
-
- 200
- 2
- 10
- 4
- 1.0
-
-
- -0.25
- 0.1
- -0.05
- -0.5
- -0.25
- -0.15
- -0.1
- 0.5
-
-
-
- TribalShield
-
-
-
- CombatExtended.PawnRenderNode_Apparel
- CombatExtended.PawnRenderNodeWorker_Drafted
- Shields/BarbBannerIV
- CutoutComplex
- ApparelBody
-
- 2.5
-
- 80
-
-
- -5
- (0, 0, -0.1)
- 30
-
-
- -30
-
-
- -5
- (0.15, 0, -0.1)
-
-
- (0.15, 0, -0.1)
-
-
-
-
-
-
-
-
- Hands
-
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_BarbBannerI"]
+
+
+
+ TribalShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/BarbBannerIV
+ CutoutComplex
+ ApparelBody
+
+ 1.3
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
-
-
- Armor
-
-
-
+
+
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianMetalShields.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianMetalShields.xml
index 23d41cdcd1..0eae10ef4b 100644
--- a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianMetalShields.xml
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianMetalShields.xml
@@ -1,158 +1,230 @@
-
- Defs/ThingDef[defName="pphhyy_Barbarian_MetalShield" or defName="pphhyy_Barbarian_MetalShieldII" or defName="pphhyy_Barbarian_MetalShieldIII"]
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_MetalShield" or
+ defName="pphhyy_Barbarian_MetalShieldII" or
+ defName="pphhyy_Barbarian_MetalShieldIII"]
+ ParentName
+ ShieldBase
- Defs
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_MetalShield" or
+ defName="pphhyy_Barbarian_MetalShieldII" or
+ defName="pphhyy_Barbarian_MetalShieldIII"]
+
+ false
+ false
+
+ LeftShoulder
+
+
+ Shield
+
+
+
+ Armor
+
+
+
-
- pphhyy_Barbarian_MetalShield
- Barbarian Metal Shield
- A Metal shield looted from the battlefield.
- Medieval
-
- Shields/Barbarian_MetalShield
- Graphic_Single
- CutoutComplex
-
-
- 125
- 7
- 8
- 5
- 6
-
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
-
- Child, Adult
-
- pphhyy_Barbarian_BarbMetalShield1
-
-
-
-
-
- Hands
- Arms
- Shoulders
- Torso
- Neck
-
-
-
-
- Armor
-
-
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_MetalShield" or
+ defName="pphhyy_Barbarian_MetalShieldII" or
+ defName="pphhyy_Barbarian_MetalShieldIII"]/equippedStatOffsets
+
+
+ -0.2
+ -1
+ -0.15
+ -0.08
+ -0.25
+ -0.05
+ 1.0
+
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_MetalShield" or
+ defName="pphhyy_Barbarian_MetalShieldII" or
+ defName="pphhyy_Barbarian_MetalShieldIII"]/weaponTags
+
-
- pphhyy_Barbarian_MetalShieldII
- Barbarian Metal Shield II
- A Metal shield looted from the battlefield.
- Medieval
-
- Shields/Barbarian_MetalShieldII
- Graphic_Single
- CutoutComplex
-
-
- 125
- 7
- 8
- 5
- 6
-
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
-
- Child, Adult
-
- pphhyy_Barbarian_BarbMetalShield2
-
-
-
-
-
- Hands
- Arms
- Shoulders
- Torso
- Neck
-
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_MetalShield" or
+ defName="pphhyy_Barbarian_MetalShieldII" or
+ defName="pphhyy_Barbarian_MetalShieldIII"]/tools
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_MetalShield" or
+ defName="pphhyy_Barbarian_MetalShieldII" or
+ defName="pphhyy_Barbarian_MetalShieldIII"]/comps/li[@Class="VFECore.CompProperties_Shield"]
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_MetalShield" or
+ defName="pphhyy_Barbarian_MetalShieldII" or
+ defName="pphhyy_Barbarian_MetalShieldIII"]
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+
+
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_MetalShield" or
+ defName="pphhyy_Barbarian_MetalShieldII" or
+ defName="pphhyy_Barbarian_MetalShieldIII"]/statBases
+
+
+ 125
+ 7
+ 8
+ 5
+ 6
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_MetalShield"]
+
+
+
+ pphhyy_Barbarian_BarbMetalShield1
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/Barbarian_MetalShield
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.15)
+
+
+ (0.15, 0, -0.15)
+
+
-
-
- Armor
-
-
+
+
+
+
-
- pphhyy_Barbarian_MetalShieldIII
- Barbarian Metal Shield III
- A Metal shield looted from the battlefield.
- Medieval
-
- Shields/Barbarian_MetalShieldIII
- Graphic_Single
- CutoutComplex
-
-
- 125
- 7
- 8
- 5
- 6
-
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
-
- Child, Adult
-
- pphhyy_Barbarian_BarbMetalShield3
-
-
-
-
-
- Hands
- Arms
- Shoulders
- Torso
- Neck
-
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_MetalShieldII"]
+
+
+
+ pphhyy_Barbarian_BarbMetalShield2
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/Barbarian_MetalShieldII
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.15)
+
+
+ (0.15, 0, -0.15)
+
+
-
-
- Armor
-
-
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_MetalShieldIII"]
+
+
+
+ pphhyy_Barbarian_BarbMetalShield3
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/Barbarian_MetalShieldIII
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.15)
+
+
+ (0.15, 0, -0.15)
+
+
+
+
+
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianRoundShields.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianRoundShields.xml
index 3686adf1f5..8b3a5f93fc 100644
--- a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianRoundShields.xml
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianRoundShields.xml
@@ -1,158 +1,230 @@
-
- Defs/ThingDef[defName="pphhyy_Barbarian_RoundShield" or defName="pphhyy_Barbarian_RoundShieldII" or defName="pphhyy_Barbarian_RoundShieldIII"]
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_RoundShield" or
+ defName="pphhyy_Barbarian_RoundShieldII" or
+ defName="pphhyy_Barbarian_RoundShieldIII"]
+ ParentName
+ ShieldBase
- Defs
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_RoundShield" or
+ defName="pphhyy_Barbarian_RoundShieldII" or
+ defName="pphhyy_Barbarian_RoundShieldIII"]
+
+ false
+ false
+
+ LeftShoulder
+
+
+ Shield
+
+
+
+ Armor
+
+
+
-
- pphhyy_Barbarian_RoundShield
- Barbarian Round Shield
- A Round shield looted from the battlefield.
- Medieval
-
- Shields/Barbarian_RoundShield
- Graphic_Single
- CutoutComplex
-
-
- 150
- 4.5
- 7
- 5
- 4.0
-
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
-
- Child, Adult
-
- pphhyy_Barbarian_BarbRoundShield1
-
-
-
-
-
- Hands
- Arms
- Shoulders
- Torso
- Neck
-
-
-
-
- Armor
-
-
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_RoundShield" or
+ defName="pphhyy_Barbarian_RoundShieldII" or
+ defName="pphhyy_Barbarian_RoundShieldIII"]/equippedStatOffsets
+
+
+ -0.2
+ -1
+ -0.15
+ -0.08
+ -0.25
+ -0.05
+ 1.0
+
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_RoundShield" or
+ defName="pphhyy_Barbarian_RoundShieldII" or
+ defName="pphhyy_Barbarian_RoundShieldIII"]/weaponTags
+
-
- pphhyy_Barbarian_RoundShieldII
- Barbarian Round Shield II
- A Round shield looted from the battlefield.
- Medieval
-
- Shields/Barbarian_RoundShieldII
- Graphic_Single
- CutoutComplex
-
-
- 150
- 4.5
- 7
- 5
- 4.0
-
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
-
- Child, Adult
-
- pphhyy_Barbarian_BarbRoundShield2
-
-
-
-
-
- Hands
- Arms
- Shoulders
- Torso
- Neck
-
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_RoundShield" or
+ defName="pphhyy_Barbarian_RoundShieldII" or
+ defName="pphhyy_Barbarian_RoundShieldIII"]/tools
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_RoundShield" or
+ defName="pphhyy_Barbarian_RoundShieldII" or
+ defName="pphhyy_Barbarian_RoundShieldIII"]/comps/li[@Class="VFECore.CompProperties_Shield"]
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_RoundShield" or
+ defName="pphhyy_Barbarian_RoundShieldII" or
+ defName="pphhyy_Barbarian_RoundShieldIII"]
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+
+
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_RoundShield" or
+ defName="pphhyy_Barbarian_RoundShieldII" or
+ defName="pphhyy_Barbarian_RoundShieldIII"]/statBases
+
+
+ 150
+ 4.5
+ 7
+ 5
+ 4.0
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RoundShield"]
+
+
+
+ pphhyy_Barbarian_BarbRoundShield1
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/Barbarian_RoundShield
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.15)
+
+
+ (0.15, 0, -0.15)
+
+
-
-
- Armor
-
-
+
+
+
+
-
- pphhyy_Barbarian_RoundShieldIII
- Barbarian Round Shield III
- A Round shield looted from the battlefield.
- Medieval
-
- Shields/Barbarian_RoundShieldIII
- Graphic_Single
- CutoutComplex
-
-
- 150
- 4.5
- 7
- 5
- 4.0
-
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
-
- Child, Adult
-
- pphhyy_Barbarian_BarbRoundShield3
-
-
-
-
-
- Hands
- Arms
- Shoulders
- Torso
- Neck
-
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RoundShieldII"]
+
+
+
+ pphhyy_Barbarian_BarbRoundShield2
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/Barbarian_RoundShieldII
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.15)
+
+
+ (0.15, 0, -0.15)
+
+
-
-
- Armor
-
-
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_RoundShieldIII"]
+
+
+
+ pphhyy_Barbarian_BarbRoundShield3
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/Barbarian_RoundShieldIII
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.15)
+
+
+ (0.15, 0, -0.15)
+
+
+
+
+
diff --git a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianTallShields.xml b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianTallShields.xml
index 08858f2232..9ef9ec0a1b 100644
--- a/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianTallShields.xml
+++ b/ModPatches/Medieval Overhaul Barbarians/ThingDefs_Misc/Shields/BarbarianTallShields.xml
@@ -1,6 +1,237 @@
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_TallShield" or
+ defName="pphhyy_Barbarian_TallShieldII" or
+ defName="pphhyy_Barbarian_TallShieldIII"]
+ ParentName
+ ShieldBase
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_TallShield" or
+ defName="pphhyy_Barbarian_TallShieldII" or
+ defName="pphhyy_Barbarian_TallShieldIII"]
+
+
+ false
+ false
+
+ LeftShoulder
+
+
+ Shield
+
+
+
+ Armor
+
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_TallShield" or
+ defName="pphhyy_Barbarian_TallShieldII" or
+ defName="pphhyy_Barbarian_TallShieldIII"]/equippedStatOffsets
+
+
+ -0.25
+ -3
+ -0.4
+ -0.2
+ -0.5
+ -0.2
+ 1.0
+
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_TallShield" or
+ defName="pphhyy_Barbarian_TallShieldII" or
+ defName="pphhyy_Barbarian_TallShieldIII"]/weaponTags
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_TallShield" or
+ defName="pphhyy_Barbarian_TallShieldII" or
+ defName="pphhyy_Barbarian_TallShieldIII"]/tools
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_TallShield" or
+ defName="pphhyy_Barbarian_TallShieldII" or
+ defName="pphhyy_Barbarian_TallShieldIII"]/comps/li[@Class="VFECore.CompProperties_Shield"]
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_TallShield" or
+ defName="pphhyy_Barbarian_TallShieldII" or
+ defName="pphhyy_Barbarian_TallShieldIII"]
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+ FullHead
+
+
+ Legs
+
+
+
+
+
+
+ Defs/ThingDef[
+ defName="pphhyy_Barbarian_TallShield" or
+ defName="pphhyy_Barbarian_TallShieldII" or
+ defName="pphhyy_Barbarian_TallShieldIII"]/statBases
+
+
+ 150
+ 5
+ 8
+ 5
+ 3.0
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_TallShield"]
+
+
+
+ pphhyy_Barbarian_BarbTallShield1
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/Barbarian_TallShield
+ CutoutComplex
+ ApparelBody
+
+ 0.8
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_TallShieldII"]
+
+
+
+ pphhyy_Barbarian_BarbTallShield2
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/Barbarian_TallShieldII
+ CutoutComplex
+ ApparelBody
+
+ 0.8
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="pphhyy_Barbarian_TallShieldIII"]
+
+
+
+ pphhyy_Barbarian_BarbTallShield3
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Shields/Barbarian_TallShieldIII
+ CutoutComplex
+ ApparelBody
+
+ 0.8
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.15, 0, -0.1)
+
+
+
+
+
+
+
+
Defs/ThingDef[defName="pphhyy_Barbarian_TallShield" or defName="pphhyy_Barbarian_TallShieldII" or defName="pphhyy_Barbarian_TallShieldIII"]
@@ -54,7 +285,6 @@
Legs
- true
@@ -107,7 +337,6 @@
Legs
- true
@@ -160,7 +389,6 @@
Legs
- true
From 43f29079c073f407d60408ae1e78e198cc0271e5 Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Mon, 12 Aug 2024 15:00:49 +0800
Subject: [PATCH 42/69] Revert "Reduce cost"
This reverts commit 1bd1589dfecd8ec592f6fb6965534a4c3d6c0c79.
---
.../Patches/Pulse Weaponry/RangedSpacer.xml | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
index 0d9a11d417..7d6ec35845 100644
--- a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
@@ -70,11 +70,11 @@
Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]
-
+
-
+
Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/weaponTags
@@ -82,14 +82,6 @@
CE_OneHandedWeapon
-
-
-
- Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/costList/ComponentSpacer
-
- 1
-
-
Defs/ThingDef[defName = "DV_PulseSMG" or defName = "DV_PulseSuppressor"]/tools
From 465670740a27032738af5de57b83e46f0521165d Mon Sep 17 00:00:00 2001
From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com>
Date: Mon, 12 Aug 2024 15:16:15 +0800
Subject: [PATCH 43/69] New Taser damage and buff
New Taser damage and add new damage to stick and buff stun chance
---
.../Defs/Pulse Weaponry/Damage.xml | 17 +++++++++++++++++
.../Patches/Pulse Weaponry/RangedSpacer.xml | 10 +++++++---
2 files changed, 24 insertions(+), 3 deletions(-)
create mode 100644 ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml
diff --git a/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml b/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml
new file mode 100644
index 0000000000..ac5e515f87
--- /dev/null
+++ b/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml
@@ -0,0 +1,17 @@
+
+
+
+ PW_Taser
+ taser
+ {0} has been tasered to death.
+ MuscleSpasms
+ TaserStab
+ TaserStab
+ 0.45
+
+
+ true
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
index 7d6ec35845..e51f739262 100644
--- a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
@@ -24,10 +24,14 @@
5
+
+ PW_Taser
+ 10
+
Stun
32
- 0.20
+ 0.40
1.68
@@ -70,11 +74,11 @@
Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]
-
+
-
+
Defs/ThingDef[defName="DV_MeleeWeapon_Stunstick"]/weaponTags
From 9e041155d6c7077bdf1ca7fab622703491e43284 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Tue, 13 Aug 2024 04:07:55 -0400
Subject: [PATCH 44/69] Make the muscle spasms work
---
.../Defs/Pulse Weaponry/Damage.xml | 39 ++++++++++++++++---
.../Patches/Pulse Weaponry/RangedSpacer.xml | 6 +--
2 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml b/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml
index ac5e515f87..8c717589f0 100644
--- a/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml
+++ b/ModPatches/Pulse Weaponry/Defs/Pulse Weaponry/Damage.xml
@@ -1,17 +1,46 @@
+
+
+ StunstickSmash
+ PW_Taser
+
+ CombatExtended.Verb_MeleeAttackCE
+ PW_Taser
+
+ MeleeAttack
+ Maneuver_Smash_MeleeHit
+ Maneuver_Smash_MeleeDeflect
+ Maneuver_Smash_MeleeMiss
+ Maneuver_Smash_MeleeDodge
+
+
+
+ PW_Taser
+ shock
+
+
PW_Taser
- taser
- {0} has been tasered to death.
- MuscleSpasms
- TaserStab
- TaserStab
+ shock
+ {0} has been shocked to death.
+ StunstickBurn
0.45
+ true
true
+
+
+ StunstickBurn
+ stunstick burn
+ a stunstick burn
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
index e51f739262..7fb687f49d 100644
--- a/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
+++ b/ModPatches/Pulse Weaponry/Patches/Pulse Weaponry/RangedSpacer.xml
@@ -20,14 +20,10 @@
head
- Poke
+ PW_Taser
5
-
- PW_Taser
- 10
-
Stun
32
From 5d65337d983916647d41d660973b2aef13254433 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Tue, 13 Aug 2024 04:41:02 -0400
Subject: [PATCH 45/69] Hide Raider Arty
---
.../Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml
index d67ea38a79..26d90672c7 100644
--- a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml
+++ b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml
@@ -65,6 +65,7 @@
+
Things/Building/Artillery/TurretArtillery_MenuIcon
0.9
5
From 2c9d2d594a3aec3dacbfa16df143d3545aa10e03 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Tue, 13 Aug 2024 19:41:26 -0400
Subject: [PATCH 46/69] Housekeeping, patch some apparel that got missed
---
.../PawnKindDefs/MO_Pawns_Cultists.xml | 1 +
.../PawnKindDefs/MO_Pawns_Medieval.xml | 1 +
.../ThingDefs_Misc/MO_Apparel_Armor.xml | 20 +++++++++++++++++++
.../ThingDefs_Misc/MO_Apparel_Misc.xml | 16 +++++++++++++++
4 files changed, 38 insertions(+)
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Cultists.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Cultists.xml
index 82967c8f56..f4588995df 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Cultists.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Cultists.xml
@@ -147,4 +147,5 @@
CE_Bow
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Medieval.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Medieval.xml
index d97f76bfb6..270b31a1fb 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Medieval.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/PawnKindDefs/MO_Pawns_Medieval.xml
@@ -176,4 +176,5 @@
CE_Bow
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Armor.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Armor.xml
index 5e83b725bd..942463fc69 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Armor.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Armor.xml
@@ -188,6 +188,26 @@
Defs/ThingDef[defName="DankPyon_Apparel_Breast_Plate"]/equippedStatOffsets/MoveSpeed
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_Zweihanders_Cuirass"]/statBases
+
+ 25
+ 10
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_Zweihanders_Cuirass"]/statBases/StuffEffectMultiplierArmor
+
+ 3.2
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_Zweihanders_Cuirass"]/equippedStatOffsets/MoveSpeed
+
+
Defs/ThingDef[defName="DankPyon_Apparel_FullPlate" or defName="DankPyon_Apparel_FullPlateGilded" or defName="DankPyon_Apparel_AdornedHeavyPlate"]/statBases
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Misc.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Misc.xml
index e2146bad45..3f99212f3f 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Misc.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Misc.xml
@@ -161,6 +161,22 @@
+
+
+ Defs/ThingDef[defName="DankPyon_Headgear_CultistHood"]/statBases
+
+ 1
+ 0
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Headgear_CultistHood"]/statBases/StuffEffectMultiplierArmor
+
+ 2
+
+
+
Defs/ThingDef[defName="DankPyon_Apparel_DirewolfPelt" or defName="DankPyon_Apparel_HyenaPelt"]/statBases
From 69776a3ba6c4f86fe63fb95cfb86db1acd4e131a Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Tue, 13 Aug 2024 20:47:48 -0400
Subject: [PATCH 47/69] Convert shields over
---
.../ThingDefs_Misc/Shields/MO_Shields.xml | 466 ++++++++++++++++--
1 file changed, 429 insertions(+), 37 deletions(-)
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml
index ba9543e3c1..428eb5f550 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml
@@ -18,20 +18,21 @@
- Defs/ThingDef[@Name="DankPyon_BaseShield"]/apparel/layers
+ Defs/ThingDef[@Name="DankPyon_BaseShield"]/apparel
-
- Shield
-
-
-
-
-
- Defs/ThingDef[@Name="DankPyon_BaseShield"]/apparel/bodyPartGroups
-
-
- LeftShoulder
-
+
+ false
+ false
+
+ LeftShoulder
+
+
+ Shield
+
+
+
+ Armor
+
@@ -40,8 +41,21 @@
Defs/ThingDef[@Name="DankPyon_BaseShield"]/tools
-
- Defs/ThingDef[defName="DankPyon_Shield" or defName="DankPyon_ShieldKite" or defName="DankPyon_ShieldHeater" or defName="DankPyon_ShieldHeater_Amboise" or defName="DankPyon_ShieldHeater_Soren" or defName="DankPyon_ShieldHeater_Oswin" or defName="DankPyon_ShieldHeater_Hesse" or defName="DankPyon_ShieldLiving" or defName="DankPyon_ShieldLindwurm"]/comps/li[@Class="VFECore.CompProperties_Shield"]
+
+
+
+ Defs/ThingDef[@Name="DankPyon_BaseShield"]/equippedStatOffsets
+
+
+ -0.2
+ -1
+ -0.15
+ -0.08
+ -0.25
+ -0.05
+ 1.0
+
+
@@ -60,42 +74,84 @@
+
+ Defs/ThingDef[
+ defName="DankPyon_Shield" or
+ defName="DankPyon_ShieldKite" or
+ defName="DankPyon_ShieldHeater" or
+ defName="DankPyon_ShieldHeater_Amboise" or
+ defName="DankPyon_ShieldHeater_Soren" or
+ defName="DankPyon_ShieldHeater_Oswin" or
+ defName="DankPyon_ShieldHeater_Hesse" or
+ defName="DankPyon_ShieldLiving" or
+ defName="DankPyon_ShieldLindwurm"]/comps/li[@Class="VFECore.CompProperties_Shield"]
+
+
- Defs/ThingDef[defName="DankPyon_Shield" or defName="DankPyon_ShieldKite" or defName="DankPyon_ShieldHeater" or @Name="DankPyon_ShieldHeaterBase" or defName="DankPyon_ShieldLiving" or defName="DankPyon_ShieldLindwurm"
- ]/statBases
+ Defs/ThingDef[
+ defName="DankPyon_Shield" or
+ defName="DankPyon_ShieldKite" or
+ defName="DankPyon_ShieldHeater" or
+ @Name="DankPyon_ShieldHeaterBase" or
+ defName="DankPyon_ShieldLiving" or
+ defName="DankPyon_ShieldLindwurm"]/statBases
8
5
-
-
+
- Defs/ThingDef[@Name="DankPyon_BaseShield"]/equippedStatOffsets
+ Defs/ThingDef[defName="DankPyon_Shield"]/statBases/StuffEffectMultiplierArmor
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
+ 2.5
-
-
-
- Defs/ThingDef[defName="DankPyon_Shield"]/statBases/StuffEffectMultiplierArmor
+
+ Defs/ThingDef[defName="DankPyon_Shield"]
- 2.5
+
+
+ DankPyon_RoundShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/IconShield
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.15)
+
+
+ (0.15, 0, -0.15)
+
+
+
+
+
+
Defs/ThingDef[defName="DankPyon_ShieldKite"]/statBases/StuffEffectMultiplierArmor
@@ -103,6 +159,48 @@
+
+ Defs/ThingDef[defName="DankPyon_ShieldKite"]
+
+
+
+ DankPyon_ShieldKite
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/IconKite
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
Defs/ThingDef[defName="DankPyon_ShieldHeater"]/statBases/StuffEffectMultiplierArmor
@@ -110,14 +208,224 @@
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater"]
+
+
+
+ DankPyon_ShieldHeater
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/IconHeater
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
Defs/ThingDef[@Name="DankPyon_ShieldHeaterBase"]/statBases/StuffEffectMultiplierArmor
2.85
-
-
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Amboise"]
+
+
+
+ DankPyon_ShieldHeater_Amboise
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/HeaterAmboise/HeaterAmboise
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Soren"]
+
+
+
+ DankPyon_ShieldHeater_Soren
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/HeaterSoren/HeaterSoren
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Oswin"]
+
+
+
+ DankPyon_ShieldHeater_Oswin
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/HeaterOswin/HeaterOswin
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Hesse"]
+
+
+
+ DankPyon_ShieldHeater_Hesse
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/HeaterHesse/HeaterHesse
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
Defs/ThingDef[defName="DankPyon_ShieldLiving"]/statBases/ArmorRating_Sharp
@@ -139,7 +447,49 @@
-
+
+ Defs/ThingDef[defName="DankPyon_ShieldLiving"]
+
+
+
+ DankPyon_ShieldSchrat
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/HeaterSchrat/HeaterSchrat
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.15)
+
+
+ (0.15, 0, -0.15)
+
+
+
+
+
+
+
+
+
+
Defs/ThingDef[defName="DankPyon_ShieldLindwurm"]/statBases/ArmorRating_Sharp
@@ -161,4 +511,46 @@
+
+ Defs/ThingDef[defName="DankPyon_ShieldLindwurm"]
+
+
+
+ DankPyon_ShieldSchrat
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/HeaterLindwurm/HeaterLindwurm
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From f3de78d06076612b866653085a2fe9af399d27fa Mon Sep 17 00:00:00 2001
From: ViralReaction <136116069+ViralReaction@users.noreply.github.com>
Date: Tue, 13 Aug 2024 18:58:05 -0600
Subject: [PATCH 48/69] Raider Artillery Research Fix
* Hides Raider Artillery from Research
* Cleanup
---
.../NewRaiderArtillery.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml
index 26d90672c7..ce9ca84393 100644
--- a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml
+++ b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml
@@ -29,7 +29,7 @@
(0,0,-2)
true
(3,3)
-
+
true
false
@@ -65,7 +65,6 @@
-
Things/Building/Artillery/TurretArtillery_MenuIcon
0.9
5
@@ -73,7 +72,8 @@
True
-
+
+
From 76446dc239d0447e276bc0094a4dc2f0107f0b56 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Tue, 13 Aug 2024 21:23:54 -0400
Subject: [PATCH 49/69] Fix typo
---
LoadFolders.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 8371c74f75..091150fea6 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -288,7 +288,7 @@
ModPatches/Medicine Supplements (Continued)
ModPatches/Medieval Medicines 1.4 Medieval Overhaul Edition
ModPatches/Medieval Overhaul
- ModPatches/Medieval Overhaul: Barbarians
+ ModPatches/Medieval Overhaul Barbarians
ModPatches/Medieval Tailor
ModPatches/Megafauna
ModPatches/Melee Animation
From 4e3d939286ca34aa6e5cdb0f881a202fae6e6309 Mon Sep 17 00:00:00 2001
From: SamaelGray <56392968+SamaelGray@users.noreply.github.com>
Date: Wed, 14 Aug 2024 15:18:10 +0330
Subject: [PATCH 50/69] MO House Roxmont patch
---
LoadFolders.xml | 5 +-
.../Patches/CE_Patches.xml | 515 ++++++++++++++++++
SupportedThirdPartyMods.md | 1 +
3 files changed, 519 insertions(+), 2 deletions(-)
create mode 100644 ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml
diff --git a/LoadFolders.xml b/LoadFolders.xml
index ccf605bfea..9047bc5a8d 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -288,6 +288,7 @@
ModPatches/Medicine Supplements (Continued)
ModPatches/Medieval Medicines 1.4 Medieval Overhaul Edition
ModPatches/Medieval Overhaul
+ ModPatches/MMedieval Overhaul House Roxmont
ModPatches/Medieval Tailor
ModPatches/Megafauna
ModPatches/Melee Animation
@@ -563,7 +564,7 @@
ModPatches/Vanilla Storytellers Expanded - Winston Waves
ModPatches/Vanilla Vehicles Expanded
ModPatches/Vanilla Vehicles Expanded - Tier 3
- ModPatches/Vanilla Vehicles Expanded - Upgrades
+ ModPatches/Vanilla Vehicles Expanded - Upgrades
ModPatches/Vanilla Weapons Expanded
ModPatches/Vanilla Weapons Expanded - Coilguns
ModPatches/Vanilla Weapons Expanded - Frontier
@@ -608,4 +609,4 @@
ModPatches/pphhyy Sanguinary Animals
ModPatches/pphhyy's Lightless Empyrean
-
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml b/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml
new file mode 100644
index 0000000000..811faff244
--- /dev/null
+++ b/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml
@@ -0,0 +1,515 @@
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_HedgeKnightRox"]
+
+
+
+ 3
+ 5
+
+
+ 150
+ 250
+
+
+ DankPyon_ShieldHeater_Roxmont
+
+ 0.5
+
+
+ 50
+ 200
+
+
+ CE_Sidearm_Tribal
+
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_FootmanRoxmont"]/apparelRequired
+
+
+ DankPyon_Apparel_Heraldic_Hauberk_Roxmont
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_FootmanRoxmont"]
+
+
+
+ 100
+ 350
+
+
+ DankPyon_ShieldHeater_Roxmont
+
+ 0.65
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_StandardRoxmont"]
+
+
+
+ 100
+ 350
+
+
+ KiteShield
+ HeaterShield
+ Buckler
+
+ 0.65
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_KnightRoxmont" or defName="DankPyon_Medieval_LordRoxmont"]
+
+
+
+ 200
+ 600
+
+
+ HeaterShield
+ KiteShield
+
+ 0.5
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Headgear_HeraldicGreatHelmRoxmont"]
+
+
+ 6
+ 1
+ 4
+ 3
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Headgear_HeraldicGreatHelmRoxmont"]
+
+
+ -0.4
+ -2
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Headgear_HeraldicGreatHelmRoxmont"]
+
+
+
+
+ 0.60
+
+ Eye
+
+
+
+ 0.60
+
+ Eye
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_Zweihanders_Cuirass_Roxmont"]/statBases
+
+ 20
+ 5
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_Zweihanders_Cuirass_Roxmont"]/statBases/StuffEffectMultiplierArmor
+
+ 4.5
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_Zweihanders_Cuirass_Roxmont"]/equippedStatOffsets/MoveSpeed
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_Zweihanders_Cuirass_Roxmont"]
+
+
+
+
+ 0.40
+
+ Neck
+
+
+
+ 0.40
+
+ Neck
+
+
+
+ 0.60
+
+ Shoulder
+
+
+
+ 0.60
+
+ Shoulder
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_FullPlate_Roxmont"]/statBases/Mass
+
+ 100
+ 12
+ 17
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_FullPlate_Roxmont"]/statBases/StuffEffectMultiplierArmor
+
+ 4
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_FullPlate_Roxmont"]/equippedStatOffsets/MoveSpeed
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_FullPlate_Roxmont"]/equippedStatOffsets
+
+ -0.2
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_FullPlate_Roxmont"]/apparel/bodyPartGroups
+
+ Hands
+ Feet
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_Apparel_FullPlate_Roxmont"]
+
+
+
+
+ 0.70
+
+ Neck
+
+
+
+ 0.70
+
+ Neck
+
+
+
+ 0.90
+
+ Leg
+
+
+
+ 0.90
+
+ Leg
+
+
+
+ 0.80
+
+ Arm
+
+
+
+ 0.80
+
+ Arm
+
+
+
+ 0.60
+
+ Hand
+
+
+
+ 0.60
+
+ Hand
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Roxmont"]
+ ParentName
+ ShieldBase
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Roxmont"]
+
+ 60
+
+ Metallic
+
+
+ Smithing
+
+ ElectricSmithy
+ FueledSmithy
+
+
+
+ 7000
+ 120
+ 4
+ 7
+ 4
+ 2.0
+
+
+ -0.25
+ -3
+ -0.4
+ -0.2
+ -0.5
+ -0.2
+ 1.0
+
+
+ Armor
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Roxmont"]/equippedStatOffsets
+
+
+ -0.25
+ -3
+ -0.4
+ -0.2
+ -0.5
+ -0.2
+ 1.0
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Roxmont"]/comps/li[@Class="VFECore.CompProperties_Shield"]
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Roxmont"]
+
+
+
+ Hands
+ Arms
+ Shoulders
+ Torso
+ Neck
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Roxmont"]
+
+
+
+ DankPyon_ShieldHeater_Roxmont
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ HouseRoxmont/Apparel/Utility/HeaterRoxmont/HeaterRoxmont
+ Graphic_Multi
+ CutoutComplex
+ ApparelBody
+
+ 1.0
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+
+
+ -5
+ (0.15, 0, -0.1)
+
+
+ (0.3, 0, -0.2)
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_PikeRoxmont"]
+
+
+ 12
+ 1.27
+
+
+ 0.08
+ 0.95
+ 1.27
+
+
+
+ shaft
+
+ Poke
+
+ 8
+ 1.3
+ 0.1
+ 1.8
+ Shaft
+
+
+ point
+
+ Stab
+
+ 20
+ 1.5
+ 6
+ 3
+ Point
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_RoxWaraxe"]/statBases
+
+ 7
+ 0.35
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_RoxWaraxe"]
+
+
+ 0.30
+ 0.40
+ 0.23
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_RoxWaraxe"]/tools
+
+
+
+ shaft
+
+ Poke
+
+ 3
+ 1.3
+ 0.1
+ 0.8
+ Shaft
+
+
+ point
+
+ Stab
+
+ 22
+ 1.7
+ 5
+ 2.5
+ Point
+
+
+ edge
+
+ Cut
+
+ 37
+ 2.18
+ 9.6
+ 1.0
+ Edge
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index fc0b7aa3e4..b3797997aa 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -306,6 +306,7 @@ Medieval Medicines 1.4 Medieval Overhaul Edition |
Medical Supplements |
Medical System Expansion |
Medieval Overhaul |
+Medieval Overhaul: House Roxmont |
Medieval Tailor |
Megafauna |
Melee Animation |
From 1bc149a97ae0371ffcf1eb8b919e55c0dcf7d0fa Mon Sep 17 00:00:00 2001
From: SamGray <56392968+SamaelGray@users.noreply.github.com>
Date: Thu, 15 Aug 2024 09:34:46 +0330
Subject: [PATCH 51/69] Typo fix
---
LoadFolders.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 3d49628bd7..e476c0e2d1 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -289,7 +289,7 @@
ModPatches/Medieval Medicines 1.4 Medieval Overhaul Edition
ModPatches/Medieval Overhaul
ModPatches/Medieval Overhaul Barbarians
- ModPatches/MMedieval Overhaul House Roxmont
+ ModPatches/Medieval Overhaul House Roxmont
ModPatches/Medieval Tailor
ModPatches/Megafauna
ModPatches/Melee Animation
@@ -610,4 +610,4 @@
ModPatches/pphhyy Sanguinary Animals
ModPatches/pphhyy's Lightless Empyrean
-
\ No newline at end of file
+
From 01742475e15f7043d551a63904a141eaa34da389 Mon Sep 17 00:00:00 2001
From: Merwini <86023141+Merwini@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:55:50 -0400
Subject: [PATCH 52/69] Changed Faction PawnGroupMakers selectionWeights to
account for the massive combatPower difference between the mechs and human
pawns, to maintain a good spawn ratio.
Changed RN2_RedStarBomb damageDef armorCategory from sharp to blunt, to prevent unintended behavior for Deflection
---
.../Defs/Ammo_Gruppa_Krovi.xml | 171 ++++----
.../Patches/Faction_Gruppa_Krovi.xml | 133 ++++++
.../Patches/Mech_Weapons_Gruppa_Krovi.xml | 407 +++++++++---------
.../Patches/Mechs_Gruppa_Krovi.xml | 349 +++++++++++++++
.../Patches/PawnKinds_Gruppa_Krovi.xml | 184 ++++----
.../Patches/Races_Gruppa_Krovi.xml | 331 --------------
6 files changed, 872 insertions(+), 703 deletions(-)
create mode 100644 ModPatches/RH2 Faction - Gruppa Krovi/Patches/Faction_Gruppa_Krovi.xml
create mode 100644 ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml
delete mode 100644 ModPatches/RH2 Faction - Gruppa Krovi/Patches/Races_Gruppa_Krovi.xml
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Defs/Ammo_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Defs/Ammo_Gruppa_Krovi.xml
index 4ad081a5b0..6af5b2be8c 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Defs/Ammo_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Defs/Ammo_Gruppa_Krovi.xml
@@ -1,87 +1,94 @@
-
-
- AmmoSet_RNTeslaCharge
- tesla coil power cell
-
- Bullet_CE_RNBullet_Tesla_Charge
-
-
-
-
- Bullet_CE_RNBullet_Tesla_Charge
- Tesla Charge
-
- Things/Projectile/Tesla_Arc
- Graphic_Single
- TransparentPostLight
- 4
-
-
- EMP
- 2.0
- 25
- false
- Artillery_HitThickRoof
- RN_Tesla_Explode
- 93
- 3.2
-
-
-
- Smoke
- (-0.3,0,0.35)
- (0.3,0,0.35)
- 90
- 1~1.1
- (0,235,31,255)
- (0,235,31,255)
-
-
-
-
-
-
-
- AmmoSet_RNPlasmaCharge
- plasma cannon power cell
-
- Bullet_CE_RNBullet_RedStar_Plasma
-
-
-
-
- Bullet_CE_RNBullet_RedStar_Plasma
- Plasma Bolt
-
- Things/Projectile/RedStar_Plasma
- Graphic_Single
- TransparentPostLight
- 4
-
-
- RN2_RedStarBomb
- 1.95
- 30
- false
- Artillery_HitThickRoof
- RN_RedStar_Explode
- 76
- 3
-
-
-
- Smoke
- (-0.3,0,0.35)
- (0.3,0,0.35)
- 90
- 1~1.1
- (0,235,31,255)
- (0,235,31,255)
-
-
-
+
+
+ AmmoSet_RNTeslaCharge
+ tesla coil power cell
+
+ Bullet_CE_RNBullet_Tesla_Charge
+
+
+
+
+ Bullet_CE_RNBullet_Tesla_Charge
+ Tesla Charge
+
+ Things/Projectile/Tesla_Arc
+ Graphic_Single
+ TransparentPostLight
+ 4
+
+
+ Electrical
+ 2.0
+ 25
+ false
+ Artillery_HitThickRoof
+ RN_Tesla_Explode
+ 93
+ 3.2
+ true
+ 0
+ 0
+ 0
+
+
+
+ Smoke
+ (-0.3,0,0.35)
+ (0.3,0,0.35)
+ 90
+ 1~1.1
+ (0,235,31,255)
+ (0,235,31,255)
+
+
+
+
+
+
+
+ AmmoSet_RNPlasmaCharge
+ plasma cannon power cell
+
+ Bullet_CE_RNBullet_RedStar_Plasma
+
+
+
+
+ Bullet_CE_RNBullet_RedStar_Plasma
+ Plasma Bolt
+
+ Things/Projectile/RedStar_Plasma
+ Graphic_Single
+ TransparentPostLight
+ 4
+
+
+ RN2_RedStarBomb
+ 1.95
+ 30
+ false
+ Artillery_HitThickRoof
+ RN_RedStar_Explode
+ 76
+ 3
+ 0
+ 0
+ 0
+
+
+
+ Smoke
+ (-0.3,0,0.35)
+ (0.3,0,0.35)
+ 90
+ 1~1.1
+ (0,235,31,255)
+ (0,235,31,255)
+
+
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Faction_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Faction_Gruppa_Krovi.xml
new file mode 100644
index 0000000000..bca7a2a202
--- /dev/null
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Faction_Gruppa_Krovi.xml
@@ -0,0 +1,133 @@
+ļ»æ
+
+
+
+
+ Defs/FactionDef[@Name="RH2_FactionBase_GruppaKrovi"]/maxPawnCostPerTotalPointsCurve
+
+
+
+ (0,35)
+ (70, 50)
+ (700, 100)
+ (1300, 150)
+ (2000, 450)
+ (4200, 1400)
+ (100000, 10000)
+
+
+
+
+
+
+ Defs/FactionDef[@Name="RH2_FactionBase_GruppaKrovi"]/apparelStuffFilter/thingDefs/li[text()="Hyperweave"]
+
+
+
+
+
+ Defs/FactionDef[@Name="RH2_FactionBase_GruppaKrovi"]/pawnGroupMakers
+
+
+
+
+ Combat
+ 100
+
+ 300
+ 30
+ 210
+ 150
+ 1
+ 9
+ 7
+ 150
+ 30
+
+
+
+
+ Combat
+ 20
+
+ 300
+ 90
+ 150
+ 20
+ 2
+ 8
+ 6
+
+
+
+
+ Combat
+ 15
+
+ Siege
+
+
+ 300
+ 60
+ 60
+ 30
+ 1
+ 8
+ 6
+
+
+
+
+ Peaceful
+
+ 300
+ 300
+ 90
+ 60
+ 90
+ 8
+ 6
+ 1
+
+
+
+
+ Trader
+
+ 1
+
+
+ 5
+ 10
+ 5
+ 1
+
+
+ 300
+ 60
+ 8
+ 6
+ 1
+
+
+
+
+ Settlement
+
+ 300
+ 570
+ 240
+ 150
+ 90
+ 90
+ 150
+ 8
+ 6
+ 2
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mech_Weapons_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mech_Weapons_Gruppa_Krovi.xml
index 9958553ad8..3e2c0eb1ab 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mech_Weapons_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mech_Weapons_Gruppa_Krovi.xml
@@ -1,46 +1,48 @@
-
-
- Defs/ThingDef[
- defName="RNGun_KV2_Howitzer" or
- defName="RNGun_Tesla_Coil" or
- defName="RNGun_RedStar_PlasmaCannon"
- ]/weaponTags
-
- NoSwitch
-
-
+
+
+ Defs/ThingDef[
+ defName="RNGun_KV2_Howitzer" or
+ defName="RNGun_Tesla_Coil" or
+ defName="RNGun_RedStar_PlasmaCannon"
+ ]/weaponTags
+
+
+ NoSwitch
+
+
-
-
- RN2Gun_KV2_DSHKMachineGun
-
- 1
- 0.2
- 1.36
- 20.00
-
-
- CombatExtended.Verb_ShootCE
- true
- Bullet_127x108mm_FMJ
- 55
- 10
- RNShot_DSHK
- GunTail_Heavy
- 9
- 2.5
- HeadAttackTool
- true
- 12
-
-
+
+
+ RN2Gun_KV2_DSHKMachineGun
+
+ 1
+ 0.2
+ 1.36
+ 20.00
+
+
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_127x108mm_FMJ
+ 55
+
+ 10
+ RNShot_DSHK
+ GunTail_Heavy
+ 9
+ 2.5
+ HeadAttackTool
+ true
+ 12
+
+
-
-
-
+
+
-
-
-
- RNGun_KV2_Howitzer
-
-
- 50.00
- 20.00
- 0.75
- 0.10
- 0.5
- 2.55
-
-
- 3.24
- CombatExtended.Verb_ShootCE
- True
- Bullet_120mmCannonShell_HE
- 4.3
- 125
- RN_152mmHowitzer_Shot
- GunTail_Heavy
- 6
- false
- false
-
- true
-
- 16
-
-
- 1
- 8.4
- AmmoSet_120mmCannonShell
-
-
-
-
- Defs/ThingDef[defName="RNGun_KV2_Howitzer"]/tools
-
-
-
- giant barrel
-
- Blunt
-
- 45
- 2.6
- 10.5
- Barrel
-
-
-
-
-
-
-
- RNGun_Tesla_Coil
-
- 50.00
- 20.00
- 1.59
- 0.15
- 1.0
- 0.35
-
-
- 0.0
- CombatExtended.Verb_ShootCE
- True
- Bullet_CE_RNBullet_Tesla_Charge
- 2.5
- 62
- RN_Tesla_Shot
- GunTail_Heavy
- 6
- false
- false
-
- false
-
- 16
-
-
- 1
- 4.15
- AmmoSet_RNTeslaCharge
-
-
-
-
- Defs/ThingDef[defName="RNBullet_Tesla_Charge"]
-
-
-
-
-
- RNGun_RedStar_PlasmaCannon
-
- 50.00
- 20.00
- 1.59
- 0.15
- 1.0
- 0.45
-
-
- 1.36
- CombatExtended.Verb_ShootCE
- True
- Bullet_CE_RNBullet_RedStar_Plasma
- 3.15
- 66
- 27
- RN_RedStar_Shot
- GunTail_Heavy
- 6
- false
- 2
- false
-
- false
-
- 16
-
-
- 2
- 5.1
- AmmoSet_RNPlasmaCharge
-
-
- AimedShot
- FALSE
-
-
-
-
- Defs/ThingDef[defName="RNBullet_RedStar_Plasma"]
-
-
-
- Defs/ThingDef[
- defName="RNGun_Tesla_Coil" or
- defName="RNGun_RedStar_PlasmaCannon"]/tools
-
-
-
- giant barrel
-
- Blunt
-
- 25
- 2.0
- 7
- Barrel
-
-
-
-
-
+
+
+
+ RNGun_KV2_Howitzer
+
+
+ 50.00
+ 20.00
+ 0.75
+ 0.10
+ 0.5
+ 2.55
+
+
+ 3.24
+ CombatExtended.Verb_ShootCE
+ True
+ Bullet_120mmCannonShell_HE
+ 4.3
+ 125
+ RN_152mmHowitzer_Shot
+ GunTail_Heavy
+ 6
+ false
+ false
+
+ true
+
+ 16
+
+
+ 1
+ 8.4
+ AmmoSet_120mmCannonShell
+
+
+
+
+ Defs/ThingDef[defName="RNGun_KV2_Howitzer"]/tools
+
+
+
+ giant barrel
+
+ Blunt
+
+ 45
+ 2.6
+ 10.5
+ Barrel
+
+
+
+
+
+
+
+ RNGun_Tesla_Coil
+
+ 50.00
+ 20.00
+ 1.59
+ 0.15
+ 1.0
+ 0.35
+
+
+ 0.0
+ CombatExtended.Verb_ShootCE
+ True
+ Bullet_CE_RNBullet_Tesla_Charge
+ 2.5
+ 62
+ RN_Tesla_Shot
+ GunTail_Heavy
+ 6
+ false
+ false
+
+ false
+
+ 16
+
+
+ 1
+ 4.15
+ AmmoSet_RNTeslaCharge
+
+
+
+
+ Defs/ThingDef[defName="RNBullet_Tesla_Charge"]
+
+
+
+
+
+ RNGun_RedStar_PlasmaCannon
+
+ 50.00
+ 20.00
+ 1.59
+ 0.15
+ 1.0
+ 0.45
+
+
+ 1.36
+ CombatExtended.Verb_ShootCE
+ True
+ Bullet_CE_RNBullet_RedStar_Plasma
+ 3.15
+ 66
+ 27
+ RN_RedStar_Shot
+ GunTail_Heavy
+ 6
+ false
+ 2
+ false
+
+ false
+
+ 16
+
+
+ 2
+ 5.1
+ AmmoSet_RNPlasmaCharge
+
+
+ AimedShot
+ FALSE
+
+
+
+
+ Defs/ThingDef[defName="RNBullet_RedStar_Plasma"]
+
+
+
+
+ Defs/ThingDef[
+ defName="RNGun_Tesla_Coil" or
+ defName="RNGun_RedStar_PlasmaCannon"]/tools
+
+
+
+
+ giant barrel
+
+ Blunt
+
+ 25
+ 2.0
+ 7
+ Barrel
+
+
+
+
+
+
+ Defs/DamageDef[defName="RN2_RedStarBomb"]/armorCategory
+
+ Blunt
+
+
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml
new file mode 100644
index 0000000000..628c738b28
--- /dev/null
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml
@@ -0,0 +1,349 @@
+
+
+
+
+ Defs/ThingDef[
+ defName="RH2Mech_KV2Walker" or
+ defName="RH2Mech_TeslaDrone" or
+ defName="RH2Mech_PlasmaDrone"
+ ]
+
+
+
+ Humanoid
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/statBases
+
+ 125
+ 125
+ 1.0
+ 1.0
+ 0.25
+ 500
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/statBases/ArmorRating_Blunt
+
+ 75
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/statBases/ArmorRating_Sharp
+
+ 30
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/comps
+
+
+ 2500
+ false
+ 0.5
+ true
+
+ 5
+
+ 200
+ 250
+ 15
+ 37
+
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]
+
+
+
+
+ false
+ 0.25
+
+ SightSensor
+
+
+
+ false
+ 0.25
+
+ SightSensor
+
+
+
+ false
+ 0.25
+
+ HearingSensor
+
+
+
+ false
+ 0.25
+
+ HearingSensor
+
+
+
+ false
+ .6
+
+ MechanicalLeg
+
+
+
+ false
+ .5
+
+ MechanicalLeg
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/comps/li[@Class="CompProperties_TurretGun" and turretDef="RNGun_KV2_KrohaLauncher"]
+
+
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/tools
+
+
+
+ bi-pedal foot
+
+ Blunt
+
+ 85
+ 3
+ FrontLeftLeg
+ true
+
+
+ bi-pedal foot
+
+ Blunt
+
+ 85
+ 3
+ FrontRightLeg
+ true
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="RH2Mech_KV2Walker"]
+
+
+
+ 10
+ 20
+
+ GrenadeHE
+
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/race/baseHealthScale
+
+ 8
+
+
+
+
+ Defs/PawnKindDef[defName="RH2Mech_KV2Walker"]/combatPower
+
+ 1400
+
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/statBases
+
+ 80
+ 20
+ 1.0
+ 1.0
+ 0.25
+ 300
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/statBases/ArmorRating_Blunt
+
+ 50
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/statBases/ArmorRating_Sharp
+
+ 20
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/comps
+
+
+ 1500
+ false
+ 0.5
+ true
+
+ 3
+
+ 140
+ 150
+ 10
+ 25
+
+
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/race/baseHealthScale
+
+ 4
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]
+
+
+
+
+ false
+ 0.1
+
+ SightSensor
+
+
+
+ false
+ 0.1
+
+ SightSensor
+
+
+
+ false
+ 0.1
+
+ HearingSensor
+
+
+
+ false
+ 0.1
+
+ HearingSensor
+
+
+
+ false
+ 1.5
+
+ MechanicalShoulder
+
+
+
+ false
+ 1.5
+
+ MechanicalShoulder
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/tools
+
+
+
+ left power fist
+
+ Blunt
+
+ 22
+ 2
+ LeftHand
+ true
+
+
+ right power fist
+
+ Blunt
+
+ 25
+ 2
+ RightHand
+ true
+ true
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="RH2Mech_TeslaDrone"]
+
+
+
+ 20
+ 30
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="RH2Mech_TeslaDrone"]/combatPower
+
+ 400
+
+
+
+
+ Defs/PawnKindDef[defName="RH2Mech_PlasmaDrone"]
+
+
+
+ 20
+ 25
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="RH2Mech_PlasmaDrone"]/combatPower
+
+ 450
+
+
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/PawnKinds_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/PawnKinds_Gruppa_Krovi.xml
index 5ba15bcff2..15904468e6 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/PawnKinds_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/PawnKinds_Gruppa_Krovi.xml
@@ -1,98 +1,98 @@
-
- Defs/PawnKindDef[@Name="RH2_GruppaKrovi_Base"]
-
-
-
- 4
- 6
-
-
-
-
-
-
- Defs/PawnKindDef[@Name="RH2_GruppaKrovi_IntermediateBase"]
-
-
-
- 4
- 6
-
-
-
- 0.15
-
- 10
- 100
-
-
- GrenadeSmoke
-
-
- 0
- 1
-
-
-
- 0.075
-
- 50
- 200
-
-
- CE_FlareLauncher
-
-
- 2
- 4
-
-
-
-
-
-
+
+ Defs/PawnKindDef[@Name="RH2_GruppaKrovi_Base"]
+
+
+
+ 4
+ 6
+
+
+
+
-
- Defs/PawnKindDef[@Name="RH2_GruppaKrovi_SpecialBase"]
-
-
-
- 4
- 6
-
-
-
- 0.125
-
- 10
- 100
-
-
- GrenadeDestructive
-
-
- 2
- 3
-
-
-
-
-
-
-
-
- Defs/PawnKindDef[@Name="RH2_GruppaKrovi_BossBase"]
-
-
-
- 4
- 6
-
-
-
-
+
+ Defs/PawnKindDef[@Name="RH2_GruppaKrovi_IntermediateBase"]
+
+
+
+ 4
+ 6
+
+
+
+ 0.15
+
+ 10
+ 100
+
+
+ GrenadeSmoke
+
+
+ 0
+ 1
+
+
+
+ 0.075
+
+ 50
+ 200
+
+
+ CE_FlareLauncher
+
+
+ 2
+ 4
+
+
+
+
+
+
+
+
+ Defs/PawnKindDef[@Name="RH2_GruppaKrovi_SpecialBase"]
+
+
+
+ 4
+ 6
+
+
+
+ 0.125
+
+ 10
+ 100
+
+
+ GrenadeDestructive
+
+
+ 2
+ 3
+
+
+
+
+
+
+
+
+ Defs/PawnKindDef[@Name="RH2_GruppaKrovi_BossBase"]
+
+
+
+ 4
+ 6
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Races_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Races_Gruppa_Krovi.xml
deleted file mode 100644
index 5f751fa5ee..0000000000
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Races_Gruppa_Krovi.xml
+++ /dev/null
@@ -1,331 +0,0 @@
-
-
-
-
- Defs/ThingDef[
- defName="RH2Mech_KV2Walker" or
- defName="RH2Mech_TeslaDrone" or
- defName="RH2Mech_PlasmaDrone"
- ]
-
-
- Humanoid
-
-
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/statBases
-
- 125
- 125
- 1.0
- 1.0
- 0.25
- 500
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/statBases/ArmorRating_Blunt
-
- 75
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/statBases/ArmorRating_Sharp
-
- 30
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/comps
-
-
- 2500
- false
- 0.5
- true
-
- 5
-
- 200
- 250
- 15
- 37
-
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]
-
-
-
-
- false
- 0.25
-
- SightSensor
-
-
-
- false
- 0.25
-
- SightSensor
-
-
-
- false
- 0.25
-
- HearingSensor
-
-
-
- false
- 0.25
-
- HearingSensor
-
-
-
- false
- .6
-
- MechanicalLeg
-
-
-
- false
- .5
-
- MechanicalLeg
-
-
-
-
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/comps/li[@Class="CompProperties_TurretGun" and turretDef="RNGun_KV2_KrohaLauncher"]
-
-
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/tools
-
-
-
- bi-pedal foot
-
- Blunt
-
- 85
- 3
- FrontLeftLeg
- true
-
-
- bi-pedal foot
-
- Blunt
-
- 85
- 3
- FrontRightLeg
- true
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RH2Mech_KV2Walker"]
-
-
-
- 10
- 20
-
- GrenadeHE
-
-
-
-
-
- Defs/PawnKindDef[defName="RH2Mech_KV2Walker"]/combatPower
-
- 800
-
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/statBases
-
- 80
- 20
- 1.0
- 1.0
- 0.25
- 300
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/statBases/ArmorRating_Blunt
-
- 50
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/statBases/ArmorRating_Sharp
-
- 20
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/comps
-
-
- 1500
- false
- 0.5
- true
-
- 3
-
- 140
- 150
- 10
- 25
-
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]
-
-
-
-
- false
- 0.1
-
- SightSensor
-
-
-
- false
- 0.1
-
- SightSensor
-
-
-
- false
- 0.1
-
- HearingSensor
-
-
-
- false
- 0.1
-
- HearingSensor
-
-
-
- false
- 1.5
-
- MechanicalShoulder
-
-
-
- false
- 1.5
-
- MechanicalShoulder
-
-
-
-
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/tools
-
-
-
- left power fist
-
- Blunt
-
- 22
- 2
- LeftHand
- true
-
-
- right power fist
-
- Blunt
-
- 25
- 2
- RightHand
- true
- true
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RH2Mech_TeslaDrone"]
-
-
-
- 20
- 30
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RH2Mech_TeslaDrone"]/combatPower
-
- 300
-
-
-
-
- Defs/PawnKindDef[defName="RH2Mech_PlasmaDrone"]
-
-
-
- 20
- 25
-
-
-
-
-
-
- Defs/PawnKindDef[defName="RH2Mech_PlasmaDrone"]/combatPower
-
- 350
-
-
-
\ No newline at end of file
From 438d17ae6dcd7a7020b6ee10dc499bf3522be6b9 Mon Sep 17 00:00:00 2001
From: SamaelGray <56392968+SamaelGray@users.noreply.github.com>
Date: Sat, 17 Aug 2024 02:58:30 +0330
Subject: [PATCH 53/69] required apparel patch reformat
---
.../Patches/CE_Patches.xml | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml b/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml
index 811faff244..ebe5f7841b 100644
--- a/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml
+++ b/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml
@@ -32,13 +32,8 @@
-
- Defs/PawnKindDef[defName="DankPyon_FootmanRoxmont"]/apparelRequired
-
-
- DankPyon_Apparel_Heraldic_Hauberk_Roxmont
-
-
+
+ Defs/PawnKindDef[defName="DankPyon_FootmanRoxmont"]/apparelRequired/li[.="DankPyon_ShieldHeater_Roxmont"]
From f182d20578d462dfb9b19f9df72f644922c3dfbb Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Fri, 16 Aug 2024 20:09:18 -0400
Subject: [PATCH 54/69] Streamline shield patch
---
.../Patches/CE_Patches.xml | 95 ++-----------------
1 file changed, 9 insertions(+), 86 deletions(-)
diff --git a/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml b/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml
index 811faff244..46ae4a6c32 100644
--- a/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml
+++ b/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml
@@ -32,13 +32,8 @@
-
- Defs/PawnKindDef[defName="DankPyon_FootmanRoxmont"]/apparelRequired
-
-
- DankPyon_Apparel_Heraldic_Hauberk_Roxmont
-
-
+
+ Defs/PawnKindDef[defName="DankPyon_FootmanRoxmont"]/apparelRequired/li[.="DankPyon_ShieldHeater_Roxmont"]
@@ -290,85 +285,10 @@
-
- Defs/ThingDef[defName="DankPyon_ShieldHeater_Roxmont"]
- ParentName
- ShieldBase
-
-
-
- Defs/ThingDef[defName="DankPyon_ShieldHeater_Roxmont"]
-
- 60
-
- Metallic
-
-
- Smithing
-
- ElectricSmithy
- FueledSmithy
-
-
-
- 7000
- 120
- 4
- 7
- 4
- 2.0
-
-
- -0.25
- -3
- -0.4
- -0.2
- -0.5
- -0.2
- 1.0
-
-
- Armor
-
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_ShieldHeater_Roxmont"]/equippedStatOffsets
-
-
- -0.25
- -3
- -0.4
- -0.2
- -0.5
- -0.2
- 1.0
-
-
-
-
Defs/ThingDef[defName="DankPyon_ShieldHeater_Roxmont"]/comps/li[@Class="VFECore.CompProperties_Shield"]
-
- Defs/ThingDef[defName="DankPyon_ShieldHeater_Roxmont"]
-
-
-
- Hands
- Arms
- Shoulders
- Torso
- Neck
-
-
-
-
-
Defs/ThingDef[defName="DankPyon_ShieldHeater_Roxmont"]
@@ -381,24 +301,27 @@
CombatExtended.PawnRenderNode_Apparel
CombatExtended.PawnRenderNodeWorker_Drafted
HouseRoxmont/Apparel/Utility/HeaterRoxmont/HeaterRoxmont
- Graphic_Multi
CutoutComplex
ApparelBody
- 1.0
+ 0.55
80
-5
(0, 0, -0.1)
+ 30
+
+ -30
+
-5
- (0.15, 0, -0.1)
+ (0.2, 0, -0.2)
- (0.3, 0, -0.2)
+ (0.2, 0, -0.2)
From 3d10095e9d247eba283e947d2c6f37a813a29b95 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Fri, 16 Aug 2024 20:35:17 -0400
Subject: [PATCH 55/69] Split up files, adjust armors
---
.../{CE_Patches.xml => CE_Apparel.xml} | 211 +-----------------
.../Patches/CE_PawnKindDefs.xml | 90 ++++++++
.../Patches/CE_Weapons.xml | 109 +++++++++
.../ThingDefs_Misc/MO_Apparel_Armor.xml | 38 +++-
4 files changed, 245 insertions(+), 203 deletions(-)
rename ModPatches/Medieval Overhaul House Roxmont/Patches/{CE_Patches.xml => CE_Apparel.xml} (51%)
create mode 100644 ModPatches/Medieval Overhaul House Roxmont/Patches/CE_PawnKindDefs.xml
create mode 100644 ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Weapons.xml
diff --git a/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml b/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Apparel.xml
similarity index 51%
rename from ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml
rename to ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Apparel.xml
index 46ae4a6c32..bfccda034b 100644
--- a/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Patches.xml
+++ b/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Apparel.xml
@@ -1,92 +1,6 @@
-
-
-
- Defs/PawnKindDef[defName="DankPyon_HedgeKnightRox"]
-
-
-
- 3
- 5
-
-
- 150
- 250
-
-
- DankPyon_ShieldHeater_Roxmont
-
- 0.5
-
-
- 50
- 200
-
-
- CE_Sidearm_Tribal
-
-
-
-
-
-
-
- Defs/PawnKindDef[defName="DankPyon_FootmanRoxmont"]/apparelRequired/li[.="DankPyon_ShieldHeater_Roxmont"]
-
-
-
- Defs/PawnKindDef[defName="DankPyon_FootmanRoxmont"]
-
-
-
- 100
- 350
-
-
- DankPyon_ShieldHeater_Roxmont
-
- 0.65
-
-
-
-
-
- Defs/PawnKindDef[defName="DankPyon_StandardRoxmont"]
-
-
-
- 100
- 350
-
-
- KiteShield
- HeaterShield
- Buckler
-
- 0.65
-
-
-
-
-
- Defs/PawnKindDef[defName="DankPyon_KnightRoxmont" or defName="DankPyon_Medieval_LordRoxmont"]
-
-
-
- 200
- 600
-
-
- HeaterShield
- KiteShield
-
- 0.5
-
-
-
-
@@ -140,7 +54,7 @@
Defs/ThingDef[defName="DankPyon_Apparel_Zweihanders_Cuirass_Roxmont"]/statBases
- 20
+ 25
5
@@ -148,7 +62,7 @@
Defs/ThingDef[defName="DankPyon_Apparel_Zweihanders_Cuirass_Roxmont"]/statBases/StuffEffectMultiplierArmor
- 4.5
+ 3.2
@@ -162,25 +76,25 @@
- 0.40
+ 0.60
Neck
- 0.40
+ 0.60
Neck
- 0.60
+ 0.80
Shoulder
- 0.60
+ 0.80
Shoulder
@@ -194,15 +108,15 @@
Defs/ThingDef[defName="DankPyon_Apparel_FullPlate_Roxmont"]/statBases/Mass
100
- 12
- 17
+ 10
+ 15
Defs/ThingDef[defName="DankPyon_Apparel_FullPlate_Roxmont"]/statBases/StuffEffectMultiplierArmor
- 4
+ 3
@@ -213,7 +127,7 @@
Defs/ThingDef[defName="DankPyon_Apparel_FullPlate_Roxmont"]/equippedStatOffsets
- -0.2
+ -0.15
@@ -330,109 +244,4 @@
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_MeleeWeapon_PikeRoxmont"]
-
-
- 12
- 1.27
-
-
- 0.08
- 0.95
- 1.27
-
-
-
- shaft
-
- Poke
-
- 8
- 1.3
- 0.1
- 1.8
- Shaft
-
-
- point
-
- Stab
-
- 20
- 1.5
- 6
- 3
- Point
-
-
-
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_MeleeWeapon_RoxWaraxe"]/statBases
-
- 7
- 0.35
-
-
-
-
- Defs/ThingDef[defName="DankPyon_MeleeWeapon_RoxWaraxe"]
-
-
- 0.30
- 0.40
- 0.23
-
-
-
-
-
- Defs/ThingDef[defName="DankPyon_MeleeWeapon_RoxWaraxe"]/tools
-
-
-
- shaft
-
- Poke
-
- 3
- 1.3
- 0.1
- 0.8
- Shaft
-
-
- point
-
- Stab
-
- 22
- 1.7
- 5
- 2.5
- Point
-
-
- edge
-
- Cut
-
- 37
- 2.18
- 9.6
- 1.0
- Edge
-
-
-
-
-
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_PawnKindDefs.xml b/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_PawnKindDefs.xml
new file mode 100644
index 0000000000..b04885b806
--- /dev/null
+++ b/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_PawnKindDefs.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_HedgeKnightRox"]
+
+
+
+ 3
+ 5
+
+
+ 150
+ 250
+
+
+ DankPyon_ShieldHeater_Roxmont
+
+ 0.5
+
+
+ 50
+ 200
+
+
+ CE_Sidearm_Tribal
+
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_FootmanRoxmont"]/apparelRequired/li[.="DankPyon_ShieldHeater_Roxmont"]
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_FootmanRoxmont"]
+
+
+
+ 100
+ 350
+
+
+ DankPyon_ShieldHeater_Roxmont
+
+ 0.65
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_StandardRoxmont"]
+
+
+
+ 100
+ 350
+
+
+ KiteShield
+ HeaterShield
+ Buckler
+
+ 0.65
+
+
+
+
+
+ Defs/PawnKindDef[defName="DankPyon_KnightRoxmont" or defName="DankPyon_Medieval_LordRoxmont"]
+
+
+
+ 200
+ 600
+
+
+ HeaterShield
+ KiteShield
+
+ 0.5
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Weapons.xml b/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Weapons.xml
new file mode 100644
index 0000000000..e2d79ce216
--- /dev/null
+++ b/ModPatches/Medieval Overhaul House Roxmont/Patches/CE_Weapons.xml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_PikeRoxmont"]
+
+
+ 12
+ 1.27
+
+
+ 0.08
+ 0.95
+ 1.27
+
+
+
+ shaft
+
+ Poke
+
+ 8
+ 1.3
+ 0.1
+ 1.8
+ Shaft
+
+
+ point
+
+ Stab
+
+ 20
+ 1.5
+ 6
+ 3
+ Point
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_RoxWaraxe"]/statBases
+
+ 7
+ 0.35
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_RoxWaraxe"]
+
+
+ 0.30
+ 0.40
+ 0.23
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_MeleeWeapon_RoxWaraxe"]/tools
+
+
+
+ shaft
+
+ Poke
+
+ 3
+ 1.3
+ 0.1
+ 0.8
+ Shaft
+
+
+ point
+
+ Stab
+
+ 22
+ 1.7
+ 5
+ 2.5
+ Point
+
+
+ edge
+
+ Cut
+
+ 37
+ 2.18
+ 9.6
+ 1.0
+ Edge
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Armor.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Armor.xml
index 942463fc69..50237d9959 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Armor.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Armor.xml
@@ -173,7 +173,7 @@
Defs/ThingDef[defName="DankPyon_Apparel_Breast_Plate"]/statBases
25
- 10
+ 5
@@ -193,7 +193,7 @@
Defs/ThingDef[defName="DankPyon_Apparel_Zweihanders_Cuirass"]/statBases
25
- 10
+ 5
@@ -208,6 +208,40 @@
Defs/ThingDef[defName="DankPyon_Apparel_Zweihanders_Cuirass"]/equippedStatOffsets/MoveSpeed
+
+ Defs/ThingDef[defName="DankPyon_Apparel_Zweihanders_Cuirass"]
+
+
+
+
+ 0.60
+
+ Neck
+
+
+
+ 0.60
+
+ Neck
+
+
+
+ 0.80
+
+ Shoulder
+
+
+
+ 0.80
+
+ Shoulder
+
+
+
+
+
+
+
Defs/ThingDef[defName="DankPyon_Apparel_FullPlate" or defName="DankPyon_Apparel_FullPlateGilded" or defName="DankPyon_Apparel_AdornedHeavyPlate"]/statBases
From b4e4db352447ab778c402f853c6a40927ac24541 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Fri, 16 Aug 2024 20:54:12 -0400
Subject: [PATCH 56/69] Housekeeping
---
LoadFolders.xml | 2 +-
.../Defs/Ammo_Gruppa_Krovi.xml | 170 ++---
.../Patches/Apparel_Gruppa_Krovi.xml | 4 +-
.../Patches/Faction_Gruppa_Krovi.xml | 246 +++----
.../Patches/Mech_Weapons_Gruppa_Krovi.xml | 396 ++++++-----
.../Patches/Mechs_Gruppa_Krovi.xml | 647 +++++++++---------
.../Patches/PawnKinds_Gruppa_Krovi.xml | 180 ++---
.../Patches/Weapons_Gruppa_Krovi.xml | 8 +-
SupportedThirdPartyMods.md | 1 +
9 files changed, 826 insertions(+), 828 deletions(-)
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 6f3a8ddf09..7289dd4f68 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -325,10 +325,10 @@
ModPatches/Revia Race ā biotech
ModPatches/RH2 DOOM
ModPatches/RH2 Faction - Bounty Hunters
+ ModPatches/RH2 Faction - Gruppa Krovi
ModPatches/RH2 Faction - Task Force 141
ModPatches/RH2 Faction - The Rangers
ModPatches/RH2 Faction - Utilitarian
- ModPatches/RH2 Faction - Gruppa Krovi
ModPatches/RH2 Faction - VOID
ModPatches/RH2 Metal Gear Solid
ModPatches/RH2 Rimmu-NationĀ² - Clothing
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Defs/Ammo_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Defs/Ammo_Gruppa_Krovi.xml
index 6af5b2be8c..acf2a00756 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Defs/Ammo_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Defs/Ammo_Gruppa_Krovi.xml
@@ -1,94 +1,94 @@
-
-
- AmmoSet_RNTeslaCharge
- tesla coil power cell
-
- Bullet_CE_RNBullet_Tesla_Charge
-
-
+
+
+ AmmoSet_RNTeslaCharge
+ tesla coil power cell
+
+ Bullet_CE_RNBullet_Tesla_Charge
+
+
-
- Bullet_CE_RNBullet_Tesla_Charge
- Tesla Charge
-
- Things/Projectile/Tesla_Arc
- Graphic_Single
- TransparentPostLight
- 4
-
-
- Electrical
- 2.0
- 25
- false
- Artillery_HitThickRoof
- RN_Tesla_Explode
- 93
- 3.2
- true
- 0
- 0
- 0
-
-
-
- Smoke
- (-0.3,0,0.35)
- (0.3,0,0.35)
- 90
- 1~1.1
- (0,235,31,255)
- (0,235,31,255)
-
-
-
+
+ Bullet_CE_RNBullet_Tesla_Charge
+ Tesla Charge
+
+ Things/Projectile/Tesla_Arc
+ Graphic_Single
+ TransparentPostLight
+ 4
+
+
+ Electrical
+ 2.0
+ 25
+ false
+ Artillery_HitThickRoof
+ RN_Tesla_Explode
+ 93
+ 3.2
+ true
+ 0
+ 0
+ 0
+
+
+
+ Smoke
+ (-0.3,0,0.35)
+ (0.3,0,0.35)
+ 90
+ 1~1.1
+ (0,235,31,255)
+ (0,235,31,255)
+
+
+
-
-
- AmmoSet_RNPlasmaCharge
- plasma cannon power cell
-
- Bullet_CE_RNBullet_RedStar_Plasma
-
-
+
+
+ AmmoSet_RNPlasmaCharge
+ plasma cannon power cell
+
+ Bullet_CE_RNBullet_RedStar_Plasma
+
+
-
- Bullet_CE_RNBullet_RedStar_Plasma
- Plasma Bolt
-
- Things/Projectile/RedStar_Plasma
- Graphic_Single
- TransparentPostLight
- 4
-
-
- RN2_RedStarBomb
- 1.95
- 30
- false
- Artillery_HitThickRoof
- RN_RedStar_Explode
- 76
- 3
- 0
- 0
- 0
-
-
-
- Smoke
- (-0.3,0,0.35)
- (0.3,0,0.35)
- 90
- 1~1.1
- (0,235,31,255)
- (0,235,31,255)
-
-
-
+
+ Bullet_CE_RNBullet_RedStar_Plasma
+ Plasma Bolt
+
+ Things/Projectile/RedStar_Plasma
+ Graphic_Single
+ TransparentPostLight
+ 4
+
+
+ RN2_RedStarBomb
+ 1.95
+ 30
+ false
+ Artillery_HitThickRoof
+ RN_RedStar_Explode
+ 76
+ 3
+ 0
+ 0
+ 0
+
+
+
+ Smoke
+ (-0.3,0,0.35)
+ (0.3,0,0.35)
+ 90
+ 1~1.1
+ (0,235,31,255)
+ (0,235,31,255)
+
+
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml
index 32b5c66d4d..1fc6084ac1 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml
@@ -6,7 +6,7 @@
Defs/ThingDef[
defName="RNApparel_EyePros_EdgeTactical" or
defName="RNApparel_EyePros_GucciAviatorGlasses"
- ]/apparel/layers
+ ]/apparel/layers
StrappedHead
@@ -19,7 +19,7 @@
defName="RNApparel_EyePros_EdgeTactical" or
defName="RNApparel_EyePros_GucciAviatorGlasses" or
defName="RNApparel_Flatcap"
- ]/statBases
+ ]/statBases
2
0.1
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Faction_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Faction_Gruppa_Krovi.xml
index bca7a2a202..39ed4b2b4d 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Faction_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Faction_Gruppa_Krovi.xml
@@ -1,133 +1,133 @@
ļ»æ
-
-
- Defs/FactionDef[@Name="RH2_FactionBase_GruppaKrovi"]/maxPawnCostPerTotalPointsCurve
-
-
-
- (0,35)
- (70, 50)
- (700, 100)
- (1300, 150)
- (2000, 450)
- (4200, 1400)
- (100000, 10000)
-
-
-
-
+
+
+ Defs/FactionDef[@Name="RH2_FactionBase_GruppaKrovi"]/maxPawnCostPerTotalPointsCurve
+
+
+
+ (0,35)
+ (70, 50)
+ (700, 100)
+ (1300, 150)
+ (2000, 450)
+ (4200, 1400)
+ (100000, 10000)
+
+
+
+
-
- Defs/FactionDef[@Name="RH2_FactionBase_GruppaKrovi"]/apparelStuffFilter/thingDefs/li[text()="Hyperweave"]
-
+
+ Defs/FactionDef[@Name="RH2_FactionBase_GruppaKrovi"]/apparelStuffFilter/thingDefs/li[text()="Hyperweave"]
+
-
-
-
- Defs/FactionDef[@Name="RH2_FactionBase_GruppaKrovi"]/pawnGroupMakers
-
-
-
-
- Combat
- 100
-
- 300
- 30
- 210
- 150
- 1
- 9
- 7
- 150
- 30
-
-
-
-
- Combat
- 20
-
- 300
- 90
- 150
- 20
- 2
- 8
- 6
-
-
-
-
- Combat
- 15
-
- Siege
-
-
- 300
- 60
- 60
- 30
- 1
- 8
- 6
-
-
+
+
+
+ Defs/FactionDef[@Name="RH2_FactionBase_GruppaKrovi"]/pawnGroupMakers
+
+
+
+
+ Combat
+ 100
+
+ 300
+ 30
+ 210
+ 150
+ 1
+ 9
+ 7
+ 150
+ 30
+
+
+
+
+ Combat
+ 20
+
+ 300
+ 90
+ 150
+ 20
+ 2
+ 8
+ 6
+
+
+
+
+ Combat
+ 15
+
+ Siege
+
+
+ 300
+ 60
+ 60
+ 30
+ 1
+ 8
+ 6
+
+
-
- Peaceful
-
- 300
- 300
- 90
- 60
- 90
- 8
- 6
- 1
-
-
+
+ Peaceful
+
+ 300
+ 300
+ 90
+ 60
+ 90
+ 8
+ 6
+ 1
+
+
-
- Trader
-
- 1
-
-
- 5
- 10
- 5
- 1
-
-
- 300
- 60
- 8
- 6
- 1
-
-
+
+ Trader
+
+ 1
+
+
+ 5
+ 10
+ 5
+ 1
+
+
+ 300
+ 60
+ 8
+ 6
+ 1
+
+
-
- Settlement
-
- 300
- 570
- 240
- 150
- 90
- 90
- 150
- 8
- 6
- 2
-
-
-
-
-
+
+ Settlement
+
+ 300
+ 570
+ 240
+ 150
+ 90
+ 90
+ 150
+ 8
+ 6
+ 2
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mech_Weapons_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mech_Weapons_Gruppa_Krovi.xml
index 3e2c0eb1ab..394d032262 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mech_Weapons_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mech_Weapons_Gruppa_Krovi.xml
@@ -1,48 +1,46 @@
-
-
- Defs/ThingDef[
- defName="RNGun_KV2_Howitzer" or
- defName="RNGun_Tesla_Coil" or
- defName="RNGun_RedStar_PlasmaCannon"
- ]/weaponTags
-
-
- NoSwitch
-
-
+
+ Defs/ThingDef[
+ defName="RNGun_KV2_Howitzer" or
+ defName="RNGun_Tesla_Coil" or
+ defName="RNGun_RedStar_PlasmaCannon"
+ ]/weaponTags
+
+ NoSwitch
+
+
-
-
- RN2Gun_KV2_DSHKMachineGun
-
- 1
- 0.2
- 1.36
- 20.00
-
-
- CombatExtended.Verb_ShootCE
- true
- Bullet_127x108mm_FMJ
- 55
-
- 10
- RNShot_DSHK
- GunTail_Heavy
- 9
- 2.5
- HeadAttackTool
- true
- 12
-
-
+
+
+ RN2Gun_KV2_DSHKMachineGun
+
+ 1
+ 0.2
+ 1.36
+ 20.00
+
+
+ CombatExtended.Verb_ShootCE
+ true
+ Bullet_127x108mm_FMJ
+ 55
+
+ 10
+ RNShot_DSHK
+ GunTail_Heavy
+ 9
+ 2.5
+ HeadAttackTool
+ true
+ 12
+
+
-
-
-
+
+
-
-
- RNGun_KV2_Howitzer
-
-
- 50.00
- 20.00
- 0.75
- 0.10
- 0.5
- 2.55
-
-
- 3.24
- CombatExtended.Verb_ShootCE
- True
- Bullet_120mmCannonShell_HE
- 4.3
- 125
- RN_152mmHowitzer_Shot
- GunTail_Heavy
- 6
- false
- false
-
- true
-
- 16
-
-
- 1
- 8.4
- AmmoSet_120mmCannonShell
-
-
+
+
+ RNGun_KV2_Howitzer
+
+
+ 50.00
+ 20.00
+ 0.75
+ 0.10
+ 0.5
+ 2.55
+
+
+ 3.24
+ CombatExtended.Verb_ShootCE
+ True
+ Bullet_120mmCannonShell_HE
+ 4.3
+ 125
+ RN_152mmHowitzer_Shot
+ GunTail_Heavy
+ 6
+ false
+ false
+
+ true
+
+ 16
+
+
+ 1
+ 8.4
+ AmmoSet_120mmCannonShell
+
+
-
- Defs/ThingDef[defName="RNGun_KV2_Howitzer"]/tools
-
-
-
- giant barrel
-
- Blunt
-
- 45
- 2.6
- 10.5
- Barrel
-
-
-
-
+
+ Defs/ThingDef[defName="RNGun_KV2_Howitzer"]/tools
+
+
+
+ giant barrel
+
+ Blunt
+
+ 45
+ 2.6
+ 10.5
+ Barrel
+
+
+
+
-
-
- RNGun_Tesla_Coil
-
- 50.00
- 20.00
- 1.59
- 0.15
- 1.0
- 0.35
-
-
- 0.0
- CombatExtended.Verb_ShootCE
- True
- Bullet_CE_RNBullet_Tesla_Charge
- 2.5
- 62
- RN_Tesla_Shot
- GunTail_Heavy
- 6
- false
- false
-
- false
-
- 16
-
-
- 1
- 4.15
- AmmoSet_RNTeslaCharge
-
-
+
+
+ RNGun_Tesla_Coil
+
+ 50.00
+ 20.00
+ 1.59
+ 0.15
+ 1.0
+ 0.35
+
+
+ 0.0
+ CombatExtended.Verb_ShootCE
+ True
+ Bullet_CE_RNBullet_Tesla_Charge
+ 2.5
+ 62
+ RN_Tesla_Shot
+ GunTail_Heavy
+ 6
+ false
+ false
+
+ false
+
+ 16
+
+
+ 1
+ 4.15
+ AmmoSet_RNTeslaCharge
+
+
-
- Defs/ThingDef[defName="RNBullet_Tesla_Charge"]
-
+
+ Defs/ThingDef[defName="RNBullet_Tesla_Charge"]
+
-
-
- RNGun_RedStar_PlasmaCannon
-
- 50.00
- 20.00
- 1.59
- 0.15
- 1.0
- 0.45
-
-
- 1.36
- CombatExtended.Verb_ShootCE
- True
- Bullet_CE_RNBullet_RedStar_Plasma
- 3.15
- 66
- 27
- RN_RedStar_Shot
- GunTail_Heavy
- 6
- false
- 2
- false
-
- false
-
- 16
-
-
- 2
- 5.1
- AmmoSet_RNPlasmaCharge
-
-
- AimedShot
- FALSE
-
-
+
+
+ RNGun_RedStar_PlasmaCannon
+
+ 50.00
+ 20.00
+ 1.59
+ 0.15
+ 1.0
+ 0.45
+
+
+ 1.36
+ CombatExtended.Verb_ShootCE
+ True
+ Bullet_CE_RNBullet_RedStar_Plasma
+ 3.15
+ 66
+ 27
+ RN_RedStar_Shot
+ GunTail_Heavy
+ 6
+ false
+ 2
+ false
+
+ false
+
+ 16
+
+
+ 2
+ 5.1
+ AmmoSet_RNPlasmaCharge
+
+
+ AimedShot
+ FALSE
+
+
-
- Defs/ThingDef[defName="RNBullet_RedStar_Plasma"]
-
+
+ Defs/ThingDef[defName="RNBullet_RedStar_Plasma"]
+
-
-
- Defs/ThingDef[
- defName="RNGun_Tesla_Coil" or
- defName="RNGun_RedStar_PlasmaCannon"]/tools
-
-
-
-
- giant barrel
-
- Blunt
-
- 25
- 2.0
- 7
- Barrel
-
-
-
-
+
+
+ Defs/ThingDef[
+ defName="RNGun_Tesla_Coil" or
+ defName="RNGun_RedStar_PlasmaCannon"]/tools
+
+
+
+
+ giant barrel
+
+ Blunt
+
+ 25
+ 2.0
+ 7
+ Barrel
+
+
+
+
-
- Defs/DamageDef[defName="RN2_RedStarBomb"]/armorCategory
-
- Blunt
-
-
+
+ Defs/DamageDef[defName="RN2_RedStarBomb"]/armorCategory
+
+ Blunt
+
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml
index 628c738b28..4511cef338 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml
@@ -1,349 +1,348 @@
-
-
- Defs/ThingDef[
- defName="RH2Mech_KV2Walker" or
- defName="RH2Mech_TeslaDrone" or
- defName="RH2Mech_PlasmaDrone"
- ]
-
-
-
- Humanoid
-
-
-
-
-
-
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/statBases
-
- 125
- 125
- 1.0
- 1.0
- 0.25
- 500
-
-
+
+ Defs/ThingDef[
+ defName="RH2Mech_KV2Walker" or
+ defName="RH2Mech_TeslaDrone" or
+ defName="RH2Mech_PlasmaDrone"
+ ]
+
+
+ Humanoid
+
+
+
+
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/statBases/ArmorRating_Blunt
-
- 75
-
-
+
+
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/statBases
+
+ 125
+ 125
+ 1.0
+ 1.0
+ 0.25
+ 500
+
+
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/statBases/ArmorRating_Sharp
-
- 30
-
-
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/statBases/ArmorRating_Blunt
+
+ 75
+
+
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/comps
-
-
- 2500
- false
- 0.5
- true
-
- 5
-
- 200
- 250
- 15
- 37
-
-
-
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/statBases/ArmorRating_Sharp
+
+ 30
+
+
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]
-
-
-
-
- false
- 0.25
-
- SightSensor
-
-
-
- false
- 0.25
-
- SightSensor
-
-
-
- false
- 0.25
-
- HearingSensor
-
-
-
- false
- 0.25
-
- HearingSensor
-
-
-
- false
- .6
-
- MechanicalLeg
-
-
-
- false
- .5
-
- MechanicalLeg
-
-
-
-
-
-
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/comps
+
+
+ 2500
+ false
+ 0.5
+ true
+
+ 5
+
+ 200
+ 250
+ 15
+ 37
+
+
+
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/comps/li[@Class="CompProperties_TurretGun" and turretDef="RNGun_KV2_KrohaLauncher"]
-
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]
+
+
+
+
+ false
+ 0.25
+
+ SightSensor
+
+
+
+ false
+ 0.25
+
+ SightSensor
+
+
+
+ false
+ 0.25
+
+ HearingSensor
+
+
+
+ false
+ 0.25
+
+ HearingSensor
+
+
+
+ false
+ .6
+
+ MechanicalLeg
+
+
+
+ false
+ .5
+
+ MechanicalLeg
+
+
+
+
+
+
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/tools
-
-
-
- bi-pedal foot
-
- Blunt
-
- 85
- 3
- FrontLeftLeg
- true
-
-
- bi-pedal foot
-
- Blunt
-
- 85
- 3
- FrontRightLeg
- true
-
-
-
-
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/comps/li[@Class="CompProperties_TurretGun" and turretDef="RNGun_KV2_KrohaLauncher"]
+
-
- Defs/PawnKindDef[defName="RH2Mech_KV2Walker"]
-
-
-
- 10
- 20
-
- GrenadeHE
-
-
-
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/tools
+
+
+
+ bi-pedal foot
+
+ Blunt
+
+ 85
+ 3
+ FrontLeftLeg
+ true
+
+
+ bi-pedal foot
+
+ Blunt
+
+ 85
+ 3
+ FrontRightLeg
+ true
+
+
+
+
-
- Defs/ThingDef[defName="RH2Mech_KV2Walker"]/race/baseHealthScale
-
- 8
-
-
+
+ Defs/PawnKindDef[defName="RH2Mech_KV2Walker"]
+
+
+
+ 10
+ 20
+
+ GrenadeHE
+
+
+
-
- Defs/PawnKindDef[defName="RH2Mech_KV2Walker"]/combatPower
-
- 1400
-
-
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/race/baseHealthScale
+
+ 8
+
+
-
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/statBases
-
- 80
- 20
- 1.0
- 1.0
- 0.25
- 300
-
-
+
+ Defs/PawnKindDef[defName="RH2Mech_KV2Walker"]/combatPower
+
+ 1400
+
+
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/statBases/ArmorRating_Blunt
-
- 50
-
-
+
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/statBases
+
+ 80
+ 20
+ 1.0
+ 1.0
+ 0.25
+ 300
+
+
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/statBases/ArmorRating_Sharp
-
- 20
-
-
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/statBases/ArmorRating_Blunt
+
+ 50
+
+
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/comps
-
-
- 1500
- false
- 0.5
- true
-
- 3
-
- 140
- 150
- 10
- 25
-
-
-
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/statBases/ArmorRating_Sharp
+
+ 20
+
+
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/comps
+
+
+ 1500
+ false
+ 0.5
+ true
+
+ 3
+
+ 140
+ 150
+ 10
+ 25
+
+
+
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/race/baseHealthScale
-
- 4
-
-
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]
-
-
-
-
- false
- 0.1
-
- SightSensor
-
-
-
- false
- 0.1
-
- SightSensor
-
-
-
- false
- 0.1
-
- HearingSensor
-
-
-
- false
- 0.1
-
- HearingSensor
-
-
-
- false
- 1.5
-
- MechanicalShoulder
-
-
-
- false
- 1.5
-
- MechanicalShoulder
-
-
-
-
-
-
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/race/baseHealthScale
+
+ 4
+
+
-
- Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/tools
-
-
-
- left power fist
-
- Blunt
-
- 22
- 2
- LeftHand
- true
-
-
- right power fist
-
- Blunt
-
- 25
- 2
- RightHand
- true
- true
-
-
-
-
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]
+
+
+
+
+ false
+ 0.1
+
+ SightSensor
+
+
+
+ false
+ 0.1
+
+ SightSensor
+
+
+
+ false
+ 0.1
+
+ HearingSensor
+
+
+
+ false
+ 0.1
+
+ HearingSensor
+
+
+
+ false
+ 1.5
+
+ MechanicalShoulder
+
+
+
+ false
+ 1.5
+
+ MechanicalShoulder
+
+
+
+
+
+
-
- Defs/PawnKindDef[defName="RH2Mech_TeslaDrone"]
-
-
-
- 20
- 30
-
-
-
-
+
+ Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/tools
+
+
+
+ left power fist
+
+ Blunt
+
+ 22
+ 2
+ LeftHand
+ true
+
+
+ right power fist
+
+ Blunt
+
+ 25
+ 2
+ RightHand
+ true
+ true
+
+
+
+
-
- Defs/PawnKindDef[defName="RH2Mech_TeslaDrone"]/combatPower
-
- 400
-
-
+
+ Defs/PawnKindDef[defName="RH2Mech_TeslaDrone"]
+
+
+
+ 20
+ 30
+
+
+
+
-
- Defs/PawnKindDef[defName="RH2Mech_PlasmaDrone"]
-
-
-
- 20
- 25
-
-
-
-
+
+ Defs/PawnKindDef[defName="RH2Mech_TeslaDrone"]/combatPower
+
+ 400
+
+
-
- Defs/PawnKindDef[defName="RH2Mech_PlasmaDrone"]/combatPower
-
- 450
-
-
+
+ Defs/PawnKindDef[defName="RH2Mech_PlasmaDrone"]
+
+
+
+ 20
+ 25
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="RH2Mech_PlasmaDrone"]/combatPower
+
+ 450
+
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/PawnKinds_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/PawnKinds_Gruppa_Krovi.xml
index 15904468e6..3dd9e52cb7 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/PawnKinds_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/PawnKinds_Gruppa_Krovi.xml
@@ -1,98 +1,98 @@
-
- Defs/PawnKindDef[@Name="RH2_GruppaKrovi_Base"]
-
-
-
- 4
- 6
-
-
-
-
+
+ Defs/PawnKindDef[@Name="RH2_GruppaKrovi_Base"]
+
+
+
+ 4
+ 6
+
+
+
+
-
- Defs/PawnKindDef[@Name="RH2_GruppaKrovi_IntermediateBase"]
-
-
-
- 4
- 6
-
-
-
- 0.15
-
- 10
- 100
-
-
- GrenadeSmoke
-
-
- 0
- 1
-
-
-
- 0.075
-
- 50
- 200
-
-
- CE_FlareLauncher
-
-
- 2
- 4
-
-
-
-
-
-
+
+ Defs/PawnKindDef[@Name="RH2_GruppaKrovi_IntermediateBase"]
+
+
+
+ 4
+ 6
+
+
+
+ 0.15
+
+ 10
+ 100
+
+
+ GrenadeSmoke
+
+
+ 0
+ 1
+
+
+
+ 0.075
+
+ 50
+ 200
+
+
+ CE_FlareLauncher
+
+
+ 2
+ 4
+
+
+
+
+
+
-
- Defs/PawnKindDef[@Name="RH2_GruppaKrovi_SpecialBase"]
-
-
-
- 4
- 6
-
-
-
- 0.125
-
- 10
- 100
-
-
- GrenadeDestructive
-
-
- 2
- 3
-
-
-
-
-
-
+
+ Defs/PawnKindDef[@Name="RH2_GruppaKrovi_SpecialBase"]
+
+
+
+ 4
+ 6
+
+
+
+ 0.125
+
+ 10
+ 100
+
+
+ GrenadeDestructive
+
+
+ 2
+ 3
+
+
+
+
+
+
-
- Defs/PawnKindDef[@Name="RH2_GruppaKrovi_BossBase"]
-
-
-
- 4
- 6
-
-
-
-
+
+ Defs/PawnKindDef[@Name="RH2_GruppaKrovi_BossBase"]
+
+
+
+ 4
+ 6
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Weapons_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Weapons_Gruppa_Krovi.xml
index 00bc2d9cd4..afa5db7386 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Weapons_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Weapons_Gruppa_Krovi.xml
@@ -445,8 +445,8 @@
False
- RN_GruppaKrovi_Marksman
- RN_SVDS
+ RN_GruppaKrovi_Marksman
+ RN_SVDS
PrecisionRifling
@@ -491,8 +491,8 @@
False
- RN_GruppaKrovi_Marksman
- RN_KSVK
+ RN_GruppaKrovi_Marksman
+ RN_KSVK
PrecisionRifling
diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index 746d33a0ac..920a29c11b 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -40,6 +40,7 @@ Mod |
[Pratt] WWII Weapons Pack (Vanilla) |
[RH2] DOOM |
[RH2] Faction: Bounty Hunters |
+[RH2] Faction: Gruppa Krovi |
[RH2] Faction: Task Force 141 |
[RH2] Faction: The Rangers |
[RH2] Faction: Utilitarian |
From 8dd11b1d703592ddb195b0bd4f659f3c47a3f805 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Fri, 16 Aug 2024 21:14:16 -0400
Subject: [PATCH 57/69] More housekeeping
---
.../Patches/Mechs_Gruppa_Krovi.xml | 13 --
.../Patches/PawnKinds_Gruppa_Krovi.xml | 114 +++++++++---------
.../Patches/TraderKinds_Gruppa_Krovi.xml | 2 +
3 files changed, 59 insertions(+), 70 deletions(-)
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml
index 4511cef338..176ff6bfeb 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml
@@ -68,42 +68,36 @@
- false
0.25
SightSensor
- false
0.25
SightSensor
- false
0.25
HearingSensor
- false
0.25
HearingSensor
- false
.6
MechanicalLeg
- false
.5
MechanicalLeg
@@ -219,7 +213,6 @@
-
Defs/ThingDef[defName="RH2Mech_TeslaDrone" or defName="RH2Mech_PlasmaDrone"]/race/baseHealthScale
@@ -233,42 +226,36 @@
- false
0.1
SightSensor
- false
0.1
SightSensor
- false
0.1
HearingSensor
- false
0.1
HearingSensor
- false
1.5
MechanicalShoulder
- false
1.5
MechanicalShoulder
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/PawnKinds_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/PawnKinds_Gruppa_Krovi.xml
index 3dd9e52cb7..e252fed382 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/PawnKinds_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/PawnKinds_Gruppa_Krovi.xml
@@ -2,57 +2,57 @@
- Defs/PawnKindDef[@Name="RH2_GruppaKrovi_Base"]
-
-
-
- 4
- 6
-
-
-
+ Defs/PawnKindDef[@Name="RH2_GruppaKrovi_Base"]
+
+
+
+ 4
+ 6
+
+
+
- Defs/PawnKindDef[@Name="RH2_GruppaKrovi_IntermediateBase"]
-
-
-
- 4
- 6
-
-
-
- 0.15
-
- 10
- 100
-
-
- GrenadeSmoke
-
-
- 0
- 1
-
-
-
- 0.075
-
- 50
- 200
-
-
- CE_FlareLauncher
-
-
- 2
- 4
-
-
-
-
-
+ Defs/PawnKindDef[@Name="RH2_GruppaKrovi_IntermediateBase"]
+
+
+
+ 4
+ 6
+
+
+
+ 0.15
+
+ 10
+ 100
+
+
+ GrenadeSmoke
+
+
+ 0
+ 1
+
+
+
+ 0.075
+
+ 50
+ 200
+
+
+ CE_FlareLauncher
+
+
+ 2
+ 4
+
+
+
+
+
@@ -84,15 +84,15 @@
- Defs/PawnKindDef[@Name="RH2_GruppaKrovi_BossBase"]
-
-
-
- 4
- 6
-
-
-
+ Defs/PawnKindDef[@Name="RH2_GruppaKrovi_BossBase"]
+
+
+
+ 4
+ 6
+
+
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/TraderKinds_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/TraderKinds_Gruppa_Krovi.xml
index a03503ebf9..813fa43d1d 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/TraderKinds_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/TraderKinds_Gruppa_Krovi.xml
@@ -1,5 +1,6 @@
+
Defs/TraderKindDef[
defName="RHBase_GruppaKrovi_Standard" or
@@ -20,4 +21,5 @@
+
\ No newline at end of file
From dda011580e92dd60dfddeaddc195619fcaed41c3 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Fri, 16 Aug 2024 21:36:36 -0400
Subject: [PATCH 58/69] Tweaks
---
.../Patches/Apparel_Gruppa_Krovi.xml | 113 +++++++++++++++++-
.../Patches/Weapons_Gruppa_Krovi.xml | 1 +
2 files changed, 109 insertions(+), 5 deletions(-)
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml
index 1fc6084ac1..fc7ec3ac17 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml
@@ -83,7 +83,29 @@
0.54
-
+
+
+ Defs/ThingDef[defName="RNApparel_K63_Helmet_GP7Gasmask"]
+
+
+
+
+ 0.20
+
+ Eye
+
+
+
+ 0.20
+
+ Eye
+
+
+
+
+
+
+
Defs/ThingDef[defName="RNApparel_Helmet_JuggernautMkII"]/statBases
@@ -109,6 +131,28 @@
Defs/ThingDef[defName="RNApparel_Helmet_JuggernautMkII"]/equippedStatOffsets/MoveSpeed
+
+ Defs/ThingDef[defName="RNApparel_Helmet_JuggernautMkII"]
+
+
+
+
+ 0.80
+
+ Eye
+
+
+
+ 0.80
+
+ Eye
+
+
+
+
+
+
+
Defs/ThingDef[
@@ -183,12 +227,12 @@
defName="RNApparel_Jacket_GORKA4AnorakJacket" or
defName="RNApparel_Jacket_GORKAESSOJacket" or
defName="RNApparel_Jacket_GORKAKMLKJacket"
- ]/statBases/Flammability
+ ]/statBases/Flammability
0.6
-
+
Defs/ThingDef[
@@ -197,7 +241,31 @@
defName="RNApparel_Soviet_JuggernautSuitMkII"
]/equippedStatOffsets/MoveSpeed
-
+
+
+ Defs/ThingDef[defName="RNApparel_CryeCAGE_Multicam" or defName="RNApparel_Defender2_Green"]
+
+
+
+
+ 0.60
+
+ Neck
+ Shoulder
+
+
+
+ 0.60
+
+ Neck
+ Shoulder
+
+
+
+
+
+
+
Defs/ThingDef[defName="RNApparel_CryeCAGE_Multicam"]/statBases
@@ -269,7 +337,41 @@
-
+
+
+ Defs/ThingDef[@Name="RNApparel_Soviet_JuggernautSuitMkII"]
+
+
+
+
+ 0.80
+
+ Neck
+
+
+
+ 0.80
+
+ Neck
+
+
+
+ 0.90
+
+ Arm
+
+
+
+ 0.90
+
+ Arm
+
+
+
+
+
+
+
Defs/ThingDef[@Name = "RHApparel_GruppaKroviHarnessBase"]/apparel/layers
@@ -361,4 +463,5 @@
60
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Weapons_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Weapons_Gruppa_Krovi.xml
index afa5db7386..690b24dc2d 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Weapons_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Weapons_Gruppa_Krovi.xml
@@ -493,6 +493,7 @@
RN_GruppaKrovi_Marksman
RN_KSVK
+ Bipod_AMR
PrecisionRifling
From a43d0e7136493349d451b80caae3acc4de446325 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Fri, 16 Aug 2024 22:38:33 -0400
Subject: [PATCH 59/69] Housekeeping and tweaks
---
.../Patches/Apparel_Gruppa_Krovi.xml | 2 +-
.../Patches/Mech_Weapons_Gruppa_Krovi.xml | 2 +-
.../Patches/Mechs_Gruppa_Krovi.xml | 15 +++++++++++----
.../Patches/TraderKinds_Gruppa_Krovi.xml | 2 +-
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml
index fc7ec3ac17..6d9ee38a30 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml
@@ -339,7 +339,7 @@
- Defs/ThingDef[@Name="RNApparel_Soviet_JuggernautSuitMkII"]
+ Defs/ThingDef[defName="RNApparel_Soviet_JuggernautSuitMkII"]
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mech_Weapons_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mech_Weapons_Gruppa_Krovi.xml
index 394d032262..0c73a72e5d 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mech_Weapons_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mech_Weapons_Gruppa_Krovi.xml
@@ -22,6 +22,7 @@
20.00
+ 1.27
CombatExtended.Verb_ShootCE
true
Bullet_127x108mm_FMJ
@@ -157,7 +158,6 @@
Defs/ThingDef[defName="RNBullet_Tesla_Charge"]
-
RNGun_RedStar_PlasmaCannon
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml
index 176ff6bfeb..d24afae67d 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Mechs_Gruppa_Krovi.xml
@@ -2,7 +2,7 @@
- Defs/ThingDef[
+ Defs/ThingDef[
defName="RH2Mech_KV2Walker" or
defName="RH2Mech_TeslaDrone" or
defName="RH2Mech_PlasmaDrone"
@@ -10,7 +10,6 @@
Humanoid
-
@@ -62,6 +61,13 @@
+
+ Defs/ThingDef[defName="RH2Mech_KV2Walker"]/butcherProducts
+
+ 100
+
+
+
Defs/ThingDef[defName="RH2Mech_KV2Walker"]
@@ -92,13 +98,13 @@
- .6
+ 0.6
MechanicalLeg
- .5
+ 0.5
MechanicalLeg
@@ -332,4 +338,5 @@
450
+
\ No newline at end of file
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/TraderKinds_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/TraderKinds_Gruppa_Krovi.xml
index 813fa43d1d..8444e86e11 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/TraderKinds_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/TraderKinds_Gruppa_Krovi.xml
@@ -5,7 +5,7 @@
Defs/TraderKindDef[
defName="RHBase_GruppaKrovi_Standard" or
defName="RHCaravan_GruppaKrovi_BlackMarket"
- ]/stockGenerators
+ ]/stockGenerators
CE_Ammo
From 79e8d2fe752049d7252ee704416dbb52db5a4d0d Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Fri, 16 Aug 2024 23:28:52 -0400
Subject: [PATCH 60/69] Tweaks
---
.../Patches/Apparel_Gruppa_Krovi.xml | 41 ++++++++++---------
.../Patches/TraderKinds_Gruppa_Krovi.xml | 7 ++++
2 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml
index 6d9ee38a30..59df622907 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/Apparel_Gruppa_Krovi.xml
@@ -305,27 +305,30 @@
- Defs/ThingDef[defName="RNApparel_Soviet_JuggernautSuitMkII"]/statBases
+ Defs/ThingDef[defName="RNApparel_Soviet_JuggernautSuitMkII"]/statBases/ArmorRating_Sharp
-
- 21000
- 360
- 0.25
- 18
- 31
- 0.27
- 1
- 5.5
- 30
- 50
- 20
- -0.25
- -0.25
- 0.15
-
+ 18
+ 50
+ 20
-
-
+
+
+
+ Defs/ThingDef[defName="RNApparel_Soviet_JuggernautSuitMkII"]/statBases/ArmorRating_Blunt
+
+ 32
+
+
+
+
+ Defs/ThingDef[defName="RNApparel_Soviet_JuggernautSuitMkII"]/equippedStatOffsets
+
+
+ 40
+
+
+
+
Defs/ThingDef[defName="RNApparel_Soviet_JuggernautSuitMkII"]/costList
diff --git a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/TraderKinds_Gruppa_Krovi.xml b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/TraderKinds_Gruppa_Krovi.xml
index 8444e86e11..afe58741b8 100644
--- a/ModPatches/RH2 Faction - Gruppa Krovi/Patches/TraderKinds_Gruppa_Krovi.xml
+++ b/ModPatches/RH2 Faction - Gruppa Krovi/Patches/TraderKinds_Gruppa_Krovi.xml
@@ -1,6 +1,13 @@
+
+ Defs/ThingDef[defName="RH2_Dima_Cigarette"]/statBases
+
+ 0.05
+
+
+
Defs/TraderKindDef[
defName="RHBase_GruppaKrovi_Standard" or
From 5d894d89837b4e18ac3e1a9ed9163af32caad312 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Sat, 17 Aug 2024 01:02:07 -0400
Subject: [PATCH 61/69] Make frag grenades smeltable
---
Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml b/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
index a36fb35d53..140fcbc614 100644
--- a/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
+++ b/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
@@ -148,12 +148,19 @@
+
+ Defs/ThingDef[defName="Weapon_GrenadeFrag"]/smeltable
+
+ false
+
+
+
Defs/ThingDef[defName="Weapon_GrenadeFrag"]
CombatExtended.AmmoThing
75
- First
+ First
@@ -405,7 +412,7 @@
CombatExtended.AmmoThing
75
- First
+ First
From 78f62c9f82af70bbb86c56d660cb99bef6bf7440 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 17 Aug 2024 00:15:25 -0700
Subject: [PATCH 62/69] Add Test for Duplicates
---
.github/workflows/duplicates.yml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 .github/workflows/duplicates.yml
diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml
new file mode 100644
index 0000000000..cd6bc7e1f8
--- /dev/null
+++ b/.github/workflows/duplicates.yml
@@ -0,0 +1,20 @@
+name: Check Patch Duplicates
+on:
+ pull_request:
+ branches: [ master, Development ]
+
+# Restrict the permissions of the ephemeral GitHub token used by this workflow
+permissions:
+ contents: read
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ - name: Check C# code style
+ run: |
+ python3 DupeFinder.py -c
From 664027c4a892e270a4e963b056fc19dffb7ce357 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 17 Aug 2024 00:20:20 -0700
Subject: [PATCH 63/69] Remove AssembliesCompat and CombatExtendedLoader
---
.github/workflows/release.yml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 756bb2140a..50669e0cd7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,13 +16,11 @@ jobs:
rm -rf AssemblyPublicizer
git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer
mkdir -p Assemblies
- mkdir -p AssembliesCore
- mkdir -p AssembliesCompat
mkdir -p ${{ runner.temp }}/downloads
- - name: build loader
+ - name: remove loader
run: |
- TEMP=${{ runner.temp }}/ python Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --download-libs --all-libs
+ rm Assemblies/CombatExtendedLoader.dll
- name: build core
run: |
TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer
@@ -32,7 +30,7 @@ jobs:
- name: package
run: |
mkdir CombatExtended
- cp -r Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+ cp -r Assemblies/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
zip -9 -r CombatExtended.zip CombatExtended
- name: Upload Package
id: upload-package
From f3152e69ca45ed13e09111a9cd50394fb7df9125 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 17 Aug 2024 00:21:44 -0700
Subject: [PATCH 64/69] Remove AssembliesCore AssembliesCompat and Loader from
zipfiles
---
.github/workflows/pullrequest.yml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index fc14818afd..5196edc729 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -25,15 +25,13 @@ jobs:
wget https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/Development/Make.py -O Make.py
wget https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/Development/BuildCompat.py -O BuildCompat.py
mkdir -p Assemblies
- mkdir -p AssembliesCore
- mkdir -p AssembliesCompat
mkdir -p ${{ runner.temp }}/downloads
rm -rf AssemblyPublicizer
git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer
- - name: build loader
+ - name: remove loader
run: |
- TEMP=${{ runner.temp }}/ python Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --download-libs --all-libs
+ rm Assemblies/CombatExtendedLoader.dll
- name: build core
run: |
@@ -46,7 +44,7 @@ jobs:
- name: package
run: |
mkdir CombatExtended
- cp -r Source/ Assemblies/ AssembliesCompat/ AssembliesCore/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+ cp -r Source/ Assemblies/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
zip -9 -r build.zip CombatExtended
- name: Upload to DO
run: |
From fb0f411577d47d236b7ad5b5cc5b38027b4b0905 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 17 Aug 2024 00:22:34 -0700
Subject: [PATCH 65/69] Remove AssembliesCompat AssembliesCore and Loader from
zipfiles
---
.github/workflows/main.yml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b04e34fc0f..f314aa9c7f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,12 +15,10 @@ jobs:
rm -rf AssemblyPublicizer
git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer
mkdir -p Assemblies
- mkdir -p AssembliesCore
- mkdir -p AssembliesCompat
mkdir -p ${{ runner.temp }}/downloads
- - name: build loader
+ - name: remove loader
run: |
- TEMP=${{ runner.temp }}/ python Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --download-libs --all-libs
+ rm Assemblies/CombatExtendedLoader.dll
- name: build core
run: |
@@ -33,7 +31,7 @@ jobs:
- name: package
run: |
mkdir CombatExtended
- cp -r Source/ Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+ cp -r Source/ Assemblies/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
zip -9 -r build.zip CombatExtended
- name: Upload to DO
run: |
From d9a9f0c280c9d984156916174dc5903a7d059d4b Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 17 Aug 2024 00:23:54 -0700
Subject: [PATCH 66/69] Rename task
---
.github/workflows/duplicates.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml
index cd6bc7e1f8..777a91976e 100644
--- a/.github/workflows/duplicates.yml
+++ b/.github/workflows/duplicates.yml
@@ -15,6 +15,6 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- - name: Check C# code style
+ - name: Check for duplicate virtual file paths
run: |
python3 DupeFinder.py -c
From a78f6b7c69d2f75b6281735a9d1cfdde60fb9c04 Mon Sep 17 00:00:00 2001
From: Logan Perkins
Date: Sat, 17 Aug 2024 00:30:50 -0700
Subject: [PATCH 67/69] Rename colliding path
---
.../DamageDefs/{Damages_Misc.xml => Anomaly_Damages_Misc.xml} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename Anomaly/Patches/DamageDefs/{Damages_Misc.xml => Anomaly_Damages_Misc.xml} (100%)
diff --git a/Anomaly/Patches/DamageDefs/Damages_Misc.xml b/Anomaly/Patches/DamageDefs/Anomaly_Damages_Misc.xml
similarity index 100%
rename from Anomaly/Patches/DamageDefs/Damages_Misc.xml
rename to Anomaly/Patches/DamageDefs/Anomaly_Damages_Misc.xml
From 82696bc8a9085e04e5f47968811c6bec0d365150 Mon Sep 17 00:00:00 2001
From: SamaelGray <56392968+SamaelGray@users.noreply.github.com>
Date: Mon, 19 Aug 2024 14:35:02 +0330
Subject: [PATCH 68/69] VRE Lycans patch
---
LoadFolders.xml | 5 +++--
.../Patches/GeneDefs/GeneDefs_Health.xml | 13 +++++++++++++
SupportedThirdPartyMods.md | 1 +
3 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/GeneDefs/GeneDefs_Health.xml
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 1d7bf52a19..87ab9e226c 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -380,7 +380,7 @@
ModPatches/RBSE
ModPatches/RH2 DOOM
ModPatches/RH2 Faction - Bounty Hunters
- ModPatches/RH2 Faction - Gruppa Krovi
+ ModPatches/RH2 Faction - Gruppa Krovi
ModPatches/RH2 Faction - Task Force 141
ModPatches/RH2 Faction - The Rangers
ModPatches/RH2 Faction - Utilitarian
@@ -556,6 +556,7 @@
ModPatches/Vanilla Races Expanded - Highmate
ModPatches/Vanilla Races Expanded - Hussar
ModPatches/Vanilla Races Expanded - Insector
+ ModPatches/Vanilla Races Expanded - Lycanthrope
ModPatches/Vanilla Races Expanded - Phytokin
ModPatches/Vanilla Races Expanded - Sanguophage
ModPatches/Vanilla Races Expanded - Saurid
@@ -613,4 +614,4 @@
ModPatches/Multiplayer
ModPatches/SRTS
-
+
\ No newline at end of file
diff --git a/ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/GeneDefs/GeneDefs_Health.xml b/ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/GeneDefs/GeneDefs_Health.xml
new file mode 100644
index 0000000000..55dcd7fbee
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/GeneDefs/GeneDefs_Health.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ Defs/GeneDef[defName="VRE_SuperiorDarkVision"]
+
+
+ 0.9
+
+
+
+
+
\ No newline at end of file
diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index af308caa03..37d7db57df 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -537,6 +537,7 @@ Vanilla Races Expanded - Fungoid |
Vanilla Races Expanded - Highmate |
Vanilla Races Expanded - Hussar |
Vanilla Races Expanded - Insector |
+Vanilla Races Expanded - Lycanthrope |
Vanilla Races Expanded - Phytokin |
Vanilla Races Expanded - Sanguophage |
Vanilla Races Expanded - Saurid |
From 5d87ee8166f4e5bc15f614d9bf4d64c8f5c71797 Mon Sep 17 00:00:00 2001
From: n7huntsman
Date: Tue, 20 Aug 2024 01:42:23 -0400
Subject: [PATCH 69/69] Rename inner folder, give warhowl suppression buff
---
.../GeneDefs_Health.xml | 0
.../Hediffs_Health.xml | 74 +++++++++++++++++++
2 files changed, 74 insertions(+)
rename ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/{GeneDefs => Vanilla Races Expanded - Lycanthrope}/GeneDefs_Health.xml (100%)
create mode 100644 ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/Vanilla Races Expanded - Lycanthrope/Hediffs_Health.xml
diff --git a/ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/GeneDefs/GeneDefs_Health.xml b/ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/Vanilla Races Expanded - Lycanthrope/GeneDefs_Health.xml
similarity index 100%
rename from ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/GeneDefs/GeneDefs_Health.xml
rename to ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/Vanilla Races Expanded - Lycanthrope/GeneDefs_Health.xml
diff --git a/ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/Vanilla Races Expanded - Lycanthrope/Hediffs_Health.xml b/ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/Vanilla Races Expanded - Lycanthrope/Hediffs_Health.xml
new file mode 100644
index 0000000000..90e2e98b1f
--- /dev/null
+++ b/ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/Vanilla Races Expanded - Lycanthrope/Hediffs_Health.xml
@@ -0,0 +1,74 @@
+
+
+
+
+ Defs/HediffDef[defName="VRE_WarHowlHediff"]/stages/li[1]/statOffsets
+
+ -0.10
+
+
+
+
+ Defs/HediffDef[defName="VRE_WarHowlHediff"]/stages/li[2]/statOffsets
+
+ -0.20
+
+
+
+
+ Defs/HediffDef[defName="VRE_WarHowlHediff"]/stages/li[3]/statOffsets
+
+ -0.30
+
+
+
+
+ Defs/HediffDef[defName="VRE_WarHowlHediff"]/stages/li[4]/statOffsets
+
+ -0.40
+
+
+
+
+ Defs/HediffDef[defName="VRE_WarHowlHediff"]/stages/li[5]/statOffsets
+
+ -0.50
+
+
+
+
+ Defs/HediffDef[defName="VRE_WarHowlHediff"]/stages/li[6]/statOffsets
+
+ -0.60
+
+
+
+
+ Defs/HediffDef[defName="VRE_WarHowlHediff"]/stages/li[7]/statOffsets
+
+ -0.70
+
+
+
+
+ Defs/HediffDef[defName="VRE_WarHowlHediff"]/stages/li[8]/statOffsets
+
+ -0.80
+
+
+
+
+ Defs/HediffDef[defName="VRE_WarHowlHediff"]/stages/li[9]/statOffsets
+
+ -0.90
+
+
+
+
+ Defs/HediffDef[defName="VRE_WarHowlHediff"]/stages/li[10]/statOffsets
+
+ -1
+
+
+
+
\ No newline at end of file