From 1b7c178e6bcfb0361d00853d44945f79e6ccd224 Mon Sep 17 00:00:00 2001 From: Nix Silvam Date: Wed, 10 Jul 2024 16:39:23 +0300 Subject: [PATCH 1/6] demon textures --- .../ADT/Mobs/Demon/custom.rsi/cow_ears.png | Bin 0 -> 180 bytes .../ADT/Mobs/Demon/custom.rsi/cow_horns.png | Bin 0 -> 200 bytes .../ADT/Mobs/Demon/custom.rsi/cow_spots.png | Bin 0 -> 502 bytes .../Demon/custom.rsi/deer_antlers_horns.png | Bin 0 -> 229 bytes .../ADT/Mobs/Demon/custom.rsi/demon_ears.png | Bin 0 -> 172 bytes .../ADT/Mobs/Demon/custom.rsi/demon_tail.png | Bin 0 -> 265 bytes .../ADT/Mobs/Demon/custom.rsi/goatee.png | Bin 0 -> 162 bytes .../Mobs/Demon/custom.rsi/guards_stripes.png | Bin 0 -> 342 bytes .../Mobs/Demon/custom.rsi/lines_emperos.png | Bin 0 -> 346 bytes .../ADT/Mobs/Demon/custom.rsi/long.png | Bin 0 -> 461 bytes .../ADT/Mobs/Demon/custom.rsi/meta.json | 71 ++++++++++++++++ .../ADT/Mobs/Demon/custom.rsi/queen_lines.png | Bin 0 -> 264 bytes .../ADT/Mobs/Demon/custom.rsi/small_horns.png | Bin 0 -> 163 bytes .../ADT/Mobs/Demon/custom.rsi/tree_lines.png | Bin 0 -> 497 bytes .../Mobs/Demon/custom.rsi/trinity_spots.png | Bin 0 -> 287 bytes .../Textures/ADT/Mobs/Demon/custom.rsi/up.png | Bin 0 -> 396 bytes .../ADT/Mobs/Demon/parts.rsi/full_f.png | Bin 0 -> 939 bytes .../ADT/Mobs/Demon/parts.rsi/full_m.png | Bin 0 -> 946 bytes .../ADT/Mobs/Demon/parts.rsi/full_t.png | Bin 0 -> 915 bytes .../ADT/Mobs/Demon/parts.rsi/head_f.png | Bin 0 -> 708 bytes .../ADT/Mobs/Demon/parts.rsi/head_m.png | Bin 0 -> 713 bytes .../ADT/Mobs/Demon/parts.rsi/head_t.png | Bin 0 -> 708 bytes .../ADT/Mobs/Demon/parts.rsi/l_arm.png | Bin 0 -> 369 bytes .../ADT/Mobs/Demon/parts.rsi/l_foot.png | Bin 0 -> 342 bytes .../ADT/Mobs/Demon/parts.rsi/l_hand.png | Bin 0 -> 317 bytes .../ADT/Mobs/Demon/parts.rsi/l_leg.png | Bin 0 -> 424 bytes .../ADT/Mobs/Demon/parts.rsi/meta.json | 80 ++++++++++++++++++ .../ADT/Mobs/Demon/parts.rsi/r_arm.png | Bin 0 -> 365 bytes .../ADT/Mobs/Demon/parts.rsi/r_foot.png | Bin 0 -> 335 bytes .../ADT/Mobs/Demon/parts.rsi/r_hand.png | Bin 0 -> 318 bytes .../ADT/Mobs/Demon/parts.rsi/r_leg.png | Bin 0 -> 412 bytes .../ADT/Mobs/Demon/parts.rsi/tail.png | Bin 0 -> 496 bytes .../ADT/Mobs/Demon/parts.rsi/torso_f.png | Bin 0 -> 1224 bytes .../ADT/Mobs/Demon/parts.rsi/torso_m.png | Bin 0 -> 1160 bytes .../ADT/Mobs/Demon/parts.rsi/torso_t.png | Bin 0 -> 1252 bytes 35 files changed, 151 insertions(+) create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_ears.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_horns.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_spots.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/deer_antlers_horns.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/demon_ears.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/demon_tail.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/goatee.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/guards_stripes.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/lines_emperos.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/long.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/meta.json create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/queen_lines.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/small_horns.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/tree_lines.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/trinity_spots.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/custom.rsi/up.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_f.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_m.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_t.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_f.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_m.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_t.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_arm.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_foot.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_hand.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_leg.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/meta.json create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_arm.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_foot.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_hand.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_leg.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/tail.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_f.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_m.png create mode 100644 Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_t.png diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_ears.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_ears.png new file mode 100644 index 0000000000000000000000000000000000000000..6c7c43592a0770a644a6adfa0fb34935ccab0156 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP%zEY z#WAE}&f8lXc^eD_m=Cxl{jb%y*`_;>O=^}(ivmmeR@G{TX4ICEzHyZ?s&w|&~N z`+nP*GbP`%{!Lo_Sy^e(DmCNzZ70sGT(x%p{~7y>_<)82!GZN}-?6_r5%G#$#xmQ! o{)*s^Gc*4-bX=EZg~&g+AS>aVVt7I>bt6c?)78&qol`;+0F0+gw*UYD literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_spots.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/cow_spots.png new file mode 100644 index 0000000000000000000000000000000000000000..f6e3dbc945291a8bf953f3c5791ff0e49e66e526 GIT binary patch literal 502 zcmVLh&;D*0IK`kMu5VWLC6Z6C~zAADPgYSt|MUk`-7Fz?;hFC zbASKy{rYS2ajZJ0KTSx9y>8T(ymBj_VOo8ElF$0edE4ihKR;*tuGa7Jm(ss!!S3Zi zYe3*%?3~@(pM4GgGU5C^xn0km7pDEsiGPq&DgW?FY(sg>Uik!hMu*?y} Jvd$@?2>`ifH)sF= literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/demon_tail.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/demon_tail.png new file mode 100644 index 0000000000000000000000000000000000000000..53bb821fa88e98f910a8fdabb41bc76d5804231b GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP;j@W zi(^Q|oVT|O`I-%QS`!anGW71YaLt==`8nGhCdO{}X*-y+LRT_6F5TAfFTYp$>CMH; zOhA2L(9pT`;=jLb`C8NXcCV{$TfZu6W0}5AZ`hRSSM%rU=FEDQ`{~~ASo4RI8{b-8 z5ObH2fN2EM_LJ_;kCs|1A98D(Xy{adLyF(u7`hdo^NhV-wAvv&*5z0ux`V7@6vC?EVFL!^3zHQP1y=E)zj6_Wt~$(699(oVQ>Hd literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/goatee.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/goatee.png new file mode 100644 index 0000000000000000000000000000000000000000..98a511a24abbd16cd13ca6bbc01b916e36f44634 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP%y;P z#WAE}&fA*@c@G$HFdta)dp(!-4&g6?nz>7!yC5Pz`yPk!CzY}sP$iB=Z#Qw{j2rg zj7Wqd^+!dl%&GN<9%h{xwf=HkU&P!8+|zKbjmblQ_P&{TPX;`DK+h^*qJQ_0o@~#W znBDky;#-P|D&!&ss33w@{iF^TH!%(JCLx0zUP66 s9rOVJ0J5{fr*XN570v~$-~o2$3Edg$GZsIu+yDRo07*qoM6N<$f|3)MMF0Q* literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/long.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/long.png new file mode 100644 index 0000000000000000000000000000000000000000..af7875e2fb59e72edaea043df3fccb085298f6a1 GIT binary patch literal 461 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|R5d zr;B4q#hkadc27F2z{7gsw4YZ{P_pJ-ai_Hn;KFBmZLIDM1Bx^Y6|}@zRVwB)-;j zpWmLk|95WGv#yx@{T{#d&ZQid&ky%yhRa9Si7meCKQK-h6-MsvpLV# z!-Y@(z@_s1?Ct+`*+Z{NEIuaTe!e|8kblGeU@wLS0j40Y9Wi?Cb*HO!-p2j4IkqD9 zIwQlL?+gvU|MsnW{a~;BT%qa3Vcs`d1Q`B^K8j>?ak(Ek$8>&T?U%J2%ijNfxP9OI z!rgc6_HA@Q2J;t9U70>V;<8xub&FjxbENLXx$Rr@`LV|NYi8FCKV4><8Wi9q*>vlm zdwJcSS)!?{l36NBI##TTYPh?+`@{vwApaY2OY0|>73)+AUYsHngTe~DWM4f*Hq6( literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/meta.json b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/meta.json new file mode 100644 index 00000000000..5c76f5ca418 --- /dev/null +++ b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/meta.json @@ -0,0 +1,71 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cow_ears", + "directions": 4 + }, + { + "name": "demon_ears", + "directions": 4 + }, + { + "name": "goatee", + "directions": 4 + }, + { + "name": "cow_horns", + "directions": 4 + }, + { + "name": "cow_spots", + "directions": 4 + }, + { + "name": "deer_antlers_horns", + "directions": 4 + }, + { + "name": "guards_stripes", + "directions": 4 + }, + { + "name": "lines_emperos", + "directions": 4 + }, + { + "name": "queen_lines", + "directions": 4 + }, + { + "name": "small_horns", + "directions": 4 + }, + { + "name": "tree_lines", + "directions": 4 + }, + { + "name": "trinity_spots", + "directions": 4 + }, + { + "name": "demon_tail", + "directions": 4 + }, + { + "name": "long", + "directions": 4 + }, + { + "name": "up", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/queen_lines.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/queen_lines.png new file mode 100644 index 0000000000000000000000000000000000000000..0e30ea261a405a186ef20a97f9287f6d0dbbe631 GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP;i&0 zi(^Q|oVT|Q@--_6xCR>h{U5(I>sQKw!MqauKzvnRsA=+&r;owZJsW=D|_|oW`!;PFCGhP?RY1z zv4*kodc#e(e}5|(7(Tq*B|9&x`cL%6m28Ya2QW;Sd1?83pJ~ad6HKPu+gEt__Ve4{6{{jsfm%Rd z$Cdf!za~eY@0@gI&O5untxI<+8~;^-$Q{@xUR|T3eQpcOQILSAtDnm{r-UW|4Qw_i literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/custom.rsi/tree_lines.png b/Resources/Textures/ADT/Mobs/Demon/custom.rsi/tree_lines.png new file mode 100644 index 0000000000000000000000000000000000000000..4a555c4d1137d85931a243c935adf426caa372b3 GIT binary patch literal 497 zcmVlvr(yWw3 zBB6nZ2wQ^&e{2D4RBeFk45+oL zK#fXo0<{#GKVM)lexx5|I3AUtSJ`R$a0o}AvtSp=v+pI2P@~@ zyR~Oi&D+N>{yJ+e-EwsO^Q-fY)iUkL-u`uZn#9|huocVe-0EjbB~^ZG|5tUp@nn#` z>CU`Q2WwC10=JzklghzH3-}z;$+@TNnXlh-)K>iji_4ia`LUd7&)N?kUw8Z1-PNBp{%_eD(K}mkg19}8 zvvKwQWsD!sn9PlFS@ORB^WN-@u_E%-+m1eReRWTB)vB~-fz2m&a#j|9x_UEYV)Use z+h@%D{`dEv-S7MV|LO*L8w@t|hxv76|A|_+{z6N1@g9i@4RhLgrtOk+Kd&2gDtE2e z#HoTaEnI6`Q|o79{w0BmLAJ#W1XFyopAh#PjSM;lVw>VBI5gg*hEAu%aSe!tK5_V(QP zbL)Vz+W^$-bqp2I`fvfj&2SXyTOTekR6xC6kN7pu;UPNyT|N~I!&LLoAjPN&&BI}Yc+ft{W)*mo&b# z5wQ|Y(Z zjLmVFfSF8&NxLiQ@3RZlf`tISmf>z9xHos*YViZ`*FQxmE6d%4zX3M>`)3I0RI300 N002ovPDHLkV1m4mYbcK{oU-`a0~y-e=M0a zP8VmtiMhLzJkKt#Ir{Ngs#s)&wNf3CY`vhDia3rLkH^xkHP!-I>)c$|l{k(u$JZ1}MK%ljg#97? zj?3)n4whw6EEZGM!pc&w*Cpr;B#I(w*BTN#5h{wi%5^92^`h zjlZ-HD6a=VtJT6%8m%?m_a7H*y6-=twZ>AKR;#t(_aK0Fts#X{F?q9o$0g&36iUSf zyF#f*#t-RtT;Q)v6iP)_sfT+3)DxSmW7BH2s8*|)K}OT>xMUq0tu@!z*J!QDIyU`| z%OInvR;!s-t3}qaQBUk;``-_+wY7CyS3X2*O%MbC1VMn-nyvETZQDEi*8-SMrvOwc z72dvlwUEx8ot=gGM&7=BC6!8L!9O*?Y&HYHdw0h37u7^RpU(-ykju+U!Z2h$pC@b2 zUsUnloh|sM2H5yAVSY8CP%0(`1~B?`j%k|g@9$%pCZkX1$y&eTQYaOfUrpHfGI zmePrSV`Jl+KKIGWKP0f&1$U3jG=HtLdt3%UMDFd9{|dm@;`=^7{ql3h_x-dX)(0>Q z12dX(b>3dkU!AuxqbY`AJT8D`S!5j>=kK)Nh;v*f>)2S9^|%0W95Wh??pzylzq@F1gat^LvM@&oXDw+ldC*839v1b>(B Uo2DpT8~^|S07*qoM6N<$f{dKM@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_t.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/full_t.png new file mode 100644 index 0000000000000000000000000000000000000000..3c71c7d8c3f8f246ff1aea5f06043ca18faf1353 GIT binary patch literal 915 zcmV;E18n?>P)BMvO)x-LHku=DoNGAc{JbAvz6|Nf4>gXe`}35A?CH?X_A%b&mCOOY_eU>F7w5k*nN8xfIV7*r(Q zTGoMsPL~|Vp)d>)$1!wW2LR~0jyR4Hh9Mlsp+Tpci%70@GYo^mFofWIN3BsurM8V= zGR0(QVE$wSk|d#CuNTrnW@ws5{@5bM7!5jIVvLbLwn)>oLQ7DXgyT58J!JA+=^Avp zgxV9xvW%;%D{kN0+k@-6z{ElG_-HjtFz9s2A6rC3#2BOLbjllJjEIQ*v6WkdnP8eG z#c|9hVvKPT$$esvz@#R4V^E_SZ4CZDVI=XKDPUbs#p! z0DykK4=G+?bp8nda6NNV*U|YWNbv&wem~{+AOeF43|L#3*yHz))X22UJvbdyQFCvC6gSUo*)PU9G;#)fA{`JuxBbC zcW`ik__4e+1NRcBR;#yczyI+P)oK+{6afIDD8k|C34Gtja5!A*e-rmEK{83J)xw82 zZ&T?^#CTJbAKtvBR;!irFHB%Qp928Qk3GD2)lT&VL4fIW%Jq@p#j7^VkG+(CVFHi7 zxm;kAp#k7WTCIyqh@yz??QMvn2ad3;ow3=K?%2Aao5B}tM1 z0Lp$7=Rbva{_Z`L{U!iFlB8Qc%Lpvp5#0>3SSKmU4N@;t9-i2MY~x(^4jis9uoCeTn10}xBwMJfj_pW`c%zS3o;Q%%CJ>h p-0J%}8sQm$%h3n`pi;gs;UCG_>q~Cg@gD#H002ovPDHLkV1ityr6~Xa literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_f.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/head_f.png new file mode 100644 index 0000000000000000000000000000000000000000..1285b693dcc7ecae9d05b7abfdf20d2f09647afe GIT binary patch literal 708 zcmV;#0z3VQP)u=#YbBkNE>8Po z?rvwt>iZR5zk91S*1wK#>YOyY9OM1bhwRun`>ZpJHgk6y2L}h)@g**c3+}ou5fR

kUg<(iaDM%@iBuUn!lu$|`48z>upYg{GpN(rlG!`RuvNPK~@vjwYW zLrS^Qi%;XH@0C(Zua7@pDIo-fVVE@`L?QeCVSLZ?D2gKTJg@Nhj4{R-V~jDz7-Nhv z#u#JIl6ETTaW?kb*;lkaeJmt3C5}(%)zO=!KHIhnt53*M)G2X%LKmm~!qQV0r+pH~ zCrfiEDm{9 zRxM0M?oyvsvoVWrR+^))x0|I|d;_ayFZEAGF3hT>HD>MwXfzrn-}hlwEkx1%Q!p=Y zAP54jN#qd(0p{h6?CwWV1hZC%dz6hYPg;0000Yg zY!=5dy2hLL@09xb*ZI22Nmr984i7#Q$M)%Gm2Q;jjZN(A>=efnOsWg_JdcQo=JR>c zh=@GTqbl=nZ*PnCH~HFQKRE6W=;q>*(lkYuWf%^J0D$3eh%C#HrYUYNE@|8!tYsp` z{Q-qxNK#4&A&_NR(S#6?QX&k)()p#<&A2}x`Qq;O%j55O-h7ESavDPoY$X`5{Qm#Bce1EMh%c3w0i)L9?CF}owzVG`K$1(Z7UwJ-bj4{R-V~jDz z7-Nhv#@K&Jxs>#<8vE_^E4rUPR#KX>ddKwo;O)w5ySuxU?N2C5)C*Scm_{dOm6fMP zCud~!j#tJ|Re2tcCYfVyzE5NV45actrpg`K?1njAJA&GV45a0Z8>x)Vn~0c)Thz} z=ptqZd))rN>9Gh)p8t%qA0@l_BH?@2m$~=x7)4eZ}8WK vi2M1CMnh==7-Nhv#u#IaF~%5U>`D0vu=#YbBkNE>8Po z?rvwt>iZR5zk91S*1wK#>YOyY9OM1bhwRun`>ZpJHgk6y2L}h)@g**c3+}ou5fR

kUg<(iaDM%@iBuUn!lu$|`48z>upYg{GpN(rlG!`RuvNPK~@vjwYW zLrS^Qi%;XH@0C(Zua7@pDIo-fVVE@`L?QeCVSLZ?D2gKTJg@Nhj4{R-V~jDz7-Nhv z#u#JIl6ETTaW?kb*;lkaeJmt3C5}(%)zO=!KHIhnt53*M)G2X%LKmm~!qQV0r+pH~ zCrfiEDm{9 zRxM0M?oyvsvoVWrR+^))x0|I|d;_ayFZEAGF3hT>HD>MwXfzrn-}hlwEkx1%Q!p=Y zAP54jN#qd(0p{h6?CwWV1hZC%dz6hYPg;00001J%PqDoQphLTwT(ZeMfb9@wud)y&4L~GS2P1omzS>lH=g2Rj*tb zZ@<0f#1TIIL&-~r5^2v%MLTmO*Gj+s8gJ4j|A$Rm`u6+p)$0!4@| z;m_4lq8}bDp7)xcmyNmCZE&YrxbF(eePg_QNo!s+1{ApFpCk_6^ zvh(McSjeb&UN*^`wM?|I{{HFXYl6B|R<6>rd_JZ9V%+^ZX(#_IVs2SGU8Q&S`K^}! z&#Zf|I(M_>>UWatFsm3C{!Lt#sne36sp_p6dA-#9Emuiw`7K$e4a+ja-q%MMKUovh z6S!1lYEa1at)C3;J>jU7SiA1^<#!T~`}Z9Y|H`cQ_E+5dN!tv)e%X1%$v(829?P13 db*1u#W8$%G(;mD`sN4p!%G1@)Wt~$(698AUkGcQ= literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_hand.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_hand.png new file mode 100644 index 0000000000000000000000000000000000000000..ff61ecd0cff443c01869d6af091b9333e64061db GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1HE{ zi(^Q|oVT|&dL3~PX??hO$JB)BdQW(_MSZ&%{6w%xIzsUG$xU4obSDX@_%vPjT5G1I zcJaXft>S5XhfBVD08Idb1MJV|Y|YJ%y&fs0{_T3@KIL9v?XE+wc9}iDGkvChdt2>& z?@9CC$!)op=hkJh_G{VV>3;$*rT)cz|GQPwK;D3W59d=N)9zJ&zIXnfxzh|K^Q=IQF^vd$@? F2>{HTh@}7k literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_leg.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..2125370c5b07083b1bcc33f2e2a8c631fb78eda8 GIT binary patch literal 424 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|R4} zr;B4q#hkad46~aZMA$#n7pW^vOv!x4QMN&Tq4WMy?ziR{3!ItP@!eFK*1)cq9=a}= z`DWGm8)BdS`L$^)C~7@p##+JS8#OvQ+&=#L zqVxM_C&D!^+|6e9u3mLYGI`F{YfmfR)$MM#IX`#nHOb_d(9lOU7wa6Zmo6{9y{%)B z$1Hs@SHWA`WdF#0Y&ufDV{2H6uI-c{u4}h8$Eh4)2HMXMaNTs0%FoH6Gk2{!Uo}yH zH^FT7+;iPWon-7>u9u3R6su=+3D5caaouw-_)*>?#*i1 z|JKibB&XLtGfM?%D1&8ATJh_kyfRJI;&Z97*DTXDm*$BCT;JL%uxaXpIhzHV-hTfb z##M1rc1PTLRnL=eH$AyqwC#58v_11Ti7R;CtL{~My!-y!G_&m&Q*_?fuDdF?c$F5n z;*G4WyH+zipCjAvzIxTFt>5pT;@u(1!wOL5<(FF`^rqi`zDY;=Z23M0&sSfoxD;3Dcwa5OoAFJP zOMgTe~DWM4f DHWHjf literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_foot.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_foot.png new file mode 100644 index 0000000000000000000000000000000000000000..92cc25101de575eb36e7bcd46da933d14d30d6f6 GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|O(Y zr;B4q#hkadHf9|*5OI5GUpReQg8srUfA1gPy>MPr+YKX@PB)LnB5RYcL0&88mRQ|q zzN7qZl{O>LKq#oYUOIQKpZaOb=yNyc6qoh)6`xD$nHIEZ%B0fR^2z58-(u{~k9>YN zGBnh4(yLuzQtH)J_wvK`ztifSocnsN-t=xS&EoH3Vfqg&c&a9TvErGuWN&D;d);Gx zzey&!_nsg7c#9ck6$8Va;M?1t?cFZ1_^8C%_rG`FVg0k@{qLP`_io>oEBg@i@iz@|m{+haTnsJo=q6zMQdLK&4hsMOXHl`}RHJKNtc7 VXY6>s_U3<(9iFa!F6*2UngHl;jClY6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_hand.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_hand.png new file mode 100644 index 0000000000000000000000000000000000000000..74b5130e82e224c3256149948e9f8fdc8eb95a52 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1FAN zi(^Q|oVT|&dL3~PIQB7c&nc_e6VfrIcNQ-{q0AzDLh;*d0oRD`6iy+tgF9bY*`%cYW4ck*!tb&Up`k%TDnnr{jNXK630Kff4wOF z;YYynzCEYP_O5B3T)lVV*RQ#k@723So9_SC3JQt;S0&j^@?4!S?VbxV(9_k=Wt~$( F69DGshe-ec literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_leg.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..020edfde734415a24a6a1077f921a0755fdb5c39 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|TR< zr;B4q#hkad46_e8NF4jof;(9g`4o6}-D=`MT`=tM6?*W5nRF zFV1zoX&>*L^UrS_agMteXQ*HF#;w^yzlxC|;WfX?y5=A+rSEH(Wgdy@bV-SOB9Yx& z@S^_unbn#gJYmY>%@eaZSckT0G5Cv7w5EX7~B8{SuEtW7rNzZ|vr{rMk9G`yDndrj`){P|7n98=eaFJ5bV?~IVrFX0Fs tv4hwBAH7-qvP9~Nz;FA8j(H!!#vJYD@<);T3K0RS$uth)dJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/tail.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/tail.png new file mode 100644 index 0000000000000000000000000000000000000000..cd8f833d5d3a99bdac7af0e38c158736eadfe7d0 GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|R4+ zr;B4q#hkadHug0cNU(qSA1fnM(f*iGM(@eIBjF{_EoFELUpxuvoV;nK#fC3!-oj2y zxgQS)z5g%Gd+NWoJnLm97by6$zvc+vhn`J3ybMn&`4}|1lwMZNTQtQeG<4<-%SDeA z9^?x+_5Gj1m+=0y#FU_CC04Ap?llYz7R?FW_w%-YR6lgVY>LJGE5+-U9Ny!#|H0Wb zkvDJ65OenX4-pGHze1JX5>((As?!|Ce1)E?BW5e1B=?+Kb!XCb-`^ z@BD0yt8bp&sZA!|&il{5RwenK5$+qkvfXzdg~z3zp5gRyTE(>~UE7Zsz5o9EN!Rw8 zP1e_0H|b3F6mIk{Ti-e{T)*5~;Ov}7xesPnPLoy2*IasAK}FkI!G$YUVVm!}!rU`I z3u0;x>aF7yZvGv=ET=zm(eEnOo}3v4>z0;(|Fd+{H@Qha#VaqJZTg-gvIrPae5nzh cX}-P;T0k}j5QD&_;K?A$)78&qol`;+0QQUCDF6Tf literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_f.png b/Resources/Textures/ADT/Mobs/Demon/parts.rsi/torso_f.png new file mode 100644 index 0000000000000000000000000000000000000000..c7c0027dafb0598e837c5645204314710b277db1 GIT binary patch literal 1224 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 O0000 Date: Wed, 10 Jul 2024 16:39:52 +0300 Subject: [PATCH 2/6] demon ftl --- .../Locale/en-US/ADT/Body/Parts/demon.ftl | 22 +++++++++++++++++++ .../en-US/ADT/Entities/Mobs/Species/demon.ftl | 4 ++++ .../Locale/ru-RU/ADT/Body/Organs/demon.ftl | 2 ++ .../Locale/ru-RU/ADT/Body/Organs/drask.ftl | 10 +++++++++ .../Locale/ru-RU/ADT/Body/Parts/demon.ftl | 22 +++++++++++++++++++ .../Locale/ru-RU/ADT/Body/Parts/drask.ftl | 2 ++ .../ru-RU/ADT/Entities/Mobs/Player/demon.ftl | 2 ++ .../ru-RU/ADT/Entities/Mobs/Species/demon.ftl | 5 +++++ Resources/Locale/ru-RU/ADT/Species/demon.ftl | 1 + Resources/Locale/ru-RU/ADT/Species/drask.ftl | 12 ---------- Resources/Locale/ru-RU/ADT/Species/kobolt.ftl | 1 + 11 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 Resources/Locale/en-US/ADT/Body/Parts/demon.ftl create mode 100644 Resources/Locale/en-US/ADT/Entities/Mobs/Species/demon.ftl create mode 100644 Resources/Locale/ru-RU/ADT/Body/Organs/demon.ftl create mode 100644 Resources/Locale/ru-RU/ADT/Body/Organs/drask.ftl create mode 100644 Resources/Locale/ru-RU/ADT/Body/Parts/demon.ftl create mode 100644 Resources/Locale/ru-RU/ADT/Body/Parts/drask.ftl create mode 100644 Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/demon.ftl create mode 100644 Resources/Locale/ru-RU/ADT/Entities/Mobs/Species/demon.ftl create mode 100644 Resources/Locale/ru-RU/ADT/Species/demon.ftl create mode 100644 Resources/Locale/ru-RU/ADT/Species/kobolt.ftl diff --git a/Resources/Locale/en-US/ADT/Body/Parts/demon.ftl b/Resources/Locale/en-US/ADT/Body/Parts/demon.ftl new file mode 100644 index 00000000000..48a7c98fb8e --- /dev/null +++ b/Resources/Locale/en-US/ADT/Body/Parts/demon.ftl @@ -0,0 +1,22 @@ +ent-PartDemon = demon body part + .desc = { ent-BaseItem.desc } +ent-TorsoDemon = demon torso + .desc = { ent-PartDemon.desc } +ent-HeadDemon = demon head + .desc = { ent-PartDemon.desc } +ent-LeftArmDemon = left demon arm + .desc = { ent-PartDemon.desc } +ent-RightArmDemon = right demon arm + .desc = { ent-PartDemon.desc } +ent-LeftHandDemon = left demon hand + .desc = { ent-PartDemon.desc } +ent-RightHandDemon = right demon hand + .desc = { ent-PartDemon.desc } +ent-LeftLegDemon = left demon leg + .desc = { ent-PartDemon.desc } +ent-RightLegDemon = right demon leg + .desc = { ent-PartDemon.desc } +ent-LeftFootDemon = left demon foot + .desc = { ent-PartDemon.desc } +ent-RightFootDemon = right demon foot + .desc = { ent-PartDemon.desc } diff --git a/Resources/Locale/en-US/ADT/Entities/Mobs/Species/demon.ftl b/Resources/Locale/en-US/ADT/Entities/Mobs/Species/demon.ftl new file mode 100644 index 00000000000..d07b87e90b4 --- /dev/null +++ b/Resources/Locale/en-US/ADT/Entities/Mobs/Species/demon.ftl @@ -0,0 +1,4 @@ +ent-BaseMobDemon = Urisst' Mzhand Demon + .desc = { ent-BaseMobSpecies.desc } +ent-MobDemonDummy = Urist McHands + .desc = A dummy reptilian meant to be used in character setup. diff --git a/Resources/Locale/ru-RU/ADT/Body/Organs/demon.ftl b/Resources/Locale/ru-RU/ADT/Body/Organs/demon.ftl new file mode 100644 index 00000000000..a216c9d900e --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Body/Organs/demon.ftl @@ -0,0 +1,2 @@ +ent-OrganDemonStomach = { ent-OrganAnimalStomach } + .desc = { ent-OrganAnimalStomach.desc } diff --git a/Resources/Locale/ru-RU/ADT/Body/Organs/drask.ftl b/Resources/Locale/ru-RU/ADT/Body/Organs/drask.ftl new file mode 100644 index 00000000000..63dfb61b328 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Body/Organs/drask.ftl @@ -0,0 +1,10 @@ +ent-OrganDraskEyes = глаза + .desc = Я тебя вижу! +ent-OrganDraskLungs = лёгкие + .desc = Фильтрует кислород из атмосферы, который затем поступает в кровь для использования в качестве переносчика электронов. +ent-OrganDraskHeart = сердце + .desc = Мне жаль того бессердечного ублюдка, который его потерял. +ent-OrganDraskInnards = внутренности + .desc = Мерзость. +ent-OrganDraskKidneys = почки + .desc = Выводят токсины из кровеносной системы. diff --git a/Resources/Locale/ru-RU/ADT/Body/Parts/demon.ftl b/Resources/Locale/ru-RU/ADT/Body/Parts/demon.ftl new file mode 100644 index 00000000000..d3d5b5e8ae6 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Body/Parts/demon.ftl @@ -0,0 +1,22 @@ +ent-PartDemon = часть тела арканы + .desc = { ent-BaseItem.desc } +ent-TorsoDemon = торс арканы + .desc = { ent-PartDemon.desc } +ent-HeadDemon = голова арканы + .desc = { ent-PartDemon.desc } +ent-LeftArmDemon = левая рука арканы + .desc = { ent-PartDemon.desc } +ent-RightArmDemon = правая рука арканы + .desc = { ent-PartDemon.desc } +ent-LeftHandDemon = левая кисть арканы + .desc = { ent-PartDemon.desc } +ent-RightHandDemon = правая кисть арканы + .desc = { ent-PartDemon.desc } +ent-LeftLegDemon = левая нога арканы + .desc = { ent-PartDemon.desc } +ent-RightLegDemon = правая нога арканы + .desc = { ent-PartDemon.desc } +ent-LeftFootDemon = левая стопа арканы + .desc = { ent-PartDemon.desc } +ent-RightFootDemon = правая стопа арканы + .desc = { ent-PartDemon.desc } diff --git a/Resources/Locale/ru-RU/ADT/Body/Parts/drask.ftl b/Resources/Locale/ru-RU/ADT/Body/Parts/drask.ftl new file mode 100644 index 00000000000..5dd856b7d7d --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Body/Parts/drask.ftl @@ -0,0 +1,2 @@ +marking-DraskArmRight = правая рука +marking-DraskArmLeft = левая рука diff --git a/Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/demon.ftl b/Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/demon.ftl new file mode 100644 index 00000000000..c9f0b371ae2 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/demon.ftl @@ -0,0 +1,2 @@ +ent-MobDemon = { ent-BaseMobDemon } + .desc = { ent-BaseMobDemon.desc } diff --git a/Resources/Locale/ru-RU/ADT/Entities/Mobs/Species/demon.ftl b/Resources/Locale/ru-RU/ADT/Entities/Mobs/Species/demon.ftl new file mode 100644 index 00000000000..ae5d1f883b4 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Entities/Mobs/Species/demon.ftl @@ -0,0 +1,5 @@ +ent-BaseMobDemon = Урист МакАркана + .desc = { ent-BaseMobSpeciesOrganic.desc } + .suffix = Аркана +ent-MobDemonDummy = { ent-BaseSpeciesDummy } + .desc = { ent-BaseSpeciesDummy.desc } diff --git a/Resources/Locale/ru-RU/ADT/Species/demon.ftl b/Resources/Locale/ru-RU/ADT/Species/demon.ftl new file mode 100644 index 00000000000..903d09dfbd2 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Species/demon.ftl @@ -0,0 +1 @@ +species-name-demon = Аркана diff --git a/Resources/Locale/ru-RU/ADT/Species/drask.ftl b/Resources/Locale/ru-RU/ADT/Species/drask.ftl index 6f61062aefc..5cdbc67a20a 100644 --- a/Resources/Locale/ru-RU/ADT/Species/drask.ftl +++ b/Resources/Locale/ru-RU/ADT/Species/drask.ftl @@ -1,13 +1 @@ species-name-drask = Драск -marking-DraskArmRight = правая рука -marking-DraskArmLeft = левая рука -ent-OrganDraskEyes = глаза - .desc = Я тебя вижу! -ent-OrganDraskLungs = лёгкие - .desc = Фильтрует кислород из атмосферы, который затем поступает в кровь для использования в качестве переносчика электронов. -ent-OrganDraskHeart = сердце - .desc = Мне жаль того бессердечного ублюдка, который его потерял. -ent-OrganDraskInnards = внутренности - .desc = Мерзость. -ent-OrganDraskKidneys = почки - .desc = Выводят токсины из кровеносной системы. diff --git a/Resources/Locale/ru-RU/ADT/Species/kobolt.ftl b/Resources/Locale/ru-RU/ADT/Species/kobolt.ftl new file mode 100644 index 00000000000..c3a413cdb86 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Species/kobolt.ftl @@ -0,0 +1 @@ +species-name-kobolt = Кобольд From e2219a8b49708211983462a0ae1a2f2eddfd47a5 Mon Sep 17 00:00:00 2001 From: Nix Silvam Date: Wed, 10 Jul 2024 16:40:13 +0300 Subject: [PATCH 3/6] demon yml --- .../Prototypes/ADT/Body/Organs/demon.yml | 19 ++ Resources/Prototypes/ADT/Body/Parts/demon.yml | 193 ++++++++++++++++++ .../Prototypes/ADT/Body/Prototypes/demon.yml | 49 +++++ .../ADT/Chemistry/metabolizer_types.yml | 58 ++++-- .../Prototypes/ADT/Damage/ADTmodifiers.yml | 86 ++++---- .../Mobs/Customization/Markings/demon.yml | 133 ++++++++++++ .../ADT/Entities/Mobs/Player/demon.yml | 50 +++++ .../ADT/Entities/Mobs/Species/demon.yml | 66 ++++++ Resources/Prototypes/ADT/Species/demon.yml | 157 ++++++++++++++ 9 files changed, 754 insertions(+), 57 deletions(-) create mode 100644 Resources/Prototypes/ADT/Body/Organs/demon.yml create mode 100644 Resources/Prototypes/ADT/Body/Parts/demon.yml create mode 100644 Resources/Prototypes/ADT/Body/Prototypes/demon.yml create mode 100644 Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml create mode 100644 Resources/Prototypes/ADT/Entities/Mobs/Player/demon.yml create mode 100644 Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml create mode 100644 Resources/Prototypes/ADT/Species/demon.yml diff --git a/Resources/Prototypes/ADT/Body/Organs/demon.yml b/Resources/Prototypes/ADT/Body/Organs/demon.yml new file mode 100644 index 00000000000..644389ccf68 --- /dev/null +++ b/Resources/Prototypes/ADT/Body/Organs/demon.yml @@ -0,0 +1,19 @@ +- type: entity + id: OrganDemonStomach + parent: OrganAnimalStomach + noSpawn: true + components: + - type: Stomach + maxVol: 50 + +- type: entity + id: OrganDemonHeart + parent: OrganAnimalHeart + components: + - type: Metabolizer + maxReagents: 2 + metabolizerTypes: [ Demon ] + groups: + - id: Medicine + - id: Poison + - id: Narcotic diff --git a/Resources/Prototypes/ADT/Body/Parts/demon.yml b/Resources/Prototypes/ADT/Body/Parts/demon.yml new file mode 100644 index 00000000000..ddc0a23bd84 --- /dev/null +++ b/Resources/Prototypes/ADT/Body/Parts/demon.yml @@ -0,0 +1,193 @@ +# TODO: Add descriptions (many) +# TODO BODY: Part damage +- type: entity + id: PartDemon + parent: BaseItem + name: "demon body part" + abstract: true + components: + - type: Damageable + damageContainer: Biological + - type: BodyPart + - type: ContainerContainer + containers: + bodypart: !type:Container + ents: [] + - type: Tag + tags: + - Trash + +- type: entity + id: TorsoDemon + name: "demon torso" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "torso_m" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "torso_m" + - type: BodyPart + partType: Torso + +- type: entity + id: HeadDemon + name: "demon head" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "head_m" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "head_m" + - type: BodyPart + partType: Head + vital: true + - type: Input + context: "ghost" + - type: MovementSpeedModifier + baseWalkSpeed: 0 + baseSprintSpeed: 0 + - type: InputMover + - type: GhostOnMove + - type: Tag + tags: + - Head + +- type: entity + id: LeftArmDemon + name: "left demon arm" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_arm" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_arm" + - type: BodyPart + partType: Arm + symmetry: Left + +- type: entity + id: RightArmDemon + name: "right demon arm" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_arm" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_arm" + - type: BodyPart + partType: Arm + symmetry: Right + +- type: entity + id: LeftHandDemon + name: "left demon hand" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_hand" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_hand" + - type: BodyPart + partType: Hand + symmetry: Left + +- type: entity + id: RightHandDemon + name: "right demon hand" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_hand" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_hand" + - type: BodyPart + partType: Hand + symmetry: Right + +- type: entity + id: LeftLegDemon + name: "left demon leg" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_leg" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_leg" + - type: BodyPart + partType: Leg + symmetry: Left + - type: MovementBodyPart + walkSpeed : 2.5 + sprintSpeed : 4.5 + +- type: entity + id: RightLegDemon + name: "right demon leg" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_leg" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_leg" + - type: BodyPart + partType: Leg + symmetry: Right + - type: MovementBodyPart + walkSpeed : 2.5 + sprintSpeed : 4.5 + +- type: entity + id: LeftFootDemon + name: "left demon foot" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_foot" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "l_foot" + - type: BodyPart + partType: Foot + symmetry: Left + +- type: entity + id: RightFootDemon + name: "right demon foot" + parent: PartDemon + components: + - type: Sprite + netsync: false + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_foot" + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: "r_foot" + - type: BodyPart + partType: Foot + symmetry: Right diff --git a/Resources/Prototypes/ADT/Body/Prototypes/demon.yml b/Resources/Prototypes/ADT/Body/Prototypes/demon.yml new file mode 100644 index 00000000000..ab2d8e2bdb1 --- /dev/null +++ b/Resources/Prototypes/ADT/Body/Prototypes/demon.yml @@ -0,0 +1,49 @@ +- type: body + name: "demon" + id: Demon + root: torso + slots: + head: + part: HeadDemon + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoDemon + organs: + heart: OrganDemonHeart + lungs: OrganHumanLungs + stomach: OrganDemonStomach + liver: OrganAnimalLiver + kidneys: OrganHumanKidneys + connections: + - left arm + - right arm + - left leg + - right leg + right arm: + part: RightArmDemon + connections: + - right hand + left arm: + part: LeftArmDemon + connections: + - left hand + right hand: + part: RightHandDemon + left hand: + part: LeftHandDemon + right leg: + part: RightLegDemon + connections: + - right foot + left leg: + part: LeftLegDemon + connections: + - left foot + right foot: + part: RightFootDemon + left foot: + part: LeftFootDemon diff --git a/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml b/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml index 0e7706c1e5a..7b89ea37180 100644 --- a/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml +++ b/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml @@ -3,50 +3,80 @@ - type: metabolizerType id: Animal - name: metabolizer-type-animal + name: animal - type: metabolizerType id: Bloodsucker - name: metabolizer-type-bloodsucker + name: bloodsucker - type: metabolizerType id: Dragon - name: metabolizer-type-dragon + name: dragon - type: metabolizerType id: Human - name: metabolizer-type-human + name: human - type: metabolizerType id: Slime - name: metabolizer-type-slime + name: slime - type: metabolizerType id: Vox - name: metabolizer-type-vox + name: vox - type: metabolizerType id: Rat - name: metabolizer-type-rat + name: rat - type: metabolizerType id: Plant - name: metabolizer-type-plant + name: plant - type: metabolizerType id: Dwarf - name: metabolizer-type-dwarf + name: dwarf - type: metabolizerType id: Moth - name: metabolizer-type-moth + name: moth - type: metabolizerType id: Arachnid - name: metabolizer-type-arachnid + name: arachnid + +- type: metabolizerType + id: Novakid + name: novakid + +- type: metabolizerType + id: Demon + name: demon + +- type: metabolizerType + id: Shark + name: shark + +- type: metabolizerType + id: Vulpkanin + name: vulpkanin + +- type: metabolizerType + id: Tajaran + name: tajaran + +- type: metabolizerType + id: Reptilian + name: reptilian + +- type: metabolizerType + id: Ursus + name: ursus - # Start ADT tweak: Drask - type: metabolizerType id: Drask - name: metabolizer-type-drask - # End ADT tweak + name: drask + +- type: metabolizerType + id: Felinid + name: felinid diff --git a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml index 3f73c916c9f..17be8eafaad 100644 --- a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml +++ b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml @@ -1,12 +1,12 @@ -# - type: damageModifierSet -# id: Fur # 1) - ебучий годспид, балансим уроном. 2) - шерсть должна гореть -# coefficients: -# Blunt: 1 -# Piercing: 1.2 -# Slash: 1.2 -# Cold: 0.6 -# Heat: 1.5 -# Poison: 1 +- type: damageModifierSet + id: Fur # 1) - ебучий годспид, балансим уроном. 2) - шерсть должна гореть + coefficients: + Blunt: 1 + Piercing: 1.2 + Slash: 1.2 + Cold: 0.6 + Heat: 1.5 + Poison: 1 - type: damageModifierSet id: Kobalt # мне даже жаль кобальдов, но жизнь такова какова она какова и больше не какова @@ -19,27 +19,27 @@ Poison: 1 Bloodloss: 0.3 -# - type: damageModifierSet -# id: Demon # они вообще то мутанты, но кого ебёт так? -# coefficients: -# Blunt: 1 -# Piercing: 1 -# Slash: 1.0 -# Cold: 0.8 -# Heat: 0.8 -# Poison: 0.8 -# Cellular: 1.5 - -# - type: damageModifierSet -# id: Shadowkin # пупупу -# coefficients: -# Blunt: 1.2 -# Piercing: 1.2 -# Slash: 1.2 -# Cold: 0.8 -# Heat: 0.8 -# Poison: 1 -# Cellular: 1 +- type: damageModifierSet + id: Demon # они вообще то мутанты, но кого ебёт так? + coefficients: + Blunt: 1 + Piercing: 1 + Slash: 1.0 + Cold: 0.8 + Heat: 0.8 + Poison: 0.8 + Cellular: 1.5 + +- type: damageModifierSet + id: Shadowkin # пупупу + coefficients: + Blunt: 1.2 + Piercing: 1.2 + Slash: 1.2 + Cold: 0.8 + Heat: 0.8 + Poison: 1 + Cellular: 1 - type: damageModifierSet id: Drask # саморезы @@ -47,15 +47,15 @@ Heat: 1.5 Asphyxiation: 2.0 -# - type: damageModifierSet -# id: Felinid # мяу -# coefficients: -# Blunt: 1.0 -# Piercing: 1.15 -# Slash: 1.30 -# Cold: 1.5 -# Heat: 2.0 -# Poison: 1.1 +- type: damageModifierSet + id: Felinid # мяу + coefficients: + Blunt: 1.0 + Piercing: 1.15 + Slash: 1.30 + Cold: 1.5 + Heat: 2.0 + Poison: 1.1 - type: damageModifierSet id: CyborgMetallic @@ -86,10 +86,10 @@ Piercing: 9 Heat: 9 -# - type: damageModifierSet -# id: Ursus # мишк -# coefficients: -# Blunt: 1.0 +- type: damageModifierSet + id: Ursus # мишк + coefficients: + Blunt: 1.0 - type: damageModifierSet id: AshWalker # Груба кожа = умно ящериц diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml new file mode 100644 index 00000000000..bb197ca124a --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml @@ -0,0 +1,133 @@ +- type: marking + id: DemomTail1 + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: demon_tail + +- type: marking + id: DemomTailLong + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: long + +- type: marking + id: DemomTailUp + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: up + +- type: marking + id: DemonCowEars + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: cow_ears + +- type: marking + id: DemonEars + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: demon_ears + +- type: marking + id: DemonCowHorns + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: cow_horns + +- type: marking + id: DemonHornsDeer + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: deer_antlers_horns + +- type: marking + id: DemonHornsSmall + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: small_horns + +- type: marking + id: DemonChestCowSpots + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: cow_spots + +- type: marking + id: DemonChestGuard + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: guards_stripes + +- type: marking + id: DemonChestLinesEmperos + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: lines_emperos + +- type: marking + id: DemonChestQueenLines + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: queen_lines + +- type: marking + id: DemonChestTreeLines + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: tree_lines + +- type: marking + id: DemonChestTrinitySpots + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [DemonSpecies] + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: trinity_spots + +- type: marking + id: DemonGoatee + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: ADT/Mobs/Demon/custom.rsi + state: goatee diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Player/demon.yml b/Resources/Prototypes/ADT/Entities/Mobs/Player/demon.yml new file mode 100644 index 00000000000..04c38254a16 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Player/demon.yml @@ -0,0 +1,50 @@ +- type: entity + save: false + name: Urisst' Mzhand Demon + parent: BaseMobDemon + id: MobDemon + components: + - type: CombatMode + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others + - type: MindContainer + showExamineInfo: true + - type: Input + context: "human" + - type: MobMover + - type: InputMover + - type: Alerts + - type: Eye + - type: CameraRecoil + - type: Examiner + - type: CanHostGuardian + + # ОТКОММЕНТИТЬ ПРИ ПЕРЕНОСЕ ЯЗЫКОВ И РАЗМЕРОВ + # - type: LanguageSpeaker + # speaks: + # - GalacticCommon + # - Arkane + # understands: + # - GalacticCommon + # - Arkane + + - type: NpcFactionMember + factions: + - NanoTrasen + - type: Respirator + damage: + types: + Asphyxiation: 1.0 + damageRecovery: + types: + Asphyxiation: -1.0 + # - type: SizeAttributeWhitelist # Frontier + # tall: true + # tallscale: 1.1 + # short: true + # shortscale: 0.9 + +#Weh diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml new file mode 100644 index 00000000000..6f99d513004 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml @@ -0,0 +1,66 @@ +- type: entity + save: false + name: Urisst' Mzhand Demon + parent: BaseMobSpeciesOrganic + id: BaseMobDemon + abstract: true + components: + - type: HumanoidAppearance + species: DemonSpecies + - type: Hunger + - type: Thirst + - type: Icon + sprite: ADT/Mobs/Demon/parts.rsi + state: full_m + - type: Sprite + netsync: false + noRot: true + drawdepth: Mobs + - type: Body + prototype: Demon + requiredLegs: 2 + - type: Speech + speechSounds: Lizard + - type: Vocal + sounds: + Male: MaleHuman + Female: FemaleHuman + Unsexed: FemaleHuman + - type: Damageable + damageContainer: Biological + damageModifierSet: Demon + - type: MeleeWeapon + # hidden: true + soundHit: + path: /Audio/Weapons/pierce.ogg + angle: 30 + animation: WeaponArcPunch + damage: + types: + Piercing: 5 + - type: Temperature + heatDamageThreshold: 400 + coldDamageThreshold: 193 #starting temperature damage treshold + currentTemperature: 310.15 + specificHeat: 46 + coldDamage: + types: + Cold : 0.1 #per second, scales with temperature & other constants + heatDamage: + types: + Heat : 0.3 #per second, scales with temperature & other constants + - type: MovementSpeedModifier + baseWalkSpeed : 2.5 + baseSprintSpeed : 4.5 + - type: Perishable + +- type: entity + save: false + name: Urist McHands + parent: MobHumanDummy + id: MobDemonDummy + noSpawn: true + description: A dummy reptilian meant to be used in character setup. + components: + - type: HumanoidAppearance + species: DemonSpecies diff --git a/Resources/Prototypes/ADT/Species/demon.yml b/Resources/Prototypes/ADT/Species/demon.yml new file mode 100644 index 00000000000..82bbe62c593 --- /dev/null +++ b/Resources/Prototypes/ADT/Species/demon.yml @@ -0,0 +1,157 @@ +- type: species + id: DemonSpecies + name: species-name-demon + roundStart: true + prototype: MobDemon + sprites: MobDemonSprites + defaultSkinTone: "#34a223" + markingLimits: MobDemonMarkingLimits + dollPrototype: MobDemonDummy + skinColoration: Hues + maleFirstNames: names_first_male + femaleFirstNames: names_first_female + maleLastNames: names_last_male + femaleLastNames: names_last_female + naming: firstlast + +- type: speciesBaseSprites + id: MobDemonSprites + sprites: + Head: MobDemonHead + Hair: MobHumanoidAnyMarking + FacialHair: MobHumanoidAnyMarking + Snout: MobHumanoidAnyMarking + Chest: MobDemonTorso + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking + Tail: MobDemonTail + Eyes: MobHumanoidEyes + LArm: MobDemonLArm + RArm: MobDemonRArm + LHand: MobDemonLHand + RHand: MobDemonRHand + LLeg: MobDemonLLeg + RLeg: MobDemonRLeg + LFoot: MobDemonLFoot + RFoot: MobDemonRFoot + +- type: markingPoints + id: MobDemonMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + required: false + HeadTop: + points: 1 + required: false + HeadSide: + points: 1 + required: false + Chest: + points: 1 + required: false + Tail: + points: 1 + required: false + Snout: + points: 1 + required: false + Legs: + points: 2 + required: false + Arms: + points: 2 + required: false + +- type: humanoidBaseSprite + id: MobDemonHead + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobDemonHeadMale + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobDemonHeadFemale + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobDemonTorso + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobDemonTorsoMale + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobDemonTorsoFemale + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobDemonLLeg + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobDemonLHand + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobDemonLArm + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobDemonLFoot + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobDemonRLeg + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobDemonRHand + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobDemonRArm + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobDemonRFoot + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: r_foot + +- type: humanoidBaseSprite + id: MobDemonTail + baseSprite: + sprite: ADT/Mobs/Demon/parts.rsi + state: tail From 5f8804fb157b7cc87732a9195a49ea63bb31fa18 Mon Sep 17 00:00:00 2001 From: Nix Silvam Date: Wed, 10 Jul 2024 16:40:35 +0300 Subject: [PATCH 4/6] empty files fix --- Resources/Prototypes/ADT/Body/Organs/fill.txt | 1 - Resources/Prototypes/ADT/Body/Parts/fill.txt | 1 - .../Prototypes/ADT/Entities/Mobs/Customization/Markings/fill.txt | 1 - Resources/Prototypes/ADT/Entities/Mobs/Player/fill.txt | 1 - Resources/Prototypes/ADT/Entities/Mobs/Species/fill.txt | 1 - 5 files changed, 5 deletions(-) delete mode 100644 Resources/Prototypes/ADT/Body/Organs/fill.txt delete mode 100644 Resources/Prototypes/ADT/Body/Parts/fill.txt delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/fill.txt delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/Player/fill.txt delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/Species/fill.txt diff --git a/Resources/Prototypes/ADT/Body/Organs/fill.txt b/Resources/Prototypes/ADT/Body/Organs/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Body/Organs/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Body/Parts/fill.txt b/Resources/Prototypes/ADT/Body/Parts/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Body/Parts/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/fill.txt b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Player/fill.txt b/Resources/Prototypes/ADT/Entities/Mobs/Player/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/Player/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/fill.txt b/Resources/Prototypes/ADT/Entities/Mobs/Species/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file From 46466380ecb65ba09b9b7d5bf7e0e3519e8e5d0e Mon Sep 17 00:00:00 2001 From: Nix Silvam Date: Wed, 10 Jul 2024 17:01:55 +0300 Subject: [PATCH 5/6] metabolizer-types fix --- .../ru-RU/ADT/Chemistry/metabolizer-types.ftl | 8 ++++ .../ADT/Chemistry/metabolizer_types.yml | 42 +++++++++---------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/Chemistry/metabolizer-types.ftl b/Resources/Locale/ru-RU/ADT/Chemistry/metabolizer-types.ftl index ff10a218e10..c7d9b2badd2 100644 --- a/Resources/Locale/ru-RU/ADT/Chemistry/metabolizer-types.ftl +++ b/Resources/Locale/ru-RU/ADT/Chemistry/metabolizer-types.ftl @@ -10,3 +10,11 @@ metabolizer-type-dwarf = Дварф metabolizer-type-moth = Ниан metabolizer-type-arachnid = Арахнид metabolizer-type-drask = Драск +metabolizer-type-demon = Аркана +metabolizer-type-novakid = Новакид +metabolizer-type-shark = Акула +metabolizer-type-vulpkanin = Вульпканин +metabolizer-type-tajaran = Таяран +metabolizer-type-reptilian = Унатх +metabolizer-type-ursus = Урс +metabolizer-type-felinid = Фелинид diff --git a/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml b/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml index 7b89ea37180..a492dde8d02 100644 --- a/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml +++ b/Resources/Prototypes/ADT/Chemistry/metabolizer_types.yml @@ -1,82 +1,82 @@ -# If your species wants to metabolize stuff differently, +# If your species wants to metabolize stuff differently, # you'll likely have to tag its metabolizers with something other than Human. - type: metabolizerType id: Animal - name: animal + name: metabolizer-type-animal - type: metabolizerType id: Bloodsucker - name: bloodsucker + name: metabolizer-type-bloodsucker - type: metabolizerType id: Dragon - name: dragon + name: metabolizer-type-dragon - type: metabolizerType id: Human - name: human + name: metabolizer-type-human - type: metabolizerType id: Slime - name: slime + name: metabolizer-type-slime - type: metabolizerType id: Vox - name: vox + name: metabolizer-type-vox - type: metabolizerType id: Rat - name: rat + name: metabolizer-type-rat - type: metabolizerType id: Plant - name: plant + name: metabolizer-type-plant - type: metabolizerType id: Dwarf - name: dwarf + name: metabolizer-type-dwarf - type: metabolizerType id: Moth - name: moth + name: metabolizer-type-moth - type: metabolizerType id: Arachnid - name: arachnid + name: metabolizer-type-arachnid - type: metabolizerType id: Novakid - name: novakid + name: metabolizer-type-novakid - type: metabolizerType id: Demon - name: demon + name: metabolizer-type-demon - type: metabolizerType id: Shark - name: shark + name: metabolizer-type-shark - type: metabolizerType id: Vulpkanin - name: vulpkanin + name: metabolizer-type-vulpkanin - type: metabolizerType id: Tajaran - name: tajaran + name: metabolizer-type-tajaran - type: metabolizerType id: Reptilian - name: reptilian + name: metabolizer-type-reptilian - type: metabolizerType id: Ursus - name: ursus + name: metabolizer-type-ursus - type: metabolizerType id: Drask - name: drask + name: metabolizer-type-drask - type: metabolizerType id: Felinid - name: felinid + name: metabolizer-type-felinid From ccbba990ca854c8f5a7d59673a29dd7f8b9b7da8 Mon Sep 17 00:00:00 2001 From: Nix Silvam Date: Wed, 10 Jul 2024 17:27:06 +0300 Subject: [PATCH 6/6] OrganDemonStomach fix --- Resources/Prototypes/ADT/Body/Organs/demon.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Body/Organs/demon.yml b/Resources/Prototypes/ADT/Body/Organs/demon.yml index 644389ccf68..544df0ff960 100644 --- a/Resources/Prototypes/ADT/Body/Organs/demon.yml +++ b/Resources/Prototypes/ADT/Body/Organs/demon.yml @@ -3,8 +3,10 @@ parent: OrganAnimalStomach noSpawn: true components: - - type: Stomach - maxVol: 50 + - type: SolutionContainerManager + solutions: + stomach: + maxVol: 50 - type: entity id: OrganDemonHeart