From 3deea2f7d68c05ec415e075328533c6eb1d4f8e6 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 29 Jan 2024 04:30:54 +0300 Subject: [PATCH] Fire anom rework (#24666) * content * d * fix artifact --- .../Xenoarchaeology/structure_artifacts.yml | 1 - .../Weapons/Guns/Projectiles/magic.yml | 30 ++++++++++++++++ .../Structures/Specific/Anomaly/anomalies.yml | 30 ++++++++++++---- .../Structures/Specific/Anomaly/cores.yml | 5 ++- .../Anomalies/Cores/pyro_core.rsi/core.png | Bin 369 -> 357 bytes .../Anomalies/Cores/pyro_core.rsi/pulse.png | Bin 391 -> 381 bytes .../Specific/Anomalies/pyro_anom.rsi/anom.png | Bin 0 -> 2577 bytes .../Anomalies/pyro_anom.rsi/meta.json | 33 ++++++++++++++++++ .../Anomalies/pyro_anom.rsi/pulse.png | Bin 0 -> 4159 bytes 9 files changed, 91 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/anom.png create mode 100644 Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/meta.json create mode 100644 Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/pulse.png diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml index ed4afd061f..57b3dab921 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml @@ -42,7 +42,6 @@ density: 75 layer: # doesn't collide with artifact storage - Opaque - - BulletImpassable mask: - MachineMask - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index bd789402d2..3556d1c8f8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -5,16 +5,46 @@ parent: BulletRocket noSpawn: true components: + - type: PointLight + color: "#E25822" + radius: 2.0 + energy: 5.0 + - type: Projectile + damage: + types: + Heat: 10 - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/magic.rsi layers: - state: fireball + shader: unshaded - type: Explosive explosionType: Default maxIntensity: 40 intensitySlope: 6 totalIntensity: 200 maxTileBreak: 0 + - type: IgnitionSource + temperature: 400 + ignited: true + - type: IgniteOnCollide + fireStacks: 0.35 + +- type: entity + id: ProjectileAnomalyFireball + name: fireball + description: Hovering blob of flame. + parent: ProjectileFireball + noSpawn: true + components: + - type: TimedDespawn + lifetime: 30 + - type: Explosive + explosionType: Default + maxIntensity: 100 + intensitySlope: 0.1 + totalIntensity: 0.3 + maxTileBreak: 0 - type: entity id: ProjectilePolyboltBase diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml index e357769aa5..4eb9d70e08 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml @@ -53,20 +53,26 @@ parent: BaseAnomaly suffix: Pyroclastic components: + - type: AmbientSound + volume: 5 + range: 5 + sound: + path: /Audio/Ambience/Objects/fireplace.ogg - type: Anomaly corePrototype: AnomalyCorePyroclastic coreInertPrototype: AnomalyCorePyroclasticInert - type: Sprite + sprite: Structures/Specific/Anomalies/pyro_anom.rsi layers: - - state: anom1 + - state: anom map: ["enum.AnomalyVisualLayers.Base"] - - state: anom1-pulse + - state: pulse map: ["enum.AnomalyVisualLayers.Animated"] visible: false - type: PointLight - radius: 2.0 + radius: 6.0 energy: 7.5 - color: "#fca3c0" + color: "#E25822" castShadows: false - type: PyroclasticAnomaly - type: TempAffectingAnomaly @@ -75,9 +81,21 @@ - type: GasProducerAnomaly releasedGas: 3 releaseOnMaxSeverity: true - spawnRadius: 3 + spawnRadius: 4 tileCount: 5 - tempChange: 550 + tempChange: 420 + - type: ProjectileAnomaly + projectilePrototype: ProjectileAnomalyFireball + targetNonSentientChance: 0.6 + projectileSpeed: 0.5 + minProjectiles: 3 + maxProjectiles: 6 + - type: IgnitionSource + temperature: 800 + ignited: true + - type: IgniteOnCollide + fixtureId: fix1 + fireStacks: 1 - type: entity id: AnomalyGravity diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml index dc8f8464d4..dcd376c91b 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml @@ -40,8 +40,11 @@ - type: PointLight radius: 1.5 energy: 1.5 - color: "#fca3c0" + color: "#E25822" castShadows: false + - type: IgnitionSource + temperature: 400 + ignited: true - type: entity parent: BaseAnomalyCore diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/pyro_core.rsi/core.png b/Resources/Textures/Structures/Specific/Anomalies/Cores/pyro_core.rsi/core.png index 61a5f22489ea5dd5e32a9a1fb97e1ec9cecab426..739e14dbf1d879d98c0160418350a31101cbc731 100644 GIT binary patch delta 317 zcmV-D0mA=xg1Y8>-@CDqdNZ}%f$We5Z z93Z6&7cO*wlmTH<2L}|=D2=L3v08zUZD}=zH2XlPSk27W?4Momcsw2nqZ9cdigB=LAd7us- zP*ebvZ>Njjwrfeq*zt5SOgU3pKh*#%o>S9)fTE&&$xXtYB6{7l;%_S8tO#g}TLCVU zAQI3?v@=d{9X7*B2hpt#p~(WEae5L$QH|Q`ONj0QJBI&;^eXmvJRX2Q!oF;f5&1da P00000NkvXXu0mjf|3r`) delta 329 zcmV-P0k;0-0`UTnF@GybL_t(oh3%CwOT$1EfWL}c#)FXUhM+>1fE`Pq&@F>=79oG2 zzrvr8KTvS#S?ZQBra?vw&lB3e9ts63Dd?`&);U+`7TWhkNR=jW2GyhC4Z2FsoF0*7CQhITk}qy z6j@|>W6;K8hl~Pb6x1T4e%#s`D}f@*)$Lt~jDkjSAw7ijen@l)cX6}@gXyGK@SSY6 zsX+Lx@2)l#KrL60tHE^g>r7}3OcJK*+P?ze{>HEWO1Z3fd|m_avVP?u9@g^5a%vx& zLkXZR{w1Ju5<;|(;Xa3jL4Ow*Euz0#LdF8{Iq5PAD3{eqz3#&5E)deQ3Ag90SFyw4 b_&0n2^piVCv diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/pyro_core.rsi/pulse.png b/Resources/Textures/Structures/Specific/Anomalies/Cores/pyro_core.rsi/pulse.png index 537c619d19d063aab1961bd880d31f4529cc92d3..e0c2c7eed1d7b62eadbef2bb09ba89c1376d8b4d 100644 GIT binary patch delta 341 zcmV-b0jmCo1N{P!F@HBnL_t(|obB2%4uUWg2H;{$bm0un+=9`CV{j^u;lk)Gm>Epm zSr|y_U?7oTr10qfp#L{AwD@>`TM5Px5fKF|k{YOKb9;KeK7(HFV&hI_tIQf>j45jq zT_4`(|Gt?bwLa%-+I;qW2gw^jIUjGcpZIF6(sw};Ln5I{pMOu({GKB@YDrEd{3?RC zHDF0j*R+d8aFQe*y{xtX=*U1xFPfVxrq5kNX9UXH+f<_k*j&p1p0N@Q1E|?T^`78-w4?%vye_ew_ng} z5lMsPsGGk?ElzBQk+wV~~qoN2zM6^L~7$de~xRNf300000NkvXXu0mjfS?Zp^ delta 351 zcmV-l0igc<0*3>TF@HfxL_t(|obB4N5rRMv1<=(R49qOSz%C4(F{c3oDXa%{9LW%51kCe8op=mAVU7>whIA5~kGoL1wyn*qP%bWD>Nf_<#k%hu1$762U?DD9!yRZO!Tps8#Am@GhXD}(LTT7anYCxSn? znBZFkbkRmR?fEW>j*f{VFPd*Bn!F3pK)bs4VI&qYmzzG9Y#A#zUx7=jQ;VHQKdPqg^Bd>kOTB>mJGc(CSP8x xpPx;%Sl8*RCt{2o6nCMR~^7V_Kv+?JL|?tw=q&6n~fH>y-rK#Y;r4sa1DT16W zu81qDSG(oNe=rg!5XuczNT|StDj^}It)i+lO{GAA!-gfSvKxE7{>kCJ@630e$1`JR zfmZk{J&o5p?|py1_rAXjbC|;%<}imj{NFZW}G6^6fAtQx&Q1bj?mbFuGdO*<*PvOm}pl{4ELuYHF|P{pBcKcPW)*_9HqYW)vbYy4Ua>?`gzz8==v(|P)&=n*Qy6+joGgd{Oj(V>h~{i=SI*wS^Wjj0v_3CW=l|}U&3f!EUr-a)jQwmz4YAcK%u?m z-zcsCRp{O`bIZ-f*9i|mF@LdyLpzR2oJi>l!1x&; zr>mU!MZoL*z`t30x(;Vop?)6DtiZYD=s3F$Yv-vwU8lX}-y~)q$L&D}^!1jv!}H#| z+pJtzfeY)fwr=o!<_TCn8RB0v|Eq1(X>a+zCp;*%FvrfLxC1Jpfy19%dpUOjs1Bf* zgW8h-bXU#5JK7sIf@m#6^dMC%fEAHOU^xX_F zaz+$NJt*}exbnH9$HG6I1$=xEd@SzXr?`8ce6AHDSO0$ukgIEGhdF?&N3h!(!w*nA z_`CV?FVo|91u&+8@@tKYdv|u=-bdz*j}JmdOFg{(Jy<*pzq|KQ;FMSflC>HIVLtF3 za;qELt#@|e-k+i0hYvduL3{iE2ckoL>L_%5#jwBy3>Hd=#BLLaMrK8f2Fez>PKW6PM33mX z5fRFaNfGfNC7zHNU)<^>0c1|hBndzQk^(9)A}RpMzsde`Pus^zkSZEP5F(5;0c1|i zWz7l3B}9)k37SHK7KF|X#=%r{Wz7o5rNoat4L&0sF8tT&n!_CCFo!vOTH&~=!=Ku# zC#^OpOlwCZ&Iy^iEd5D=Bv)8_UY_%e6MzIl;vOH1cQ{3Z#7tJ06bT-~>9dHb~55g-Q7UDNpO3fH+ND0e)&fO9Utd$s=Yjk!w0c2}wCjZG{q`r79pI z00*fqP)<|WkPx}ejC}$zN(g!c3a`KQ-QLSz`FYGVu>fISaCb9BgE5(y3Q+;%fNuf6 zOrd|OgoFz*N^ljC6avppPSRpJq_~mn~05n7jnE~_X z*Ui_fC&p)t)&oH(A?RL%4$f9`z)gJxCHjE*wRJc(fR&P|Mn}LjO`NC>XuW&8*|`d( z%NO4u+)hV8uhVY~v=vNQ9JS1kpu18J1|wi~**v8`z-$-Il;jhW?sDyIj{6&@2Br_8 zQ;7B_fGLo89;}_G@}(6P-n!i+%xOwydF(1p6+oc*r-KU)T{8QF6S7Yn*ZiB)k zh%KYHxBTn1jXFI0xd`(S{JKd4pf%KMiV$Q(I#se;K&fMDfF)ZIa>{%u_4!$P145{# zw-yCW8vBbdD40S`h+A*1h)VRSaI#+LfGt>H6Vbo85Cm!5j zE`V$TXhpBjpd78g+r1wiOl3?#?Kq(uTHFl%3GVhv-2&sK?CuD5T1E?)bKQNYfG{($uUgo&m3e9TLc@^rb`cyaIj2k@uA8RqWx#~LLf$ZdUo^Z-hi zFaB1ose1*ozz7(XHyf8C_;r6m0)7k8QhN*yapiGw8oJ2oJ&NfMz&axn>hpyk2OgoU zB~6Nn3=szff~dC)$uS8;=(0-+Bcbcq69P?okcGP=W=+);~Px5-LpdQcE; zZ}~U$JyP4KM{kGy1-D&xNZ2!ch;hjeaolk?9M-*ZBz;V7ZmN`6 zOgUT+9Vod!nQ?m-Qhzs;mKBcs(UL|Yr>eGqW2+H38DY`3-iC3>*+_pt8XakM0sZq8 nK^jSc|0f$GV(2;c{(yf2%(33_lulgb00000NkvXXu0mjfd4j>| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/meta.json new file mode 100644 index 0000000000..aa4c1273a1 --- /dev/null +++ b/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by TheShuEd (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "anom", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "pulse", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/pulse.png b/Resources/Textures/Structures/Specific/Anomalies/pyro_anom.rsi/pulse.png new file mode 100644 index 0000000000000000000000000000000000000000..a064a8d2260aa9af56160ed4e03115f5231fdb81 GIT binary patch literal 4159 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