From 869687c303ffbb322cd7b49291a82c6f779be044 Mon Sep 17 00:00:00 2001 From: Ladyayla Date: Tue, 19 Nov 2024 20:48:19 -0500 Subject: [PATCH 1/9] added icon --- .../Decoration/Flags/bos_flagpole.rsi/icon.png | Bin 480 -> 619 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png index e4c52a607586f2bd99e3feb0aaab74bf87bc3ef4..55f43c9b3f4691cb78fa71d1911574059c599d37 100644 GIT binary patch delta 607 zcmV-l0-*ii1M38k7k@wq1^@s6dyaLk00001b5ch_0Itp)=>Px%B}qg3`xShC4u@-a$O#A@thJ^~rE631s zV5!!ne0w$?{N5a3$d?*?lgf(FN6YrCi7?1uCNl z6susV)}{RDlYhuPXDCz^+Eq{>Roox%f9q@Q_2D^U&r1v7M;|3`?e$~-O>;qc4n%F| z$*&Ijn2iTQaij!9b04*yk;@>HDqy4M$yr}oNoH1tN#r7FkP^cA7TMr)!}I z-+PjdpwBp&r|>pQ8AgMK!uoLZVng$qEOnF*DF@|hHE!0T#VfC zp6qA3v{(b3rcD8apXBVIg0Px$nn^@KR9J=8mtRZ5 zP#DI4%fJx@3o|ri(v2uZb*pqKevdA?^}}?#Z{oEW-OV8It`yVg4-FbPFJfKDY#P;e z-hudBZG&^3-}{{RY&)>ds#i*Wy;AZeb8JY=&5QxS(c!)bLVsEHO3Bv?wbdj5(Eiw? zc-lY$Ap!t+>i0wtVgRX>0rW!6PaEd^UNwb86HtK=1LTTj(Rd|*<@jCO!nG|RehQl^ z0D*GFGOlg0eRes2_Hum%ThUXAoj|zypz5%Bw%R0Zn2}Qu_drm6U=ENPwIYvCWEX_Z z14T_iQ!xxLLw{=2nwz_}#bh$!^PmC1)EVFnJAZm8HK8}`Xj9kqcQ=M)tIdU82+X5O zc^CN3t@du5_*q!k1#Z6w%&LzfQ4d@k>-4)n8!j;aFMbfd2LR4@UTJq*gkMZ?l=#;$ zPW6cac*Bksb Date: Wed, 20 Nov 2024 14:47:54 -0500 Subject: [PATCH 2/9] Added pngs + yaml Added images for the animals as well as the yaml for them Including the spawners - added MARKS to that file --- .../Entities/Markers/Spawners/mobs.yml | 59 ++++++++++-- .../_Nuclear14/Entities/Mobs/NPCs/animals.yml | 84 ++++++++++++++++++ .../Mobs/Animals/beaver.rsi/beaver.png | Bin 0 -> 1116 bytes .../Mobs/Animals/beaver.rsi/meta.json | 18 ++++ .../Mobs/Animals/opossum.rsi/meta.json | 22 +++++ .../Mobs/Animals/opossum.rsi/normopossum.png | Bin 0 -> 897 bytes .../Mobs/Animals/opossum.rsi/opossum.png | Bin 0 -> 1279 bytes .../Mobs/Animals/rabbit.rsi/meta.json | 22 +++++ .../Mobs/Animals/rabbit.rsi/normrabbit.png | Bin 0 -> 904 bytes .../Mobs/Animals/rabbit.rsi/rabbit.png | Bin 0 -> 1132 bytes .../Flags/bos_flagpole.rsi/meta.json | 2 +- 11 files changed, 199 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/beaver.png create mode 100644 Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/normopossum.png create mode 100644 Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/opossum.png create mode 100644 Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/normrabbit.png create mode 100644 Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/rabbit.png diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml index c8fef1b6a6a..18f28042c66 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml @@ -1,4 +1,4 @@ -# Passive Animals +#MARK: Passive Animals - type: entity name: Brahmin Spawner id: N14SpawnMobBrahmin @@ -59,7 +59,52 @@ prototypes: - N14MobRadstag -# Hostile Animals +- type: entity + name: Beaver Spawner + id: N14SpawnMobBeaver + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/beaver.rsi + state: beaver + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobBeaver + +- type: entity + name: Opossum Spawner + id: N14SpawnMobOpossum + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/opossum.rsi + state: opossum + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobOpossum + +- type: entity + name: Rabbit Spawner + id: N14SpawnMobRabbit + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + state: rabbit + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobRabbit + +#MARK: Hostile Animals - type: entity name: Molerat Spawner id: N14SpawnMobMolerat @@ -210,7 +255,7 @@ prototypes: - N14MobYaoguai -# Scaley Animals +#MARK: Scaley Animals - type: entity name: Deathclaw Spawner id: N14SpawnMobDeathclaw @@ -256,7 +301,7 @@ prototypes: - N14MobDeathclawMetal -# Insects +#MARK: Insects - type: entity name: Bloatfly Spawner id: N14SpawnMobBloatfly @@ -408,7 +453,7 @@ - N14MobRaiderPsycho -# Ghoul +#MARK: Ghoul - type: entity name: Feral Ghoul Spawner id: N14SpawnMobFeralGhoul @@ -469,7 +514,7 @@ prototypes: - N14MobGhoulMaypole -# Robots +#MARK: Robots - type: entity name: Assaultron Spawner id: N14SpawnMobAssaultron @@ -635,7 +680,7 @@ prototypes: - N14MobRobotEyebot -#Pets +#MARK: Pets - type: entity name: Haggis the Cat Spawner id: N14SpawnMobHaggis diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml index ab10c9714a4..682e2e99b58 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml @@ -1234,3 +1234,87 @@ - type: HTN rootTask: task: MouseCompound + +#MARK: Beaver +- type: entity + parent: N14MobBaseSimple + id: N14MobBeaver + name: beaver + description: Wonder what kind of trees its knawed down. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: beaver + sprite: _Nuclear14/Mobs/Animals/beaver.rsi + - type: DamageStateVisuals + states: + Alive: + Base: beaver + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal + +#MARK: Opossum +- type: entity + parent: N14MobBaseSimple + id: N14MobOpossum + name: opossum + description: Play dead! + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: opossum + sprite: _Nuclear14/Mobs/Animals/opossum.rsi + - type: DamageStateVisuals + states: + Alive: + Base: opossum + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal + +#MARK: Rabbit +- type: entity + parent: N14MobBaseSimple + id: N14MobRabbit + name: rabbit + description: Not a cotton-tail anymore, huh. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: rabbit + sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + - type: DamageStateVisuals + states: + Alive: + Base: rabbit + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/beaver.png b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/beaver.png new file mode 100644 index 0000000000000000000000000000000000000000..be32fdd14918bb4b430c0840302e57a15997f6ae GIT binary patch literal 1116 zcmV-i1f%Px(7D+@wRA@u(n9olWK@`W|@}od$OB-w;{5mKkq9O_hf(b&5Cy(ky!`VN|GtrBB z^kfW3BH;jvsFWoIiyLg&)%?C!kp_w(LPyU(CAK8!Q& zpQ-?=72uJ;z`%gHyu5tsE69_9v9U3exy{bbdRoIHciY=4NrsmA2cwi*@T_Ssg8| z0B}GojG=;1=X3&l1z=5t9RM8&o&ea12b7Zr@F5c=pU+46d|rND^~We{_D~_W>Z&5O z0o(~*rZ>A^C4-ywz4S8mi9)T{Df#Q2tDs)9kNeaL*a}{ucswp2fk-4mZK;o1kAZ6d zY|w5WK;}=f0-&Y1{h7D|cn?4&T#H5p0Jq6-1>o+`klEUjplq?53i-d;=S;$UP4gv+ zZEVns#YI+!$HuG=+K2$@WV{C>Z9{&mbFmKFfF;!e|bRRE_cTgRcbS^>vF^)#*NsRGasz)#Qr z(hxyE0B?g{dJ~=iAj2wzN*WSgtA%4$V&2owplTf7xe1{f(P>EN0I+Mwpdo_Hdj;XT z0<6X%yuW_KR)0FX-#5T`GPfpTJi2v3bdw&x{#G`o^}2_nU9t-mXtHm}tn7A(SYALJ z3BYQc|8`o<8~%PF!py9cKw%gxo{t#}U(80W*I7+F#Q_A?rUSwefRk|u#(VeH)|U9| z3BwR&HEvfL=pAq`0U#Ix%(GGTnsSc^$HXVz3EJA)#ETJz4hR9j&MbC#wfoD)5d`nu zgUvsszD%*3{53xg=~cm4AvpmM8$vU!^2|p3j_kx7z`2&^4gdOAk1Un+)jR-p1oZaF-As4k5hX% zOj9#62G28ioO`vjR2Hz4H?6FwVgUfhEp>GwOBl#DGR@~05YOvCKm}l3R2B?kz$DLe iyx)6!@|@24eC;1$>cl@r`{DBd0000Px&J4r-ARA@u(SUqT3Q53#TF_^eyF-XbKqD#RNx?~ZvXEVd2Q@|nVA|-3UK?rW4 z2tpRYsW`+fdn8Mi5-N02+94D%OBRj9Os{+w&f|K0zIU!aG^yU@$@ScGzVAEVQ_c;D z1z&*$=P#B5EFG}m3K+ct`F!5?(kqwC8ReT)`&r^(14hwkH0p`D-ENC{ivS#3Z?-&f z-2J&@<6sG(lFwu^vUs&xl~2pEK)qfc>Od-$`hNw`tse@7 zWYI>1eUNF*}kfcyLVeL5P;G5gzUqE*N)vBGI z$~5Vd69?l=9e`vIp;Rh~VzD?R0u?G03QqCE&xbQ7Pj%F0(4Oi5RZwmd*j-YKtI5ah zn{?MCR=sKRpyt!nl?++k-IW5E;&}A} z=nj~x0MmBvC7w5Oz)K`BEvBUa(<=Dd&o3Ro?V#Tb?v`g(qwzdzvmC&=3vd$vLlLcH zGAUB26sumnUbnBWubs1g_YmW1a~j|aXj1YjDD@7(vMkS<)oRt&?-;l))#Er*sV5ka zUteFBdBfrGq&Nfwpz#@#<2VsOo+eH8j$x9*-ELPN>-Bn`w?nQ1*f%%!?}rER?e@3vjGqY z0&y&WQyriK;5Y(6Ha9mVF@32{P&=>2A*R#mu-vDTR&$U8zz_Sxk;In*P{(PL6420b zaBv{EDwT?$&u$&T_gL9%R;U(?#bP7j`fC6Y^q^L&Sha717n zd0hl543g<|dW2A|R&&S`P{eV5iM{L%7mmxVpFSb67n7O>#QjNju_mWsskF028-KY X#P=-Ag?-dx00000NkvXXu0mjfp;eyD literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/opossum.png b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/opossum.png new file mode 100644 index 0000000000000000000000000000000000000000..c8a5dcb17b19fea4024ccc71e16cf71347ea9976 GIT binary patch literal 1279 zcmVPx(xk*GpRA@u(m|tj9R~*NGab4PVO=BtcPFyLvNvVX!ZL&=$wK6OyC4CzRb}vCn z9>ss9(x+l6R`IEnGV+uMVQ&pZp)%~G;3m$Q5-f#HDc#UiN=W#1}C8W2n-Dk8CIzztoiI& z>gecTgVAV|`#>PTeIyd$erah*$!IYEpl51ukiN2UUhJ;|!4bg8#ztfB=?rNAh{a-g z`u%?Yx&k=v^BH!Lm&Lse0EQfGTz_)&CRKHIvYmzDVS3!$%$Z=y3P-SO$$|_07YvWr zL*-@VO3ML2PwI50>x`uyTcOct)TpbgV`DQjGu$^cG?2&R;cH#jX=-YUujP4xKww<~ zY+p{XhDRnaMFY5f>Xaczd)n_Ouh&a^wrpX8_g}rDWHL$hu~=SKe0}lax&cTe613Nw z3CO*qPMW6i_3xJk=s6MXKK8@fGXNVQ3(#v%p3vQNn#^wl{PBJ1c2i>8Ha7gOqA%yX z{0c;hAF8Y6+t+7i36BVx>Z@5PQon`6MzyBVd?G=A&&|=?)~#%$=IK-Vw5Eo{y>Eg+ zrTvs1V4F$MgWIr+_F#6F`(3pe5YUOHqDNWqpQEE}^z*j1yfs$i#X9MbWUYHiJ1V>RyNK(Y5_0AtxxYHKL;?f?`k_5gTWvVqhfSAD#Lm4ogo|!uh}LvA^=VhYytH3^%;nO+wIN?`StQ; z`u4;L{w;%$9X4kI0E~~1^YG&0q9p`4Us+kn^IBS3NCsfuvyg3B8|J6eY0kjz?(TnA z4jZ>_8Gp^s(@&F=oPubFYHR72>>1l^sL(Uq+uO^-BO@bRHm|O((#z3N`k<|iA)ulZ z$7&p3QCY%yF{h-Ygv;*s_IBQDpEuR_*zK-1`YwmtxW?;9KGv+8Pc?ce_fh}-}~ zU=kchgE(YBVCPOM^LTheKoA?tS;5aZ5oMm*OalNoFPeZLe#@C4M;`Zu^I|R_$NvJDX zRw5B9&3;Q%cya&$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/meta.json b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/meta.json new file mode 100644 index 00000000000..5c625881fb3 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by ladyayla for N14", + "size": { + "x": 32, + "y": 16 + }, + "states": [ + { + "name": "rabbit", + "directions": 4 + }, + { + "name": "normrabbit", + "directions": 4 + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/normrabbit.png b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/normrabbit.png new file mode 100644 index 0000000000000000000000000000000000000000..d6eff8d2f90142a3f26d12d46490499f60010e27 GIT binary patch literal 904 zcmV;319$w1P)Px&LPXTO#|C!fxXTX0NMbjEda0w?^C1D4FJ)HA{_`vukyA4(COIxYyfBoGVJhIcOez|HqI*v zs?IJpxFSFSP?SMTFvx>^9{}`WgByS@hX0Fmdj%kOQzXawodKXx*j=p!@PA)?pv9N1 zLAvVb+}6^nj73SGMG?DD>Nqbxp7WmkWjCe-fJ8=iPem5{NQQ(S?tSLak7 zuvcu%(;MHXw-3eFAK#LrEau-60DN37m&JHIF6{%u+7SbVAVA&%(Y8mR{YUFK^wc@8 zX-OZncDUVc#o=&xf>!|m!UO?@jUBNY808QN90~;9ac)y&(Rg(l^ReR`aK3KXxsYYy z2Iny<0BC+763*vyYNS@=6d;=x6s*hJ*e#FY&NV^~rWib%&7O{9a3lUW1yULgDazm| z4YduFx|TNA);YRXitd<9NN+X(&@$rPx(CP_p=RA@uxS+PzVK@c4j5NDrIFt$=)V;bxRB#j5C3>3QV% zzA6P68Y7#jL5`9D_Kju;1916FzpWBCL1g*){G5I-E%o{OaDA%l;!LbTbCqUI&ZxE8Q$8!KT4M?MqKl_xiIN2<%E-uoK+uNWt zqskxtBFzCz01rbF+&Hg5Nx=5{IOMa9aUEBQkq7|e=mGj+U>{Z}6vjFTF?gJ< zH)JQ1q592DF=N0Fv6A<)(O2s$_#I3ue%HSVovI(O^K|mbv@tdGF@`n9NObRk=zv~`d;PSkAsqYyepq$H*{%E zQXB>~fP}b8;LHO&XPjf{X0z0&*R9}XS@Iq=$$B0&Ivu+Llso_?m!s11@<4;ed%rLP z2{0z2>-*GbxBIrdl`%c|az0NOZ(#rq1Nbn*)T&$a>S_Qy))*Uzlr=_6lc|Z&_i1xw zg^n*TRggTFe{x-NibbM!I|x3CZ1r+dpnabxpQrB44gK^y Date: Thu, 21 Nov 2024 17:56:49 -0500 Subject: [PATCH 3/9] Added dead pngs and Normal versions for fun Added dead for all the above, and got rid of the rat rsi folder because I dont have the png for it yet --- .../Entities/Markers/Spawners/mobs.yml | 30 ++++++++++++++++++ .../Mobs/Animals/beaver.rsi/dead.png | Bin 0 -> 445 bytes .../Mobs/Animals/opossum.rsi/dead.png | Bin 0 -> 516 bytes .../Mobs/Animals/rabbit.rsi/dead.png | Bin 0 -> 431 bytes 4 files changed, 30 insertions(+) create mode 100644 Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/dead.png create mode 100644 Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/dead.png create mode 100644 Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/dead.png diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml index 18f28042c66..303be33eeb6 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml @@ -104,6 +104,36 @@ prototypes: - N14MobRabbit +- type: entity + name: Normal Opossum Spawner + id: N14SpawnMobNormOpossum + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/opossum.rsi + state: normopossum + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobOpossum + +- type: entity + name: Normal Rabbit Spawner + id: N14SpawnMobNormRabbit + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + state: normrabbit + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobRabbit + #MARK: Hostile Animals - type: entity name: Molerat Spawner diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/dead.png b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..46cd7792a8639348a594a3f1076c615fe76324c5 GIT binary patch literal 445 zcmV;u0Yd(XP)Px$cS%G+R7gwhlrc-gP!Pv2`bqtztD9Z z9LK5MQ0)Z%Y*Ey8UF9$0SgRJm^+m5}_+`qfSI{~UC)D}2Am0FPE>EfQ?Y&2_p=Fgy z0C04sLU*c?|7>RRKWx12lD`dz1YjW)L0dm%)aCI^16>G+^Bfk|J1EU_Fg;K1nF1l= zI0k+TznusH;AmNB+)AjX8EGWQ)|?y=2zQQq26_lXFbo5tD5B$aKsEqa5W6fEV=9Jz znv_tDLtg^TUv=_3rb+R~GzC>vq1|pv5I+3%YO2%O0C?#vDQA@#RCqR>(mD@ADDoT> zA!yZFEm$Ur6n{%o%EOp1#E&47{`0+1gVi6|zZwka;h`WK7QY*f6pnG{RdI~tdE2(- n!^Nu!fPx$zDYzuR7gwhl)p;?VHn3Bf17a!V&LRb%?cuvLu5poC@%d2wum?!Epp)Q<{*y# z4Z`6Tk#I7uK>5>8?wC7GUh#`ENR+@-;7Ex`;tN@^REEc0;<#HJw3k5h91lVynNPORBqnx&L zCjLF0>dqU1&;g)0&+{Y@i9`rM8wkTf+c5)UPza16%Q6gyLl8yr-`7Ej=W2EFq$q&m zwOWnDtyU{=90&1uoQmagxwW@8LNQlfXESo^)a!+tZkNs@z@^_02ObZY!r>JV+R%26 zYbMSVCyfUDei1;$G46Xk8WG@15TGf`w7&59RM5$21X8C%4q%g*K#-Tg01l&3(pHHO z0yn(Px$X-PyuR7gwhld+1zKoEvUP;xeUU?2!$X>%57M6j^3NqG-*efoQtvrBJrjob?y zHjzLOB4QB~0($(zP1s};x6{UHlI-s6|Ias*20b_$57wurfhU2x6YxFnioy4TfVGVV zKIU^yD97h&Wy~$-KzuY9&~Fr(4T$ioWl`2_Y6j9YrCTPXQZ*6c=QO45;c(kPIT?v+ zpaN5LlZ1~Pvy5h*$L~=X7Q`!CAedBv^XXL3dug{dLyUI4=Jjr?RoHi2m%ml?a-h&h zt~`!uG@0ZgMh2X6K38P3rdni!>`dTiTs?h)x zeb>EGzh66JAS6hoO~60w^*9IbA`Su)5a)g652zf%DrI#rfmEFlnGMMkBZYe|mr8Lg Z{sD$c$r0 Date: Thu, 21 Nov 2024 18:05:43 -0500 Subject: [PATCH 4/9] to fix merge will add back after update --- .../Entities/Markers/Spawners/mobs.yml | 75 ------------------- 1 file changed, 75 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml index 303be33eeb6..e600867e027 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml @@ -59,81 +59,6 @@ prototypes: - N14MobRadstag -- type: entity - name: Beaver Spawner - id: N14SpawnMobBeaver - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - sprite: _Nuclear14/Mobs/Animals/beaver.rsi - state: beaver - - state: ai - - type: ConditionalSpawner - prototypes: - - N14MobBeaver - -- type: entity - name: Opossum Spawner - id: N14SpawnMobOpossum - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - sprite: _Nuclear14/Mobs/Animals/opossum.rsi - state: opossum - - state: ai - - type: ConditionalSpawner - prototypes: - - N14MobOpossum - -- type: entity - name: Rabbit Spawner - id: N14SpawnMobRabbit - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi - state: rabbit - - state: ai - - type: ConditionalSpawner - prototypes: - - N14MobRabbit - -- type: entity - name: Normal Opossum Spawner - id: N14SpawnMobNormOpossum - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - sprite: _Nuclear14/Mobs/Animals/opossum.rsi - state: normopossum - - state: ai - - type: ConditionalSpawner - prototypes: - - N14MobOpossum - -- type: entity - name: Normal Rabbit Spawner - id: N14SpawnMobNormRabbit - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi - state: normrabbit - - state: ai - - type: ConditionalSpawner - prototypes: - - N14MobRabbit - #MARK: Hostile Animals - type: entity name: Molerat Spawner From 8caa248e1f0e4686aa6c900e6aec1ef8b00ab99f Mon Sep 17 00:00:00 2001 From: Ladyayla Date: Thu, 21 Nov 2024 18:11:56 -0500 Subject: [PATCH 5/9] This might be it lol --- .../Entities/Markers/Spawners/mobs.yml | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml index e600867e027..59073e319d1 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml @@ -59,6 +59,81 @@ prototypes: - N14MobRadstag +- type: entity + name: Beaver Spawner + id: N14SpawnMobBeaver + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/beaver.rsi + state: beaver + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobBeaver + +- type: entity + name: Opossum Spawner + id: N14SpawnMobOpossum + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/opossum.rsi + state: opossum + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobOpossum + +- type: entity + name: Rabbit Spawner + id: N14SpawnMobRabbit + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + state: rabbit + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobRabbit + +- type: entity + name: Normal Opossum Spawner + id: N14SpawnMobNormOpossum + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/opossum.rsi + state: normopossum + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobOpossum + +- type: entity + name: Normal Rabbit Spawner + id: N14SpawnMobNormRabbit + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + state: normrabbit + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobRabbit + #MARK: Hostile Animals - type: entity name: Molerat Spawner @@ -635,6 +710,21 @@ prototypes: - N14MobRobotEyebot +- type: entity + name: Spore Plant Spawner + id: N14SpawnMobSporePlant + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Plants/sporeplant.rsi + state: sporeplant + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobSporeplant + #MARK: Pets - type: entity name: Haggis the Cat Spawner From f3d92bd325cd269752c5c630e7766345d8ef155f Mon Sep 17 00:00:00 2001 From: Ladyayla Date: Thu, 21 Nov 2024 18:33:21 -0500 Subject: [PATCH 6/9] im trying world --- .../Entities/Markers/Spawners/mobs.yml | 77 +------------------ 1 file changed, 1 insertion(+), 76 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml index 59073e319d1..bebfb216b4c 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml @@ -59,81 +59,6 @@ prototypes: - N14MobRadstag -- type: entity - name: Beaver Spawner - id: N14SpawnMobBeaver - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - sprite: _Nuclear14/Mobs/Animals/beaver.rsi - state: beaver - - state: ai - - type: ConditionalSpawner - prototypes: - - N14MobBeaver - -- type: entity - name: Opossum Spawner - id: N14SpawnMobOpossum - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - sprite: _Nuclear14/Mobs/Animals/opossum.rsi - state: opossum - - state: ai - - type: ConditionalSpawner - prototypes: - - N14MobOpossum - -- type: entity - name: Rabbit Spawner - id: N14SpawnMobRabbit - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi - state: rabbit - - state: ai - - type: ConditionalSpawner - prototypes: - - N14MobRabbit - -- type: entity - name: Normal Opossum Spawner - id: N14SpawnMobNormOpossum - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - sprite: _Nuclear14/Mobs/Animals/opossum.rsi - state: normopossum - - state: ai - - type: ConditionalSpawner - prototypes: - - N14MobOpossum - -- type: entity - name: Normal Rabbit Spawner - id: N14SpawnMobNormRabbit - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi - state: normrabbit - - state: ai - - type: ConditionalSpawner - prototypes: - - N14MobRabbit - #MARK: Hostile Animals - type: entity name: Molerat Spawner @@ -724,7 +649,7 @@ - type: ConditionalSpawner prototypes: - N14MobSporeplant - + #MARK: Pets - type: entity name: Haggis the Cat Spawner From 0b709226f040c7997f02b3120979647d0f17fd63 Mon Sep 17 00:00:00 2001 From: Ladyayla Date: Thu, 21 Nov 2024 18:34:35 -0500 Subject: [PATCH 7/9] shrugs --- .../Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml index bebfb216b4c..15c1124277f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml @@ -650,7 +650,7 @@ prototypes: - N14MobSporeplant -#MARK: Pets +#Pets - type: entity name: Haggis the Cat Spawner id: N14SpawnMobHaggis From f1f874e3c29984a6255a936e7f2fbcdb76d8f98c Mon Sep 17 00:00:00 2001 From: Ladyayla Date: Thu, 21 Nov 2024 18:36:40 -0500 Subject: [PATCH 8/9] ok ok amybe?? --- .../Entities/Markers/Spawners/mobs.yml | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml index 15c1124277f..fea02ca9641 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml @@ -59,6 +59,81 @@ prototypes: - N14MobRadstag +- type: entity + name: Beaver Spawner + id: N14SpawnMobBeaver + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/beaver.rsi + state: beaver + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobBeaver + +- type: entity + name: Opossum Spawner + id: N14SpawnMobOpossum + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/opossum.rsi + state: opossum + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobOpossum + +- type: entity + name: Rabbit Spawner + id: N14SpawnMobRabbit + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + state: rabbit + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobRabbit + +- type: entity + name: Normal Opossum Spawner + id: N14SpawnMobNormOpossum + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/opossum.rsi + state: normopossum + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobOpossum + +- type: entity + name: Normal Rabbit Spawner + id: N14SpawnMobNormRabbit + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + state: normrabbit + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobRabbit + #MARK: Hostile Animals - type: entity name: Molerat Spawner From f69e29516d24f680c3f8faf2c5098251665a6b5e Mon Sep 17 00:00:00 2001 From: Ladyayla Date: Tue, 3 Dec 2024 16:37:10 -0500 Subject: [PATCH 9/9] Updated Seperation Should separate the spawners and enities --- .../Entities/Markers/Spawners/mobs.yml | 22 +++---- .../_Nuclear14/Entities/Mobs/NPCs/animals.yml | 66 +++++++++++++++++-- 2 files changed, 71 insertions(+), 17 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml index fea02ca9641..28078f1399f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml @@ -60,8 +60,8 @@ - N14MobRadstag - type: entity - name: Beaver Spawner - id: N14SpawnMobBeaver + name: Nuclear Beaver Spawner + id: N14SpawnMobNuclearBeaver parent: MarkerBase components: - type: Sprite @@ -72,11 +72,11 @@ - state: ai - type: ConditionalSpawner prototypes: - - N14MobBeaver + - N14MobNuclearBeaver - type: entity - name: Opossum Spawner - id: N14SpawnMobOpossum + name: Nuclear Opossum Spawner + id: N14SpawnMobNuclearOpossum parent: MarkerBase components: - type: Sprite @@ -87,11 +87,11 @@ - state: ai - type: ConditionalSpawner prototypes: - - N14MobOpossum + - N14MobNuclearOpossum - type: entity - name: Rabbit Spawner - id: N14SpawnMobRabbit + name: Nuclear Rabbit Spawner + id: N14SpawnMobNuclearRabbit parent: MarkerBase components: - type: Sprite @@ -102,11 +102,11 @@ - state: ai - type: ConditionalSpawner prototypes: - - N14MobRabbit + - N14MobNuclearRabbit - type: entity - name: Normal Opossum Spawner - id: N14SpawnMobNormOpossum + name: Opossum Spawner + id: N14SpawnMobOpossum parent: MarkerBase components: - type: Sprite diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml index 682e2e99b58..f6ee0b841f3 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml @@ -1238,8 +1238,8 @@ #MARK: Beaver - type: entity parent: N14MobBaseSimple - id: N14MobBeaver - name: beaver + id: N14MobNuclearBeaver + name: nuclear beaver description: Wonder what kind of trees its knawed down. components: - type: Sprite @@ -1266,8 +1266,8 @@ #MARK: Opossum - type: entity parent: N14MobBaseSimple - id: N14MobOpossum - name: opossum + id: N14MobNuclearOpossum + name: nuclear opossum description: Play dead! components: - type: Sprite @@ -1291,11 +1291,38 @@ damageContainer: Biological damageModifierSet: WastelandAnimal +- type: entity + parent: N14MobBaseSimple + id: N14MobOpossum + name: opossum + description: Play dead! + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: normopossum + sprite: _Nuclear14/Mobs/Animals/opossum.rsi + - type: DamageStateVisuals + states: + Alive: + Base: normopossum + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw #At some point need their own meat + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal + #MARK: Rabbit - type: entity parent: N14MobBaseSimple - id: N14MobRabbit - name: rabbit + id: N14MobNuclearRabbit + name: nuclear rabbit description: Not a cotton-tail anymore, huh. components: - type: Sprite @@ -1318,3 +1345,30 @@ - type: Damageable damageContainer: Biological damageModifierSet: WastelandAnimal + +- type: entity + parent: N14MobBaseSimple + id: N14MobRabbit + name: rabbit + description: What a sweet little cotton-tail! + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: normrabbit + sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + - type: DamageStateVisuals + states: + Alive: + Base: normrabbit + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw #At some point need their own meat + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal