From a6fed9d24e5dec1649254da9d2c7f66e9c4fb69d Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Thu, 16 Sep 2021 00:54:23 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A7=8E=EC=9D=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AutomataWearSetting.xml | 8 ++---
1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml | 10 +++---
1.3/Defs/ThingDef/ThingDef_Apparel.xml | 6 ++++
1.3/Defs/ThingDef/ThingDef_Module.xml | 6 ++--
.../UI/Abilities/PNOfficerCommand.png | Bin 0 -> 16288 bytes
.../{AbilityDefs.xml => Ideo_AbilityDefs.xml} | 4 +--
...ffs_Module.xml => Ideo_Hediffs_Module.xml} | 0
Ideology/Defs/Ideo_Reserch_ProjectDefs.xml | 34 ++++++++++++++++++
...ef_Module.xml => Ideo_ThingDef_Module.xml} | 22 ++++++++++--
...ml => Royal_Hediffs_BodyParts_Psychic.xml} | 0
...ml => Royal_Hediffs_BodyParts_Vanilla.xml} | 0
...Defs.xml => Royal_Reserch_ProjectDefs.xml} | 2 +-
...f_Weapon.xml => Royal_ThingDef_Weapon.xml} | 0
13 files changed, 74 insertions(+), 18 deletions(-)
create mode 100644 Content/Textures/UI/Abilities/PNOfficerCommand.png
rename Ideology/Defs/{AbilityDefs.xml => Ideo_AbilityDefs.xml} (93%)
rename Ideology/Defs/{Hediffs_Module.xml => Ideo_Hediffs_Module.xml} (100%)
create mode 100644 Ideology/Defs/Ideo_Reserch_ProjectDefs.xml
rename Ideology/Defs/{ThingDef_Module.xml => Ideo_ThingDef_Module.xml} (60%)
rename Royalty/Defs/{Hediffs_BodyParts_Psychic.xml => Royal_Hediffs_BodyParts_Psychic.xml} (100%)
rename Royalty/Defs/{Hediffs_BodyParts_Vanilla.xml => Royal_Hediffs_BodyParts_Vanilla.xml} (100%)
rename Royalty/Defs/{Reserch_ProjectDefs.xml => Royal_Reserch_ProjectDefs.xml} (92%)
rename Royalty/Defs/{ThingDef_Weapon.xml => Royal_ThingDef_Weapon.xml} (100%)
diff --git a/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml b/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml
index 30a11d8..1b90f8f 100644
--- a/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml
+++ b/1.3/Defs/AutomataRaceSettings/AutomataWearSetting.xml
@@ -1,12 +1,12 @@
-
+
\ No newline at end of file
diff --git a/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml b/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml
index 71e1769..53add90 100644
--- a/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml
+++ b/1.3/Defs/ReserchDefs/Reserch_ProjectDefs.xml
@@ -157,7 +157,7 @@
Gunsmithing
1.0
- 2.1
+ 2.8
@@ -172,7 +172,7 @@
GasOperation
2.0
- 2.8
+ 3.5
@@ -187,7 +187,7 @@
Mortars
2.0
- 3.5
+ 4.2
@@ -205,7 +205,7 @@
PNRP_BrainCasing
5.0
- 3.5
+ 4.2
@@ -220,6 +220,6 @@
ChargedShot
5.0
- 2.1
+ 2.8
\ No newline at end of file
diff --git a/1.3/Defs/ThingDef/ThingDef_Apparel.xml b/1.3/Defs/ThingDef/ThingDef_Apparel.xml
index 028b550..7327a36 100644
--- a/1.3/Defs/ThingDef/ThingDef_Apparel.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Apparel.xml
@@ -33,6 +33,9 @@
PNHeadgear
+
+ true
+
@@ -892,6 +895,9 @@
PNRoyalHeadgear
+
+ true
+
diff --git a/1.3/Defs/ThingDef/ThingDef_Module.xml b/1.3/Defs/ThingDef/ThingDef_Module.xml
index 45aa520..560a00b 100644
--- a/1.3/Defs/ThingDef/ThingDef_Module.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Module.xml
@@ -9,7 +9,7 @@
PNApparelModule
- ApparelUtility
+ PNApparel
@@ -76,7 +76,7 @@
- 14000
+
@@ -85,7 +85,7 @@
- ShieldBelt
+
6
diff --git a/Content/Textures/UI/Abilities/PNOfficerCommand.png b/Content/Textures/UI/Abilities/PNOfficerCommand.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f9c04d1e312fa1fb60c55b95c10cb6ac0d85d78
GIT binary patch
literal 16288
zcma)jRZ!i{6Xg%PxVvj`hv4o6*Wg?T8Xyqdxj4Z+xH|-Qy*LT(7TjHf%YOfT->Q9>
z>8gI1sy;Q-U45p{4|P>}bQBU4007Vx6=XF3vylHSB+!3*znIzRe+I@yQ(g+Fo*+8{
z04hLHMpE0;|dzX-(m9>?RHLAnUZeHx7LPjK-X1a`mAGRfBT=YX=W!@pZ
zg6RQ09G~7GggQtB64EE*KlL5ZzPs$T^lTH8=YWIp=<1h`k(#`xuidZi?gw4z&*zV8
zE)%cWE|Zp18>+|HVAbQ&ivZ7CxJ^1lNpau_#wjrls`&QsN|HwjFgzkF^Rqsj`bIQh1jxY%AV9Ls(r|#=9pJLN#I^-)
z3607>Xm|-W50GGo6wEooK`;P+08y((7)F7iwT9CF^)oUsM@Rvn)1hyghnY=$Au53!
zc;%?@h4}-u86{j570hV;3TXYEgmJ^~bfecGV0xzryNq%fD1jBgl)#7E#p3)3$>*Q_
z8abDQGQvEC0Oo-F1Ui$vRiGbK+@)4NBLH-_lED6@NDstvIZ$LW6J8Pv4Fs2&kN}hP
z8$R{JS+4zU#(`HzzuCj9{|Azoun&sfMyY$xeOs63UwB7tI#IOxcW#Ay%yNo#pllbsv`M)jx@Q}n5
z{I=Lu*eqZSGE2h@P`JGHc;XMFdKH7oZ)xE_zkfcVNf-&f@_gA#UJ*5TgBd@c1;(r(
zg3A(bHW2ck^(vN3Ks?lT|K5QK9l#M$dH)AA!z>}@5vbEhkV6=LeJEuX16V0n*XIMg!@@4bPIIffkt}
zuWLL-xE1AT;IYf{W>I4v%+xj3u*+oiJe9j^CVPDQNxL?Q7qv%gPj5F6L}NNs!s*9IJl;xSkusy8;-~Hh2_q
z@;$@mb@6->9v&?mBr%D64?GaJ+yEO_6){Zc#+bxaF5rs^!G~Z%U(3r^a^@C)B+D@j
z$JRPgL&lO_gP9oRdQk{pbitd`7pSu72`~n-LiJ}Il*4L|phrc!*19_8Y
zM@N#MKYtd$`B62;dv*^r2TV}YIJ~x^Grl`~9ZLMPfwK9TiO>WjRsP$@^iNfi{JRnm
zLg?34a4%R+IiDO5+
zeolS^)>L9IFRy~tvjyv~Gzk#aQ6b=I;;wO}G@T6z_VAve>DJoS)%EaRIC}!~Gumx>
z5q^6|#}NZo)L@RTPRdXQ{dws}lB7?7+A>6gS6Z=PfKL?ItWm5HWB(xPsX0qWHv`Ne
z(e~89`%5oQYi>Q4A5C&92U!vaD)KSb!=}ifm5JnKBRd5s`f)uXh{M!^6v`AWT~z*P
zlGQ=PPr`N(Aj+whH4O&8e&XTbSxnWdYTym*e1GLfu5c`b`Sc!Vf(u}nf=X&i(>La2
zzY%Uax80`af|MwSvB=5EGbRrzQ|OL{nY1o#bMC;vI~Jsz5RNK8Ui#h+m;^H5PrpEl
znVm2p3;m!p^{3UZn_&l<_VfCHZsLZzPNc0?7_Bf5T()u7lE!L;LlfdArkr9_<9CS(
zZRmGW2=y%{umMv`aLK5Mcq`6C=AWt@clf#k13bk(vW~t{i;MTP*Ve`t6RY)Iusn1(
zygNz68}O6F2w^>$Feu^}7#jYY{4PNDglRn6l0Y0GLv!ifRfHgtps>rQqvNRJ%=2D@
z59=9$Xyp$F9$}*0ddGljN@xZWB9WD+7i2zOTqw69
zd;baQ_SwhP%c&if>Gh)zi2vL`tzaB=iP_h&xx|F52_1>Tj7Gc*@&s4$;lW`zV0YuM
zId?ic3lmdaf**a;yKP^o7$pXzkyzmd_Q+01SU6t+8Lg&5reqZ%%q%~#S4AO$!9s?H
zE2L24;T47^YJ^fjh9-dlUzXa(SHMjM3VR}+>tf{vwbc$gG6}4$-@i@q*e`oXD-R?W9Y)QsTsHT6o)z+-zQ|1_Axj&AxzrUEXvojTv463|qX&i4f-3Qlv7qTd{4*mObOuiPT
zv+T7R#z?7s(OQe&IL4G5`t>0Y3Ali9bjTw=lOpb72ewT@5}aDnRRfWbdB8g-T5Co`
zcz(ItE_3W48^15>b+xq*sq%aj#&MBl
z0P2JIM)=o~`&}8>Ed>RXP?}LZo#JJ(3?Vn>{|Zm~cqTvY`17O)_*@r~&$*-Z`(qo;
z34z3YA5+0%3$~}to?PbyF;i@Kklx+byl6mTf(#qEQlEgIqm5`*?YR{ckB5wyDSWkK
z`j_u?;I%##r}Taoc$xCyS_A;kPYkOC6P-f!szs
z<%S@-F)$T`YWxz6<=y~O0HyBVn^Tb*xsaFApw9T=I*Sz}gB_*R-c3&l+4Cfa@9OGu
z<|Xk1DW+5x@j_a?ZuWDRA>y3~m$Wc1qD^;;fWbI6U{jv@jh8yWwkczR(vW9Lo2MR!
zHY~aKE52Lz{gLH``SVQ6KhoJspq{*^XJ0DoqX!KU=TsgwRy26$+2{K~*JS_fnS73{
zx)PbL+#Jr>n}mg>i$VtibX-RQUBv@MG7;tomIm)5!sYq2I?R8u?c$4@^OA5>RaL=X
zz2-LWtG)MJJlj@7;3o$PgwQk9@maI@aJ-0hqeb0VrFuD=Yu*86E569e%6z)*rFwr_
z4Bn=o79wm#td01o(1vIA(v^ihACp;L&BCK1w3!FB31D9xJ`9cXs>vs5oo~>0P
z-C}1=)o|Q$Lohh=qaW|7ZUehEil*iUrLQZ(f=H{>B4B~Z7%zc$QMR?0CS)mqa>Fyd
zzBQOi{#;w=F7Dk4W05A4+)>3DWyQGl&Hiq%Nl(g9R!JK7@}L8VeStBc|C@P={7WGs
z_i5%#4-V3~EsqB3_u2(!aNMYdr$f~MiWdEcU+6@N6;
zRjQY2$k@J^10{NOp)j^n{BC7k4)&bc%21s!KNd0wdY%8)vTOR96gpN#{BiR!t|6(u
zYBMn0bWkg<6Q=%d_o`FP9=jiWepwgmtYaO4WBY^FfN|3g}
zj#*k$8C69a0dK2t5SRc+A@-
z8lKG=jgpOvH_#vn`3>zSjmUe8N1P8uAUYX?Y|IAlt0N&2;}fb;1cmYp=e2YY
z{`)1G)@mbm?OfkW#CqA-2p&CgEU-}*1jP}DmWcx&ccm3}zTX6Me2wdDZ5P9f;ZVf!
zX*W;%2A|UbSDR3(vWtoRh$8Xw7N<#G(h9vHXrR7-vST0E)e1XmLkZ`Hy(X<(AEx}~
zg@Ua3R{IdN>M-1M@%RCUip$SEe6fj2yziVtnFqUZ3SZOjcUy_a;b%t
z!8I#uUUUY_Oa?~0~VLqwPuh_MGlA5C))}2O>=IwUG2oV7KYDsx7Sf2t>W}GUw*;R8z_f~=khf_
z%{h({jp`}OjR`%YIrV-!)oTdTe}ALMju&<4!$Kq0L`k)lq&hl0AM8@v7`zMaO4HN^
zObrQP^EubQT?7el1S$<-%2;-zilz4sXvsq@d9-4Qwu2BV*H_@>v^ZVfh^OFLM0}e2
zPn~;{4MR#P4I{0NFa6D*if56u{ztq!+c
z-7$?NYG#Qg22i8uv44a_Z$+Y*V==j;q<;5Ey6AHO>w!K=EnMUW@{1dYv%b9Lrc6u7n9z_h1$8@A_Va*Kw}#J8U1->JE?Y-
zf(|*!N@z_@70&WqeJ*UlR`Cns6nCsWh9Ah5*g(!6NB@C)OrW@x4Dkc;l{&{5xp5hW
z($m4T=56ZkS)DSpmITZcxC?7wOBbAk$5Jqmz%d{D0r)F2`S-JayvtqUMfPvId?b2h
z;_x6N!n=#5;6)Ro(EZxzHq?FaOp(UsE)rH8bmOd7$5Kg36G@
zx2wWIuHO|*wN7)%qNrJ&vR9+?+Yl7e&Yn&e+l9ZY%45=x8aNLoo}$7)bCLBHVMUhT
z@qoiZriyg`u*u`~((V9Om`m~~#ZIefTUwB@fEkjIFZEcC7y+>^Tyyv5D3A3ukevz4
zKC21j&z5waY;c4}({}KE%jP{Mt2{5vSWN{yVQgOEY&iLv7%#lEQ@Y*@_}FPIor^?&
zS+$l7)l_?ke6l<0*R$~V$G_7=JhfOpqz3Uj^@a7F09T5%oeQGLdaF{$&Z7taLlE|#
zk(I=mfzJf6EmLUpTUv<+>qQ_W{lLyyEj&}9{-1J*L_|;2M^pC2_Yp0nA!;)~GQY$+
zDLT8cG=+%ZPggdFZ=9mHzVl>FQ32Y5somd
zdsH*+|22g_XnI1No{LxNU;%8;`vbwVjfdHLRsQ5mPk2GNuX3rh*l1>F$81aPd2od#
zszdq*Y>?kpvNSk-VLFvgYsPB%UBZxzdYZ9vRynm&Lc|r(!vyUryKmB#sR-iP{4hy&
zpgs$(qo{wYxyEse{2vQMR>N2(vqL7nQSSXTd#QEK=K9;#Lfowm|L*IO`7*TNS7VbQ
zr_IUMFjDo-N!l7EaKFri|7zt7v3*s$=AV-Nturd$AVfa#sYgD5R7(u1E<1mwBpcaK
z9387Z^VNnu0smmXgR92|z+fav*28lXHTEoQKs4ss>%XA>UCJGs@hLE$17Ot{9Z;|S
zWgKNWLzCbdQ7K-IZsY!xpty$
z)qBCSu^^+X6Y;`^*(mA{k7;@u(Sh!$LZT-24))W9{*&ilp&^lEe_gMXEiA1eACWva
z#~qetM~}u<1f{ue^QIO`*vG2a2S)0R>?<9o$s1nR@@;&v{iS?x~qV=Dcw&oPrZ()+1oVV0B6V>z(;<>4n
zu8LQXyk;TaT7=s>ml|t`Q}p#c!7gkB(JaF$Hw@5}l)%p(ygR@A
zB+)7=f?B?@ps=y>wIFb{F9qJvqYdqMg{ymvz=e;7S#MPS{QPZIUPQ>!FabOZCpwSR
z8NUz1I37;K55VI^f@X;{Y~D+O>b$*;R<7X74pZZhEPEOo@vo5u$D>g3^*cHX#f52E
z%{d4Kwt!pfkIEb&s*5+KED_;cBM@U*=H%@AX$Q7}0Nq=K*c46ABu&83794j~HTXJ>J
zHFI8?d0ldxJcc1n`i(q`wDZ$&P_KhklG(r^Hh$}Iq%7kY!?JHDHtxe_Kg;D`+L|xl
znAy^BkTU?4O{XK<^i(s#)D+_cHj-rtsi2|}&)V|o4i47b4T4lAi>VfD0K@~W$c25B
zF~EA2mxO3rO*Pgqaom}jWi^yNmvYtp0DG{vYK2Z`I)
zW|A+h&P6|^5=3M{z#>6?S;}av?1RZiTAW9XTHuy+x3IIgmW@^SjW3gL-1&@jN!^(|
zKMuXVF>@w7_&CoY0Ue3{>l?iVQ;aALh#1UHs@c3`s1pJR?!spl&+jpe>){l}fgTh_
zS7w}y4rPdXp+1uwJS{Szy%BV(@M+bJBzD#%C5xx%%b
zFC}Uuu?oCFKBmj?9}4Syceg;Gt%C<1$ivCr2yk;?`{2oWQxY?vbmFl!_|J!{>noLk
zu#dVq)+Q&ZSwkjvKJRzQkkFl}rKO;E`%1WBrZizU?rSnHPw#)iBcmKce{CBsuUF=Y
z8XrVlhiI2tz6eM9W3iVM>xJDlgj-3@oxJq^`7RW0SCRS-F}G=giy1p7S+U)|eC%}Dzg@}xonA4It8?}D@
z%fvZAt4_;he|)!{P*SpX^3pZy?&@D~T$=Vc%E}pPbLgr{HCTh`kM0a>?4^HxGOWF8
zD!bgu^e~IRfmm90c>4q%nHUbX)||Jt!gi1tcDgr-$t(*7E@vqT!;G0yL_koA43;hxIh
zr@sgL>lw@$3xg@7LSSklr}v|@Q@`6r(5UU~&O=uqr*3CAcAR*F!O2x<;A(Yk-XQ(DWWq6;L8_0&blK-Yr(8jYYnPYXvs#O)lHfCeRcQh(1xrci=6D9}>@
z5SbS+9>t3cJO{RBS-dm;$6l^z%mZ_#mA^e#TU2ZGJ?9Z-(T&j&FBhKO(s-=6C&@bnp$R3;Y!_(V-75nK8L|GcpJQQ@*iIXD>WwfRu)tCB>zsQv15
z!0d$oP>L4!*BNe%m1=m~yXu>1DPqmVQd~0_4er`Vz-Nfg;$UxPU&LYd3B7gi{JDsK
z!Lgkh=g0KI$t_O&(#pYP22bqsxDMeV{ERrIHv*=3H;NX%?7=D1o2pVjqCSDkWJUy!
zbzFarDB{(MVW!676i$L=D4&yNN@Dr}TiV#$rLgrenf$2T#b)QR=2&$_&@3I0z?kd_
zd(qrDXzIBBJ|(*PvWSqF`Qw=n1>dL-Xh8#2HF7`_#TozJOG^mHYd;TY`5n>4cbj@Q
z!l*M|zmWel<+MAmVHX^oYj-0x@v&x6%@s%gSXenVJsmS&xj;*z#QD!b)N?C4n@A)6
z2Wuc=D8{Hu1Ch879+D
zDd+>+5tYo!6KG4^4Nwwg?{nkMQmu}QeEGdq3V$oVpNj#-bc%S5g>sFrJnkKPjcpBI
z(>jd^X{H4z0=z#KY%walYGts0bnc@lymkIbZsI7Bh@Ya1W6`6ikL4E7Gsrm6{uUWp
z>)M<*LOIY_u~qwn3@c6&U9PUFOWJta6TAmf+bpeV9%5S9@VLV*bR~v+F(-*v;pIl|
z;TshDh2U=cds*!&s&FNi54hG#?K(o-5P8nB3-C=~YuteoX|Tt)%H_{Zcltv#K%-G*
z*oD!1{_XVSus3+JMz(DhrIIm^h5=VsLxz=J8V|m#K19@5v03&w~-SCcf|F44X=S`N9)oaz2$X_o&o+P|)MCK9~v5O+Y?l%&*1IF2?i9b_5r4p_L-ZCc2b-n+~
z6!{{d^2iqYd+P<0a+;5jYBm=F+2oh;$dsiXYmSofjOfqn-k9%R+d9eVvdJCf?JE?*
zjW`Y}zYZ^N^VTV)3R!n@`QM2CW7@ViyWv`2DptS0d366*gnN)cf$s`%@vOgDoycHK
z#FK4g47=Qa-7O+goUC+qyzvPt!cca%?ew72$%auDJ^{SXOybe%l7f2hkuj|5VEj2*
zRC(K|eQnxHE4G71J+AuX#9ptmd`9=v8od^7NU&Bx
z(HGwd=nJWlA==bTk=^P-vW@(CXMa2OyG}OZo>Oa9Z)J=U-znlw-0u}gJ^%@Yo(wuj
z)a*GWEL_gUXik+sf`#lDt6v`Nm)yzvs*TzHqd3Uuk3$BwC3Z}z);s`@bM!BEKJg)n
z31TQ8v-*H^5QO?qdKyy&o>WByjgHJ6netbrrz8SuZTG{pra}kU!y7psG?%sLAN|%Z
zPl-Igq|_L0CKlwf9%E#QOmgD%py3}+nhO~~GTNXx@h4a#Skwl|f!0WzOSIsUebo`x
z+UjCd+Tl3pFMeZm;o{^Q5fh(d+n3khDSA%l=1sMnrY?eH_EsgRd>!cYg~+gz`8(jG
z>&+g@e{!6+i9g9$%N8bY8mHT^f1-~DvpSI4WsQYIwh4;DR6`YEbT7EML^@pb~DqSpal
zULIbp6|@kh(WrQLxBoMWJUNm)DKIBV!#(klIFxdNh^O_qDnHaJz!6fnPq<_I}&o>C_3fU1sFPM2V-g0x!BUo|!7e9yt5
zw~2o}W*o6Slhu7#>?cpZZG(Y>dxtUO$mHH%3}M3-m!ARsh=xCrG45$k7Je0`zguQ8
zB$B2Fvz*Zg7Y>XFTTM~~<@$etoona2lw&{{Rf4+S17^tUci&F^F5s%xW&)c{6enqm
zUSYH;!}+MN2IZA$v7hF+J`vJx^`Og`D`sS*R@9KORopjVxv&Bf8;YYDvR1*Zp6b;u
z$|^rr%VAEJ%<$7hn{liPVMy;AH~%>x#;5Ga(UA17pf?eLx$@U%qt0!}?pO)^8*P|_
z92}gIbmEfy~
zXX$W^|L(Dui)raa!_W@y2IWr3FP`3jo~o(u;|PSY9^>UBX1ihTtvoJU%xnnKr0Q@u
zLYTbyKC`+O4)$TRRFWI6IZ~8vL3ckj$OQ~Q@taI-JurFp3I`^zDiiB8t5diB^FhDB2!UDc-kftDVv@T^XwRwX5<6YN}VkhHM7`RsG%
z)hXf`*yn?vpyU{aEr24Tu0iuhD&I&va+@v@gXud?V<)Y39AA*Sl!8#or5z?fqM(_J
z5zaUPKRULh=Mb%r7y0MLXyPj6(Y|>ef)RjM94a_6%DH38;V9wff~g%QDKW2Z5+90C
z_{mJ0&ff04*EUK1%S@ipuBBdW%`e0jv473=7492J7@<8pt9vV5`Nex>r)es*;C%E6
z_e!VNsSL@V>}~Ejik<(7pA&mKVf<*_!P+tP1}G*;;=!LL
z5`@e?&Y`3E;=|MHt!a;Y2`t%5U11B^Kw_K{-CY`@A9)N|y#r>J0>$m{vgz*jjyC>5B`N4rMIOkKIz74&~*;fjumN
z60{H+iJjG&VPVWB(Uym^RO=w*HLpVMUO&h4`rGTfmf)aMb71O@}~}cr|*3`)9KIsUvAQ$L*hXJcYCz8p46ABra=&
ztTr!uK>j`SeC30<|LSv1Y8;^*6}rR$XsR!aObA6hAi;eGfPlgknnSG!;w(|fNcr^Q
zjn(r$zbWv;N(o>|Fk(Swt@;O$an-r=$fyH=u0WvqtRiNfpRW@e8NOPH4*BP#FvP+o
zT@y0t{QZV4oj5?xbN!(nwFC`EXmP&Z;1ojC6C;6Bk_;;1CeeQ&0=gQe)3z;R#MooizsrFQ7hT0&>tZ96+`VDY9-=qyHxC86IiA*U6~O;!WXdA$Kw`^bU*cYk0h+^8TI~
zG))82AEU<^o64U$8W?8GVu<$lp2DZ1&E?4YXVf$6_>I@PcsT&x6JTZEO7EC-t0h34
z$0=e|fYoF8eifL
z4QnN}2P>9B$kQ~w<*(1dtZ-&*(j_t#13myB+kZ-vqwj43vUaXTi)O9S^0t#gX&%;@
zBZ823;x`A;BokWqRt-+i9LcIBhk`k&rdBH#5yr;DR&aF!^gJ(GkX?H`1DW#-z)eQ`Q>OS;dTRBf9tZoOx;(>fWHP>*b
z6XEf2lGIbN>Tuy~Z2;^EcFq~;Y=idx2!#z7nMTUlsgtstqGuw?iP%=r2b@tj8@UOW
z<#P2`g&96MwSSflEFcQs)UcSt21|i&(qV1Ra{_Rx6A3>4_
zUtshr;mc-&(9*<^Y~q5jU8XuLacL+xGVV@Se>1OGzMCw!?FlTs^pE!`A^_eGTHIdy
zG3o9T+(QF}AUWp)bHVx?gPqs!o}jc-iz#1g@Cywf&EZqf@-JO82N6S0iVP$
z8%6d3>FhN2sYep%TS!pAvn5{Yfm!cg#fL@I6D+Ny17!6S_6m$oZ$L^6dYF_$J*!sz
zcxC}q{Qb3_*}DaFh*(a9OqB@l?uHIvbg
zB}djD^0}D%GI~cp$KPZJ3X4h?NT?qz`eocL%;)jp9K&Bsbt`J(R;}Zr2u^|+@vi|L
zH)_uj9&r*?0pBe0poNT1CE~mYmbOLX2fEWlZFr?9PRDg#k;}f0h*4G}V%Vi
zWFS>F*_ouEBCVv-hq{MTSHbX8Yly{AyCpR
z3_D!NucDNHPN;}(RHRB|@vN5g>i9|Yc<3yAoj_;E9{+))Lm%xN6;z#!=T~!Z^^E}?
zK=It9fs4vT=c;?er|HMLX5D6u%GnCWK1AOspx`)V4Gt+e0zB2XG}MhFw-cr8R~AB|
z!@6uR7^W1$LpbfT6LzYwb$BwA={*!R@@;q{Bjk3Fy@b#!WFQD=$Z;ElZf@xYlK+C7IZT2-;}XJsx;tk97kP*
z?Mrht1AB|pTQ43}u6J0Pr^C?xtcX?U%gIB+-faQ(ZYs+aldlJ9vuX{f)xQY>zdJ>D
z^T)fJIVv$;#+HZSD1m3XrHP;nM_Yt&-y6}%;WO8QwqMYyOj>Zq-Bd0WKk=4qIg<6O
zOicXA(i6)|)8WMzGv&b3pY5x&DHxp%ePPYKy+LIl2~XYQ6n!f*O~rpJUvyv5?cRX=
zrX5YU>)}Vpbmy<^>3Vj{c+`%rqXgt3EAQS%<`PDj(Y6Q^mXP17vE(A->?lfPvQwx)7u+=}kzi-EUxy;g<-nlV**rZ`KZ9_2hAkUK~y02yJ
zST}3&>nN}XSgu8IkwDlniZa+N2{!TRT-}N30#)&XbLUz_oEeOl$FWZsk6qb_h4lrI
zQ6=at>}kSA&;4DFGIsaP8iMJ=;=_WH@^+qYrRfq@jPbJo>m0;|D2(`=fau`MXf{%xVRK^hmFYlNrx%wnfQ`yLvExZC55V(Zr@w36|Cag=Q?O8J%P2w%@{-~fl$s+
z#=U9~;Frg~kK>1h?kkXWG&HCS79lyMp<`h@a`XgC#vf7TIvWaiyu9|{Np1#
zz5E))IK%=+GN=ip1rRSgjr@NJbX9
zuUW=rW{56l-hX?&MkF71Fj+}fLUbdy#n_kz4KJ=EQnhJ*`+Gza>~igCWgi;omKq^q
zXiJceQV5Wq9lnN)y@r$&a1jiHbY=b}f2}h89M1GZAP4nRnoxj0nM*6&N$@o{>!HqEKis-W8)t(A~f%}LCD)Tl^&GWVImt>p0`?UOj8Q4hG}Pw
z>-@HJz$#)#=AzqUP{5C2{EC0RMxb{dEEl6ECuPk(0yrZiqBr_W6_&{?6ZU#bX|!l+
zwaqm1!U+4o@bn2d3$ct>KVhkLe?ywUab$#{gcPsmP%VzSJ_OY{u1Gt7{P!N3Htv|g@AQ1Bb=Kaixc1b;35hz56
zkkH_ARM!<$WM3OE=PsviZ$IH=&>;)6@hNADWBdybLJGIEiRg8}uCwexBs~$PVqqSN
zE?aOx?C|l%LKy_}rB6A5-xoYZ-Ui}fmII!a5pZ#vo`u>1M4s1sv~|Qo3on?!jaxt4
zztb5G$H~N--mcWJ0rh&D8Oni=3#^sB#%30Ra#{(!H&5(f)!_4^+0)XECq*)}BzP$l
zcwW&T_ZJEZODsG{m^ILXN8H+mW@M0H-~s`M`yxf(!aC9?W>j?pqYPz?D+H=hl1{PQ
z{j-0@QmYRRR{i_AtT{Gydhq*U&l}!GiFhmPY6mdB^Q((E!0y=OCecfswuSs;6RHvY
zaNlniCrzERIeUgc7on{rIzJ?|TlUxN1z0YfQ29@Jh8lHz)zlYr*tN5oQ=}ng0f@V4
zAwTs=iQwO*&58A()go%7V
zCIIsruN8uB@{vh3AAmz@RGXHV)iW`~t2EBUm>t&+2$_(tiqi6fh5Kh5q<6K4-|rf;
zaVpagw|ve&=&&fV8i*(#6}6^6R4x(!*s^t$I!o56IF>W4ww0e+lpTNPSN9c#`Jbr3
z|99dC@n(ZxJ==PG8+i%>YiL>K`)=E%HGdwF0LA;4p(KhS#^AiG$JEFeHQ2wQ*v
znDP^i-I@5T^Us5?(k)_;ssI*wjN670U$Bc?S96X@EB+2qvl8O^Zp*wlxQ&&c|JUZF
z^*_ar4qS8Cm)0JJRGXjLE14UZ5LzsMZ*KA}w%lju#G9II)q_3NQXW%uL@w$7?yKMX
zFq@9*$WRbR>jN6~SP2c;tU45R)Y(J1)<^y$u*|lf)O(o(iXmq9<|X=0v>G4F8Q1H4bKct~#dPVZMAdH}`}I>_e+`r7VWcaj=;IH238eF13Z=yM5EK^$`Y4Pztvy3Fv~xcF8REJynDoZJxrZ=
zOHTBFkKo}$b6j24DLHfd^hevVriZ*2iHrkK|9RU_NF3G%wdb?WjFHog9Ntv_FjkA4
z*T|`%qB%&n{!Lc$3tixr6({v)!>DVdcpylXhVJ;q>sFYKP2#sLTe5lD|v$%jvU
z+V+nt8jFL`#@;=_+7*PoB70VfLj*7aB9YPh)vwO#$_+guo
zX*%V)>yhGZWw03CzuEAQEuT-CD6iy*QV;N)z)?IpdbBjrc%Dw
z_mmT-Y_m8)F$ucDKfdih$Mxd5=gr>{GWO)oaF3=L9#NkpeNN*
zu?F9!WtkcYwqT31ZyHI!WXeMJhf?CL&40uAf;!1{xgasA%^W1aR|#)0Q&xku*5H?u
zP+LHqNrU2pzP|n@likQyIcpyl15uMQuv?5ohwl+tz6=dD7uwCF
zr^vaEP7{lcWoDu%}_7^g`GlDSjg>f@dKqfw@cxYY&f~|7FRV^78TvFCWvcgqMuF
zLr++$U-ePwp#J%c660g{wrFkqzhgWj{BVK)=@2?K(hxv$VZFT)Qjv0nlRjN01zzH6
zXB#!;M5;zDafHB=81-a5Yj%1I9SaYS^~h8{q=IT`4WmV0B54@25Gt+p@mKliqLAB4
zBa5m3qot7SYip50wtz-fnxhy6piuMvEJiJhRP&z@?BH|qPcD4|7#K&wEL~h)*}gYE
zN?#4Z_2VP`eOIBH)1#yOB)+FrE~3C47>L?2pKai%3jJ)ZOFcK6Y&sv_l9wkfcfmA~
zkoSv$mbIg_QDWH;Wp;%-O^YpMu-W^u@9qy+AO=d5bMUj(sJiVOP1taglPXmquWk)d
zB{EdxZKR>1;*HsDYT>i>z}v95GYyPHN5lkQ=J=vMTWSSbM~cpWLmKm>Xu~@{#xqJZ
zpb;~jPQyfw;(kH>;4MTP$Pb1}_QPUaxwY(k!pR`80*!pNo^vufysOx6=$Hz#Jm;
ztd!5avnE5ujH01ygn5842JNK|0R8Sc_Ez)Ih<%6%Rg8`C2mU8lrwmMbxqAL6Ar7cs
oV+;JI>@kJ=f4H-Dfd_GaJNO5e1aQoMl6yc=R#m223LNx*072~M*Z=?k
literal 0
HcmV?d00001
diff --git a/Ideology/Defs/AbilityDefs.xml b/Ideology/Defs/Ideo_AbilityDefs.xml
similarity index 93%
rename from Ideology/Defs/AbilityDefs.xml
rename to Ideology/Defs/Ideo_AbilityDefs.xml
index b25f92c..2f17109 100644
--- a/Ideology/Defs/AbilityDefs.xml
+++ b/Ideology/Defs/Ideo_AbilityDefs.xml
@@ -10,8 +10,8 @@
CastAbilityOnThing
False
False
- UI/Abilities/CombatCommand
- UI/Abilities/CombatCommand
+ UI/Abilities/PNOfficerCommand
+ UI/Abilities/PNOfficerCommand
True
False
True
diff --git a/Ideology/Defs/Hediffs_Module.xml b/Ideology/Defs/Ideo_Hediffs_Module.xml
similarity index 100%
rename from Ideology/Defs/Hediffs_Module.xml
rename to Ideology/Defs/Ideo_Hediffs_Module.xml
diff --git a/Ideology/Defs/Ideo_Reserch_ProjectDefs.xml b/Ideology/Defs/Ideo_Reserch_ProjectDefs.xml
new file mode 100644
index 0000000..b7b4977
--- /dev/null
+++ b/Ideology/Defs/Ideo_Reserch_ProjectDefs.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+ PNRP_TierB_Module
+
+ ...
+ PN_technology
+ 1000
+ Industrial
+
+ PNRP_TierB_Apparel
+
+ 4.0
+ 2.1
+
+
+
+ PNRP_TierC_Module
+
+ ...
+ PN_technology
+ 3250
+ Spacer
+
+ PNRP_TierC_Apparel
+
+ 6.0
+ 2.1
+
+
+
\ No newline at end of file
diff --git a/Ideology/Defs/ThingDef_Module.xml b/Ideology/Defs/Ideo_ThingDef_Module.xml
similarity index 60%
rename from Ideology/Defs/ThingDef_Module.xml
rename to Ideology/Defs/Ideo_ThingDef_Module.xml
index 40c5374..5085b2d 100644
--- a/Ideology/Defs/ThingDef_Module.xml
+++ b/Ideology/Defs/Ideo_ThingDef_Module.xml
@@ -1,14 +1,30 @@
+
+
+
PN_OfficerModule
...
+
+ 14000
+
- 3
- 80
- 10
+ 5
+ 2
+
+ PNRP_TierC_Module
+
+ 6
+
+
+
+
+
+
+
PN_OfficerModuleHediff
diff --git a/Royalty/Defs/Hediffs_BodyParts_Psychic.xml b/Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml
similarity index 100%
rename from Royalty/Defs/Hediffs_BodyParts_Psychic.xml
rename to Royalty/Defs/Royal_Hediffs_BodyParts_Psychic.xml
diff --git a/Royalty/Defs/Hediffs_BodyParts_Vanilla.xml b/Royalty/Defs/Royal_Hediffs_BodyParts_Vanilla.xml
similarity index 100%
rename from Royalty/Defs/Hediffs_BodyParts_Vanilla.xml
rename to Royalty/Defs/Royal_Hediffs_BodyParts_Vanilla.xml
diff --git a/Royalty/Defs/Reserch_ProjectDefs.xml b/Royalty/Defs/Royal_Reserch_ProjectDefs.xml
similarity index 92%
rename from Royalty/Defs/Reserch_ProjectDefs.xml
rename to Royalty/Defs/Royal_Reserch_ProjectDefs.xml
index ac8b8e2..b5c216b 100644
--- a/Royalty/Defs/Reserch_ProjectDefs.xml
+++ b/Royalty/Defs/Royal_Reserch_ProjectDefs.xml
@@ -11,7 +11,7 @@
PNRP_Production
1.0
- 3.5
+ 0.7
PanielStart
diff --git a/Royalty/Defs/ThingDef_Weapon.xml b/Royalty/Defs/Royal_ThingDef_Weapon.xml
similarity index 100%
rename from Royalty/Defs/ThingDef_Weapon.xml
rename to Royalty/Defs/Royal_ThingDef_Weapon.xml