From d30b51c982a204a379cedf91c3152b9c8794b180 Mon Sep 17 00:00:00 2001 From: Red <96445749+TheShuEd@users.noreply.github.com> Date: Sun, 15 Jun 2025 18:03:38 +0300 Subject: [PATCH] Firewave (#1430) * nerf spiders * firebolt to firewave * Update firebolt.yml * rename file * Update firewave.yml * Update firewave.yml --- .../Fire/{firebolt.yml => firewave.yml} | 52 ++++++++++-------- .../_CP14/Entities/Mobs/NPC/spider.yml | 2 +- .../_CP14/Skill/Basic/pyrokinetic.yml | 8 +-- .../Actions/Spells/fire.rsi/firebolt.png | Bin 474 -> 0 bytes .../Actions/Spells/fire.rsi/firewave.png | Bin 0 -> 607 bytes .../_CP14/Actions/Spells/fire.rsi/meta.json | 4 +- .../Effects/Magic/firebolt.rsi/firebolt.png | Bin 583 -> 0 bytes .../Effects/Magic/firebolt.rsi/meta.json | 14 ----- 8 files changed, 36 insertions(+), 44 deletions(-) rename Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/{firebolt.yml => firewave.yml} (67%) delete mode 100644 Resources/Textures/_CP14/Actions/Spells/fire.rsi/firebolt.png create mode 100644 Resources/Textures/_CP14/Actions/Spells/fire.rsi/firewave.png delete mode 100644 Resources/Textures/_CP14/Effects/Magic/firebolt.rsi/firebolt.png delete mode 100644 Resources/Textures/_CP14/Effects/Magic/firebolt.rsi/meta.json diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firebolt.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml similarity index 67% rename from Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firebolt.yml rename to Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml index 896ecd6f81..efea7753e0 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firebolt.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml @@ -1,11 +1,11 @@ - type: entity - id: CP14ActionSpellFirebolt - name: Firebolt - description: A staple of a pyrokinetic's arsenal - a small but potent bolt of fire. + id: CP14ActionSpellFirewave + name: Firewave + description: You release a wave of hot fire that strikes multiple targets in an area. components: - type: Sprite sprite: _CP14/Actions/Spells/fire.rsi - state: fireball + state: firewave - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.75 - type: CP14MagicEffectManaCost @@ -15,9 +15,9 @@ effects: - !type:CP14SpellProjectile prototype: CP14Firebolt - - !type:CP14SpellSpawnEntityOnUser - spawns: - - CP14ImpactEffectFirebolt + spread: 2 + projectileSpeed: 5 + projectileCount: 6 - type: CP14MagicEffectVerbalAspect endSpeech: "Ignis acus!" - type: CP14MagicEffectCastingVisual @@ -33,10 +33,9 @@ path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/fire.rsi - state: firebolt - event: !type:CP14DelayedEntityWorldTargetActionEvent + state: firewave + event: !type:CP14EntityWorldTargetActionEvent cooldown: 1.0 - breakOnMove: false - type: entity id: CP14RuneFirebolt @@ -58,11 +57,11 @@ categories: [ HideSpawnMenu ] save: false components: - - type: Sprite - layers: - - state: wave_up - color: "#eea911" - shader: unshaded + - type: PointLight + color: "#E25822" + radius: 2.0 + energy: 2.0 + - type: LightFade - type: entity id: CP14Firebolt @@ -71,28 +70,35 @@ categories: [ HideSpawnMenu ] save: false components: + - type: TimedDespawn + lifetime: 1 + - type: SpawnOnDespawn + prototype: CP14ImpactEffectFirebolt - type: PointLight color: "#E25822" - radius: 1.1 - energy: 1.0 + radius: 2.0 + energy: 2.0 - type: Projectile + impactEffect: CP14ImpactEffectFirebolt damage: types: - Heat: 10 + Heat: 2 soundHit: path: /Audio/Weapons/Guns/Hits/energy_metal1.ogg - type: Sprite - sprite: _CP14/Effects/Magic/firebolt.rsi + sprite: _CP14/Effects/fire.rsi layers: - - state: firebolt + - state: small shader: unshaded + - type: ChangeTemperatureOnCollide + heat: 10000 - type: entity parent: CP14BaseSpellScrollFire - id: CP14SpellScrollFirebolt - name: firebolt spell scroll + id: CP14SpellScrollFirewave + name: firewave spell scroll components: - type: CP14SpellStorage spells: - - CP14ActionSpellFirebolt + - CP14ActionSpellFirewave diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml index 1079d70f4b..d7f42c4b4a 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml @@ -49,7 +49,7 @@ - type: MobThresholds thresholds: 0: Alive - 90: Dead + 40: Dead #- type: SolutionContainerManager # solutions: # melee: diff --git a/Resources/Prototypes/_CP14/Skill/Basic/pyrokinetic.yml b/Resources/Prototypes/_CP14/Skill/Basic/pyrokinetic.yml index c1a5dc55df..1991782db8 100644 --- a/Resources/Prototypes/_CP14/Skill/Basic/pyrokinetic.yml +++ b/Resources/Prototypes/_CP14/Skill/Basic/pyrokinetic.yml @@ -103,15 +103,15 @@ prerequisite: PyrokineticT2 - type: cp14Skill - id: CP14ActionSpellFirebolt - skillUiPosition: 6, 6 + id: CP14ActionSpellFirewave + skillUiPosition: 8, 4 tree: Pyrokinetic icon: sprite: _CP14/Actions/Spells/fire.rsi - state: firebolt + state: firewave effects: - !type:AddAction - action: CP14ActionSpellFirebolt + action: CP14ActionSpellFirewave restrictions: - !type:NeedPrerequisite prerequisite: PyrokineticT2 diff --git a/Resources/Textures/_CP14/Actions/Spells/fire.rsi/firebolt.png b/Resources/Textures/_CP14/Actions/Spells/fire.rsi/firebolt.png deleted file mode 100644 index ac658353bc073ac170ac7c430315b63ab638d84f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 474 zcmV<00VV#4P)pGj7da6R9Hu2U>F6XAu!TIfRUU4_#ej5fUJ*k6)K+;Gg(Mc3{v}l zGQ)plJs*!qlru2AAk`SSdXho_-SQ7dB>M$dJ})BMcA!S09RRcZ$x)pap8s#TDYY2p zXp$TNvRuacN)1Z<=MwJ;Y$3%&Oz?qxkIiyW6cD2ypBkbPA-d&^a9=+sXg@s1*fP|k zC_c>42+BPKqu_CbPBU__BP_>lH%?1ITKqF18aGa70GWl?0mN7ivJB)Cyq3b;3bP!_ zXOx?c+X3&xCHn+yo)^OOl9J`95(3!ryuknGtw7(tB^dEY3dl+W=)S*u)S_Pa|3d+g zxzx)4FgIe&1;{}UQV6mfCU%F>;)AmFiAIn(EE`hdD2#FdvR^X=gFaAt<>36x87InZhcT*!Uk+HyQ$?Api;i0BB&PVa4vR Qp#T5?07*qoM6N<$g4TePx%8A(JzR9J=8SG!8XP#FG>2ntrHxEK%@*FHd@<{8{tU!g;Wy67Mzr4<)xhYWcJ z-TDk|!3S`4&=%rST5-_rcSufp&dKdGqSYS)NzUc_{>yhRz<)QY!-?Kqkodh8BNs$2 z2nfinpHLl+Nb1j#V82E}0B6<`w-5m}uk1cM&ryF9HUMCVHXpOOGPn}Px6#1`@R~iy zgpJc?@ILUQrj;U~f-go!fA7ve&m8m8q!?(C6manAxY8}rY$p#`B0NMJ!1q%y9ap-C zwZ|&}pcAwJ*_#Ns4u^w@?Zio#unGCKBY848t8}=O_%m-9Jqc8EE>V(N5fD9>z4D_z z+DhOSrX{xqCTEpSGPs__B&f`h8G)kUNuZGo0npHMV8Uh=*hbnU^M=tA!51T=p9RJ@ z9&$mv(4>xBiUSY0Z7!pc>P3R)%j93Pd(6_tsH9>fxSckEfd^)RB@&o7j9&S~Z}IP^ zan;_Z=Q053=wFviDuG1rLqbpEs(oC0X!HMtNQLt!)_|yO6|id*DoS};^y_x*DLql_w!zVToKY}HKP!y3&OpP>dcjV$3B(SZEC42L^DM5kW2{(rPp?Ko5}^W5f_vLm%$iN}8;< zYc++1N70x9Dazne=s|<0ps$ayPWD=hkULYvuvP+E0DSSaIRNJNS*Hr144TP_(-}Kc zG$QScun&pk2^0bZK#;o}6pUb}JXQcMmJbRN#8$=)@D&mSpN60*;M?yb2;d@8A6o_P z5~-uSovld0swGXq&RAj`0-;<1KHvSb-&(w-HO{dxFRS5?D^e%{+$U1U<(<@q)QCE> z(h?RIMvONSxpPH*wX@vB-OT|4{sN36njI-XD7g0(^uGsD>=Z@~@E8#2hQ$oz7Do!e zx8GAhV9@$Wj}*W~_{A4+aYyzUdRG++cozM(J9VZC zGxUW*T)lGk^ly9tQLC8dWrL#Yy6OG#YQLfUCmlMjQUyE_y1kBkQ7$f@fo*6~5kFXk zps2ZjA>~!G2Qdo>wpWtBj