From 0b861128aca209c66e7b337d7fb0bd0c58dd80c7 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 14 Dec 2024 06:33:11 +0300 Subject: [PATCH 01/22] Blood Cult Cat --- .../_NF/ghost/roles/ghost-role-component.ftl | 7 +++ .../_NF/Datasets/Names/cat_cult.yml | 12 ++++ .../_NF/Entities/Mobs/NPCs/pets.yml | 55 ++++++++++++++++++ .../_NF/Roles/Ghostroles/whitelisted.yml | 8 +++ .../_NF/Roles/Jobs/Fun/misc_startinggear.yml | 8 ++- .../_NF/Mobs/Pets/cat.rsi/cultcat.png | Bin 0 -> 2665 bytes .../_NF/Mobs/Pets/cat.rsi/cultcat_dead.png | Bin 0 -> 547 bytes .../_NF/Mobs/Pets/cat.rsi/cultcat_rest.png | Bin 0 -> 890 bytes .../Pets/cat.rsi/cultcat_rest_unshaded.png | Bin 0 -> 241 bytes .../_NF/Mobs/Pets/cat.rsi/cultcat_sit.png | Bin 0 -> 701 bytes .../Pets/cat.rsi/cultcat_sit_unshaded.png | Bin 0 -> 154 bytes .../Mobs/Pets/cat.rsi/cultcat_unshaded.png | Bin 0 -> 1122 bytes .../_NF/Mobs/Pets/cat.rsi/mask_null.png | Bin 0 -> 109 bytes .../Textures/_NF/Mobs/Pets/cat.rsi/meta.json | 44 +++++++++++++- 14 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml create mode 100644 Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat.png create mode 100644 Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_dead.png create mode 100644 Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest.png create mode 100644 Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest_unshaded.png create mode 100644 Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit.png create mode 100644 Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit_unshaded.png create mode 100644 Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_unshaded.png create mode 100644 Resources/Textures/_NF/Mobs/Pets/cat.rsi/mask_null.png diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl index a0035770418..0b92424e332 100644 --- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl @@ -15,6 +15,13 @@ ghost-role-information-clarpy-name = Clarpy ghost-role-information-clarpy-description = Avast ye mail! wanted by Nanotrasen for crimes against mice. ghost-role-information-clarpy-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other pirates. +ghost-role-information-cult-cat-name = Cult Cat +ghost-role-information-cult-cat-description = Founded the Blood Cult out of boredoom. +ghost-role-information-cult-cat-rules = You are a [color=red][bold]Free Agent[/bold][/color] and free to choose your course of actions. + Please note that [color=yellow]all server rules still apply.[/color] Additionally: + - [color=red]DO NOT[/color] damage player shuttles or their contents. + - [color=red]DO NOT[/color] gib players. Once they're dead, leave them be. + ghost-role-information-cappy-name = Cappy ghost-role-information-cappy-description = Stop resisting! Certified in lethal-force and defensive tactics. diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml new file mode 100644 index 00000000000..1235fbdf499 --- /dev/null +++ b/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml @@ -0,0 +1,12 @@ +- type: dataset # Names of town that held witch trials + id: names_cat_cult + values: + - Salem + - Valais + - Trier + - Fulda + - Berwick + - Pendle + - Würzburg + - Bamberg + - Torsåker diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 711d2dc5055..2172cafd0bb 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -223,6 +223,61 @@ factions: - Cat +- type: entity + name: cult cat + parent: [NFMobPet, MobCatGhost] + id: MobCatCult + description: Founded the Blood Cult out of boredoom. + components: + - type: Sprite + drawdepth: Mobs + sprite: _NF/Mobs/Pets/cat.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: cultcat + - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] + state: cultcat_unshaded + shader: unshaded + - type: DamageStateVisuals + states: + Alive: + Base: cultcat + BaseUnshaded: cultcat_unshaded + Critical: + Base: cultcat_dead + BaseUnshaded: mask_null + Dead: + Base: cultcat_dead + BaseUnshaded: mask_null + - type: GhostRole + name: ghost-role-information-cult-cat-name + description: ghost-role-information-cult-cat-description + rules: ghost-role-information-cult-cat-rules + prototype: CatCult + - type: Loadout + prototypes: [ MobCatCultGear ] + - type: RandomMetadata + nameSegments: [ names_cat_cult ] + - type: AutoImplant + implants: + - MedicalTrackingImplant + - LightImplant + - type: IntrinsicRadioTransmitter + channels: + - Freelance + - type: ActiveRadio + channels: + - Freelance + - type: NpcFactionMember + factions: + - Cat + - BloodCultNF + - type: NFSalvageMobRestrictions + despawnIfOffLinkedGrid: false + addComponentsOnDeath: [] + removeComponentsOnDeath: [] + - type: CargoSellBlacklist + # Adopted from space-wizards #26265 (Thank you, PolterTzi) - type: entity name: Yip Yip diff --git a/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml b/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml index 4cd480e23af..c549ef4c595 100644 --- a/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml +++ b/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml @@ -48,6 +48,14 @@ entityPrototype: MobCatMistake whitelisted: true +- type: ghostRole + id: CatCult + name: ghost-role-information-cult-cat-name + description: ghost-role-information-cult-cat-description + rules: ghost-role-information-emotional-support-rules + entityPrototype: MobCatCult + whitelisted: true + - type: ghostRole id: MonkeyPunpun name: ghost-role-information-punpun-name diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml index df51b02df3e..cad08630eb5 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml @@ -33,6 +33,12 @@ id: CappyIDCard belt: ClothingBeltNfsdWebbing +- type: startingGear + id: MobCatCultGear + equipment: + head: ClothingHeadHatPirate + id: ClarpyIDCard + # Adopted from space-wizards #26265 (Thank you, PolterTzi) - type: startingGear id: MobKoboldGear @@ -40,4 +46,4 @@ head: ClothingHeadHatStrawHat ears: ClothingHeadsetService jumpsuit: ClothingUniformJumpsuitHawaiRed - id: YipYipIDCard \ No newline at end of file + id: YipYipIDCard diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat.png new file mode 100644 index 0000000000000000000000000000000000000000..20518db471de47c6e0c33c58b285752b95775930 GIT binary patch literal 2665 zcmV-v3YPVWP)Pxh|A`UQ5L_idx9T6h)-DD$@`wq4Y>ZOFE)-!miXB>7I`7w=xo7_v zX12A{cJ4sa-Pmt((%y5={r-OEdw=Kr=ALt49`l&TJbuFvW*VP5b!x)(bI&~|_wV1I zm*c?)A1sRVcA-%FO0foZ?%XLKb2{nl?3BfF6bp~Xlh@`{_0yqf0bYIeRq<&u$x}5o z?A*C?&P6Du^H8J!S!1D4i1@(3Ejv*RTrL-z+Mkfw;&Qo);xR3N$K#PDB_+Ae{;XOE zg+i0+XA2&WM_R2`04l4hbHy+WtX8XO`$a{-+O_L(I-MjE3BJ-45{U#(r<1j7*B3)q zFy49lpuGRSH6)Wsr2KC`1AzcS$@p>qeQS8z={f>Xgu>S+PqS@%SHaoMv;d!f{wV+!izQblgvecI z@6QI_dHbMT_s|2m>#PXwRjcs({YWJ19(rJQBLFg;|Nh*$+_jXF@6Vl^Aj)iD+x9N8 zZF`r{G!2{02EdNH?`HqyAFvnB#S zG#aC|_4nw35q8{l7w=xXMoCEte!t%ok0}ANZ}!sVe@maw$G6}01LQhiTU(oJbL=ng zn{vbqESiOAEW(9<^b@FE$RGV1f+ExL?#FSZP6nB-rC9s z!C)>Yr}bn}jueW9C3o?N#R5X`hj0`unU4=7=%J0Dl4m~Gz=7=va$lV%S|v8ByDmA zD$3h3my1(Y8@08yba!`)J8J4U?R0YIopmU3b_GZz66ja{g{~+099Xq#6L?gN%#}O{gCk872`=aNxj!*;N3ze*HR;Xq4gM z;hVNch(;n@y?WI&S5fhL;KxgpmQP%PDJysJ=Rxxh6oXVc&ByULue|b#0C@T3m&J#% z7^!sHG}olJHCwB+|10?QYVqvOSpNr@7htX(m}|@nFxL*uHRc7FYX{~U^8(DZ19Ode z0p{9)xkg?A_Uzds_w3noON*PEH*daei=(&7HC=xu32^YuH{|+DmuPpp>Fw<;%J7yg zTVz|?M&Q<*&pzAMwvjDcwiLzF+uJMK-EP)jy2QaZ-cK%? zd;Kj_hC4bsq(J66kQJgBw6$%_i6D@4baa^V<+az}lB)*?=^Y#6YFit=;p>yyOcKEB z^@{fP_S|Q(|Hja-o6HE8yMn&Hk5Cka2^MBe&Fc=Kd)YMe4L665H-EJ4sFmSsw=LRY&D%iSptLgCFx^=6psHni@axtFM z%-&y9Qxn0P`-f9uN&$SoTqQm*z{QIf3wBxvfni7#RY6rX&h=-u&Ri~Yj(a?w+?k(q z{r#w_hN3DMhD4ZHbG&%*BJqI%e7{V+QZ;23c+4N*WK$FQ!e%O1EgGt-B1DF^W%X*L zl&ol8YUn99dxH z%9Sex8{5?WgmgGdCe*EHUdqbl_wd8{3!FIdS;1T=P$5w`8}*?UOM5P!&$Ux$`+4QmtP7}iI2j!o0W!0>G|VqJ{&4;Rkl98%eE4v|k#zX* zVe#aXPs;4``7o0RLQ(1I=@Cdtb@lH^rSk6>Z6eU-rlo*Bq zfUfI=LLuxn3(qfKam$?tIC}J`cz*c`?6%B#L|xZ`%obVp1!T*39~}-SWu>JEA&5sK zsA~Q_%PF%!Bo;>k5^`dUH>N0=Nh$lkVHh}_PBhK*c4NWNG!3WIiD4LdeHbr9JQ~UQ zABn}MnaqXV_ybB$)zsXM{!YMn&a5pV z1j%HQR4T>jjX-XA09b8yR8`GIXSPqj#kxmc}hjV@#hCwQo znsA~tAEp$br>934DV;guSfsv;B$A*4Yh7R#JZl$jq%^-CHvf*3}|_mrN=22)_#0UJvs z=~}#)KrqPr@i_lH|2@Z!9h*e<;)^fJb@4dSSd6p%{XF{Uqqn2alhEJa&%J>F4!fN% z>gssurI#l8(%IQ56-D8Z1q&#zuIAuRKTXRy;}94b9cAIdg$N-ybm&lCC9^Z{;zf&0 zb*LCDUbHA@FCPvaIwXV;EL^ydk1ls=-zt2+ zTqTuGb3#?wyLa!DVJ)R3ol4P{(q~M?GcJkM)YcIShk3fbp03XAQ>vhPx$-AP12R9J=WlRazOP!xurTRXPo!CVb#G-NP@>>4%2`U3@1LZZ!6x6)Z-NA(9} zZS74B89ZkaojiK+Y;AEUF(Luw%A}}6D%G+~+a*)=fZ&Sr@xJHi3TkRltK7Bcc}3!MIu+aTe`Pov7Jbq* zWiU9yb>9~K9LK3{!1KK9O|!{)w@d%=5!<#i%d#@lG%N1^Mw+JRx=xy=08A#Am7LNB zY}?MxyIsEC-vbau5xriID2mWDjV$}^VLTp}YB#6N(RID_u4x)^95Wh?1Uzq`xm}bb z2>`zD3wZu+Qc5&UD{|sEt_TVtkW!X%Hic)i8J1-sr7T^_k^$fM#r5fF=3iZj{KA-~ zx$O}tB}%E1sZG}Fbs?N%S=P>)%5NBkVKH^yB%fw;!d=91j8ckryNzKOrI>A>{OW&= zQVOLM%jHs341DVMvqqyqk|cayE&)(V6=w2hTR6`f9vtv`f1e*uPh2b(7>2=WwL%Di zVHnu<36sesK@bSXadvOuo9AVnPKWPzcZ_du|2Xw7-X9&I>pBnfIbT{W-W?v&+S}t| lu>j!1@i7ncIUjFs#7}4Ryxan|zhM9X002ovPDHLkV1h-J_mcns literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest.png new file mode 100644 index 0000000000000000000000000000000000000000..099de165c5f328cadfae2885879629fd525316cb GIT binary patch literal 890 zcmV-=1BLvFP)Px&G)Y83RCt{2n!iumKorNnE+(;E3EdFDNEwh=7!gBt8=1NxA%t3QMylBQ2Utu@ zDE$MvbZE&26$4VYPHrbg7F0G)Vt}ZjvZ&-9QOb1yoBU4fGy#eCk*qkrJAa?wJ>Nxn z4z7r_W21Q=s53?sf41VLYd^~}%D0|1VW zjv%FkVG z>ZtVFI>2!pRqxFp2x8%gcH%)0KuU>hHVe}<5&o&7`YQw=<38gP^RV`_2|e`__oKRv}pK93J)XV5eaZ)Rp-Sr%??Zt!Aj ztL+*vYW=p0;CIhcmSy4R_!yru8EoY9$c&H221RXK=jV@3 zpCAZ=AP9mW2!bF8f*^>8fpe}n=czKnNoe_7ygn&WC={@n%c<>3MQhjIFG=eIHgh@k zT-R?Cqj$9dX|;Rlcgzh&#!W6RBASV`51+I?V7pS$zSL^iySl=%u49l$=%wE^JIpy( zVHiRPkxG1!`haNG2T6|)Tpv(xK$_Vfv_3!xfr}J*fh77p9gx<5wDkeaL@D}V>GyQN zu=DfH_`V+>v$L}hLO@Ch+qR!heZVO7A7y>ODD|m6pp!V&2T*;$)2I*l2itxA+xG-f Q;s5{u07*qoM6N<$f_(>`FaQ7m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest_unshaded.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest_unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..7269ce17b2197a3ebc8fcdc41f8e7257ff32ce31 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|R(rZQhE&XX zd+Q+QVFMo4fThkUlit_|OfT@y?B-r*dn4#$wYqS}z8ogY6M{hH3=Dg=bnJEF*Q^b> z`RBy1?GumwKe&ZCL-6>THAO#lA7u#YuI_yECtW!6A?v4wE7sP3_;>%V(!2d)Z|>&{ z{*HV;`_|^q_IwE;!he6QDl4-CnYUp>59dcqzV!xk{nBmhZhT@l@cmX|R%`OE?!c*d khAU6&4y;l8^)>YE%%A+(0cq@J-8o=wp00i_>zopr0I1Pqpa1{> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit.png new file mode 100644 index 0000000000000000000000000000000000000000..308c253f1f5bc2f69ec29de7f0ddffa749deac3e GIT binary patch literal 701 zcmV;u0z&Px%cS%G+R9J=Wmd#64Q5c7xbLKXvL(beYegwj_@B_^RbuHwoO_mU}@MFBtCZU$? z=PwXM3fc~g<06PCaap#AXq6C=I3iSnICIC3EQGq()8aZZlB0KEa?|{F=iK-H-se5% zz2_dNs;a80s_K82@DsGSxLB6y`1rU^rBcVd2L}gFjFn|M`%pX{*F!_Mk3i0fuPDI8 z#Do^;qvQpUa{~Z~n2P!NXGkeoSa^PZ0G4HGtp!p_lrk|*6QvaKxOM6_RCEO*k$TTG zU?7Cx!_pGbsL9yqNJ)sw0@R0&jr)3g0l0bVPRVyF29Qi9#n<%>Z=k(`d%8R6>F(s^ zi>Ln{;3R$gw9Kp5ZDt;__V)J3WjAqMmt1!9)Z}FW zq|<4AeQoX3n3|dzLZJ{B>%;7R|9NI|0K+c;KwVcCu}1aRyk%M1RNlM{1PBI$+>6D0 zd6oqL@cWljGWmh)BBi9YwUs)3<|*tS;K}1hx_2|n`{pJl?>`U#W1}P5xDX^94tqgb zqqW9$T{4*r*IHV90r={Hjcksc-CZ`aIl!yBsreF0DFT526cxLbw*i>?yj(ee?d@&e zMIx+bRu~%{(WYqvAcQ!q+QD_*qj=l4xzgR|3&3{|tY%hF(FP2|z;PV5@-`~kPz1Sy zKJfbEuH*3bhwaPP*9y$c%!p`1BSLszm0=h>yxPMJDN%Brbkd>Pq$p(0tZ=!wVJ#00000NkvXXu0mjfb2Cyc literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit_unshaded.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit_unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..9a2e23061d33ad5e21ab7269e423640c3ee68a59 GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}A)YRdArY-_ zFCXMQV8G*i(ZBtK%H4X?uUD#rQdnH`8KNUNLqbDCd4=v=e9Cmx`N*{E90!Ze@43Sq zzdP|b(~Y_F?#Eqs`TxJPXzls_fDJNRkL*vp!|ci{Fkw|)N(#_?22WQ%mvv4FO#q*< BIPd@f literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_unshaded.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..e16977956fb7fcc199213a59a1906984c37dedf1 GIT binary patch literal 1122 zcmV-o1fBbdP)Px(97#k$RCt{2n@w*MM;OQdCW**aRhnQ+RUCWhxjC3z5NQ-L5|X*(z^5oDB*Fnw zLre&Aco8V-p-4UO9ehJF2L>Tz6SXQ_g2aKU6FCaR5nv}~owX4MvR2lt*Uapj)9g>O z?6G#AdFJnDo_SjX0RaI40SA|m$i^H9kd6SI)t){l{O}Fi0^BdI+R6cbV_Sf3U?Ccn z&O_1yEG3h~s_Z30iG=jMQUWX`ljM9Z_n+SA*0Pt}IdzJhd+2VI zCYR%8WiQcoc5K}*-33}3>qq0AVBaS}P1ErE>C@gP!EPa4DDZdh-$~yuB*5NzdnO(? zsD7JLVs@Pu%s*T9HVFd2<<(VwePo0H!1tr0uI7N&MVOP=>H>4cBA+W3xz`Es*3=XM zfM3Z^hIjpYkqDHIfXu`MsqR?_4g5TcOOKf+LiF_Z;Kt-6dAqRz0O&v5hwHzLlioh@ z=12*UnV2Benu^TEMzg^)Z{LvAu`#mv{2$jvs8lKlha(7o`UC(7hmT-ra0ul}S=g3T z7Z?~EMCPx*4Gmp-`I3)}L}kngqrLtYnzn;0PoHuCxLSC|cQg&Pn)swhDgq9LzHB75 zCMT_4moX>IVyVRcINWa-g%m}>g@+G?qfa;j7-OiE%|orG);>ts2VJ?QKK( zTM>?c-C>CD`P{^-BnSW(A3bW;#TWynRH|<2P0{^EyZOVup91=Hm`Gw*+hbTrzl7l3Z{!ReGW03NRS@}2JqXHCtPof866{_w7H2`EC#@O z^C1)pfyCn-8(`ha^8f$< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mask_null.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mask_null.png new file mode 100644 index 0000000000000000000000000000000000000000..2975c479be7566a6c59a7aca4e20778aa850feb7 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)ID7sLn`LH rJ;=xlwOr9UK@K`#+rw1POb(`njxgN@xNA?@buF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json index e8f1d8ea4ab..3193bc67c3b 100644 --- a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json +++ b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, piratecat and mistakecat edited by Dvir001, nfsdcat and cavecat edited by ghostprince", + "copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, piratecat and mistakecat edited by Dvir001, nfsdcat and cavecat edited by ghostprince | Cult cat taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/simple/pets.dmi and modified by erhardsteinhauer (discord/github)", "states": [ { "name": "piratecat", @@ -93,6 +93,48 @@ { "name": "cattag", "directions": 4 + }, + { + "name": "cultcat", + "directions": 4 + }, + { + "name": "cultcat_unshaded", + "directions": 4 + }, + { + "name": "cultcat_dead" + }, + { + "name": "cultcat_rest", + "delays": [ + [ + 0.1, + 0.2, + 0.1, + 0.2 + ] + ] + }, + { + "name": "cultcat_rest_unshaded", + "delays": [ + [ + 0.1, + 0.2, + 0.1, + 0.2 + ] + ] + }, + { + "name": "cultcat_sit" + }, + { + "name": "cultcat_sit_unshaded" + }, + { + "name": "mask_null" } ] } From 3531fefec1e2fd7693063884623faf4520349b7b Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 14 Dec 2024 15:26:07 +0300 Subject: [PATCH 02/22] abilities --- .../_NF/ghost/roles/ghost-role-component.ftl | 2 +- Resources/Prototypes/_NF/Actions/types.yml | 10 ++++ .../Conditional/mobs_hostile_bloodcult.yml | 31 ++++++++--- .../_NF/Entities/Mobs/NPCs/pets.yml | 52 +++++++++++++++--- .../Objects/Misc/subdermal_implants.yml | 39 +++++++++++++ .../Weapons/Guns/Projectiles/magic.yml | 20 +++++++ .../_NF/Roles/Ghostroles/whitelisted.yml | 4 +- .../_NF/Roles/Jobs/Fun/misc_startinggear.yml | 6 -- .../Effects/bloodcultprojectiles.rsi/hand.png | Bin 0 -> 2020 bytes .../bloodcultprojectiles.rsi/meta.json | 14 +++++ 10 files changed, 153 insertions(+), 25 deletions(-) create mode 100644 Resources/Prototypes/_NF/Actions/types.yml create mode 100644 Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/hand.png create mode 100644 Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/meta.json diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl index 0b92424e332..d7089b8638a 100644 --- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl @@ -15,7 +15,7 @@ ghost-role-information-clarpy-name = Clarpy ghost-role-information-clarpy-description = Avast ye mail! wanted by Nanotrasen for crimes against mice. ghost-role-information-clarpy-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other pirates. -ghost-role-information-cult-cat-name = Cult Cat +ghost-role-information-cult-cat-name = Blood Cult Cat ghost-role-information-cult-cat-description = Founded the Blood Cult out of boredoom. ghost-role-information-cult-cat-rules = You are a [color=red][bold]Free Agent[/bold][/color] and free to choose your course of actions. Please note that [color=yellow]all server rules still apply.[/color] Additionally: diff --git a/Resources/Prototypes/_NF/Actions/types.yml b/Resources/Prototypes/_NF/Actions/types.yml new file mode 100644 index 00000000000..90a2cd4d10d --- /dev/null +++ b/Resources/Prototypes/_NF/Actions/types.yml @@ -0,0 +1,10 @@ + +- type: entity + id: ActionActivateDissonantWhispersImplant + name: Dissonant Whispers + description: Utter unharmonious and disquieting whispers giving form to eldritch horrors. + components: + - type: InstantAction + icon: { sprite: Objects/Fun/bikehorn.rsi, state: icon } + event: !type:ActivateImplantEvent + useDelay: 5 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_bloodcult.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_bloodcult.yml index f88f8ac1441..8bdcb696a5c 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_bloodcult.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_bloodcult.yml @@ -1,5 +1,5 @@ - type: entity - name: Blood Cult Priest Spawner + name: blood cult priest spawner suffix: AI, Hostile, Caster id: SpawnMobBloodCultistPriest parent: MarkerBase @@ -23,7 +23,7 @@ - MobBloodCultistPriest - type: entity - name: Blood Cult Acolyte + name: blood cult acolyte spawner suffix: AI, Hostile, Melee id: SpawnMobBloodCultistAcolyte parent: MarkerBase @@ -47,7 +47,7 @@ - MobBloodCultistAcolyte - type: entity - name: Blood Cult Zealot + name: blood cult zealot spawner suffix: AI, Hostile, Melee id: SpawnMobBloodCultistZealotMelee parent: MarkerBase @@ -71,7 +71,7 @@ - MobBloodCultistZealotMelee - type: entity - name: Blood Cult Zealot + name: blood cult zealot spawner suffix: AI, Hostile, Ranged id: SpawnMobBloodCultistZealotRanged parent: MarkerBase @@ -95,7 +95,7 @@ - MobBloodCultistZealotRanged - type: entity - name: Blood Cult Zealot + name: blood cult zealot spawner suffix: AI, Hostile, Caster id: SpawnMobBloodCultistCaster parent: MarkerBase @@ -119,7 +119,7 @@ - MobBloodCultistCaster - type: entity - name: Blood Cult Leech + name: blood cult leech spawner suffix: AI, Hostile, Melee, Fast id: SpawnMobBloodCultLeech parent: MarkerBase @@ -135,7 +135,7 @@ - MobBloodCultLeech - type: entity - name: Ascended Cultist + name: ascended cultist spawner suffix: AI, Hostile, Caster, Megafauna id: SpawnMobBloodCultistAscended parent: MarkerBase @@ -151,7 +151,7 @@ - MobBloodCultistAscended - type: entity - name: Blood Cult Janitor + name: blood cult janitor spawner suffix: AI, Hostile, Melee id: SpawnMobBloodCultistJanitor parent: MarkerBase @@ -175,3 +175,18 @@ - type: ConditionalSpawner prototypes: - MobBloodCultistJanitor + +- type: entity + name: blood cult cat spawner + suffix: Ghost + id: SpawnMobCatBloodCult + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _NF/Mobs/Pets/cat.rsi + state: cultcat + - type: ConditionalSpawner + prototypes: + - MobCatBloodCult diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 2172cafd0bb..40597e8bc1c 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -224,9 +224,9 @@ - Cat - type: entity - name: cult cat + name: blood cult cat parent: [NFMobPet, MobCatGhost] - id: MobCatCult + id: MobCatBloodCult description: Founded the Blood Cult out of boredoom. components: - type: Sprite @@ -253,21 +253,20 @@ name: ghost-role-information-cult-cat-name description: ghost-role-information-cult-cat-description rules: ghost-role-information-cult-cat-rules - prototype: CatCult - - type: Loadout - prototypes: [ MobCatCultGear ] + prototype: CatBloodCult - type: RandomMetadata nameSegments: [ names_cat_cult ] - type: AutoImplant implants: - MedicalTrackingImplant - - LightImplant + - RedLightImplant + - DissonantWhispersImplant - type: IntrinsicRadioTransmitter channels: - - Freelance + - Science - type: ActiveRadio channels: - - Freelance + - Science - type: NpcFactionMember factions: - Cat @@ -277,6 +276,43 @@ addComponentsOnDeath: [] removeComponentsOnDeath: [] - type: CargoSellBlacklist + - type: ActionGun + action: ActionEldritchPush + gunProto: EldritchPushGun + +- type: entity + id: EldritchPushGun + name: eldritch hand gun + description: Shoots eldritch hand. + categories: [ HideSpawnMenu ] + components: + - type: RechargeBasicEntityAmmo + rechargeCooldown: 180 + rechargeSound: + path: /Audio/Magic/fireball.ogg + - type: BasicEntityAmmoProvider + proto: BulletEldritchHand + capacity: 1 + count: 1 + - type: Gun + soundGunshot: + path: /Audio/Effects/teleport_arrival.ogg + soundEmpty: null + projectileSpeed: 3 + +- type: entity + id: ActionEldritchPush + categories: [ HideSpawnMenu ] + name: "[color=yellow]Force Push[/color]" + description: "Summon forth an eldritch hand. [color=yellow]3 minutes cooldown.[/color]" + components: + - type: WorldTargetAction + icon: { sprite : _NF/Effects/bloodcultprojectiles.rsi, state: hand } + event: !type:ActionGunShootEvent + priority: 2 + checkCanAccess: false + range: 0 + itemIconStyle: BigAction # Adopted from space-wizards #26265 (Thank you, PolterTzi) - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml index 3c8f2bb85d3..598286ae3dc 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml @@ -107,3 +107,42 @@ - type: SubdermalImplant permanent: true - type: BibleUserImplant + +- type: entity + parent: BaseSubdermalImplant + id: RedLightImplant + name: light implant (red) + description: This implant emits light from the user's skin on activation. + categories: [ HideSpawnMenu ] + components: + - type: SubdermalImplant + implantAction: ActionToggleLight + - type: PointLight + enabled: false + radius: 2.5 + softness: 5 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + color: "#ff0000" + - type: Tag + tags: + - SubdermalImplant + - HideContextMenu + - Flashlight + - type: UnpoweredFlashlight + +- type: entity + parent: BaseSubdermalImplant + id: DissonantWhispersImplant + name: dissonant whispers implant + description: This implant allows user to emmit dissonant whispers. + categories: [ HideSpawnMenu ] + components: + - type: SubdermalImplant + implantAction: ActionActivateDissonantWhispersImplant + - type: TriggerImplantAction + - type: EmitSoundOnTrigger + sound: + path: /Audio/_NF/Effects/bloodcult/whispers.ogg + params: + variation: 0.125 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index 1e7999e12e4..82b11c40536 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -71,3 +71,23 @@ impactFlash: sprite: _NF/Effects/bloodcultbeams.rsi state: red_lightning + +- type: entity # For blood cult cat + parent: BaseBullet + id: BulletEldritchHand + name: eldritch hand + categories: [ HideSpawnMenu ] + components: + - type: StaminaDamageOnCollide + damage: 100 + - type: Projectile + damage: + types: + Asphyxiation: 0 + - type: Sprite + noRot: false + sprite: _NF/Effects/bloodcultprojectiles.rsi + layers: + - state: hand + - type: Ammo + muzzleFlash: null diff --git a/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml b/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml index c549ef4c595..07a855d1cfc 100644 --- a/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml +++ b/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml @@ -49,11 +49,11 @@ whitelisted: true - type: ghostRole - id: CatCult + id: CatBloodCult name: ghost-role-information-cult-cat-name description: ghost-role-information-cult-cat-description rules: ghost-role-information-emotional-support-rules - entityPrototype: MobCatCult + entityPrototype: MobCatBloodCult whitelisted: true - type: ghostRole diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml index cad08630eb5..ad70a4a987f 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml @@ -33,12 +33,6 @@ id: CappyIDCard belt: ClothingBeltNfsdWebbing -- type: startingGear - id: MobCatCultGear - equipment: - head: ClothingHeadHatPirate - id: ClarpyIDCard - # Adopted from space-wizards #26265 (Thank you, PolterTzi) - type: startingGear id: MobKoboldGear diff --git a/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/hand.png b/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/hand.png new file mode 100644 index 0000000000000000000000000000000000000000..66d776da6cea65c0f46398d2ebd6af79a5c59899 GIT binary patch literal 2020 zcmVEX>4Tx04R}tkv&MmKpe$iQ?*4Z9qb_DkfC<6AX>yxs#pXIrLEAagUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwX9p)m7b)?7O`%1M2gm(*ckglc4iK7ErkZ_|fT~$W zIuRFh`Bl;PiU9=SM+7m6nR+s_n1$>3x`&6acTt|@e(ujPq!dgBctqkkrW+RV2Jy_M zrE}gV4zaSN5T6rI7<576N3P2bzi}?LS>Tx=Bb%Nl4iSr`9+rEUl?|0RMjTdDjq-(@ z!wTmu&T6&JI``x+3>37L4A*InA%P_%k%9;rbyQG=g($5WDJIgiA9wMOw*4t`$>gel zkz)ZhsF2!z@IUz7ty!F&a*_gZp#R0TKgI#yF3@V&_V=-Ew@v`>GjOGK{k0}A`$>AE ztA&q%;5Kk^-PPnh;Bp5TdD10AYD-?4La_+EpV2qvf#F+VaLwthvyamUAWK~>-v9@P zK%_+3>n`v1_xAShnNEK{yXH8}tP02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00q2BL_t(o!|j$|Y*XhM#(zHFIf?(41aewJJK|0$1zOlV z^GD2OsZivW4a@~qtEHMqB*aZOb($(oyQ+|OL3h<&O=>44xiC|wYHCBIby2Iyivmp> zmIVtKX#z=C0{A#MCbnby{M&^&o|BlCk&E5%N|t<%zVCUT?|I+%`3^jcHO7Td%wEfW zX)T+R&=rV;`M(fILYEzi#T^xr(DfiV@>-I2t8SRQNMFr+fE{qU_8Gt-yK{WNwI&6U z&@~LvZq-enR-{iWlE}jxLOeM>fFo}b7@is9!vXymz}|I_ zF`B)_m=ONoNs^k>^)5RUizhO3bTn@wk(r}UEAnQ?KDsZBbG)L|>2FlPsc|iHfU`TI z_F+X)M}_bkmcj15d$6{)VOR#QZh7u#vm_lntSD;EC}LQ8RiQv6%*n(#dM2-aa}zo> z{)6gfT}x~AePVKi@Q!F4;4MW_Pno8Fn{8mWw^Eq6Lc2G>KknS*vLyMp!NHNtb)uaw z!tSjc0tN@q03c?@`uD?-gX^lBJo@snw(TKKCe9IvgjpOpPtGVZlDQ5*yEnj3|2;AC zUhC75*`-Bx{v=BA%ULETuh8ZR;FsN8$!B=+SHB?l*#uvVeoo_86a4`DVaS=1d-g!j z(i0EQNpkdvgs7%{2f}92Br%cWLE_? zn@%C_VvY*of5SBYT$_9qf!YR3uGb5t+Qh&H*RBC#{D~?9g4;G!;qL6>lZU){Z5xV;eM)(*2i1%3xQt< z3c@CZE8pMt(wC7Vty!%axi@XFJ#QXmOkHsJsH$@p_4=PQK1_Y@JngPp;p((t4R^0xEAQiYnfHH~3Od z&rEGjSG~D+Iu^jNbe{1wVLrK$#rz_rW)BN#jjWd9+UxJ(J+wonPW@6%>2$zg3$;g9e z=-u*N`a-dIa(tlv7*-rw~^hCY*$MbX1;*wX`rN+kc&EA8`il*_2-i-i5essPszel z(3vVMGH;ZTC57K$kkxK-eCSX8`(enn(uV8VWl&LGZp#)%V091@PR8TM+2>nvoZ zgO-&8XgAH=Hp|LoEbA`-XLMa#>AbG{{Sx}1w>N0M_S*4Nrn&2~B>4fRgz&Fiw^NAe z=S?#W@QP(=0Ke9CZARDMsfX+OUp~izit@U19Rs{CNou`yzwPY&BfzC2M`i$4y59p6 zaFlTVZ~y3{V7)a?;%`g-Km_hZrZ&DU>BD#!wecSpqLbXeM*Fw`0000 Date: Sat, 14 Dec 2024 15:26:38 +0300 Subject: [PATCH 03/22] dev_map and bloodmoon --- Resources/Maps/_NF/Bluespace/bloodmoon.yml | 12 +- Resources/Maps/_NF/Test/dev_map.yml | 189 +++++++++++++++------ 2 files changed, 146 insertions(+), 55 deletions(-) diff --git a/Resources/Maps/_NF/Bluespace/bloodmoon.yml b/Resources/Maps/_NF/Bluespace/bloodmoon.yml index c7c93ca0579..2e2e6a73f4e 100644 --- a/Resources/Maps/_NF/Bluespace/bloodmoon.yml +++ b/Resources/Maps/_NF/Bluespace/bloodmoon.yml @@ -22,6 +22,7 @@ entities: components: - type: MetaData - type: Transform + parent: invalid - type: MapGrid chunks: 0,0: @@ -1089,8 +1090,6 @@ entities: - type: Transform pos: 11.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 1079 @@ -1098,8 +1097,6 @@ entities: - type: Transform pos: 10.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - proto: BloodCollector entities: - uid: 1137 @@ -6042,6 +6039,13 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,-11.5 parent: 1 +- proto: SpawnMobCatBloodCult + entities: + - uid: 351 + components: + - type: Transform + pos: 17.5,13.5 + parent: 1 - proto: StructureMeleeWeaponRackBloodCultFilled entities: - uid: 470 diff --git a/Resources/Maps/_NF/Test/dev_map.yml b/Resources/Maps/_NF/Test/dev_map.yml index 17d9cb3c7fa..c8dab44962e 100644 --- a/Resources/Maps/_NF/Test/dev_map.yml +++ b/Resources/Maps/_NF/Test/dev_map.yml @@ -112,7 +112,7 @@ entities: -4,3: 1: 8738 -4,4: - 1: 230 + 1: 238 -3,0: 0: 65524 -3,1: @@ -120,8 +120,7 @@ entities: -3,2: 1: 35071 -3,-1: - 2: 17 - 0: 56780 + 0: 56797 -2,0: 0: 65534 -2,1: @@ -156,9 +155,14 @@ entities: 1: 4352 -4,-2: 0: 65535 + -5,-2: + 0: 34952 + 1: 8704 + -5,-1: + 0: 34952 + 1: 8738 -3,-2: - 0: 52477 - 3: 4352 + 0: 56829 -2,-2: 0: 3838 -2,-4: @@ -185,7 +189,7 @@ entities: 1: 17 0: 3276 -1,4: - 1: 240 + 1: 255 0,5: 0: 52428 0,6: @@ -236,14 +240,15 @@ entities: 1: 8738 2,1: 1: 2 + 0: 60928 2,-1: 1: 8738 + 3,1: + 0: 56780 3,2: 0: 36828 3,0: 0: 36590 - 3,1: - 0: 52428 3,-1: 0: 36044 4,0: @@ -271,9 +276,11 @@ entities: 2,-5: 1: 57344 3,-4: - 1: 13107 + 1: 13105 + 0: 2 3,-5: - 1: 12288 + 1: 4096 + 0: 8192 3,-2: 0: 52224 4,-2: @@ -303,13 +310,9 @@ entities: 8,-1: 0: 819 -5,0: - 1: 17476 - -5,-1: - 1: 17476 + 1: 17506 -5,1: 1: 17476 - -5,-2: - 1: 16384 5,1: 0: 48051 5,2: @@ -323,9 +326,9 @@ entities: 6,3: 0: 626 -3,4: - 1: 240 + 1: 255 -2,4: - 1: 240 + 1: 255 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -357,36 +360,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 22.831823 - - 85.89114 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.14996 - moles: - - 20.078888 - - 75.53487 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 chunkSize: 4 - type: GasTileOverlay - type: BecomesStation @@ -989,6 +962,13 @@ entities: - type: Transform pos: -2.5,-16.5 parent: 179 +- proto: BlueprintLithograph + entities: + - uid: 1088 + components: + - type: Transform + pos: 13.5,17.5 + parent: 179 - proto: BluespaceMatterBinStockPart entities: - uid: 1254 @@ -4024,10 +4004,10 @@ entities: parent: 179 - proto: CrateScienceLabBundle entities: - - uid: 1428 + - uid: 1504 components: - type: Transform - pos: 13.5,17.5 + pos: 13.5,19.5 parent: 179 - proto: CrewMonitoringServer entities: @@ -4745,6 +4725,14 @@ entities: - type: Transform pos: -0.982072,-3.4785347 parent: 179 +- proto: HoloGraffitiProjector + entities: + - uid: 1495 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.00722605,4.669485 + parent: 179 - proto: HolosignWetFloor entities: - uid: 848 @@ -5377,6 +5365,13 @@ entities: - type: Transform pos: -16.5,-5.5 parent: 179 +- proto: MercenaryTechFabHacked + entities: + - uid: 1508 + components: + - type: Transform + pos: -14.5,-5.5 + parent: 179 - proto: MicroManipulatorStockPart entities: - uid: 712 @@ -5443,6 +5438,13 @@ entities: - type: Transform pos: -6.3051395,8.791253 parent: 179 +- proto: NFEnergyPickaxe + entities: + - uid: 1497 + components: + - type: Transform + pos: -3.6757717,-2.0560873 + parent: 179 - proto: NfsdTechFab entities: - uid: 498 @@ -5478,6 +5480,21 @@ entities: - type: Transform pos: -3.5,10.5 parent: 179 +- proto: NFWeaponHoloflareGun + entities: + - uid: 1496 + components: + - type: Transform + pos: -3.8007717,-2.545206 + parent: 179 + - type: Item + heldPrefix: cyan + - type: EnergyGun + currentFireMode: + state: cyan + name: cyan + fireCost: 240 + proto: HoloFlareCyan - proto: NitrogenCanister entities: - uid: 459 @@ -6060,6 +6077,11 @@ entities: rot: 3.141592653589793 rad pos: 0.5,17.5 parent: 179 + - uid: 1231 + components: + - type: Transform + pos: 21.5,14.5 + parent: 179 - uid: 1232 components: - type: Transform @@ -6072,11 +6094,11 @@ entities: parent: 179 - proto: RailingCorner entities: - - uid: 1231 + - uid: 1428 components: - type: Transform rot: -1.5707963267948966 rad - pos: 21.5,14.5 + pos: 20.5,14.5 parent: 179 - proto: RailingCornerSmall entities: @@ -6205,6 +6227,40 @@ entities: - type: Transform pos: -13.5,-7.5 parent: 179 +- proto: ScrapOre + entities: + - uid: 1499 + components: + - type: Transform + pos: 3.3558059,17.606743 + parent: 179 + - uid: 1500 + components: + - type: Transform + pos: 3.5589309,17.528618 + parent: 179 + - uid: 1501 + components: + - type: Transform + pos: 3.3401809,17.294243 + parent: 179 + - uid: 1502 + components: + - type: Transform + pos: 3.6995559,17.731743 + parent: 179 + - uid: 1503 + components: + - type: Transform + pos: 3.8089309,17.247368 + parent: 179 +- proto: ScrapProcessor + entities: + - uid: 1498 + components: + - type: Transform + pos: 3.5,18.5 + parent: 179 - proto: Screen entities: - uid: 1192 @@ -6279,6 +6335,18 @@ entities: - type: Transform pos: -11.5,-5.5 parent: 179 +- proto: SheetPaper + entities: + - uid: 1506 + components: + - type: Transform + pos: 13.352237,16.538458 + parent: 179 + - uid: 1507 + components: + - type: Transform + pos: 13.695987,16.538458 + parent: 179 - proto: SheetPGlass entities: - uid: 416 @@ -6597,6 +6665,13 @@ entities: rot: -1.5707963267948966 rad pos: -10.425851,2.3130608 parent: 179 +- proto: SpawnMobCatBloodCult + entities: + - uid: 1493 + components: + - type: Transform + pos: 20.5,14.5 + parent: 179 - proto: SpawnMobCatCappy entities: - uid: 1230 @@ -7313,6 +7388,11 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,8.5 parent: 179 + - uid: 1505 + components: + - type: Transform + pos: 13.5,16.5 + parent: 179 - proto: TableGlass entities: - uid: 964 @@ -9408,6 +9488,13 @@ entities: - type: Transform pos: -3.433327,-1.5 parent: 179 +- proto: WeaponLaserTurboNF + entities: + - uid: 1494 + components: + - type: Transform + pos: -3.471971,0.6138556 + parent: 179 - proto: WeaponLauncherMultipleRocket entities: - uid: 671 From b2e2a23a8ade20500c643b091249e77a514d405a Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 14 Dec 2024 15:51:27 +0300 Subject: [PATCH 04/22] cat stuff --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 40597e8bc1c..930ed42b961 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -229,6 +229,14 @@ id: MobCatBloodCult description: Founded the Blood Cult out of boredoom. components: + - type: Body + prototype: Bloodsucker + requiredLegs: 1 + - type: MeleeWeapon + damage: + types: + Slash: 1 + Bloodloss: 1 - type: Sprite drawdepth: Mobs sprite: _NF/Mobs/Pets/cat.rsi @@ -313,6 +321,7 @@ checkCanAccess: false range: 0 itemIconStyle: BigAction + useDelay: 180 # Adopted from space-wizards #26265 (Thank you, PolterTzi) - type: entity From 7a0d62d7d7bcd9b8f4f52b4299caad4a7560be90 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 14 Dec 2024 15:57:18 +0300 Subject: [PATCH 05/22] vgroid spawn chance --- .../Spawners/Random/mobs_hostile_bloodcult.yml | 16 ++++++++++++++++ .../_NF/Procedural/chromite_vgroid.yml | 6 ++++++ 2 files changed, 22 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_bloodcult.yml diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_bloodcult.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_bloodcult.yml new file mode 100644 index 00000000000..4b997ad99a1 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_bloodcult.yml @@ -0,0 +1,16 @@ +- type: entity + name: blood cult cat spawner + suffix: Ghost, 5% Spawn Chance + id: SpawnMobCatBloodCultLowChance + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _NF/Mobs/Pets/cat.rsi + state: cultcat + - type: RandomSpawner + prototypes: + - MobCatBloodCult + chance: 0.05 + offset: 0.0 diff --git a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml index 2fd1323baba..34752139472 100644 --- a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml +++ b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml @@ -266,6 +266,12 @@ groups: - id: SpawnMobBloodCultistCaster amount: 1 + - !type:MobsDunGen + minCount: 0 + maxCount: 1 + groups: + - id: SpawnMobCatBloodCultLowChance + amount: 1 #- type: dungeonConfig # id: NFVGRoidInteriorDungeonsChromite From 57eebaeb7a16911d7f56cea54fedd98d2bad7e00 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 14 Dec 2024 16:01:17 +0300 Subject: [PATCH 06/22] 5 min --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 930ed42b961..88fca4d653e 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -295,7 +295,7 @@ categories: [ HideSpawnMenu ] components: - type: RechargeBasicEntityAmmo - rechargeCooldown: 180 + rechargeCooldown: 300 rechargeSound: path: /Audio/Magic/fireball.ogg - type: BasicEntityAmmoProvider @@ -321,7 +321,7 @@ checkCanAccess: false range: 0 itemIconStyle: BigAction - useDelay: 180 + useDelay: 300 # Adopted from space-wizards #26265 (Thank you, PolterTzi) - type: entity From 3d1f8428eb6b1c254fbb24fe6140e33d3726c343 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 14 Dec 2024 16:05:58 +0200 Subject: [PATCH 07/22] Update chromite_vgroid.yml --- Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml index 34752139472..9d8c3941b17 100644 --- a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml +++ b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml @@ -267,7 +267,7 @@ - id: SpawnMobBloodCultistCaster amount: 1 - !type:MobsDunGen - minCount: 0 + minCount: 1 maxCount: 1 groups: - id: SpawnMobCatBloodCultLowChance From 3c227559a87c442b554b3514d796d6f10a273599 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Sat, 14 Dec 2024 23:41:21 +0300 Subject: [PATCH 08/22] Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 88fca4d653e..bac0c648136 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -312,7 +312,7 @@ id: ActionEldritchPush categories: [ HideSpawnMenu ] name: "[color=yellow]Force Push[/color]" - description: "Summon forth an eldritch hand. [color=yellow]3 minutes cooldown.[/color]" + description: "Summon forth an eldritch hand. [color=yellow]5 minute cooldown.[/color]" components: - type: WorldTargetAction icon: { sprite : _NF/Effects/bloodcultprojectiles.rsi, state: hand } From 5b1be29dae8d869be9ce8beaa116bcf548cf1770 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Sat, 14 Dec 2024 23:41:29 +0300 Subject: [PATCH 09/22] Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index bac0c648136..f6738354539 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -227,7 +227,7 @@ name: blood cult cat parent: [NFMobPet, MobCatGhost] id: MobCatBloodCult - description: Founded the Blood Cult out of boredoom. + description: Founded the Blood Cult out of boredom. components: - type: Body prototype: Bloodsucker From 9bec1b9ff09cad311992dc2a613ef8075b89770f Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Sat, 14 Dec 2024 23:41:39 +0300 Subject: [PATCH 10/22] Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index f6738354539..e83a270d650 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -291,7 +291,7 @@ - type: entity id: EldritchPushGun name: eldritch hand gun - description: Shoots eldritch hand. + description: Shoots an eldritch hand. categories: [ HideSpawnMenu ] components: - type: RechargeBasicEntityAmmo From 3b3b6a9848e25703ff85f5fa0556eb0f429e6c7a Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Sat, 14 Dec 2024 23:41:51 +0300 Subject: [PATCH 11/22] Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index e83a270d650..08f5c046802 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -278,7 +278,6 @@ - type: NpcFactionMember factions: - Cat - - BloodCultNF - type: NFSalvageMobRestrictions despawnIfOffLinkedGrid: false addComponentsOnDeath: [] From e9d9c039881926d81b74d2b55ebefb5aa705c0b0 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 14 Dec 2024 23:53:27 +0300 Subject: [PATCH 12/22] more names --- .../Prototypes/_NF/Datasets/Names/cat_cult.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml index 1235fbdf499..1072a6045a9 100644 --- a/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml +++ b/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml @@ -1,4 +1,4 @@ -- type: dataset # Names of town that held witch trials +- type: dataset # Mostly names of towns that held witch trials id: names_cat_cult values: - Salem @@ -10,3 +10,16 @@ - Würzburg - Bamberg - Torsåker + - Glamis + - Danube + - Montpezat + - Nördlingen + - Kirkwall + - Denbigh + - Tyburn + - Bamberg + - Beaumaris + - Braunschweig + - Carrickfergus + - Soulmother + - Leatherlips From fb5b3c602de3d69e8b124b4a22d8b2c0eba64562 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 15 Dec 2024 00:40:29 +0300 Subject: [PATCH 13/22] more names --- .../Prototypes/_NF/Datasets/Names/cat_cult.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml index 1072a6045a9..f0cf1b90b76 100644 --- a/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml +++ b/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml @@ -1,6 +1,7 @@ - type: dataset # Mostly names of towns that held witch trials id: names_cat_cult values: + # Towns - Salem - Valais - Trier @@ -10,7 +11,6 @@ - Würzburg - Bamberg - Torsåker - - Glamis - Danube - Montpezat - Nördlingen @@ -21,5 +21,16 @@ - Beaumaris - Braunschweig - Carrickfergus + - Belvoir + # Witches + - Glamis - Soulmother - Leatherlips + - Kolgrim + - Dacal + - Koldings + - Balfour + - Burroughs + - Wardwell + - Guilladot + - Saenger von Mossau From 8c23e74c4b3cb4871b4e306c1754b3fae050d9d1 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 15 Dec 2024 18:05:03 -0500 Subject: [PATCH 14/22] Minor grammar, cat crit/dead sprites --- .../Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl | 2 +- Resources/Maps/_NF/Bluespace/bloodmoon.yml | 1 - Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 4 ++-- Resources/Prototypes/_NF/Actions/types.yml | 1 - Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 8 ++++---- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl index d7089b8638a..a60dfba3622 100644 --- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl @@ -16,7 +16,7 @@ ghost-role-information-clarpy-description = Avast ye mail! wanted by Nanotrasen ghost-role-information-clarpy-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other pirates. ghost-role-information-cult-cat-name = Blood Cult Cat -ghost-role-information-cult-cat-description = Founded the Blood Cult out of boredoom. +ghost-role-information-cult-cat-description = Founded the Blood Cult out of boredom. ghost-role-information-cult-cat-rules = You are a [color=red][bold]Free Agent[/bold][/color] and free to choose your course of actions. Please note that [color=yellow]all server rules still apply.[/color] Additionally: - [color=red]DO NOT[/color] damage player shuttles or their contents. diff --git a/Resources/Maps/_NF/Bluespace/bloodmoon.yml b/Resources/Maps/_NF/Bluespace/bloodmoon.yml index 2e2e6a73f4e..c801fdfb124 100644 --- a/Resources/Maps/_NF/Bluespace/bloodmoon.yml +++ b/Resources/Maps/_NF/Bluespace/bloodmoon.yml @@ -22,7 +22,6 @@ entities: components: - type: MetaData - type: Transform - parent: invalid - type: MapGrid chunks: 0,0: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 819ac170786..c432019c106 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1987,7 +1987,7 @@ state: slug sprite: Mobs/Animals/slug.rsi - type: Carriable #DeltaV - freeHandsRequired: 1 + freeHandsRequired: 1 - type: Physics - type: Fixtures fixtures: @@ -3537,4 +3537,4 @@ suffix: Accent components: - type: ReplacementAccent - accent: nymph \ No newline at end of file + accent: nymph diff --git a/Resources/Prototypes/_NF/Actions/types.yml b/Resources/Prototypes/_NF/Actions/types.yml index 90a2cd4d10d..29225918c64 100644 --- a/Resources/Prototypes/_NF/Actions/types.yml +++ b/Resources/Prototypes/_NF/Actions/types.yml @@ -1,4 +1,3 @@ - - type: entity id: ActionActivateDissonantWhispersImplant name: Dissonant Whispers diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 08f5c046802..9562d4b887b 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -59,9 +59,9 @@ Alive: Base: piratecat Critical: - Base: piratecat_dead + Base: piratecat Dead: - Base: piratecat_dead + Base: piratecat - type: GhostRole name: ghost-role-information-clarpy-name description: ghost-role-information-clarpy-description @@ -252,10 +252,10 @@ Base: cultcat BaseUnshaded: cultcat_unshaded Critical: - Base: cultcat_dead + Base: cultcat BaseUnshaded: mask_null Dead: - Base: cultcat_dead + Base: cultcat BaseUnshaded: mask_null - type: GhostRole name: ghost-role-information-cult-cat-name From 579e8408387f947deff0e67b7d03c642f644ebce Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 20 Dec 2024 18:23:28 +0200 Subject: [PATCH 15/22] Fix --- .../Objects/Misc/subdermal_implants.yml | 48 ++++++++++--------- .../_NF/Procedural/chromite_vgroid.yml | 12 ++--- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml index 598286ae3dc..eac7d21d3b1 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml @@ -115,21 +115,22 @@ description: This implant emits light from the user's skin on activation. categories: [ HideSpawnMenu ] components: - - type: SubdermalImplant - implantAction: ActionToggleLight - - type: PointLight - enabled: false - radius: 2.5 - softness: 5 - mask: /Textures/Effects/LightMasks/cone.png - autoRot: true - color: "#ff0000" - - type: Tag - tags: - - SubdermalImplant - - HideContextMenu - - Flashlight - - type: UnpoweredFlashlight + - type: SubdermalImplant + implantAction: ActionToggleLight + permanent: true + - type: PointLight + enabled: false + radius: 2.5 + softness: 5 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + color: "#ff0000" + - type: UnpoweredFlashlight + - type: Tag + tags: + - SubdermalImplant + - HideContextMenu + - Flashlight - type: entity parent: BaseSubdermalImplant @@ -138,11 +139,12 @@ description: This implant allows user to emmit dissonant whispers. categories: [ HideSpawnMenu ] components: - - type: SubdermalImplant - implantAction: ActionActivateDissonantWhispersImplant - - type: TriggerImplantAction - - type: EmitSoundOnTrigger - sound: - path: /Audio/_NF/Effects/bloodcult/whispers.ogg - params: - variation: 0.125 + - type: SubdermalImplant + implantAction: ActionActivateDissonantWhispersImplant + permanent: true + - type: TriggerImplantAction + - type: EmitSoundOnTrigger + sound: + path: /Audio/_NF/Effects/bloodcult/whispers.ogg + params: + variation: 0.125 diff --git a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml index ff0af0dd93c..23fa433eac2 100644 --- a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml +++ b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml @@ -272,12 +272,12 @@ groups: - id: SpawnMobBloodCultistAscended # Boss amount: 1 - - !type:MobsDunGen - minCount: 1 - maxCount: 1 - groups: - - id: SpawnMobCatBloodCultLowChance - amount: 1 +# - !type:MobsDunGen # Cat dies to space, big sad +# minCount: 1 +# maxCount: 1 +# groups: +# - id: SpawnMobCatBloodCultLowChance +# amount: 1 #- type: dungeonConfig # id: NFVGRoidInteriorDungeonsChromite From b95b2f699925840fbcc610543a4e66e0a767c100 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 20 Dec 2024 19:17:45 +0200 Subject: [PATCH 16/22] Mob changes --- .../_NF/Entities/Mobs/NPCs/pets.yml | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 502903380a4..6aca4ef8a01 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -4,6 +4,7 @@ components: - type: GhostRole - type: IntrinsicRadioReceiver + - type: CargoSellBlacklist - type: entity name: Clippy @@ -40,7 +41,6 @@ - Cat - PetsNT - type: ShowJobIcons - - type: CargoSellBlacklist - type: entity name: Clarpy @@ -86,7 +86,6 @@ factions: - Cat - PirateNF - - type: CargoSellBlacklist - type: PirateAccent - type: Speech audioParams: @@ -154,7 +153,6 @@ - type: InteractionPopup interactSuccessSound: path: /Audio/_NF/Animals/nfsdcat_meow.ogg - - type: CargoSellBlacklist - type: PirateBountyItem id: Cappy - type: SouthernAccent @@ -197,8 +195,6 @@ description: "???" components: - type: Sprite - drawdepth: Mobs - sprite: _NF/Mobs/Pets/cat.rsi layers: - map: ["enum.DamageStateVisualLayers.Base"] state: mistakecat @@ -224,15 +220,19 @@ successChance: 0.0 interactFailureString: petting-failure-mistake - type: MovementSpeedModifier - baseWalkSpeed : 8 - baseSprintSpeed : 8 + baseWalkSpeed : 6 + baseSprintSpeed : 6 + - type: NFSalvageMobRestrictions + despawnIfOffLinkedGrid: false + addComponentsOnDeath: [] + removeComponentsOnDeath: [] - type: NpcFactionMember factions: - Cat - type: entity name: blood cult cat - parent: [NFMobPet, MobCatGhost] + parent: [NFMobPet, MobCatMistake] id: MobCatBloodCult description: Founded the Blood Cult out of boredom. components: @@ -273,23 +273,15 @@ nameSegments: [ names_cat_cult ] - type: AutoImplant implants: - - MedicalTrackingImplant - RedLightImplant - DissonantWhispersImplant + - MedicalTrackingImplant - type: IntrinsicRadioTransmitter channels: - Science - type: ActiveRadio channels: - Science - - type: NpcFactionMember - factions: - - Cat - - type: NFSalvageMobRestrictions - despawnIfOffLinkedGrid: false - addComponentsOnDeath: [] - removeComponentsOnDeath: [] - - type: CargoSellBlacklist - type: ActionGun action: ActionEldritchPush gunProto: EldritchPushGun @@ -332,7 +324,7 @@ # Adopted from space-wizards #26265 (Thank you, PolterTzi) - type: entity name: Yip Yip - parent: MobKobold + parent: [NFMobPet, MobKobold] id: MobKoboldYipyip description: He lives in a pineapple on the Frontier! components: From f98d3bf1b8f0b40fb73ce71898e765df24eaa6a7 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Fri, 20 Dec 2024 12:27:35 -0500 Subject: [PATCH 17/22] pun pun pet, chromite spawn, no breathe --- Resources/Prototypes/Entities/Mobs/NPCs/pets.yml | 2 +- Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 7 +++++++ .../Prototypes/_NF/Procedural/chromite_vgroid.yml | 12 ++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index d067fe3cb40..5e8ebbf6ded 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -793,7 +793,7 @@ - type: entity name: Pun Pun - parent: MobMonkey + parent: [NFMobPet, MobMonkey] # Frontier: add NFMobPet id: MobMonkeyPunpun description: A prominent representative of monkeys with unlimited access to alcohol. components: diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 6aca4ef8a01..cc696d42ef7 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -229,6 +229,13 @@ - type: NpcFactionMember factions: - Cat + - type: Respirator # Paranormal cat: doesn't need to breathe (but it will) + updateInterval: 99999 # Shouldn't run often, if ever. + suffocationThreshold: -100 # Should never happen. + damage: + types: {} + damageRecovery: + types: {} - type: entity name: blood cult cat diff --git a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml index 23fa433eac2..d308f5f51c6 100644 --- a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml +++ b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml @@ -272,12 +272,12 @@ groups: - id: SpawnMobBloodCultistAscended # Boss amount: 1 -# - !type:MobsDunGen # Cat dies to space, big sad -# minCount: 1 -# maxCount: 1 -# groups: -# - id: SpawnMobCatBloodCultLowChance -# amount: 1 + - !type:MobsDunGen + minCount: 1 + maxCount: 1 + groups: + - id: SpawnMobCatBloodCultLowChance + amount: 1 #- type: dungeonConfig # id: NFVGRoidInteriorDungeonsChromite From 43d352942caa5f03731daf5e505c2b59554ca86d Mon Sep 17 00:00:00 2001 From: Whatstone Date: Fri, 20 Dec 2024 12:30:17 -0500 Subject: [PATCH 18/22] remove pet from pun pun (not needed) --- Resources/Prototypes/Entities/Mobs/NPCs/pets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 5e8ebbf6ded..d067fe3cb40 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -793,7 +793,7 @@ - type: entity name: Pun Pun - parent: [NFMobPet, MobMonkey] # Frontier: add NFMobPet + parent: MobMonkey id: MobMonkeyPunpun description: A prominent representative of monkeys with unlimited access to alcohol. components: From bb14fe5c437af8d0c5ac9cf8ea4769cb63884188 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Fri, 20 Dec 2024 12:37:48 -0500 Subject: [PATCH 19/22] remove pet from Yip Yip, tag parity w/ pun pun --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index cc696d42ef7..9b25a589002 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -331,7 +331,7 @@ # Adopted from space-wizards #26265 (Thank you, PolterTzi) - type: entity name: Yip Yip - parent: [NFMobPet, MobKobold] + parent: MobKobold id: MobKoboldYipyip description: He lives in a pineapple on the Frontier! components: @@ -357,6 +357,7 @@ - CannotSuicide - DoorBumpOpener - VimPilot + - AnomalyHost - type: Loadout prototypes: [ MobKoboldGear ] - type: Grammar From 1399f71c2c74d8f0a4656246701ddeca1e1ef69e Mon Sep 17 00:00:00 2001 From: Whatstone Date: Fri, 20 Dec 2024 12:40:29 -0500 Subject: [PATCH 20/22] Fix chromite vgroid indentation --- .../Prototypes/_NF/Procedural/chromite_vgroid.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml index d308f5f51c6..ff0af0dd93c 100644 --- a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml +++ b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml @@ -272,12 +272,12 @@ groups: - id: SpawnMobBloodCultistAscended # Boss amount: 1 - - !type:MobsDunGen - minCount: 1 - maxCount: 1 - groups: - - id: SpawnMobCatBloodCultLowChance - amount: 1 + - !type:MobsDunGen + minCount: 1 + maxCount: 1 + groups: + - id: SpawnMobCatBloodCultLowChance + amount: 1 #- type: dungeonConfig # id: NFVGRoidInteriorDungeonsChromite From 836bef9f3c1a3b6f4b59ab13aedee9c740ccd85f Mon Sep 17 00:00:00 2001 From: Whatstone Date: Fri, 20 Dec 2024 12:43:32 -0500 Subject: [PATCH 21/22] Restore mistake's sprite --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 9b25a589002..027d9adfeb6 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -195,6 +195,7 @@ description: "???" components: - type: Sprite + sprite: _NF/Mobs/Pets/cat.rsi layers: - map: ["enum.DamageStateVisualLayers.Base"] state: mistakecat From ad7b3bd2a023dc91b27a512ad9de414950d04f89 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Fri, 20 Dec 2024 12:51:24 -0500 Subject: [PATCH 22/22] Remove cult cat from chromite roid due to baro dmg --- .../Prototypes/_NF/Procedural/chromite_vgroid.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml index ff0af0dd93c..38d0ba111ce 100644 --- a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml +++ b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml @@ -272,12 +272,12 @@ groups: - id: SpawnMobBloodCultistAscended # Boss amount: 1 - - !type:MobsDunGen - minCount: 1 - maxCount: 1 - groups: - - id: SpawnMobCatBloodCultLowChance - amount: 1 + # - !type:MobsDunGen # Dies to barotrauma - equip it for space if you want this restored + # minCount: 1 + # maxCount: 1 + # groups: + # - id: SpawnMobCatBloodCultLowChance + # amount: 1 #- type: dungeonConfig # id: NFVGRoidInteriorDungeonsChromite