From e06e1bb7fc7ad77a2f55e185058ee6a8fbceebd4 Mon Sep 17 00:00:00 2001 From: Viator-MV Date: Mon, 9 Jun 2025 14:35:56 +0300 Subject: [PATCH] Druid stuff (#1396) * staff * Revert "staff" This reverts commit bb7532e0b267773de44813718397e1250b88417e. * not resprite --- .../Objects/Weapons/Magic/twoHandedStaffs.yml | 19 ++++++++++ .../_CP14/Loadouts/Jobs/adventure.yml | 6 ++++ .../druid_staff.rsi/equipped-NECK.png | Bin 0 -> 533 bytes .../TwoHandedStaff/druid_staff.rsi/icon.png | Bin 0 -> 475 bytes .../druid_staff.rsi/inhand-left.png | Bin 0 -> 684 bytes .../druid_staff.rsi/inhand-right.png | Bin 0 -> 693 bytes .../TwoHandedStaff/druid_staff.rsi/meta.json | 34 ++++++++++++++++++ .../druid_staff.rsi/wielded-inhand-left.png | Bin 0 -> 587 bytes .../druid_staff.rsi/wielded-inhand-right.png | Bin 0 -> 587 bytes 9 files changed, 59 insertions(+) create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml index 1aa4db81ad..4f48f86b24 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml @@ -103,3 +103,22 @@ sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi - type: Clothing sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi + +- type: entity + id: CP14MagicDruidStaff + parent: CP14MagicHealingStaff + name: magic druid staff + description: A long, half-tech, half-magic stick designed to convert magical energy into spells. + components: + - type: CP14SpellStorage + spells: + - CP14ActionSpellPlantGrowth + - type: Sprite + sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi + - type: Clothing + sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi + - type: CP14MagicEnergyContainer + energy: 0 + maxEnergy: 30 + - type: CP14MagicManacostModify + globalModifier: 0.9 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml index f14060465b..6d723f3113 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml @@ -8,6 +8,7 @@ - CP14ModularCopperSword - CP14ModularCopperRapier - CP14BowCombat + - CP14MagicDruidStaff - type: loadout id: CP14ModularCopperSkimitar @@ -40,3 +41,8 @@ belt2: CP14ClothingBeltQuiverCopperArrow neck: CP14BowCombat +- type: loadout + id: CP14MagicDruidStaff + dummyEntity: CP14MagicDruidStaff + equipment: + neck: CP14MagicDruidStaff \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..98da4dfa57fcea47da29e08c2b2f407473bef657 GIT binary patch literal 533 zcmV+w0_y#VP)Px$&q+iDqBOizpOIR)#Kpgo5wVK0qF(AcgiBO6@vO zyU3<=M7lDF3+ZOMC;_V}&ei{8vEfD9c?NLOo^3b7OUWVTQqW3K^I zAsXpwjg(dmUc0sP-DmoZ8bdh&x{)_A*>Z@*Qh6LD19VNncKk2dIbd}vCm?UF>BQzU z3ZvE7CGa2EiL%OoY%}B>q0bNArdySOLm&g{7ElzJ-QOnG7~m|S&yQ->oKJx91{}LZ zH{O7}ju34gF@Kyxg40tuFYift_X609M-y;)W3iU$4}S;66c=*1VIo4K@bFC3D{=Hx?aHfW~l2mQT5gtfQ1aGTL3{21W_YD XW6qWJbLsLW00000NkvXXu0mjf&aUE~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8096dae640fdeaa4e94274bf8fad8290ba67a445 GIT binary patch literal 475 zcmV<10VMv3P)Px$l}SWFR9J=0m%UEHP#A_Ej6nuM+Bh&!whsKn#5h5mh=Uhk!tO;l=moHN5hji% zx;Qa88Qh7&fP9v0D!(XrCD)PorVBF zQazc?S0LiDqXi%e5tdAZaR7mcHl6@oogHg0&&C~IbsYb|Dd3iDtvf*}kO>IoAmLT5 zV==AtK%8Vzxh0!+qn5ZQw*G>4qvq?ltP-VA2Snl;HY={*su#D0Q0{@Kdc#rX>GcbM z>+@6Po=6NJ5D&d~Kz&(h0f<7VOo#TnUV38m`MuGeFk&`TAdI;kxzgjToKd?aeiB%* zdZ_?x0%05=4no@){-%NFWyI7}9cO7oQ^|lRe7Lx-Q~}mOq*8*gO#kR8>j!z0s><@d RLy!Of002ovPDHLkV1jgG*O~wT literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..77779e21e587f88b488626820bd1da517f2cb990 GIT binary patch literal 684 zcmV;d0#p5oP)Px%W=TXrRCt{2nz3%%Fc5~%L1B0>3VAk-4AEc(2oPjx42@Z`76S4v(F6El40LH9 zAX8BwAmgqStvXRUYI2^Bm+q$@qU`D_$`J2^F;kTlE*s|IUEiI_dhOW@mF_y zBe)=+|=s=_@;T*XJ@2 zLKdInD6BP-aTLnC>+^k^K#0;aCnuc7@{#|uTJ1+`HeYm-^@gg7kdORqzS!F++T(^* zfOMPfUG|Vw)R8 z3y?2ZBd^PC8Un-v-dhMw1U3cy;Q(ct6_^0FV2uE%tq>+a)xf7J$Y_uqTed)}ux1J% zMn4cjdi@@^St0_h0oAt^~UP={Dmw3AM{EfY9B+JoK7%DkkhYbHqfqLo?_W)CYFD3&Ky!k( zkGTCi=k_sE%0GT$>`RH?tG_7IC6e_j!zR~)uFslH%L*Sgl z`^j}+zb$?&j5`hL#)!kvv97YIc;0{E0mkJ6jzLoqU`bJ(w0;Vx(0TzJZRZt@`1$DN Sml<>b00006H( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..971df2d023a905e4fdba02217ad16f31d7ae0a08 GIT binary patch literal 693 zcmV;m0!safP)Px%Z%IT!RCt{2n!Rq@FcgK4io(z!1oCVe9jYM;5TMA?1Rk?wEezyc>Id+{7|4=5 zK&GNzG8J($XtOnRl2BwYys(o}TQOsi;uS@e-(pyn>8s<*`$H0NI2`->(QTF}?XAXZvJ4;@9UV zuj<8&?YwU@*XJiZW{hvYpNvOB+dq^q6#x8ezIavbX|?izf6BI>IF5F%wVAT*we2p?t1j_o3Y4*B z-m7v@fMM7Jup3yq#6bZ7KonTIz(E0`LB9z*j8Vx0x=iN;kj+*H1&}HrS^!C~?s_Wh z6xydifh}GT2ELRCl?1S*6)resN0slb>;Y}>1Pf&CtXv6(fv;px(}aO9Rk=D3pcvFN zGWJ#yz!vu}kg>OOrLZhcfGRir_c6fXa5x+SZl6Dsb&8Z@*Jd&v@g~j>oJ}v^-QBH= zavDt13|9~I^}*G{nsi-KS%7HJZ)CwVNi+Of{UIA)Nr0F!e*gGew=H{_%@)B<`1bXaZd=~{yhm$lTnR?a;u*^3k8=ti*!6s={8Z?mwT6adtmd#Q}*U)`n z)0!+mg>pA&DhB8-iIoH}xmTz=16h*>sZfpqrbN(P4_L7tK#6rRKsVMbh*06`0MiCI b9A^0oHJbVHo68#R00000NkvXXu0mjf1Jyb_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/meta.json new file mode 100644 index 0000000000..17c7fcdc0d --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by solaetv", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6d0eb3675e5ad5f42c9a9003bbdb05b6ef19f9fd GIT binary patch literal 587 zcmV-R0<`^!P)Px%1xZ9fRCt{2n!irNFc8MC2mu2^WyXl18JtKgof38I&Qd8O50VGygD@hobVp1G zrY;ERPzKa6FcF~+rOPoOM^1<-P^Tp5`z=wN^ZD-lCy~Ao0RR91000000HqN1Ivn*n zY}>XLM7<6N(&0cl3loca9d?CaR|pQIQ~x4_zL!ZPkPe5w$3#SfQ7dy*h0<+T5o5!q zGd08Grx%(eb0Q+T8jUk!1k&NR;{zH-=V^Pp-{sAd$BbB*aHY!ty2f>nP#ACuot4JuHgY!Q^RqQU?G0000000000006*u7>ru1 zbb-HOeHDY`6`}swWux8i@{#<|2HO2D52N!&k=-idE0rR}r${3Eu3haYlDL*>v&~wW z&UKC9HzdMZ+^c8U^cIfo_?#pPx%1xZ9fRCt{2n!irNFc8MC2mu2^WyXl18JtKgof38I&Qd8O50VGygD@hobVp1G zrY;ERPzKa6FcF~+rOPoOM^1<-P^Tp5`z=wN^ZD-lCy~Ao0RR91000000HqN1Ivn*n zY}>XLM7<6N(&0cl3loca9d?CaR|pQIQ~x4_zL!ZPkPe5w$3#SfQ7dy*h0<+T5o5!q zGd08Grx%(eb0Q+T8jUk!1k&NR;{zH-=V^Pp-{sAd$BbB*aHY!ty2f>nP#ACuot4JuHgY!Q^RqQU?G0000000000006*u7>ru1 zbb-HOeHDY`6`}swWux8i@{#<|2HO2D52N!&k=-idE0rR}r${3Eu3haYlDL*>v&~wW z&UKC9HzdMZ+^c8U^cIfo_?#p