From 8cd4fb5e007589324d9bb0f0b426bc37eebc565d Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 15 Jun 2024 07:46:48 +0300 Subject: [PATCH 01/13] initial commit --- .../_NF/Entities/Clothing/Head/hoods.yml | 45 ++++++++++++++++ .../Entities/Clothing/OuterClothing/coats.yml | 50 ++++++++++++++++++ .../wizard_robe_blue.rsi/equipped-HELMET.png | Bin 0 -> 9631 bytes .../Hoods/Coat/wizard_robe_blue.rsi/icon.png | Bin 0 -> 820 bytes .../Hoods/Coat/wizard_robe_blue.rsi/meta.json | 18 +++++++ .../wizard_robe_red.rsi/equipped-HELMET.png | Bin 0 -> 8645 bytes .../Hoods/Coat/wizard_robe_red.rsi/icon.png | Bin 0 -> 738 bytes .../Hoods/Coat/wizard_robe_red.rsi/meta.json | 18 +++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 2094 bytes .../Coats/wizard_robe_blue.rsi/icon.png | Bin 0 -> 569 bytes .../wizard_robe_blue.rsi/inhand-left.png | Bin 0 -> 379 bytes .../wizard_robe_blue.rsi/inhand-right.png | Bin 0 -> 502 bytes .../Coats/wizard_robe_blue.rsi/meta.json | 26 +++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1291 bytes .../Coats/wizard_robe_red.rsi/icon.png | Bin 0 -> 449 bytes .../Coats/wizard_robe_red.rsi/inhand-left.png | Bin 0 -> 317 bytes .../wizard_robe_red.rsi/inhand-right.png | Bin 0 -> 317 bytes .../Coats/wizard_robe_red.rsi/meta.json | 26 +++++++++ 18 files changed, 183 insertions(+) create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/meta.json diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml index 18f16acd12c..6c0911470ad 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml @@ -35,6 +35,9 @@ sprite: Clothing/Head/Hoods/Coat/hoodsyndicate.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodsyndicate.rsi + - type: HideLayerClothing + slots: + - Hair - type: entity parent: ClothingHeadBase @@ -46,6 +49,9 @@ sprite: _NF/Clothing/Head/Hoods/cult.rsi - type: Clothing sprite: _NF/Clothing/Head/Hoods/cult.rsi + - type: HideLayerClothing + slots: + - Hair - type: Tag tags: - HidesHair @@ -59,3 +65,42 @@ name: cult hood components: - type: Unremoveable + +# Tactical Wizards Hoods +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodTacticalWizardBlue + name: blue wizard tactical hood + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi + - type: HideLayerClothing + slots: + - Hair + - type: Tag + tags: + - HidesHair + - WhitelistChameleon + - type: Contraband + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodTacticalWizardRed + name: red wizard tactical hood + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi + - type: HideLayerClothing + slots: + - Hair + - type: Tag + tags: + - HidesHair + - WhitelistChameleon + - type: Contraband diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml index 3f731167066..add0aa5f46d 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml @@ -155,3 +155,53 @@ sprite: _NF/Clothing/OuterClothing/Misc/pirate_captain.rsi - type: Clothing sprite: _NF/Clothing/OuterClothing/Misc/pirate_captain.rsi + +# Tactical Wizards Robes +- type: entity + parent: + - ClothingOuterStorageBase + - ClothingOuterBaseToggleable + id: ClothingOuterRobeTacticalWizardBlue + name: blue wizard tactical robes + description: The perfect synthesis of tradition with modern materials and warfare practices. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodTacticalWizardBlue + - type: Armor # ClothingOuterArmorBulletproof stats for now, later will be changed to something else + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.75 + Heat: 0.9 + Cold: 0.4 + - type: ExplosionResistance + damageCoefficient: 0.80 + +- type: entity + parent: + - ClothingOuterStorageBase + - ClothingOuterBaseToggleable + id: ClothingOuterRobeTacticalWizardRed + name: red wizard tactical robes + description: The perfect synthesis of tradition with modern materials and warfare practices. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodTacticalWizardRed + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.75 + Heat: 0.4 + - type: ExplosionResistance + damageCoefficient: 0.80 diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..2cf996a2212967c6824666222260be2f26f5f7e7 GIT binary patch literal 9631 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f3693a0ce6343f9d1a7c748f911525e02be5e55a GIT binary patch literal 820 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 g`|7CNe*LDp0FZpvdGynhq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8c648f24be39a89226f60e1c7565f2a99847c5b0 GIT binary patch literal 738 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 MUHx3vIVCg!0AQb*cK`qY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..cb5c0a0773406344b84515077c7a1f291895a6cd GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zr+K2E}V( z8}4wjX)}98p32z#-`He(=I7$-sA4_`7Z~{8`K|b1;VdqOn)`et`n6*Eik2JOnzyq&k=LvPq?b??~?SzGHuo~>Rn+jHgN!da)j z?^Q9L7os=a{l`JsqK(-XKgX;MTg||bwwbf(06W8sG|73-(-wVMdPQ+*U({NmnU&Ak zS|r^B+X8*e?#g#WZ>=s@`*TlY>yKZ59RzrSV;P-7rYwtPVlc`5+2$U4;9kDN_TL-q zw3^sAk*KxSB3$=HqqSle-`!`Mtb_y>P3gG$Y}4B|t|kVC2fNNo zUtjZ#li|qw{plCi&15{DnU<8M;Ps^DfZfC8^GexoKh~c2JZo7b+lD!kAO4mzSlp=h z-yI*?AYk-TCcXFyTaTOm>v_9_y1y1qll{tXHTU;g({J}XJB;24o6oO(vhTy1Pr&Hn fOO5bM^YvxW0Px(t4TybRCt{2nmugWMi_=4Sv*RlBnPpF)OMV>Wl4d$=;l5h6*jPP4qRQwt8V>v_B@gqo{V`04O);znGr*A>7M&*O>b zCFU{FPn9vO{GOC7m&?4_>+v8`_ES(BU07CsvuZIF8&`ZcK0R?!yUTXcso8T|?I)5A<@{#`kGf)NgBHNBW z<^yfun*RSiusoCK??~eG1wl6)q)%XgseYmXPPfY&z$2gsr5m8S1Xms4Fp_r#uz`nA zs)AYq8bh8KX&I#-C98g-0oQDs7SQT;d7uLU_yBN)z_Bbm-=`%dKSavi1YFz3wQbhM zFku?{MxC@8bTMkc>yh+Lj_(2O41=rF)K5JS3aLf5Xd00q@?_HbnG6sFH^UI2)2C&? zB=wCA2*+EsA?bNDX?$t&GB3s!|of1C(u2*HXF)PQ?aGUB%DswS`|B?kjvjn@t9Wb{I0Sy$e%ES$*u zw{>R7=!UUL2KZ}yzY?Wl^y#lx6XFcb6^0^2S|YUI;du zP1?Y3Qu47*-!whZn7pHZziqd9PY9}=4)a2=m2xdnCKh7uu%+OxtZoURZV8e5Qy|m{ zb<@N+G3H`UJ_l+M)YU0G0zIr+IdPihSRIy@}KVHl4CmLd+% zftm%%Oy7VqFw4KM_)>;em}wjk3fTk>I+g`fej0=eq|N}&7~RjP1w7N^>@vZMjA-Hc zDU1T+v}SZHW&QtIo^ydH<CJK7R-BBE#Ugm`pG(w-}S=jT07Tp?&lIrYlFOfeJ` zyyE-=HiFMlG2G1h0000EWmrjOO-%qQ00008000000002eQPx$VM#!7#i3ym{}RHvUnGx z4eW)X=_q9;^Lgg_M-|T?u!mE(VEe0M$t~JHP8)$mEu0o0Cr^8r zAjmbb*1$;=(bk$6h|}c25O@V{WFCr+#Kk~cYtAb9w@~PwE~VWsK#k=|52ScncnVy| z|3kstg@SA&a~7xm$tkc6JeJH^D%g`woC7;b5%@k)9P_0$&k|!cX`m(s>cEku4_Ll| zX~~>^e#k0yYuFl=iH#djEFNQu68%pMD9cEezEJ~mzXldB{+D%!!{PW}d;>v^b{FLs rv-ki201jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjfvU|OD literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e922ca64f134b470a2c9e538ec0b4643a39c4843 GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|?s~d7hE&XX zd&`^akb#KX!(hb+UP~719bMR6@*+s4Q(Mqz#pEy-t#5_eE%Wk4f_~h-vuy5@CKb;~ zAe8GNDtcwfm2Z!;&t2WVQ#CT!=-4e+)~lBLkNJAN{jGFwz3$mAv9Jc?5NGbS#m{UC zm)D+-a(*%GmUH!=8M_(!CBI9aniX}z@DMjcfd^+p^>?x7Vh@b7{m$tp&S&7!FL~#@ zeq#j0CXi*38;|=3{^eMh-uz$WYJb2RJ_ZZN>eqh#)xp07yYw7f?43TcHl+ULIQoxS zVVk_;B(s;Ck0OJ$7D#VB0Q4wdYJ_K+uP=iZkj(+aAaE&oGKlhY^>bP0l+XkKKHhsO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ac5a8667f44cd79865f3c4b10a8af161393ddfa0 GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|?s~d7hE&XX zd&`ioSwZC3$9^@Hc}ogEX~^0xN$$V2@};Mb#ET|Q(*`4x#&7>;e-S+Kxl_-E6Q~gc z{&je=s%QT#`&)4CNs{iYHD66F$)p z0LdS1myf&Ie&?Bza-Qvb)qBYkE32|MKbimVN$KU}^A2mYKE_qEd9C7B_?TfNTz^!Iy$3gIJ!felF{r5}E+n?Rt{{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/meta.json new file mode 100644 index 00000000000..44b430ca836 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by GentleButter (discord/github) for New Frontier SS14 server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 3dca8aeb99b4795ecbbad9ab64140f5f0ce95f48 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 15 Jun 2024 08:01:31 +0300 Subject: [PATCH 02/13] lic update --- .../_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/meta.json | 2 +- .../_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/meta.json | 2 +- .../Clothing/OuterClothing/Coats/wizard_robe_blue.rsi/meta.json | 2 +- .../Clothing/OuterClothing/Coats/wizard_robe_red.rsi/meta.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/meta.json index 43782d59845..a6cdcf381ec 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-NC-SA-3.0", "copyright": "Sprited by GentleButter (discord/github) for New Frontier SS14 server", "size": { "x": 32, diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/meta.json index 43782d59845..a6cdcf381ec 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-NC-SA-3.0", "copyright": "Sprited by GentleButter (discord/github) for New Frontier SS14 server", "size": { "x": 32, diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi/meta.json index 44b430ca836..3ad9b9cf80c 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-NC-SA-3.0", "copyright": "Sprited by GentleButter (discord/github) for New Frontier SS14 server", "size": { "x": 32, diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/meta.json index 44b430ca836..3ad9b9cf80c 100644 --- a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-NC-SA-3.0", "copyright": "Sprited by GentleButter (discord/github) for New Frontier SS14 server", "size": { "x": 32, From 3d92fc50284e5bed018918ec8c6e25fd65661ecc Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 15 Jun 2024 13:46:13 +0300 Subject: [PATCH 03/13] chargeable staves and staff charging altar --- .../WizardStaffRechargeableComponent.cs | 7 + .../Entities/Structures/Power/chargers.yml | 8 + .../Weapons/Guns/Projectiles/magic.yml | 40 ++++- .../Weapons/Guns/Wizard/wizard_staffs.yml | 143 ++++++++++++++++++ .../Objects/Weapons/Melee/wizard_staff.yml | 11 -- .../Specific/Wizards/staff_charger.yml | 68 +++++++++ .../Effects/wizardbeams.rsi/green-beam-01.png | Bin 0 -> 1162 bytes .../wizardbeams.rsi/lightning-beam-01.png | Bin 0 -> 5209 bytes .../wizardbeams.rsi/lightning-hit-01.png | Bin 0 -> 2338 bytes .../wizardbeams.rsi/lightning-muzzle-01.png | Bin 0 -> 2441 bytes .../_NF/Effects/wizardbeams.rsi/meta.json | 39 +++++ .../Effects/wizardmuzzleflash.rsi/meta.json | 14 ++ .../spell-muzzle-flash-01.png | Bin 0 -> 266 bytes .../Wizard/recharger_altar.rsi/empty.png | Bin 0 -> 7887 bytes .../Wizard/recharger_altar.rsi/full.png | Bin 0 -> 8301 bytes .../recharger_altar.rsi/light-charged.png | Bin 0 -> 601 bytes .../recharger_altar.rsi/light-charging.png | Bin 0 -> 6643 bytes .../recharger_altar.rsi/light-empty.png | Bin 0 -> 563 bytes .../Wizard/recharger_altar.rsi/light-off.png | Bin 0 -> 7886 bytes .../Wizard/recharger_altar.rsi/meta.json | 60 ++++++++ 20 files changed, 378 insertions(+), 12 deletions(-) create mode 100644 Content.Shared/_NF/Weapons/Ranged/Components/WizardStaffRechargeableComponent.cs create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Specific/Wizards/staff_charger.yml create mode 100644 Resources/Textures/_NF/Effects/wizardbeams.rsi/green-beam-01.png create mode 100644 Resources/Textures/_NF/Effects/wizardbeams.rsi/lightning-beam-01.png create mode 100644 Resources/Textures/_NF/Effects/wizardbeams.rsi/lightning-hit-01.png create mode 100644 Resources/Textures/_NF/Effects/wizardbeams.rsi/lightning-muzzle-01.png create mode 100644 Resources/Textures/_NF/Effects/wizardbeams.rsi/meta.json create mode 100644 Resources/Textures/_NF/Effects/wizardmuzzleflash.rsi/meta.json create mode 100644 Resources/Textures/_NF/Effects/wizardmuzzleflash.rsi/spell-muzzle-flash-01.png create mode 100644 Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/empty.png create mode 100644 Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/full.png create mode 100644 Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/light-charged.png create mode 100644 Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/light-charging.png create mode 100644 Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/light-empty.png create mode 100644 Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/light-off.png create mode 100644 Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/meta.json diff --git a/Content.Shared/_NF/Weapons/Ranged/Components/WizardStaffRechargeableComponent.cs b/Content.Shared/_NF/Weapons/Ranged/Components/WizardStaffRechargeableComponent.cs new file mode 100644 index 00000000000..34bc2034a0b --- /dev/null +++ b/Content.Shared/_NF/Weapons/Ranged/Components/WizardStaffRechargeableComponent.cs @@ -0,0 +1,7 @@ +namespace Content.Shared.Weapons.Ranged.Components; + +[RegisterComponent] +public sealed partial class WizardStaffRechargeableComponent : Component +{ + +} diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml index 582a5b0dee4..5d3f6f4ab77 100644 --- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml +++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml @@ -157,6 +157,9 @@ slots: charger_slot: ejectOnInteract: true + blacklist: # Frontier + components: # Frontier + - WizardStaffRechargeable # Frontier whitelist: components: - HitscanBatteryAmmoProvider @@ -188,6 +191,8 @@ blacklist: tags: - PotatoBattery + components: # Frontier + - WizardStaffRechargeable # Frontier - type: entity parent: BaseItemRecharger @@ -209,6 +214,9 @@ slots: charger_slot: ejectOnInteract: true + blacklist: # Frontier + components: # Frontier + - WizardStaffRechargeable # Frontier whitelist: components: - HitscanBatteryAmmoProvider 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 2fe3197f16c..c80a18c2e62 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -1,4 +1,5 @@ -- type: entity +## Bullets +- type: entity parent: BaseBulletTrigger id: BulletFireBolt name: fire bolt @@ -57,6 +58,28 @@ - type: Ammo muzzleFlash: null +- type: entity + parent: BaseBulletTrigger + id: BulletIceGlobe + name : ice globe + noSpawn: true + components: + - type: Projectile + damage: + types: + Cold: 5 + soundHit: + collection: WeakHit + forceSound: true + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/magic.rsi + layers: + - state: ice + shader: unshaded + - type: Ammo + muzzleFlash: null + +## Hitscan - type: hitscan id: BloodCultLaser damage: @@ -71,3 +94,18 @@ impactFlash: sprite: _NF/Effects/bloodcultbeams.rsi state: red_lightning + +- type: hitscan + id: WizardHitscanLightning + damage: + types: + Shock: 10 + muzzleFlash: + sprite: _NF/Effects/wizardbeams.rsi + state: lightning-muzzle-01 + travelFlash: + sprite: _NF/Effects/wizardbeams.rsi + state: lightning-beam-01 + impactFlash: + sprite: _NF/Effects/wizardbeams.rsi + state: lightning-hit-01 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml new file mode 100644 index 00000000000..72e35892f7d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml @@ -0,0 +1,143 @@ +# BASE +- type: entity + parent: BaseItem + id: WeaponChargedStaffWizardBase + name: battle-wizard tactical staff + description: Big magic wand for big spells. + abstract: true + components: + - type: WizardStaffRechargeable + - type: Sprite + sprite: Objects/Weapons/Guns/Basic/staves.rsi + layers: + - state: change + - type: AmmoCounter + - type: Gun + fireRate: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Effects/Lightning/lightningshock.ogg + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: Item + size: Normal + shape: + - 0,0,4,0 + inhandVisuals: + left: + - state: change-inhand-left + right: + - state: change-inhand-right + - type: StaticPrice + price: 190 + +# VARIATIONS +## WIZARDS +- type: entity + parent: WeaponChargedStaffWizardBase + id: WeaponChargedStaffWizardLightning + name: wizard lightning staff + description: An acolyte-grade battle staff. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Basic/staves.rsi + layers: + - state: change + - type: HitscanBatteryAmmoProvider + proto: WizardHitscanLightning + fireCost: 40 + - type: Item + size: Normal + shape: + - 0,0,4,0 + inhandVisuals: + left: + - state: change-inhand-left + right: + - state: change-inhand-right + +- type: entity + parent: WeaponChargedStaffWizardBase + id: WeaponChargedStaffWizardIce + name: wizard ice staff + description: An acolyte-grade battle staff. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Basic/staves.rsi + layers: + - state: nothing + - state: nothing-unshaded + shader: unshaded + color: "cyan" + - type: ProjectileBatteryAmmoProvider + proto: BulletIceGlobe + fireCost: 40 + - type: Item + size: Normal + shape: + - 0,0,4,0 + inhandVisuals: + left: + - state: staff-inhand-left + - state: staff-inhand-left-unshaded + shader: unshaded + color: "cyan" + right: + - state: staff-inhand-right + - state: staff-inhand-right-unshaded + shader: unshaded + color: "cyan" + - type: StaticPrice + price: 190 + +## CULTISTS +- type: entity + parent: WeaponChargedStaffWizardBase + id: WeaponChargedStaffCultistBoltDark + name: cultist dark bolt staff + description: An acolyte-grade battle staff. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Basic/staves.rsi + layers: + - state: animation + - type: ProjectileBatteryAmmoProvider + proto: BulletBloodCultDarkBolt + fireCost: 40 + - type: Item + size: Normal + shape: + - 0,0,4,0 + inhandVisuals: + left: + - state: animation-inhand-left + right: + - state: animation-inhand-right + - type: StaticPrice + price: 190 + +- type: entity + parent: WeaponChargedStaffWizardBase + id: WeaponChargedStaffCultistLightning + name: cultist dark lightning staff + description: An acolyte-grade battle staff. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Basic/staves.rsi + layers: + - state: animation + - type: HitscanBatteryAmmoProvider + proto: BloodCultLaser + fireCost: 40 + - type: Item + size: Normal + shape: + - 0,0,4,0 + inhandVisuals: + left: + - state: animation-inhand-left + right: + - state: animation-inhand-right diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml index 419fcac920f..225510f8965 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml @@ -73,14 +73,3 @@ soundHit: path: /Audio/Effects/bite.ogg - type: Contraband - -- type: entity - name: cultist staff - parent: WizardStaffMeleeBlood - id: WizardStaffDarkBolt - suffix: "Dark bolt" - components: - - type: BasicEntityAmmoProvider - proto: BulletBloodCultDarkBolt - capacity: 10 - count: 10 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/Wizards/staff_charger.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/Wizards/staff_charger.yml new file mode 100644 index 00000000000..1c9253cdae6 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/Wizards/staff_charger.yml @@ -0,0 +1,68 @@ + +- type: entity + parent: BaseMachinePowered + id: WizardStaffRecharger + name: staff altar + placement: + mode: SnapgridCenter + components: + - type: Transform + anchored: true + noRot: false + - type: Sprite + sprite: _NF/Structures/Specific/Wizard/recharger_altar.rsi + snapCardinals: true + layers: + - map: ["enum.PowerChargerVisualLayers.Base"] + state: "empty" + - map: ["enum.PowerChargerVisualLayers.Light"] + state: "light-off" + shader: "unshaded" + - type: Appearance + - type: Charger + slotId: charger_slot + - type: Anchorable + delay: 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 80 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:EmptyAllContainersBehaviour + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.45,0.45" + density: 190 + mask: + - MachineMask + layer: + - MachineLayer + - type: StaticPrice + price: 25 + # no powercellslot since stun baton etc arent powercells + - type: PowerChargerVisuals + - type: ContainerContainer + containers: + charger_slot: !type:ContainerSlot + - type: ItemSlots + slots: + charger_slot: + ejectOnInteract: true + whitelist: + components: + - WizardStaffRechargeable diff --git a/Resources/Textures/_NF/Effects/wizardbeams.rsi/green-beam-01.png b/Resources/Textures/_NF/Effects/wizardbeams.rsi/green-beam-01.png new file mode 100644 index 0000000000000000000000000000000000000000..61de7059bf319b5a7242f4b902cec07017af8502 GIT binary patch literal 1162 zcmV;51aEX>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{y*W~a{Y}D<^4E*V=SLoq%@Dh* zbzCT(*Zp2OEnqMht?eE?0r#L&s3CNSs2rC~k?gfWG2I61?|1(5AV)-Gv%U2VDdD*T z0tuerq5dfawKcUzLWwalweoo1ekUQ=L3qrj++X*zeY8b9g|srb4~2C6fp_V9RvG=@ zBiN3w?WDgG01N8DrQ8VZZ701a)O%jP-%b}iXYb?vxTmL^wP?;1^t|uhcsRwEJ1?-c zo%HB~D;5CtQaVP)Q2UtWE`~5RSizDpOH2)jQ@;^%;!80Bo@>WQn3IUu6sqn4b_zhC zo$DYaCqkE4*vgwic6ipno^5@s2#{4uc2o276u)!0J|aJ2(vtQoFWDgdi=8RA=mbF! z1VIo4L2#qN?PnbnB`s_=W{w0%s_HWZMH!*}PJ+(H*!%<;hdu6W;80O&z@9}?7AQITGBzMq`!Mp> zQyp;hS%4+%MRLA7Vmdu6gG1IhoNktXRo(xYUee?Qkj*y#2+C3ju)&vGbmjmEf*=Tj cAc!CM0wa}azH7Ys_5c6?07*qoM6N<$f_m{1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Effects/wizardbeams.rsi/lightning-beam-01.png b/Resources/Textures/_NF/Effects/wizardbeams.rsi/lightning-beam-01.png new file mode 100644 index 0000000000000000000000000000000000000000..6dcc885332b4682825f1f0c8f68ffeb79c41504b GIT binary patch literal 5209 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 TUjdyD00000NkvXXu0mjfyrl)? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Effects/wizardbeams.rsi/lightning-hit-01.png b/Resources/Textures/_NF/Effects/wizardbeams.rsi/lightning-hit-01.png new file mode 100644 index 0000000000000000000000000000000000000000..933b3bce9448f4c9189ae4b42eecf81d013f9dde GIT binary patch literal 2338 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 IM6N<$f>q*G3IG5A literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Effects/wizardbeams.rsi/lightning-muzzle-01.png b/Resources/Textures/_NF/Effects/wizardbeams.rsi/lightning-muzzle-01.png new file mode 100644 index 0000000000000000000000000000000000000000..2b3695ad9468b2d3570c9c2ec0a4b3bcf42bdfe9 GIT binary patch literal 2441 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 Hu0mjfOJkor literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Effects/wizardbeams.rsi/meta.json b/Resources/Textures/_NF/Effects/wizardbeams.rsi/meta.json new file mode 100644 index 00000000000..214a176e7b9 --- /dev/null +++ b/Resources/Textures/_NF/Effects/wizardbeams.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/effects/footprints.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "green-beam-01", + "delays": + [ + [ 0.06, 0.06, 0.06, 0.06 ] + ] + }, + { + "name": "lightning-beam-01", + "delays": + [ + [ 0.06, 0.06, 0.06, 0.06 ] + ] + }, + { + "name": "lightning-hit-01", + "delays": + [ + [ 0.06, 0.06 ] + ] + }, + { + "name": "lightning-muzzle-01", + "delays": + [ + [ 0.06, 0.06 ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Effects/wizardmuzzleflash.rsi/meta.json b/Resources/Textures/_NF/Effects/wizardmuzzleflash.rsi/meta.json new file mode 100644 index 00000000000..9a9c72c2a42 --- /dev/null +++ b/Resources/Textures/_NF/Effects/wizardmuzzleflash.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprited by GentleButter (discord/github) for New Frontier SS14 server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spell-muzzle-flash-01" + } + ] +} diff --git a/Resources/Textures/_NF/Effects/wizardmuzzleflash.rsi/spell-muzzle-flash-01.png b/Resources/Textures/_NF/Effects/wizardmuzzleflash.rsi/spell-muzzle-flash-01.png new file mode 100644 index 0000000000000000000000000000000000000000..24258b4b57938f64560bfee5e9df36ba8d8d168d GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t2|vCLn2z= zPI2TqWFX>_zG1Cf`6Z=!&Q*--AE?^2FE4msxaPsBREJ$3Bpxqw;tb)L(e&fK+GPKP zHUrKCiMGT));*Rwnb%KtJu!5gxBc1eg#GfD_sGqVkGoY}FQwYBM2+V{^kV0lD~z6| zCpRy7R<<+mQzql~8Of7U85(95Gc+9E>$)>eQJ+g^^`uEIMyt}B8LNJ+HW!dpn9+Z^ z@tn>{?H_aN4;b(q_Bbj$bz@wV`x8!(Pxw+JJkxxA8MJ_G4j=}BOTm*tl&7no%Q~lo FCIF!vV#ojh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/empty.png b/Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..3a2d11712ad141663689d1d535d24dc82df5de5b GIT binary patch literal 7887 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 LXX~o1f&2dj|I&`* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/full.png b/Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..f8622c569118a92e515303be1b0e5fbe25784484 GIT binary patch literal 8301 zcmeHMc|4Ts+aFm%)`*0RJ!ST>4YHH$LXwtQ8D=vxj3t!Fv7`{`L`8^1c9N}7SxYLE zEh@=gwz9oLopU((iYa%-5qy~=7D z6{(OlM=KDM^2v97o-uzI)%`{C+V!Qi+`*bqUZ&Y=|IqxeQtO`s3rIyHKD7}c0c<uVBOWbiX2Z^+Q;Pl-q#j?uKiN?aozY} z8>{Z-2qNWcf5@BZ_g3qObX}29SDm=Umh0bi7MB83yVq+xe1q;TGxhPn_NVE`Ep%7{ zPQVMJMQyicPETh@NdVYr1TP{x*qhtA6#0YXVeHDoxc0+ zQFJgj!nhpW)|=!YGQ8Lt_YSb~?bIsbxS~MInS1p5kTLy;=ulGY#Gc(5ikuM(3mPXr zAUH&d$_u6B&_gYir=PCvl^36WQ1sBwBP04ISHu>`c9r`AYL5hTGUeXj8N5xQ7#~JC3n5I|$Bt@%-T3qU^mI z-Hv&A`3n+mrZQRYUEIj|^Boy!S9I-IJaYv`H&u4DyOnx%?T22EKNqXll0zx&^hoi^ z5JNnLkCRFubN`L6RYI&zk|83tb#1iia5+AA}31+GZ%$~oM)>Q@z*vvPmUc6@D$ zv(BKC0!`pvJbUZ>z90v?b3-vLLJq$492ZuCUgNEk7k>5&kR{ojM%Vo z9s?wzF1u~JrK)vl=fT)xsy!DZm=u4tj!cGDV})XSI#t?jx#eQtSi(!vT7Aj>%jt-; zwdWty`SPw>rBp0`SW@n8X26r>R$In>llOWXt099!QwmI%j7WZ50zwjZy0YkJ&nU+d+8Csx-$?Si#ec|(s=r;$jn<_gs<|9O+EQxM z*5h!&7qI83SxsLu-(imt@08d0d804I<2mKXK<95$%>2};t5QY1rJTvLo^e&U%z+L$ z^3WY1`Y`E$>hL8F6ye$A4)Far`|x);vN!kPTPuOV_qzziGGT?ixv~#mCv$VYRF?5A zuj-I`SUX8*FP|}Uy_&VqRV8Dldn7SkPc+eAOEQoea%84HS7S=iyq~4C=(}KaN$n6z zNj)bK1!X)nN8DN%n-xBvUpt$unMf@^9A>>DK{+J|4g1v9myI}maI&gdA|`2(6D`Sp(I3+yB+LBYO%_8mT`e9RkuuQIz9Bh9 z%){TS2zVRyiZG+nqi3Fav-bQ_4-HHXE_^#Ca^nhBktaj}jL9wrUz zD-U_pM~TW-cb-%Rgtfi*oBu^iy0J~u$8ol6N1=nc^|rkEt(-dLv-^1ZD#TYfIH!*C zubt*t1aXJfpI%N5lM_IS^UuUc9?sr7N3?V6 ziOHwLFMXA`)GORaPxFgvm}!1~V8*t7{%$?(>RKx|0b$I0`h$gsSxs$DtjVqHlRbB0 zulpz@pNm z+KBA%R*m|ao zJvQq?*od{y{zKu;;{0=UCqL%ctBO8vxIhkye-#V4RU^EdeEp?YndwLpD1o=9-3yTc zXiso){P@l_K6MV|t$I+KCxPyU(P=c+ueDuKZGWzsC-6(NZr+OMp|t)vVTYuu5#2N` z#R|Cc6CzI_HnrgN?gCvI@+nrMaI?ZN{Bxpui(*PrAf!`Gdl0BEWj^b(qTCH00n1

QhPV|~ONnwZtBz|(TmLJV!#sD_ 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 Mn%SBb7@rLLFMGIsYybcN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/light-charged.png b/Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/light-charged.png new file mode 100644 index 0000000000000000000000000000000000000000..145b988f447112ce2db06ce2dc42f0eaed237f26 GIT binary patch literal 601 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/light-empty.png b/Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/light-empty.png new file mode 100644 index 0000000000000000000000000000000000000000..1dd96ecde352a5bc0fd320c20c97cb416239f467 GIT binary patch literal 563 zcmV-30?hr1P)EX>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{yyfX4u2M=RM-g*E4002ovPDHLkV1hfA B<}&~Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/light-off.png b/Resources/Textures/_NF/Structures/Specific/Wizard/recharger_altar.rsi/light-off.png new file mode 100644 index 0000000000000000000000000000000000000000..f3c9d1ccd108a201fa4b0f6f9cce4af85ca15e83 GIT binary patch literal 7886 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 Date: Sun, 16 Jun 2024 05:10:06 +0300 Subject: [PATCH 04/13] fx --- .../Weapons/Guns/Projectiles/magic.yml | 19 +++++++++ .../Weapons/Guns/Wizard/wizard_staffs.yml | 37 +++++++++++++++--- .../Effects/bloodcultprojectiles.rsi/hand.png | Bin 0 -> 2020 bytes .../bloodcultprojectiles.rsi/meta.json | 14 +++++++ 4 files changed, 64 insertions(+), 6 deletions(-) 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/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index c80a18c2e62..9edd737c2e2 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -58,6 +58,25 @@ - type: Ammo muzzleFlash: null +- type: entity + parent: BaseBulletTrigger + id: BulletBloodCultHand + name: blood hand + noSpawn: true + components: + - type: Projectile + damage: + types: + Asphyxiation: 2 + Blunt: 5 + - type: Sprite + noRot: false + sprite: _NF/Effects/bloodcultprojectiles.rsi + layers: + - state: hand + - type: Ammo + muzzleFlash: null + - type: entity parent: BaseBulletTrigger id: BulletIceGlobe diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml index 72e35892f7d..88b6f661bfb 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml @@ -52,7 +52,7 @@ - type: Item size: Normal shape: - - 0,0,4,0 + - 0,0,3,1 inhandVisuals: left: - state: change-inhand-left @@ -78,7 +78,7 @@ - type: Item size: Normal shape: - - 0,0,4,0 + - 0,0,3,1 inhandVisuals: left: - state: staff-inhand-left @@ -97,7 +97,7 @@ - type: entity parent: WeaponChargedStaffWizardBase id: WeaponChargedStaffCultistBoltDark - name: cultist dark bolt staff + name: cultist's staff of blood bolt description: An acolyte-grade battle staff. components: - type: Sprite @@ -110,7 +110,32 @@ - type: Item size: Normal shape: - - 0,0,4,0 + - 0,0,3,1 + inhandVisuals: + left: + - state: animation-inhand-left + right: + - state: animation-inhand-right + - type: StaticPrice + price: 190 + +- type: entity + parent: WeaponChargedStaffWizardBase + id: WeaponChargedStaffCultistHand + name: cultist's staff of blood hand + description: An acolyte-grade battle staff. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Basic/staves.rsi + layers: + - state: animation + - type: ProjectileBatteryAmmoProvider + proto: BulletBloodCultHand + fireCost: 40 + - type: Item + size: Normal + shape: + - 0,0,3,1 inhandVisuals: left: - state: animation-inhand-left @@ -122,7 +147,7 @@ - type: entity parent: WeaponChargedStaffWizardBase id: WeaponChargedStaffCultistLightning - name: cultist dark lightning staff + name: cultist's staff of blood lightning description: An acolyte-grade battle staff. components: - type: Sprite @@ -135,7 +160,7 @@ - type: Item size: Normal shape: - - 0,0,4,0 + - 0,0,3,1 inhandVisuals: left: - state: animation-inhand-left 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, 6 Jul 2024 11:33:06 +0300 Subject: [PATCH 05/13] cult recharger --- .../WizardStaffRechargeableComponent.cs | 6 +++ .../Weapons/Guns/Wizard/wizard_staffs.yml | 37 +++++++++++++---- .../Specific/Wizards/staff_charger.yml | 20 ++++++++- .../recharger_altar_cult.rsi/empty.png | Bin 0 -> 1168 bytes .../recharger_altar_cult.rsi/full.png | Bin 0 -> 1138 bytes .../light-charged.png | Bin 0 -> 630 bytes .../light-charging.png | Bin 0 -> 1020 bytes .../recharger_altar_cult.rsi/light-empty.png | Bin 0 -> 96 bytes .../recharger_altar_cult.rsi/light-off.png | Bin 0 -> 1168 bytes .../recharger_altar_cult.rsi/meta.json | 39 ++++++++++++++++++ 10 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 Resources/Textures/_NF/Structures/Specific/BloodCult/recharger_altar_cult.rsi/empty.png create mode 100644 Resources/Textures/_NF/Structures/Specific/BloodCult/recharger_altar_cult.rsi/full.png create mode 100644 Resources/Textures/_NF/Structures/Specific/BloodCult/recharger_altar_cult.rsi/light-charged.png create mode 100644 Resources/Textures/_NF/Structures/Specific/BloodCult/recharger_altar_cult.rsi/light-charging.png create mode 100644 Resources/Textures/_NF/Structures/Specific/BloodCult/recharger_altar_cult.rsi/light-empty.png create mode 100644 Resources/Textures/_NF/Structures/Specific/BloodCult/recharger_altar_cult.rsi/light-off.png create mode 100644 Resources/Textures/_NF/Structures/Specific/BloodCult/recharger_altar_cult.rsi/meta.json diff --git a/Content.Shared/_NF/Weapons/Ranged/Components/WizardStaffRechargeableComponent.cs b/Content.Shared/_NF/Weapons/Ranged/Components/WizardStaffRechargeableComponent.cs index 34bc2034a0b..cbed741e65c 100644 --- a/Content.Shared/_NF/Weapons/Ranged/Components/WizardStaffRechargeableComponent.cs +++ b/Content.Shared/_NF/Weapons/Ranged/Components/WizardStaffRechargeableComponent.cs @@ -5,3 +5,9 @@ public sealed partial class WizardStaffRechargeableComponent : Component { } + +[RegisterComponent] +public sealed partial class BloodCultStaffRechargeableComponent : Component +{ + +} diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml index 88b6f661bfb..04e629eafb3 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml @@ -1,12 +1,11 @@ # BASE - type: entity parent: BaseItem - id: WeaponChargedStaffWizardBase - name: battle-wizard tactical staff + id: WeaponChargedStaffBase + name: tactical battle-staff description: Big magic wand for big spells. abstract: true components: - - type: WizardStaffRechargeable - type: Sprite sprite: Objects/Weapons/Guns/Basic/staves.rsi layers: @@ -34,10 +33,24 @@ - type: StaticPrice price: 190 +- type: entity + id: WeaponStaffRechargeableWizard + abstract: true + components: + - type: WizardStaffRechargeable + +- type: entity + id: WeaponStaffRechargeableBloodCult + abstract: true + components: + - type: BloodCultStaffRechargeable + # VARIATIONS ## WIZARDS - type: entity - parent: WeaponChargedStaffWizardBase + parent: + - WeaponChargedStaffBase + - WeaponStaffRechargeableWizard id: WeaponChargedStaffWizardLightning name: wizard lightning staff description: An acolyte-grade battle staff. @@ -60,7 +73,9 @@ - state: change-inhand-right - type: entity - parent: WeaponChargedStaffWizardBase + parent: + - WeaponChargedStaffBase + - WeaponStaffRechargeableWizard id: WeaponChargedStaffWizardIce name: wizard ice staff description: An acolyte-grade battle staff. @@ -95,7 +110,9 @@ ## CULTISTS - type: entity - parent: WeaponChargedStaffWizardBase + parent: + - WeaponChargedStaffBase + - WeaponStaffRechargeableBloodCult id: WeaponChargedStaffCultistBoltDark name: cultist's staff of blood bolt description: An acolyte-grade battle staff. @@ -120,7 +137,9 @@ price: 190 - type: entity - parent: WeaponChargedStaffWizardBase + parent: + - WeaponChargedStaffBase + - WeaponStaffRechargeableBloodCult id: WeaponChargedStaffCultistHand name: cultist's staff of blood hand description: An acolyte-grade battle staff. @@ -145,7 +164,9 @@ price: 190 - type: entity - parent: WeaponChargedStaffWizardBase + parent: + - WeaponChargedStaffBase + - WeaponStaffRechargeableBloodCult id: WeaponChargedStaffCultistLightning name: cultist's staff of blood lightning description: An acolyte-grade battle staff. diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/Wizards/staff_charger.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/Wizards/staff_charger.yml index 1c9253cdae6..ddd72fe119b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Specific/Wizards/staff_charger.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/Wizards/staff_charger.yml @@ -1,7 +1,6 @@ - - type: entity parent: BaseMachinePowered - id: WizardStaffRecharger + id: StaffRechargerWizard name: staff altar placement: mode: SnapgridCenter @@ -66,3 +65,20 @@ whitelist: components: - WizardStaffRechargeable + +- type: entity + parent: StaffRechargerWizard + id: StaffRechargerCult + name: cult staff altar + placement: + mode: SnapgridCenter + components: + - type: Sprite + sprite: _NF/Structures/Specific/BloodCult/recharger_altar_cult.rsi + - type: ItemSlots + slots: + charger_slot: + ejectOnInteract: true + whitelist: + components: + - BloodCultStaffRechargeable diff --git a/Resources/Textures/_NF/Structures/Specific/BloodCult/recharger_altar_cult.rsi/empty.png b/Resources/Textures/_NF/Structures/Specific/BloodCult/recharger_altar_cult.rsi/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..1a7e51f4f960613c29dae518b2ca98486dc1433f GIT binary patch literal 1168 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 ia6M~*xD)(70R90n6#8TQIQ}pI0000 Date: Tue, 9 Jul 2024 02:07:33 +0300 Subject: [PATCH 06/13] split hoods and robes --- .../_NF/Entities/Clothing/Head/hoods.yml | 43 ---------------- .../Clothing/Head/wizards_headwear.yml | 41 +++++++++++++++ .../Entities/Clothing/OuterClothing/coats.yml | 50 ------------------- .../Clothing/OuterClothing/wizard_robes.yml | 48 ++++++++++++++++++ 4 files changed, 89 insertions(+), 93 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Head/wizards_headwear.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wizard_robes.yml diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml index 3d4071bea99..39b025dfb49 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml @@ -137,46 +137,3 @@ - type: Unremoveable - type: FactionClothing faction: ContrabandClothing - -# Tactical Wizards Hoods -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatHoodTacticalWizardBlue - name: blue wizard tactical hood - noSpawn: true - components: - - type: Sprite - sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi - - type: Clothing - sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi - - type: HideLayerClothing - slots: - - Hair - - type: Tag - tags: - - HidesHair - - WhitelistChameleon - - type: Contraband - - type: FactionClothing - faction: ContrabandClothing - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatHoodTacticalWizardRed - name: red wizard tactical hood - noSpawn: true - components: - - type: Sprite - sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi - - type: Clothing - sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi - - type: HideLayerClothing - slots: - - Hair - - type: Tag - tags: - - HidesHair - - WhitelistChameleon - - type: Contraband - - type: FactionClothing - faction: ContrabandClothing diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/wizards_headwear.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/wizards_headwear.yml new file mode 100644 index 00000000000..f0dc811401d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/wizards_headwear.yml @@ -0,0 +1,41 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodTacticalWizardBlue + name: blue wizard tactical hood + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi + - type: HideLayerClothing + slots: + - Hair + - type: Tag + tags: + - HidesHair + - WhitelistChameleon + - type: Contraband + - type: FactionClothing + faction: ContrabandClothing + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodTacticalWizardRed + name: red wizard tactical hood + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi + - type: HideLayerClothing + slots: + - Hair + - type: Tag + tags: + - HidesHair + - WhitelistChameleon + - type: Contraband + - type: FactionClothing + faction: ContrabandClothing diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml index 29499699fe2..4296717f97f 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml @@ -159,53 +159,3 @@ sprite: _NF/Clothing/OuterClothing/Misc/pirate_captain.rsi - type: Clothing sprite: _NF/Clothing/OuterClothing/Misc/pirate_captain.rsi - -# Tactical Wizards Robes -- type: entity - parent: - - ClothingOuterStorageBase - - ClothingOuterBaseToggleable - id: ClothingOuterRobeTacticalWizardBlue - name: blue wizard tactical robes - description: The perfect synthesis of tradition with modern materials and warfare practices. - components: - - type: Sprite - sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi - - type: Clothing - sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi - - type: ToggleableClothing - clothingPrototype: ClothingHeadHatHoodTacticalWizardBlue - - type: Armor # ClothingOuterArmorBulletproof stats for now, later will be changed to something else - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.75 - Heat: 0.9 - Cold: 0.4 - - type: ExplosionResistance - damageCoefficient: 0.80 - -- type: entity - parent: - - ClothingOuterStorageBase - - ClothingOuterBaseToggleable - id: ClothingOuterRobeTacticalWizardRed - name: red wizard tactical robes - description: The perfect synthesis of tradition with modern materials and warfare practices. - components: - - type: Sprite - sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi - - type: Clothing - sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi - - type: ToggleableClothing - clothingPrototype: ClothingHeadHatHoodTacticalWizardRed - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.75 - Heat: 0.4 - - type: ExplosionResistance - damageCoefficient: 0.80 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wizard_robes.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wizard_robes.yml new file mode 100644 index 00000000000..9ec2c1eae3e --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wizard_robes.yml @@ -0,0 +1,48 @@ +- type: entity + parent: + - ClothingOuterStorageBase + - ClothingOuterBaseToggleable + id: ClothingOuterRobeTacticalWizardBlue + name: blue wizard tactical robes + description: The perfect synthesis of tradition with modern materials and warfare practices. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodTacticalWizardBlue + - type: Armor # ClothingOuterArmorBulletproof stats for now, later will be changed to something else + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.75 + Heat: 0.9 + Cold: 0.4 + - type: ExplosionResistance + damageCoefficient: 0.80 + +- type: entity + parent: + - ClothingOuterStorageBase + - ClothingOuterBaseToggleable + id: ClothingOuterRobeTacticalWizardRed + name: red wizard tactical robes + description: The perfect synthesis of tradition with modern materials and warfare practices. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodTacticalWizardRed + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.75 + Heat: 0.4 + - type: ExplosionResistance + damageCoefficient: 0.80 From be0bc7900fac37158e058177ea9a025bf0d0e114 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Tue, 23 Jul 2024 20:43:58 +0300 Subject: [PATCH 07/13] couple more wiz staffs, a bit of clean up --- .../NPCs/mob_hostile_wizardfederation.yml | 25 ++++ .../Weapons/Guns/Wizard/wizard_staffs.yml | 118 +++++++++++++++--- 2 files changed, 127 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml index ff73c379876..6ec4e396b7f 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml @@ -245,3 +245,28 @@ lifetime: 30 - type: Ammo muzzleFlash: null + +- type: entity + noSpawn: true + parent: WaterElementalConjured + id: WaterElementalConjuredStaff + components: + - type: NPCImprintingOnSpawnBehaviour + whitelist: + components: + - HumanoidAppearance + - type: HTN + rootTask: + task: KillerTomatoCompound + blackboard: + NavClimb: !type:Bool + false + NavInteract: !type:Bool + true + NavPry: !type:Bool + true + #- type: NpcFactionMember + #factions: + #- NanoTrasen + - type: TimedDespawn + lifetime: 180 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml index 04e629eafb3..f3857199764 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml @@ -24,7 +24,7 @@ - type: Item size: Normal shape: - - 0,0,4,0 + - 0,0,3,1 inhandVisuals: left: - state: change-inhand-left @@ -63,9 +63,6 @@ proto: WizardHitscanLightning fireCost: 40 - type: Item - size: Normal - shape: - - 0,0,3,1 inhandVisuals: left: - state: change-inhand-left @@ -91,9 +88,6 @@ proto: BulletIceGlobe fireCost: 40 - type: Item - size: Normal - shape: - - 0,0,3,1 inhandVisuals: left: - state: staff-inhand-left @@ -108,6 +102,107 @@ - type: StaticPrice price: 190 +- type: entity + parent: + - WeaponChargedStaffBase + - WeaponStaffRechargeableWizard + id: WeaponChargedStaffWizardElemental + name: wizard blue curacao elemental staff + description: An acolyte-grade battle staff. + components: + - type: Sprite + layers: + - state: nothing + - state: nothing-unshaded + shader: unshaded + color: "#75b1f0" + - type: ProjectileBatteryAmmoProvider + proto: WaterElementalConjuredStaff + fireCost: 500 + - type: Item + inhandVisuals: + left: + - state: staff-inhand-left + - state: staff-inhand-left-unshaded + shader: unshaded + color: "#75b1f0" + right: + - state: staff-inhand-right + - state: staff-inhand-right-unshaded + shader: unshaded + color: "#75b1f0" + - type: StaticPrice + price: 190 + +- type: entity + parent: + - WeaponChargedStaffBase + - WeaponStaffRechargeableWizard + id: WeaponChargedStaffWizardSoap + name: wizard soap staff + description: An acolyte-grade battle staff. + components: + - type: Sprite + layers: + - state: healing + - type: ProjectileBatteryAmmoProvider + proto: SoapConjured + fireCost: 40 + - type: Item + inhandVisuals: + left: + - state: healing-inhand-left + right: + - state: healing-inhand-right + - type: StaticPrice + price: 190 + +- type: entity + parent: + - WeaponChargedStaffBase + - WeaponStaffRechargeableWizard + id: WeaponChargedStaffWizardBoltFire + name: wizard fire bolt staff + description: An acolyte-grade battle staff. + components: + - type: Sprite + layers: + - state: animation + - type: ProjectileBatteryAmmoProvider + proto: BulletFireBolt + fireCost: 40 + - type: Item + inhandVisuals: + left: + - state: animation-inhand-left + right: + - state: animation-inhand-right + - type: StaticPrice + price: 190 + +- type: entity + parent: + - WeaponChargedStaffBase + - WeaponStaffRechargeableWizard + id: WeaponChargedStaffWizardBoltMagic + name: wizard magic bolt staff + description: An acolyte-grade battle staff. + components: + - type: Sprite + layers: + - state: chaos + - type: ProjectileBatteryAmmoProvider + proto: BulletMagicBolt + fireCost: 40 + - type: Item + inhandVisuals: + left: + - state: chaos-inhand-left + right: + - state: chaos-inhand-right + - type: StaticPrice + price: 190 + ## CULTISTS - type: entity parent: @@ -125,9 +220,6 @@ proto: BulletBloodCultDarkBolt fireCost: 40 - type: Item - size: Normal - shape: - - 0,0,3,1 inhandVisuals: left: - state: animation-inhand-left @@ -152,9 +244,6 @@ proto: BulletBloodCultHand fireCost: 40 - type: Item - size: Normal - shape: - - 0,0,3,1 inhandVisuals: left: - state: animation-inhand-left @@ -179,9 +268,6 @@ proto: BloodCultLaser fireCost: 40 - type: Item - size: Normal - shape: - - 0,0,3,1 inhandVisuals: left: - state: animation-inhand-left From 77b2a8f190ec012a06b1192a83f890d752049337 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Mon, 19 Aug 2024 09:07:40 +0300 Subject: [PATCH 08/13] constructible staff altars and forge --- .../Entities/Objects/Devices/production.yml | 60 +++++++++++++++++- .../Weapons/Guns/Wizard/wizard_staffs.yml | 27 ++++---- .../Specific/Wizards/staff_charger.yml | 44 +++---------- .../Structures/Specific/bloodcult.yml | 4 +- .../Specific/Wizard/scrolls.rsi/meta.json | 14 ++++ .../Wizard/scrolls.rsi/spell_default.png | Bin 0 -> 633 bytes 6 files changed, 99 insertions(+), 50 deletions(-) create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/spell_default.png diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index a57f0eb6313..5fc079ee485 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -239,4 +239,62 @@ chemicalComposition: Silicon: 20 - type: StaticPrice - price: 40 \ No newline at end of file + price: 40 + +# Wizards and cultists +- type: entity + id: ScrollWizardStaffRechargerAltar + parent: BaseMachineCircuitboard + name: staff altar binding scroll + components: + - type: Sprite # placeholder + sprite: _NF/Objects/Specific/Wizard/scrolls.rsi + state: spell_default + - type: MachineBoard + prototype: StaffRechargerWizard + # requirements: + # ShardCrystalBlue: 2 + # CandleBlue: 2 + # stackRequirements: + # CableHV: 10 + - type: PhysicalComposition + materialComposition: + Paper: 200 + chemicalComposition: + Carbon: 10 + - type: StaticPrice + price: 0 + +- type: entity + id: ScrollCultStaffRechargerAltar + parent: ScrollWizardStaffRechargerAltar + name: cult staff altar binding scroll + components: + - type: Sprite # placeholder + sprite: _NF/Objects/Specific/Wizard/scrolls.rsi + state: spell_default + color: "red" + - type: MachineBoard + prototype: StaffRechargerCult + # requirements: + # ShardCrystalRed: 2 + # CandleRed: 2 + # stackRequirements: + # CableHV: 10 + +- type: entity + id: ScrollCultForge + parent: ScrollWizardStaffRechargerAltar + name: cult forge binding scroll + components: + - type: Sprite # placeholder + sprite: _NF/Objects/Specific/Wizard/scrolls.rsi + state: spell_default + color: "red" + - type: MachineBoard + prototype: BloodCultProp02 + # requirements: + # ShardCrystalRed: 2 + # CandleRed: 2 + # stackRequirements: + # CableHV: 10 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml index f3857199764..513178dd56b 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml @@ -19,8 +19,11 @@ soundGunshot: path: /Audio/Effects/Lightning/lightningshock.ogg - type: Battery - maxCharge: 1000 - startingCharge: 1000 + maxCharge: 800 + startingCharge: 800 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 1 # With fireCost 40 the recharge rate should give you one charge back every 40 seconds or so - type: Item size: Normal shape: @@ -48,10 +51,10 @@ # VARIATIONS ## WIZARDS - type: entity + id: WeaponChargedStaffWizardLightning parent: - WeaponChargedStaffBase - WeaponStaffRechargeableWizard - id: WeaponChargedStaffWizardLightning name: wizard lightning staff description: An acolyte-grade battle staff. components: @@ -70,10 +73,10 @@ - state: change-inhand-right - type: entity + id: WeaponChargedStaffWizardIce parent: - WeaponChargedStaffBase - WeaponStaffRechargeableWizard - id: WeaponChargedStaffWizardIce name: wizard ice staff description: An acolyte-grade battle staff. components: @@ -103,10 +106,10 @@ price: 190 - type: entity + id: WeaponChargedStaffWizardElemental parent: - WeaponChargedStaffBase - WeaponStaffRechargeableWizard - id: WeaponChargedStaffWizardElemental name: wizard blue curacao elemental staff description: An acolyte-grade battle staff. components: @@ -118,7 +121,7 @@ color: "#75b1f0" - type: ProjectileBatteryAmmoProvider proto: WaterElementalConjuredStaff - fireCost: 500 + fireCost: 400 - type: Item inhandVisuals: left: @@ -135,10 +138,10 @@ price: 190 - type: entity + id: WeaponChargedStaffWizardSoap parent: - WeaponChargedStaffBase - WeaponStaffRechargeableWizard - id: WeaponChargedStaffWizardSoap name: wizard soap staff description: An acolyte-grade battle staff. components: @@ -158,10 +161,10 @@ price: 190 - type: entity + id: WeaponChargedStaffWizardBoltFire parent: - WeaponChargedStaffBase - WeaponStaffRechargeableWizard - id: WeaponChargedStaffWizardBoltFire name: wizard fire bolt staff description: An acolyte-grade battle staff. components: @@ -181,10 +184,10 @@ price: 190 - type: entity + id: WeaponChargedStaffWizardBoltMagic parent: - WeaponChargedStaffBase - WeaponStaffRechargeableWizard - id: WeaponChargedStaffWizardBoltMagic name: wizard magic bolt staff description: An acolyte-grade battle staff. components: @@ -205,10 +208,10 @@ ## CULTISTS - type: entity + id: WeaponChargedStaffCultistBoltDark parent: - WeaponChargedStaffBase - WeaponStaffRechargeableBloodCult - id: WeaponChargedStaffCultistBoltDark name: cultist's staff of blood bolt description: An acolyte-grade battle staff. components: @@ -229,10 +232,10 @@ price: 190 - type: entity + id: WeaponChargedStaffCultistHand parent: - WeaponChargedStaffBase - WeaponStaffRechargeableBloodCult - id: WeaponChargedStaffCultistHand name: cultist's staff of blood hand description: An acolyte-grade battle staff. components: @@ -253,10 +256,10 @@ price: 190 - type: entity + id: WeaponChargedStaffCultistLightning parent: - WeaponChargedStaffBase - WeaponStaffRechargeableBloodCult - id: WeaponChargedStaffCultistLightning name: cultist's staff of blood lightning description: An acolyte-grade battle staff. components: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/Wizards/staff_charger.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/Wizards/staff_charger.yml index ddd72fe119b..cd620dfb136 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Specific/Wizards/staff_charger.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/Wizards/staff_charger.yml @@ -1,13 +1,10 @@ - type: entity - parent: BaseMachinePowered id: StaffRechargerWizard + parent: [ BaseMachine, ConstructibleMachine ] name: staff altar placement: mode: SnapgridCenter components: - - type: Transform - anchored: true - noRot: false - type: Sprite sprite: _NF/Structures/Specific/Wizard/recharger_altar.rsi snapCardinals: true @@ -17,43 +14,16 @@ - map: ["enum.PowerChargerVisualLayers.Light"] state: "light-off" shader: "unshaded" + - type: Machine + board: ScrollWizardStaffRechargerAltar - type: Appearance - type: Charger + chargeRate: 40 slotId: charger_slot - type: Anchorable delay: 1 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 80 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:EmptyAllContainersBehaviour - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.45,-0.45,0.45,0.45" - density: 190 - mask: - - MachineMask - layer: - - MachineLayer - type: StaticPrice - price: 25 - # no powercellslot since stun baton etc arent powercells + price: 250 - type: PowerChargerVisuals - type: ContainerContainer containers: @@ -67,14 +37,16 @@ - WizardStaffRechargeable - type: entity - parent: StaffRechargerWizard id: StaffRechargerCult + parent: StaffRechargerWizard name: cult staff altar placement: mode: SnapgridCenter components: - type: Sprite sprite: _NF/Structures/Specific/BloodCult/recharger_altar_cult.rsi + - type: Machine + board: ScrollCultStaffRechargerAltar - type: ItemSlots slots: charger_slot: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/bloodcult.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/bloodcult.yml index 00cb4380207..c9991528bcd 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Specific/bloodcult.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/bloodcult.yml @@ -224,7 +224,7 @@ shader: unshaded - type: entity - parent: Autolathe + parent: BaseLatheLube id: BloodCultProp02 name: blood cult forge description: A forge for weapon and armor production. @@ -242,6 +242,8 @@ map: ["enum.MaterialStorageVisualLayers.Inserting"] - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Machine + board: ScrollCultForge - type: MaterialStorage whitelist: tags: diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/meta.json new file mode 100644 index 00000000000..2b4785939ea --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/78db6bd5c2b2b3d1f5cd8fd75be3a39d5d929943 and https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7 ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spell_default" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/spell_default.png b/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/spell_default.png new file mode 100644 index 0000000000000000000000000000000000000000..e7780ff2cafdfce82c61d3e8318616e18267cfbe GIT binary patch literal 633 zcmV-<0*3vGP)_H%aq~MmHeT+}xmP8SK9Dm<@67qmH#6s4!}Q1aCosMQ zN*8GpV`4WK3QRyZh@H=pu|;1WMKyQxcO(GEg_Su9PaAEUO!5INUb-(RJKBxqM8cK; z9C|^j1)5skpja%awRpK)pqF}s5^G82k2uf8yyNqpHDIK6)Yy2sQffd}w{d==Ot0Uu zo&xyZ4UPoh7+VZc@%B>frdFv_Gg6>v>rG=cm9GwL2_Row0|*ESn~_;XL&$m;>MH~1sast{6u&aJ65fBc14oJw|qrl`r zwR?uuWz4)ti@+1yR{2|f!k2MRCMnG zzKnEEIkX_o0UdazV0Ckk9&XOtR_CoozTx1C?%e;sBLG`x_gVy)ME~6VI_B#4YC%r| z$Yr#ZCuB!TuK8>)qJ9@60Gne3B48ylDva-6GhO@u%|~)+ TC*K=w00000NkvXXu0mjfPgo00 literal 0 HcmV?d00001 From 02bc9ddacdddcb77a4527729c276c71292c56736 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Wed, 21 Aug 2024 07:16:09 +0300 Subject: [PATCH 09/13] small edits --- .../_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml index 513178dd56b..4d98a992338 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_staffs.yml @@ -23,7 +23,7 @@ startingCharge: 800 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 1 # With fireCost 40 the recharge rate should give you one charge back every 40 seconds or so + autoRechargeRate: 1 # With fireCost 40 the recharge rate should restore one charge every 40 seconds or so - type: Item size: Normal shape: From 056f94c349e73f7a951b3468fa9fea85a1c9f224 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Wed, 21 Aug 2024 07:38:48 +0300 Subject: [PATCH 10/13] purple robes, new scroll sprite --- .../Clothing/Head/wizards_headwear.yml | 34 ++++++++++---- .../Clothing/OuterClothing/wizard_robes.yml | 44 +++++++++++++++--- .../Entities/Objects/Devices/production.yml | 4 +- .../Hoods/Coat/wizard_robe_blue.rsi/meta.json | 2 +- .../equipped-HELMET.png | Bin 0 -> 714 bytes .../Coat/wizard_robe_purple.rsi/icon.png | Bin 0 -> 377 bytes .../Coat/wizard_robe_purple.rsi/meta.json | 18 +++++++ .../Hoods/Coat/wizard_robe_red.rsi/meta.json | 2 +- .../equipped-OUTERCLOTHING.png | Bin 0 -> 1563 bytes .../Coats/wizard_robe_purple.rsi/icon.png | Bin 0 -> 477 bytes .../wizard_robe_purple.rsi/inhand-left.png | Bin 0 -> 320 bytes .../wizard_robe_purple.rsi/inhand-right.png | Bin 0 -> 323 bytes .../Coats/wizard_robe_purple.rsi/meta.json | 26 +++++++++++ .../Wizard/crystal.rsi/crystalthingy.png | Bin 0 -> 1335 bytes .../Specific/Wizard/crystal.rsi/meta.json | 18 +++++++ .../Wizard/crystal_paper.rsi/crystalpaper.png | Bin 0 -> 2151 bytes .../Wizard/crystal_paper.rsi/meta.json | 18 +++++++ .../Wizard/scrolls.rsi/crystalpaper.png | Bin 0 -> 2151 bytes 18 files changed, 147 insertions(+), 19 deletions(-) create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/crystal.rsi/crystalthingy.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/crystal.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/crystal_paper.rsi/crystalpaper.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/crystal_paper.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/crystalpaper.png diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/wizards_headwear.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/wizards_headwear.yml index f0dc811401d..dd33be8fc58 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/wizards_headwear.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/wizards_headwear.yml @@ -1,6 +1,8 @@ - type: entity - parent: ClothingHeadBase id: ClothingHeadHatHoodTacticalWizardBlue + parent: + - ClothingHeadBase + - ContrabandClothing name: blue wizard tactical hood noSpawn: true components: @@ -15,13 +17,12 @@ tags: - HidesHair - WhitelistChameleon - - type: Contraband - - type: FactionClothing - faction: ContrabandClothing - type: entity - parent: ClothingHeadBase id: ClothingHeadHatHoodTacticalWizardRed + parent: + - ClothingHeadBase + - ContrabandClothing name: red wizard tactical hood noSpawn: true components: @@ -36,6 +37,23 @@ tags: - HidesHair - WhitelistChameleon - - type: Contraband - - type: FactionClothing - faction: ContrabandClothing + +- type: entity + id: ClothingHeadHatHoodTacticalWizardPurple + parent: + - ClothingHeadBase + - ContrabandClothing + name: purple wizard tactical hood + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi + - type: HideLayerClothing + slots: + - Hair + - type: Tag + tags: + - HidesHair + - WhitelistChameleon diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wizard_robes.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wizard_robes.yml index 9ec2c1eae3e..aa18b146995 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wizard_robes.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wizard_robes.yml @@ -1,8 +1,10 @@ - type: entity + id: ClothingOuterRobeTacticalWizardBlue parent: - ClothingOuterStorageBase - ClothingOuterBaseToggleable - id: ClothingOuterRobeTacticalWizardBlue + - ContrabandClothing + - RecyclableItemClothArmor name: blue wizard tactical robes description: The perfect synthesis of tradition with modern materials and warfare practices. components: @@ -12,22 +14,24 @@ sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodTacticalWizardBlue - - type: Armor # ClothingOuterArmorBulletproof stats for now, later will be changed to something else + - type: Armor # placeholder stats, will be changed to something else modifiers: coefficients: Blunt: 0.8 Slash: 0.8 - Piercing: 0.75 + Piercing: 0.4 Heat: 0.9 Cold: 0.4 - type: ExplosionResistance - damageCoefficient: 0.80 + damageCoefficient: 0.40 - type: entity + id: ClothingOuterRobeTacticalWizardRed parent: - ClothingOuterStorageBase - ClothingOuterBaseToggleable - id: ClothingOuterRobeTacticalWizardRed + - ContrabandClothing + - RecyclableItemClothArmor name: red wizard tactical robes description: The perfect synthesis of tradition with modern materials and warfare practices. components: @@ -42,7 +46,33 @@ coefficients: Blunt: 0.8 Slash: 0.8 - Piercing: 0.75 + Piercing: 0.4 + Heat: 0.4 + - type: ExplosionResistance + damageCoefficient: 0.40 + +- type: entity + id: ClothingOuterRobeTacticalWizardPurple + parent: + - ClothingOuterStorageBase + - ClothingOuterBaseToggleable + - ContrabandClothing + - RecyclableItemClothArmor + name: purple wizard tactical robes + description: The perfect synthesis of tradition with modern materials and warfare practices. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodTacticalWizardPurple + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.4 Heat: 0.4 - type: ExplosionResistance - damageCoefficient: 0.80 + damageCoefficient: 0.40 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index 5fc079ee485..28f669ae7a8 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -248,8 +248,8 @@ name: staff altar binding scroll components: - type: Sprite # placeholder - sprite: _NF/Objects/Specific/Wizard/scrolls.rsi - state: spell_default + sprite: _NF/Objects/Specific/Wizard/crystal_paper.rsi + state: crystal_paper - type: MachineBoard prototype: StaffRechargerWizard # requirements: diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/meta.json index a6cdcf381ec..fdb6bd418cc 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-NC-SA-3.0", + "license": "CC-BY-NC-SA-4.0", "copyright": "Sprited by GentleButter (discord/github) for New Frontier SS14 server", "size": { "x": 32, diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..8ca2a6d9dec9973664873959f7d698bacad99d65 GIT binary patch literal 714 zcmV;*0yX`KP)Px%YDq*vRCt{2+A(X}Koke?ze|G$CyOi_G{h8tf(*&frJCA8HZ7eRFb#C@s*+Xh zk|DHfA%>WOJ$1<@s6BPck}ptNLP#M3TULkE^L0qioYf}Py-1guyx$UZXZhWoUZlfM z0AqJriE@(f1;V!M*>Rl2cz5`Q^j#DOJ0C^5ZF}z-DZchez8B1b+m?+uiD!K#7U6G` zmne&%b%O5&Vv>wewQA@MI(xEx>&eR<*c$0HC~7MrC;! zVSgw#pFb{z{h>&bA1E)C$%DvBK4E+>5a~%9+lTmGAX;u)g#DoafUrLlEw?Sy{lOw3 z?*u2w7!RMWl3x zNOjoM8z48KJ4WpckO9;c&-0a)tkjrtER+kRwE!PJzb{b(6-|ywjxj6pjjQFh#e+t3 zcD(8|jP3)}3^+YI(Vlp2a$F)+p$V~jDz7-NjFMe++& wuNcBW3Px$Gf6~2R9J=WlrL|>Kp2M~mXV4U(?29wJ^^BgnaypwA7F}PUw~vtf-autaiRe?jk2Ovy> z-tL$VfUn fV2Hlk1fU0K}W<5%_7Etp|Di&6T)SJ>b|Lz&F6|n5ISEG+QmH{%4e5 zz_ndE?e11?UdVLX-K{(sl?Y^chSTtvj%Py7r{kG$8s5c3R3ZRi)D29_BAzb=Ks;Xx z)3Pw?hVos?0+VP|b8L^*VttXX7Hj1Zge(7qhkVcd^Btcbn^MiM5|AazHrHr08V$e+ XF|ct+gj%<{00000NkvXXu0mjf2mYoA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi/meta.json new file mode 100644 index 00000000000..fdb6bd418cc --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Sprited by GentleButter (discord/github) for New Frontier SS14 server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/meta.json index a6cdcf381ec..fdb6bd418cc 100644 --- a/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-NC-SA-3.0", + "license": "CC-BY-NC-SA-4.0", "copyright": "Sprited by GentleButter (discord/github) for New Frontier SS14 server", "size": { "x": 32, diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..542756f4725c9b70e5b66d14ddaa8af991bae3b7 GIT binary patch literal 1563 zcmV+$2ITpPP)Px)yGcYrRCt{2nome0R~*N`QJbloWE+i|hOV+$EY;w;EM6*9DO4|eC_*W{2!c1E zCzn7^>PaYi5&>p%AV#!9kyQ#!2A%7-mom5F$GCibkd^4FO z^JWq~?0i5n&b&Xr-}n9An?LUdn3$NDn3$NDyrftz+W=M;rj|t^C%|EMK>53{afjKT zCf3g9Cg;V2-Ka>PKiG|mbCdJp!ql=@sct?^4FK@mXp^qT_p<S6lJT zk6)p!)m2tLd&c8~_dbN}icLD#<#NOC3y4}5q*{a`Te#A66#!&5WY2g2z-jS>xy_0K z04Q5T7N(ZP)8YwmR&Ky)@dPa`EoBRz(P=4!c7ZVs2NPR8FnFUdZSZ=#ixtIpv5e>s6xa z;zT>ZXHp2q_b}=m2LQ?WH@YJ@h+IQk=dXBn_LD7VDv(P%U~n~!9D8`*@_EC9XVPdZe71SN(wlAX;*GKYx`^f{K?1m*}( zQ@b7`!HSxbdivKafbv^^I+I2+7r)d`;bbRBDF(~F1XBc5Q@CC!F-BpH0_N>;n*N>} z`0nTXstFT~;)^f+(sA~T$HY6g4Ygb@qtpaWiHc1H+Mnqr|KsnE+$7aRm!tnn|6Qjtc2KCyZ8ISX0 zSc{_|{nGgeYBtt_Nq|UfU+Q3KW>pMDwxA_%r_s>w1CiK1Q(fIt;PY=+W&dC1?eOqf zM0Z{0yFeti4=B>_LXj=J+yB09BlO^E@05ui+WSFQJ4_K!DNCc>*`cfRMxZs5grI8* z93F?IW7_$P$P7_?%}wUwy4y3nJ${+gBOycAh`rhMmUQbO5%9}zyBGRph-9#l_kom< z&}D<6N8!t)(a9JlFAM(x@0kDRjN{O+0000EWmrjOO-%qQ00008000000002eQPx$eMv+?R9J=WmA^|uQ545NMJeTvwDYPAnMac5j6zfhSHRW;Ejrg`&=iGC?_nZS4G#ZUYqd-1=A~VUH ztd)fvKChL9%p`L%pFWY}?v7)6QpZBJDE&S^iTFA~*z`rz%0dcZlZdb5_xUMgi%KG9 zCUtCenuB$t;sQ38=OrnG{kix0{iuN91Tn*+QE_=&cxLu7_^rf!rc|6W$(%G7O#ots zH6jYY={lTV94f_Bsz9gP2Ebf2Juh~;&cLq1#6vhN!s$A|R~5dS926^XUA!liRJ^-nofZF z{lkZVl1fBH0g06~^}8y*-V*L-%PsQ(x4l6m?6Mq50XIqll!kD>us0}gC>SCX3=M3S z5goDr8D|GO65wbzrThV<|~CPCFdK|7pyYy4L+(XcC|%Sabbys z*AM&cul8<>HdST<8Uq3q{zA+3I)lHz$+^1F^Phw9o;6&O{c3TYo3u=n<1VS}UoTrH z|D(4(f7boWdID?{%b$LF?P=?59RF2ZKyapi`#sC^TZDJb<%bx?z|gQi(UvdYyVPpW zthHy$8E?H)Ucv9KoB2k0#oY#jjype#rljmQm2KaC*F8Xccck8&juU#;B~|hdCT8CB zUlCt(_7^h)L)}eYzr%@XOk2Ab0gdHLjqptK^<~fkvN@pETne5HVtKmyxvX7P084?Tz$ z^gUnuQrX@h_uTRBTi5;Pn?J6+{p&>jUZzP~;`*{)n{1TLe`YNYF%3w5IO4ke#tqp# ztpm@`G^o4{t6p7s?AZ(J`^Lr-!hHlLOQt)ID%hT1*Wt~$( F69An@ezyPs literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi/meta.json new file mode 100644 index 00000000000..3f61f578e20 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Sprited by GentleButter (discord/github) for New Frontier SS14 server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/crystal.rsi/crystalthingy.png b/Resources/Textures/_NF/Objects/Specific/Wizard/crystal.rsi/crystalthingy.png new file mode 100644 index 0000000000000000000000000000000000000000..7ae18a2930e4201851d40fce9f7d048a0f4b9862 GIT binary patch literal 1335 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 d00008000000002eQ Date: Wed, 21 Aug 2024 08:02:47 +0300 Subject: [PATCH 11/13] fix --- .../_NF/Entities/Objects/Devices/production.yml | 4 ++-- .../Specific/Wizard/crystal_paper.rsi/meta.json | 8 ++++---- .../Specific/Wizard/scrolls.rsi/crystalpaper.png | Bin 2151 -> 0 bytes 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/crystalpaper.png diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index 28f669ae7a8..100f0c13f0e 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -247,9 +247,9 @@ parent: BaseMachineCircuitboard name: staff altar binding scroll components: - - type: Sprite # placeholder + - type: Sprite sprite: _NF/Objects/Specific/Wizard/crystal_paper.rsi - state: crystal_paper + state: crystalpaper - type: MachineBoard prototype: StaffRechargerWizard # requirements: diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/crystal_paper.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Wizard/crystal_paper.rsi/meta.json index 0b22c658c0e..e4635ecdaf4 100644 --- a/Resources/Textures/_NF/Objects/Specific/Wizard/crystal_paper.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Specific/Wizard/crystal_paper.rsi/meta.json @@ -8,11 +8,11 @@ }, "states": [ { - "name": "cystalpaper", - "delay": + "name": "crystalpaper", + "delays": [ - [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] - ] + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] } ] } diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/crystalpaper.png b/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/crystalpaper.png deleted file mode 100644 index 08a1b96d52eb6221b4210165097cad9a3dd3858a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2151 zcmV-t2$=VYP)Px-2T4RhRCt{2TwiDuM;QMlNNgkFYI-Tv20|5VDfS4SXhR4_ypRXYL&ShkP%DyD zOCOFLK@;PHNlp>Ny+sp>B!QN|fj$@?LQaf?5Gg7lNGXCsAoZkfPmkcKq4oN3e3RMP zz0L04-XF93gD|uI=C|L>e)IjAxd09vIB?*=fdh+iCX!6%`yCwQ4$gRIh@+#6P6yf; z&iLmZ>-dAso4=4<44?K{G9WD%BSmJObNC(pwa(8J@aX7b@`A6Z=;-KTa^y&5QTVhk z>G^s~#^m#VJ~j26!=GFJGm&KSg0HBEO1sIQFaBbxj2x*fIul7IM~+mQnk~}7^Ys?X zW)g=#d;Gle<%2(4D0Kc}{@~fOzZ5q}u{i2_s{jCdFYQ$P(Rse4x)h7c+AyEHE=Yr0EV`F3d@0N6Qqxl7iT7-Q;z zyWE9GSN350$-8)TWe)(zN;)qJ|LDpd1-}{CiC;}Q+~qFJ_AJ92h+?*98UMaZeFyJe zKSsnqiMrk@HvWW~?h?%QEUWSx^|01@{}*drBn|ckqIht5698cO%>n?hL0NvYzy^n} zdjnBfTYQYES9s#*g(vVr^Viin#4HMh-y4Xs_SbLN#`wK~DAsS-#;)^qvH$fzR1U52 zr%5^S>YlFg2UeCT^e$HvO8;k*KkaN3KJ80x{_Il#V46H!If!G6Z3e|i1)?n%BZguO zHGZ=oek0E~{0@IE_%$scL5jr@EIx;0i){!NpEE?x`@w24rqMRC{jA#TY$txJ+psDR zU=@F^+gR;cO$B@zUt;yn_vbNOIf%~p=S{ziQU9Ok&lPwJ{h{#>R}NbGF4>UZ$TyIW z{?9ePrUGtsl>q=6g9&&8QRaT~{=Mky)3KQtBprW!*PJ5ARjc#IR>S~>!rv6CkR>@N zD-D2UB1I2{zduv{e9OO<`E|LV6P=|j23@OQo@D?j<(od6N`&}A4T$(B;R`h=JQTX$3fQ6lwOr$D@~^6ZWQL_!T%mBH zl4)5+v*7tffkh#;W+p56#SEiaem!x}_&38iFn<_B?taE!(_Mn;vkS}uM*NcifOoGS z0{{kp_?bPgW&zD?mM*0J&nADmB{DtZPnl`8@1Mpm9adGqjjl2@1``03)=gAI(K1>Q z0B>}ap}uPlfO2*b2SS{gtm0oy{%r6c_~RJHJ!5E<+8IAtHL`%DWOPi|X(>SDH?zy7 z5c)sc{8~$78(n2+3RM75jz9Ik+W7~UH(|JP5Uo->9{MKJa_dUMOmvnq!T6F0#hJ${ z_mlXi`l?m=#etx@74FYN-=so*F}@WQk?LCfwB1jSHL9K7ugOme$6Gr-M938R?EhTy zr`v`}{5SnC04R5SQU8lO!00@AFgqd*X}NX9fHVV%;5#B+Flq&I&3|-sF}WksfbiBK z06_DA2LMp|$#=4n5+DyQZ(?=2#wSXsO`2(elr_?uk|zr&f>*?J$uKKmhw;~1B5V0& zpXzy1ygMEDWlG3jYn9qHc{N>L(%jd+Ezo;A(2Q&|OAjRTrh7&g= z14`>Bw#!>Wy|7#V7aBi#A&tQVOUMA~%Wg)zkF*MSwQX0j@^d$Ul+aUs)y%)v+Mv4q zi;kfYDMy zCj9x9-|qa4!2~8cOIdvFE_boj0JX&2L}zK*ut9__3wWbrtE>}5@UsvF%vK`b{9`}; zCmRG2{47Wb6T*S{!;1Tj?g+}a{Dr{Z7))TQuUgjsV*1}3h%$bOpc#O61H6ncvAUKoET(>6#+R`8T*8lozw7?!DE_j7f5_dBnwf)! z_<{V&@9-A}|7`7bv`Xz5a`&U;s(h~sMzPMGsx40j&DO78K$#$5Wp_A%_si*+zn6~n`r!N;Sygy9tl$rC9WosQTEP$K zm*3&HAHSvrB=W`Q5+k5L@rA_SPVwY=A+C`b<)5j$rQpxR`sG@Fhu>QMnYvpAFaN4L zF$}&l05EOmpEo)KIsEqI=XVI%QGN#w95`^`z#jM?T@bM;07yJ@0000EWmrjOO-%qQ d00008000000002eQ Date: Wed, 21 Aug 2024 20:16:11 +0300 Subject: [PATCH 12/13] wizard belts and masks --- .../Entities/Clothing/Belt/belts_wizard.yml | 86 ++++++++++++++++++ .../Entities/Clothing/Masks/masks_wizard.yml | 86 ++++++++++++++++++ .../wizard_sash.rsi/equipped-belt-base-01.png | Bin 0 -> 368 bytes .../Belt/wizard_sash.rsi/icon-base-01.png | Bin 0 -> 198 bytes .../wizard_sash.rsi/inhand-left-base-01.png | Bin 0 -> 757 bytes .../wizard_sash.rsi/inhand-right-base-01.png | Bin 0 -> 764 bytes .../Clothing/Belt/wizard_sash.rsi/meta.json | 26 ++++++ .../Mask/wizard.rsi/equipped-mask-base-01.png | Bin 0 -> 868 bytes .../Clothing/Mask/wizard.rsi/icon-base-01.png | Bin 0 -> 609 bytes .../Mask/wizard.rsi/inhand-left-base-01.png | Bin 0 -> 718 bytes .../Mask/wizard.rsi/inhand-right-base-01.png | Bin 0 -> 689 bytes .../_NF/Clothing/Mask/wizard.rsi/meta.json | 26 ++++++ .../Coats/wizard_robe_purple.rsi/icon.png | Bin 477 -> 434 bytes 13 files changed, 224 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_wizard.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_wizard.yml create mode 100644 Resources/Textures/_NF/Clothing/Belt/wizard_sash.rsi/equipped-belt-base-01.png create mode 100644 Resources/Textures/_NF/Clothing/Belt/wizard_sash.rsi/icon-base-01.png create mode 100644 Resources/Textures/_NF/Clothing/Belt/wizard_sash.rsi/inhand-left-base-01.png create mode 100644 Resources/Textures/_NF/Clothing/Belt/wizard_sash.rsi/inhand-right-base-01.png create mode 100644 Resources/Textures/_NF/Clothing/Belt/wizard_sash.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Mask/wizard.rsi/equipped-mask-base-01.png create mode 100644 Resources/Textures/_NF/Clothing/Mask/wizard.rsi/icon-base-01.png create mode 100644 Resources/Textures/_NF/Clothing/Mask/wizard.rsi/inhand-left-base-01.png create mode 100644 Resources/Textures/_NF/Clothing/Mask/wizard.rsi/inhand-right-base-01.png create mode 100644 Resources/Textures/_NF/Clothing/Mask/wizard.rsi/meta.json diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_wizard.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_wizard.yml new file mode 100644 index 00000000000..348cf92f6b8 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_wizard.yml @@ -0,0 +1,86 @@ +- type: entity + id: ClothingBeltWizardBlue + parent: + - ClothingBeltStorageBase + - RecyclableItemClothBasic + - ContrabandClothing + name: blue wizard sash + description: A webbing with pockets lined with waterproof (water, huh?) material. + components: + - type: Sprite + sprite: _NF/Clothing/Belt/wizard_sash.rsi + layers: + - state: icon-base-01 + color: "#9595af" + - type: Item + inhandVisuals: + left: + - state: inhand-left-base-01 + color: "#9595af" + right: + - state: inhand-right-base-01 + color: "#9595af" + - type: Clothing + sprite: _NF/Clothing/Belt/wizard_sash.rsi + clothingVisuals: + belt: + - state: equipped-belt-base-01 + color: "#9595af" + +- type: entity + id: ClothingBeltWizardRed + parent: + - ClothingBeltStorageBase + - RecyclableItemClothBasic + - ContrabandClothing + name: blue wizard sash + description: A webbing with pockets lined with waterproof (water, huh?) material. + components: + - type: Sprite + sprite: _NF/Clothing/Belt/wizard_sash.rsi + layers: + - state: icon-base-01 + color: "#d81919" + - type: Item + inhandVisuals: + left: + - state: inhand-left-base-01 + color: "#d81919" + right: + - state: inhand-right-base-01 + color: "#d81919" + - type: Clothing + sprite: _NF/Clothing/Belt/wizard_sash.rsi + clothingVisuals: + belt: + - state: equipped-belt-base-01 + color: "#d81919" + +- type: entity + id: ClothingBeltWizardPurple + parent: + - ClothingBeltStorageBase + - RecyclableItemClothBasic + - ContrabandClothing + name: purple wizard sash + description: A webbing with pockets lined with waterproof (water, huh?) material. + components: + - type: Sprite + sprite: _NF/Clothing/Belt/wizard_sash.rsi + layers: + - state: icon-base-01 + color: "#3e2147" + - type: Item + inhandVisuals: + left: + - state: inhand-left-base-01 + color: "#3e2147" + right: + - state: inhand-right-base-01 + color: "#3e2147" + - type: Clothing + sprite: _NF/Clothing/Belt/wizard_sash.rsi + clothingVisuals: + belt: + - state: equipped-belt-base-01 + color: "#3e2147" diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_wizard.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_wizard.yml new file mode 100644 index 00000000000..b52fe1f6f56 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_wizard.yml @@ -0,0 +1,86 @@ +- type: entity + id: ClothingMaskWizardBlue + parent: + - ClothingMaskGasExplorer + - RecyclableItemClothDevice + - ContrabandClothing + name: blue wizard gas mask + description: A close-fitting magical mask. + components: + - type: Sprite + sprite: _NF/Clothing/Mask/wizard.rsi + layers: + - state: icon-base-01 + color: "#9595af" + - type: Item + inhandVisuals: + left: + - state: inhand-left-base-01 + color: "#9595af" + right: + - state: inhand-right-base-01 + color: "#9595af" + - type: Clothing + sprite: _NF/Clothing/Mask/wizard.rsi + clothingVisuals: + mask: + - state: equipped-mask-base-01 + color: "#9595af" + +- type: entity + id: ClothingMaskWizardRed + parent: + - ClothingMaskGasExplorer + - RecyclableItemClothDevice + - ContrabandClothing + name: red wizard gas mask + description: A close-fitting magical mask. + components: + - type: Sprite + sprite: _NF/Clothing/Mask/wizard.rsi + layers: + - state: icon-base-01 + color: "#d81919" + - type: Item + inhandVisuals: + left: + - state: inhand-left-base-01 + color: "#d81919" + right: + - state: inhand-right-base-01 + color: "#d81919" + - type: Clothing + sprite: _NF/Clothing/Mask/wizard.rsi + clothingVisuals: + mask: + - state: equipped-mask-base-01 + color: "#d81919" + +- type: entity + id: ClothingMaskWizardPurple + parent: + - ClothingMaskGasExplorer + - RecyclableItemClothDevice + - ContrabandClothing + name: purple wizard gas mask + description: A close-fitting magical mask. + components: + - type: Sprite + sprite: _NF/Clothing/Mask/wizard.rsi + layers: + - state: icon-base-01 + color: "#3e2147" + - type: Item + inhandVisuals: + left: + - state: inhand-left-base-01 + color: "#3e2147" + right: + - state: inhand-right-base-01 + color: "#3e2147" + - type: Clothing + sprite: _NF/Clothing/Mask/wizard.rsi + clothingVisuals: + mask: + - state: equipped-mask-base-01 + color: "#3e2147" diff --git a/Resources/Textures/_NF/Clothing/Belt/wizard_sash.rsi/equipped-belt-base-01.png b/Resources/Textures/_NF/Clothing/Belt/wizard_sash.rsi/equipped-belt-base-01.png new file mode 100644 index 0000000000000000000000000000000000000000..dd14c53823532b1d869740d277f941929900ff1d GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zwLD!MLn`LH zy=B5505&6*a(^pNgPX@|8HTLHqemj)?Mqg|1ozUfjsBc3&mY8#!P#9+PeSv z3NAw(NkWW3b+jnLIzJ)KbLh*2~7a~ C>YsD~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Belt/wizard_sash.rsi/icon-base-01.png b/Resources/Textures/_NF/Clothing/Belt/wizard_sash.rsi/icon-base-01.png new file mode 100644 index 0000000000000000000000000000000000000000..8e5169e8d8f23d0ae462b5cab3438aa4094b170c GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}4W2HJArY-_ zFYe}KRTN;o@VeNT*F_-bbkUlFY;O+r_4Mi_2;9k;EPgg=Tk)Zvg^3J`Edov*>x1V! z3_8_kcqr=kb!DY5_a+vn-Q8nxxY%#a)(3mri{Gv6H%#bp6GxhUxpj#L`UHx3vIVCg!00y5=tpET3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Belt/wizard_sash.rsi/inhand-left-base-01.png b/Resources/Textures/_NF/Clothing/Belt/wizard_sash.rsi/inhand-left-base-01.png new file mode 100644 index 0000000000000000000000000000000000000000..bcdbc364ea9065421c16b03aec73a302c2eff734 GIT binary patch literal 757 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 vIsA!@xLx9j@afe#hn700000NkvXXu0mjf4+Ir~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Mask/wizard.rsi/inhand-left-base-01.png b/Resources/Textures/_NF/Clothing/Mask/wizard.rsi/inhand-left-base-01.png new file mode 100644 index 0000000000000000000000000000000000000000..0749f15436e4d1a2ab2ec54ec1c661951b3f81e6 GIT binary patch literal 718 zcmV;<0x|uGP)EX>4Tx04R}tkv&MmP!xqvQ%glE4i*s+%ut;yh>AE$6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRZ7c=mzuY2mIx{LBG@4i2)SIL_U@QK88OgAjz4dR(i zOXs{#9A+g+AwDM_H|T=Ik6f2se&bwpSm2pqBa@mZ4ik&T4wgHZl?;`5nmD4U8s!UF zmle)ioYhK=weHDZ7|LraX|B^6MjT5>APEsNYAB-u3sKrNQcR@iJm%paa{Nhh$>b`7 zkz)Z>sE`~#_#gb9ty!3wbdy3cAn;<_AEQ8U7iiXP`}^3onsb!v*ymNb&k^qAVafSz5xyn zfw3ZGuY0_^yK`>;_O#~r138d#khirqOaK4@1W80eRCt{2+ChqhFcgI0^e_hym+uNW zLKZG_EAN#vTO0u^ih6)coAtTf0Wa!x2Z?@R}XKU^P5|b z(0$ouSzdmIRSp0E00000006+{S^O?D-3OfMXhYDtMfkR_c8*~f+&s^297ng`4ouVZ z$y(>I+9F(<)fVBhthNZ3X0ai-{6BX#1OVP~2fi3Pj4#db6951J07*qoM6N<$g7gtX AQvd(} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Mask/wizard.rsi/inhand-right-base-01.png b/Resources/Textures/_NF/Clothing/Mask/wizard.rsi/inhand-right-base-01.png new file mode 100644 index 0000000000000000000000000000000000000000..80e407eb27377eb83c2c719878d43ca533f53feb GIT binary patch literal 689 zcmV;i0#5yjP)EX>4Tx04R}tkv&MmP!xqvQ%glE4i*s+%ut;yh>AE$6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRZ7c=mzuY2mIx{LBG@4i2)SIL_U@QK88OgAjz4dR(i zOXs{#9A+g+AwDM_H|T=Ik6f2se&bwpSm2pqBa@mZ4ik&T4wgHZl?;`5nmD4U8s!UF zmle)ioYhK=weHDZ7|LraX|B^6MjT5>APEsNYAB-u3sKrNQcR@iJm%paa{Nhh$>b`7 zkz)Z>sE`~#_#gb9ty!3wbdy3cAn;<_AEQ8U7iiXP`}^3onsb!v*ymNb&k^qAVafSz5xyn zfw3ZGuY0_^yK`>;_O#~r138d#khirqOaK4?=Sf6CRCt{2+Rcf?Fbsxa?UtbyRDud{ z&91?HG;_he0F-G*><>lP&9<|nJt;HDQye^Bc>h0X_9;$j(WZ(Bt)#aNo zC3h+1sz_@sGW-{&(Q&v=x z^O>SFlO_P$hV?}hfYW!lyggT1Q^^6h-vhu*nsYmL`i>u0Vd+aaE5hkJz^4n}Ee?tf zJT&gv2*gON8-H^#Z{#u@50nKcJ1`s%@J8;B6bD5I4iDl0#A9JBBMg9LCg?h0TF-3& z?CLKHNbTlmJv9i9x9}!MZkcVo-ahe|$4)#8JSquLI)c;6iT}i+ktoqf)Q?$4;!FI` pxH>zM02jwu<$pk<(P;h!A7L1eOPL5dr~m)}07*qoLl=;V|r4@LbfRVK7T)n_&P$^^hMOlLJDD% zh_B=K`6*H-gLR|g0ydZDB`Jjcx%c}0sDR-FF~g!!ad}&KX7(}ot;Bt% zRGc%(oHQ3r0AhwUA_~CiI-Fh{D#cW)K&RUVz+5yvFLt`lz^=l?LpUtL={mqy6~3Ds z6f1CDy<&bkOn-FF@Yvkf4llhY&v_wRlsm`UW80$CuhrO^1Uw>!liRJ^-nofZF{lkZVl1fBH0g06~^}8y*-V*L-%PsQ(x4l6m?6Mq50XIqll!kD> zus0}gC>SCX3=M3S5goDr8D|GO65wbzrTh Date: Sun, 8 Sep 2024 11:14:14 +0300 Subject: [PATCH 13/13] toying with scrolls --- .../Entities/Objects/Devices/production.yml | 4 +- .../Guns/Wizard/wizard_spell_scrolls.yml | 144 ++++++++++++++++++ .../Specific/Wizard/runes.rsi/meta.json | 77 ++++++++++ .../Wizard/runes.rsi/rune-center-01.png | Bin 0 -> 275 bytes .../Wizard/runes.rsi/rune-center-02.png | Bin 0 -> 307 bytes .../Wizard/runes.rsi/rune-center-03.png | Bin 0 -> 293 bytes .../Wizard/runes.rsi/rune-center-04.png | Bin 0 -> 260 bytes .../Wizard/runes.rsi/rune-center-05.png | Bin 0 -> 290 bytes .../Wizard/runes.rsi/rune-center-06.png | Bin 0 -> 212 bytes .../Wizard/runes.rsi/rune-center-07.png | Bin 0 -> 316 bytes .../Wizard/runes.rsi/rune-inner-01.png | Bin 0 -> 275 bytes .../Wizard/runes.rsi/rune-inner-02.png | Bin 0 -> 255 bytes .../Wizard/runes.rsi/rune-inner-03.png | Bin 0 -> 279 bytes .../Wizard/runes.rsi/rune-inner-04.png | Bin 0 -> 277 bytes .../Wizard/runes.rsi/rune-inner-05.png | Bin 0 -> 275 bytes .../Wizard/runes.rsi/rune-inner-06.png | Bin 0 -> 334 bytes .../Wizard/runes.rsi/rune-inner-07.png | Bin 0 -> 275 bytes .../Wizard/runes.rsi/rune-outer-01.png | Bin 0 -> 320 bytes .../Wizard/runes.rsi/rune-words-01.png | Bin 0 -> 456 bytes .../Wizard/runes.rsi/rune-words-02.png | Bin 0 -> 478 bytes .../Wizard/runes.rsi/rune-words-03.png | Bin 0 -> 423 bytes .../Wizard/runes.rsi/rune-words-04.png | Bin 0 -> 417 bytes .../Wizard/runes.rsi/rune-words-05.png | Bin 0 -> 459 bytes .../Wizard/runes.rsi/rune-words-06.png | Bin 0 -> 415 bytes .../Wizard/runes.rsi/rune-words-07.png | Bin 0 -> 446 bytes .../Specific/Wizard/scrolls.rsi/base.png | Bin 0 -> 616 bytes .../Specific/Wizard/scrolls.rsi/meta.json | 28 +++- .../Specific/Wizard/scrolls.rsi/scroll-0.png | Bin 0 -> 777 bytes .../Specific/Wizard/scrolls.rsi/scroll-1.png | Bin 0 -> 694 bytes .../Wizard/scrolls.rsi/scroll-blank.png | Bin 0 -> 616 bytes .../Wizard/scrolls.rsi/scroll-rolled.png | Bin 0 -> 386 bytes .../Wizard/scrolls.rsi/scroll-seal-rolled.png | Bin 0 -> 129 bytes .../scrolls.rsi/scroll-seal-unrolled.png | Bin 0 -> 143 bytes .../Wizard/scrolls.rsi/scroll-text.png | Bin 0 -> 694 bytes .../Wizard/scrolls.rsi/scroll-torn.png | Bin 0 -> 777 bytes .../Wizard/scrolls.rsi/spell_default.png | Bin 633 -> 0 bytes 36 files changed, 249 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_spell_scrolls.yml create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-01.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-02.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-03.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-04.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-05.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-06.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-07.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-01.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-02.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-03.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-04.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-05.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-06.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-07.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-outer-01.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-01.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-02.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-03.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-04.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-05.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-06.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-07.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/base.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/scroll-0.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/scroll-1.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/scroll-blank.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/scroll-rolled.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/scroll-seal-rolled.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/scroll-seal-unrolled.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/scroll-text.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/scroll-torn.png delete mode 100644 Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/spell_default.png diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index 100f0c13f0e..7a0697359e8 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -272,7 +272,7 @@ components: - type: Sprite # placeholder sprite: _NF/Objects/Specific/Wizard/scrolls.rsi - state: spell_default + state: scroll-text color: "red" - type: MachineBoard prototype: StaffRechargerCult @@ -289,7 +289,7 @@ components: - type: Sprite # placeholder sprite: _NF/Objects/Specific/Wizard/scrolls.rsi - state: spell_default + state: scroll-text color: "red" - type: MachineBoard prototype: BloodCultProp02 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_spell_scrolls.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_spell_scrolls.yml new file mode 100644 index 00000000000..01f91aef03c --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Wizard/wizard_spell_scrolls.yml @@ -0,0 +1,144 @@ +# Base +- type: entity + id: SpellScrollRolled + name: spell scroll + parent: BaseItem + description: Rolled piece of paper emanating eldritch energies. + #abstract: true + #noSpawn: true + suffix: Folded + components: + - type: Item + size: Small + shape: + - 0,0,1,0 + - type: Sprite + sprite: _NF/Objects/Specific/Wizard/scrolls.rsi + layers: + - state: scroll-rolled + - state: scroll-seal-rolled + color: "red" + shader: unshaded + - type: SpawnItemsOnUse + items: + - id: SpellScrollBase + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + id: SpellScrollBase + parent: BaseItem + name: spell scroll + description: A piece of paper with arcane inscriptions on it. + #abstract: true + #noSpawn: true + components: + - type: Item + size: Small + shape: + - 0,0,1,1 + - type: Sprite + sprite: _NF/Objects/Specific/Wizard/scrolls.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: scroll-0 + map: ["enum.GunVisualLayers.Mag"] + - sprite: _NF/Objects/Specific/Wizard/runes.rsi + state: rune-outer-01 + color: "red" + scale: 0.4, 0.4 + offset: 0.01,-0.05 + - sprite: _NF/Objects/Specific/Wizard/runes.rsi + state: rune-inner-01 + color: "red" + scale: 0.4, 0.4 + offset: 0.01,-0.05 + - sprite: _NF/Objects/Specific/Wizard/runes.rsi + state: rune-center-01 + color: "red" + scale: 0.4, 0.4 + offset: 0.01,-0.05 + - sprite: _NF/Objects/Specific/Wizard/runes.rsi + state: rune-words-01 + color: "red" + scale: 0.4, 0.4 + offset: 0.01,-0.05 + - state: scroll-seal-unrolled + color: "red" + - type: MagazineVisuals + magState: scroll + steps: 2 + zeroVisible: true + - type: Tag + tags: + - Sidearm + - type: AmmoCounter + - type: Gun + fireRate: 1 + soundGunshot: + path: /Audio/Effects/teleport_arrival.ogg + - type: BasicEntityAmmoProvider + proto: WaterElementalConjuredStaff + capacity: 1 + count: 1 + - type: StaticPrice + price: 500 + +# Variants +## Offencive +- type: entity + id: SpellScrollRolledElementalWater + parent: SpellScrollRolled + components: + - type: Sprite + sprite: _NF/Objects/Specific/Wizard/scrolls.rsi + layers: + - state: scroll-rolled + - state: scroll-seal-rolled + color: "blue" + shader: unshaded + - type: SpawnItemsOnUse + items: + - id: SpellScrollElementalWater + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + id: SpellScrollElementalWater + parent: SpellScrollBase + components: + - type: Sprite + sprite: _NF/Objects/Specific/Wizard/scrolls.rsi + layers: + - state: scroll-text + - sprite: _NF/Objects/Specific/Wizard/runes.rsi + state: rune-outer-01 + color: "cyan" + scale: 0.4, 0.4 + offset: 0.01,-0.05 + - sprite: _NF/Objects/Specific/Wizard/runes.rsi + state: rune-inner-02 + color: "cyan" + scale: 0.4, 0.4 + offset: 0.01,-0.05 + - sprite: _NF/Objects/Specific/Wizard/runes.rsi + state: rune-center-02 + color: "cyan" + scale: 0.4, 0.4 + offset: 0.01,-0.05 + - sprite: _NF/Objects/Specific/Wizard/runes.rsi + state: rune-words-02 + color: "cyan" + scale: 0.4, 0.4 + offset: 0.01,-0.05 + - state: scroll-seal-unrolled + color: "blue" + - type: BasicEntityAmmoProvider + proto: WaterElementalConjuredStaff + capacity: 1 + count: 1 + +## Utility + +## Memes diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/meta.json new file mode 100644 index 00000000000..4fb2f7c3552 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/meta.json @@ -0,0 +1,77 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation13 at https://github.com/tgstation/tgstation/blob/master/icons/effects/cult.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rune-outer-01" + }, + { + "name": "rune-center-01" + }, + { + "name": "rune-center-02" + }, + { + "name": "rune-center-03" + }, + { + "name": "rune-center-04" + }, + { + "name": "rune-center-05" + }, + { + "name": "rune-center-06" + }, + { + "name": "rune-center-07" + }, + { + "name": "rune-inner-01" + }, + { + "name": "rune-inner-02" + }, + { + "name": "rune-inner-03" + }, + { + "name": "rune-inner-04" + }, + { + "name": "rune-inner-05" + }, + { + "name": "rune-inner-06" + }, + { + "name": "rune-inner-07" + }, + { + "name": "rune-words-01" + }, + { + "name": "rune-words-02" + }, + { + "name": "rune-words-03" + }, + { + "name": "rune-words-04" + }, + { + "name": "rune-words-05" + }, + { + "name": "rune-words-06" + }, + { + "name": "rune-words-07" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-01.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-01.png new file mode 100644 index 0000000000000000000000000000000000000000..343d2d581d3bd47eb8ab5217560fd939ee781d0b GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}XFXjULn2z= zhD7rnR^ahocK5W*UdzaD&H=ORIIh+$I~ug~+Jze|%z+C7H2zpum?hrc=JE1uef!31 zw{rhpKjR?6kl-ZM@;5?Co6V=^4x V8NTY>Sp@VLgQu&X%Q~loCIJ3*Yk&X% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-02.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-02.png new file mode 100644 index 0000000000000000000000000000000000000000..659ad135315aa4a42cc0e7ece030c12b1ccd1f78 GIT binary patch literal 307 zcmV-30nGl1P)Px#?MXyIR9J=WRY4BJFbFf#{zac&UdApZLlIq_YC8=}m7;(!m_UI>qw(*MD~EmG zt7~WDZQJ%S{^Kfvg4h$0Oy{uEcrKDlan9st_EWG5RD?6Cgf77cHsCN0{_i?JF76m#_OdBvjJtfSb?jVO6R)!{`S|$!k$9q-bNd>Xrm?fjov7El z%wF5uFxnO|B&5Ab-y59Ksb;jfi$nBMky)YZfvZxA>|B<{+y4dS{tI9fQz}we`Hm^{ zzLSy@Q`g--?);?N^ZHq1I$s{??s(7fVgl3p-45Gi7qh-NDiWZo?`4aQXlM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-04.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-04.png new file mode 100644 index 0000000000000000000000000000000000000000..f081f7cfa5a95ea7d8bc88f43356481ca329a7f1 GIT binary patch literal 260 zcmV+f0sH=mP)Px#zDYzuR9J=Wl~E4EFbG3o+P$2k$0uVy$wa#~g-V+=jrY}5DL4iik)kMye@CMm zd+(by0P|~-n^>*2P~3Y|z&3vJ8=ARJo(vV*fFf7;62bWz43m~ZgMAnUFyM8$3>J%LQ z53;06;9L-rI?LchO+n#tObPIFzjzi&^hBxz``Vt}2Srg7Kfwbx|5#{L9_0`K0000< KMNUMnLSTZ{HE2En literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-05.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-05.png new file mode 100644 index 0000000000000000000000000000000000000000..0beb976387b873cc7e4e2664c112202a5be1c97f GIT binary patch literal 290 zcmV+-0p0$IP)Px#+(|@1R9J=WmE8`*AP9wV*?ZAPhbKF`>1nWkL$_qR;7b}UML7yqk)kMyAJZ~U zW_I~aRl&Zyck?aF@^ZIT^PLq^fcvBDK3|0jdfHQPs`v?s8?% zFr9)Jl+Q?DlG-K!Ts{4D-$03y;xwtUYge?r7m%rbfxU>(EuAS&83 o$8aDDb$j>zm2UoyTMDWbkN_ND@!2^`ZBMybKn7o2?ym~@W?d3*-7Bj)s)&_f$TA)n6kVaqvCMq1)C0zjTfI9=|!sd3d%-h&Ag!VW7(xJYD@< J);T3K0Ra7NOCSIM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-07.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-center-07.png new file mode 100644 index 0000000000000000000000000000000000000000..2371168aa8605d0237f78854084fc8d717690a40 GIT binary patch literal 316 zcmV-C0mJ@@P)Px#_DMuRR9J=WRZ9{>AqWed-ivqi$I0lT=wxW0Vmn>c%((FbAz}nJHa7kpGTU&T z=WtzB-OMiI9LF&{f142~B>yJFX9QH$0l>_ls(r4_|BS$!1i}ggp(PS!0xdAf?lAzM z&B+DPOWdm)^IbRT)B18xlnLad(fO@X;i^|iOrN2SC O0000Px#%}GQ-R9J=WmQfDGAP7Wpv-iTIJ11j*q;V5bXtzm|Wj;$}UJ+EHRO;VVtUzmR zwN9e>YOT}n@0E*X%*@ju00lEat^kM{1DKhNaq&WU0fd_hzGMn-7 zTcA}4Z$rNih&H3>ItQWfFL6CcpZ-ITOK4w;^E~pji*wn Zh(55gV?RIAIxYYJ002ovPDHLkV1m%Ma%KPk literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-02.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-02.png new file mode 100644 index 0000000000000000000000000000000000000000..1ece95ca5a71e83b0cd1aadc3ddd76d658cbe04a GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}J3U<-Ln2z= zP7CBZqQK+wc+>YT_j12!e=jPzzCH5JDe<$N^eY=@Pc0#q|9-PXy);*UKT{oduJXs9 zy8L$gY^_kVnET9I$wpmHvzV6qZJZ6I zufJu<20xT*bY8@772N!?VEuu@g743b*RVT2c*wkFeX{+RhlTrqo?!5F^>bP0l+XkK D>8NJz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-03.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-03.png new file mode 100644 index 0000000000000000000000000000000000000000..43213384eb0dfd019a607ea53a486989f1871245 GIT binary patch literal 279 zcmV+y0qFjTP)Px#(Md!>R9J=WmQ51FAP9w_(|h63eJ7(E)3J%*Zzoy!R!KCxPZ(69t*x8I);y-gR#7{KxVeJ;!~L52WCL^CtaL2?1mY7umNgau*AfR;{ud+x)FJCo?8L{ zoKjcaPAk%MXcgP}xfvi@k_C75Re(u|s(BN@AViZnQOAWOK`0Ta*H%Z*FTWAxK}YX| dTU%QteE^O9c0O)sGO+*v002ovPDHLkV1n7daLxb# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-04.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-04.png new file mode 100644 index 0000000000000000000000000000000000000000..a23bcec3cdbb7e0630d8f723760313b5b2a35887 GIT binary patch literal 277 zcmV+w0qXvVP)Px#&q+i|>Euhu$zf1j~L#HEyB5P%B{g}fucoEX3`p^F4-fVxGj1IvzfisdY5E|`cI z0IDCfe5!{~4s=7vWbVc@9!<<60n&9f?`-Z$|Lk#caEZ(kf{kdkkc4$VwGn9}+Fr>L biA014_|a)@`<|N#00000NkvXXu0mjf3xjc^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-05.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-05.png new file mode 100644 index 0000000000000000000000000000000000000000..a07f8c1ca5c2156f4d2d8f26fcb1e4ff38f0079a GIT binary patch literal 275 zcmV+u0qp*XP)Px#%}GQ-R9J=Wl|c@|Fbo83#J`fK$1e+)x{BO5U6)XS$eb!#veOmVM2p40!`_Wj z%IJGFdS1@C`}uQ};svLax;I5c#axkh1gZv$2&sr(w_=+JB!LQ46UMEGq77`%LK2T) zIG-HKM8qPZZFs*GSipv(z!FFUA7vzP_3ag?g|BYl_XWIxb(?^l6SoT>j08dhrGuTG zVS$;rf8#TOt1ZAY1ZluZj6`ZAoCx2BEF#sc+XH4@PhH2mL>pwW>w31pez4a-BzUn{ ZC@+;-YJ$1u>Wu&Z002ovPDHLkV1kn=alrrp literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-06.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-06.png new file mode 100644 index 0000000000000000000000000000000000000000..97fd6ca6a8c48b2e4c78576ece4758dcfef96549 GIT binary patch literal 334 zcmV-U0kQsxP)Px$2uVaiR9J=WRzVKKAPj?P|4N_UyezwfDh&yksoG^&s?Xob0|PWVvIm05CcL)si;M(AtFIdyfV>t zq2k_%CMM9R6pE;dOQ6Nl#-;dieL+d z31(}cGV>MN;@7a+K20JW-)IrmMwT7F8FU1VV+iCl>_!3{$B;N`;4NJU52@A0ESC=0;Q#;t07*qoM6N<$f{Sd6*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-07.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-inner-07.png new file mode 100644 index 0000000000000000000000000000000000000000..e938f9936b4a7eae3805c6e6b34fe0ad0c70c42c GIT binary patch literal 275 zcmV+u0qp*XP)Px#%}GQ-R9J=WmQfDGAP7Wpv-iTIJ11j*q;V5bXtzm|Wj;$}UJ+EHRO;VVtUzmR zwN9e>YOT}n@0E*X%*@ju00lEat^kM{1DKhNaq&WU0fd_hzGMn-7 zTcA}4Z$rNih&H3>ItQWfFL6CcpZ-ITOK4w;^E~pji*wn Zh(55gV?RIAIxYYJ002ovPDHLkV1m%Ma%KPk literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-outer-01.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-outer-01.png new file mode 100644 index 0000000000000000000000000000000000000000..a3c0d942fc4cf007294ee35c42885b7ac4bf200c GIT binary patch literal 320 zcmV-G0l)rPx#`bk7VR9J=Wmq8B1AP7Z^nR{_{JsGo+2}MvlDRfg-HdX!;Yx99x>#-5U14Nuo zY^}*hSS9}K2uo2VFoc@R;4a7vfH+wfUG7E!%Jt-}_W%eHF9{m~eLd$gAxe<=0Me^L z`lSZATYL#20iwjG5DXA4?n3Azh!i(9%5mO(O2{h63S{hl(6X*!Y5);Y!pCO?A>#8D zcmZC37odpWVrua3|M?1t@!(bh*Z?YvHYAQ-~5eS;+n zf^a>jbq()^m>OQMGlJF{w^siemaW!q)*Avhm$Dico6}z|Z~m$~hMp*_J^upG?x5AH S(08K%0000Px$f=NU{R9J=WS6glaAq+HC@8v!E&dKNxrpDMjHtbhBQj|!+55{INM1LJge%$xH zYn!znX3hW_pCeq?MMOm3n*qgnX67y#W+ni7-4tJ|3rj$~YXXqWHJL`*yAVg=79vD89H|d zO$jbOM)uJ_Qg6j4(~#JyU5Ck!dLU77gVAr3>h8|L3^8PGPx$m`OxIR9J=OS3#1*AP8)?@~`CS;bqK4sFn~l8TYc=Cr1r5t$+jkcN80(=Q-M| zv|smq_XQCFfU@tq+IVE_I1T{7&n(mGPC5`r9M6^`L-`$n*&C zhgyvnCc&G7bG2_qirf;&KCBTJbAB^+$0AZj$Fe1J7Ofd^$tO_&XjMxqIh(&AQ=mD| zr2Pn=P)+Gp*SkyDBhy>6Vm94RrvI1(c-0JfZIb^=Klz*Z03}N; Ub!)h(4*&oF07*qoM6N<$f*%Ofng9R* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-03.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-03.png new file mode 100644 index 0000000000000000000000000000000000000000..93b06e1fb213bd202f22f2e06dd01fa0a6a8601a GIT binary patch literal 423 zcmV;Y0a*TtP)Px$VM#ZRpc`!n;ID)9PtJL2 z0W%j7IoBRz>aS{%QUU;c-C5+x0YF5+%!QeYpF6YXXO>vWEcpQvkw@e}#{%|LB63B3 zih#3Sj#5d&4e$1@HN`wzWJ8>CoOfYjb z4zs`o(F!zatKYl}R``AhTezYa*h=nExxhy0lkz$V<)HHi07@z4@Xx5|ydu{iC!$(F z&bi8f-4;kG5m39Jsp*?g9n7cU?f|q_4%6`0Q3;6d^&RNefelr#i%Niq5Ho8%SZ)b_ z4*Z{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-04.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-04.png new file mode 100644 index 0000000000000000000000000000000000000000..0778603cd7d26391c28466bd4e2db0adc7196101 GIT binary patch literal 417 zcmV;S0bc%zP)Px$TS-JgR9J=WS50-!V7^=Q0S(emHIR@qJ$9%02L#h+z1hQpd?u)pE72I`1d7;Z%ROw;Va|;s>6`Wjh$8S2wp%`-;be5 z8&%FI3AZ4J(7L@k*l__pQi~`Dwzxk)m59~@!w$EL+;cP@(8hC;+%~gDz#(#N)f(Co zVn2?>Ki`PT{VAnH)KcxWv!}rp#00000 LNkvXXu0mjfa2&M- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-05.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-05.png new file mode 100644 index 0000000000000000000000000000000000000000..a58824d74e203949c141affe9cd3b29d140c2144 GIT binary patch literal 459 zcmV;+0W|)JP)Px$g-Jv~R9J=OS6hz5FbEu0y_a+Jax(VEcqaruk~I6%ks{S@Z16B(0(?8ff4txC zE9$Es}5ui@yV@}0)K)-*Bzi!i>l7X5<^j)89MPA z8CO*w`ic1!31a{_=%KDNklq+618$s7;HNt+HdU3NmAM0MjGVXv0sg|6h!{W~0;Vga zc@;@|HqH1%WWb2_Q|UBADa9yD+TPKDM*9uwQ#c!y(Z)a)0;#I~7qA0t^t9Snkd^G_ z08@TPcxTZxz%lBj%w1F=?gZW_F|#%qh4Lxm&TJ_KA|e2VAePxr8n63{Gt0JEgpUX> zIuYj%rTEGCBPnj|fYmt36HfH*6?UNA@egG}datCV7~v+niD9djmg0~yb|WoqR^W#H zzy*WZUc>)KJz;A+S9-hN`q0YF(~z(eWms%nR!J*7$9aEfSRLJ_lonD3 zT8|8@d>8aK$U0>JEqj*QxfugJ3{TGEi~D~OegRp8`E)flKDqz^002ovPDHLkV1hBW B$Ljz9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-06.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-06.png new file mode 100644 index 0000000000000000000000000000000000000000..50da41002736a4995f9f263f5d0126d9d184ddfc GIT binary patch literal 415 zcmV;Q0bu@#P)Px$SxH1eR9J=OmQk{UFbGBAP4|UMmzB|$&5pm?y2VH#DgeXmF#A!7h*u92*+IOH%+DIT8nnk^5ivM1 zU10Hk3W(;O1dpAcg2@n8O-eg}vm@20xeqZhb_8G; zKzcvF2!I`t<9#!w83FhXJ`Ok4Jiy6NGE@m~Hep)k>Ygc&Vc4_mBl72#y_XoKmCZ)7 z7%UsT9jK39(PXr@d;|c4>c0r%8dIP)!);fdJu@?XU002ov JPDHLkV1gj9rx5@E literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-07.png b/Resources/Textures/_NF/Objects/Specific/Wizard/runes.rsi/rune-words-07.png new file mode 100644 index 0000000000000000000000000000000000000000..3e0b317df883fcca0eaeb26f000468b3d27aa158 GIT binary patch literal 446 zcmV;v0YUzWP)Px$cu7P-R9J=OSHYIUAPB^L`(NbK!5j&3T@y zYZ(y%0Dy>^SQ#A00RR9$t6421aRkoB$P!>gWJF~1461-!S?<|B?;ya4=-;*gJQXm% z7fnh;kR@^D0bA#EjS-RM|CW5SUOn(Th@s325vA*?2$ByGm7u9FJee;!+^ho^t3#*2 zNU}RnB_x(A(!}i)STRr%({e;5DDJw2#OTGsHe7Lh79$^64^-#Ft8Uxi{7_L9FmC0U zYu|*DsAXunz|?6wWH@#4D*@Abd^J4oK$H6xuLM;7T{9p+-792MD-D59IN!sl&@1pI z6kpzO4w!v^8{B!KBH9bKn{XC$q`+1cwDwVpN1IV`C!O0cFVWS0NI)0Bs}!jkAZ zZFnXW_Ifx84RoPx%B1uF+R9J=WmcMJ;KorNn*IEvuiA^zB1uI2pk)T7D;@L}v%pLrv(~K!W|S(!86pgP0D!)O zDupNour{8^jm&+#dG`UP>5>kQA|F4Ocd%?1Vc^4XhM4hb<$h%d0KoZp1^~GG@fEFO z2Wi5U>)Y26e*HFc52OiK+OGsi6ArV_z^|`h*)A6G5^K$ezFiSk0kcm_n^J(VJ!Xir z9MHEb%=i>*tpm%Zg&_=lEaK(9JzUTMq@{s`M+ z_VoH3ot!EUuY+p@@KkBSaesS5HZ0%1u7=bCgzYhtZj_n*Cq?!^G#BI~{3`%vpEdG8 zG^Z6$GJu4jk zqZXpdUSNnz0RS_0&YHNNUti^)b;5r2NM^gxxhH^KGpf6WmhB=x3mYn{jbzgq!7->yh+PXdq-``^{=SWZEd+Mxsp10VW!s=UvOc!}PiySD;a z4Uisr7Ql?1GXOBOOQDRX*2&^sSb?k;NEPx%!%0LzR9J=WR=;oBKp1`35|EV;R3SktOl7ecsY92FnV}srXW(yO=}ttaqOf=2 zZ(!)0AsI5GF4=qwvIk?HM*Sa3KwEd+Y$1chi4O3sQCZ~m z3e3I%08nl4*46|<_uU9bQz0mcMR{#L| z`%eIX#r+KuCpsLPM~<&v4)ObsDo(($d8GYN0*=k0<{0?hHMCM06Kjg)kpX2hlNep7 zIXT(vC156N4Axcy%4UWU?_qg#3aun}4QAiK#G3l;p(9U#Kt_ZZACO8HL;qRL2ZE?$ zb03j?co8;XCTlDhKB;sOsdN#|M*Y!x`W8j*AOb-+Hpgl{5bvw`0L@0-N5=b1-pAz- zsZ2;YVK{b0R1g`*<~V-y(YJmzABfP4%Y@P=FdVzkO65mhCQfughUS8sM?so^nqx5g z23qY7nvFVA=_1sb@01u0K1wH2kC0) ztqoC1Cj!c5Ccc@;8hf$^yr2jG@F)sMq}f6S*+M4PR%|UGP<8}*$QCkad_MQxyO)SJ z5ye6J1iZb$#F}DaP4VU8LTuh@cZ3cOffRvYV?tw;hq8$%^a}Fsl?wnPcE-eAK6E#} zW(Dwh-fDMtLX>bWx+N=>q42H??8FodFA7V#j@5hsHODX<%QaE4B7FPd96x{T5)O4Z z{{G-pjKDSoWxSUnKqLr@`x^k;FbmcIV0!|jjkr=AOTg?KP&Pdg&vdM#WQ{GyS1!ia zP&PAU3mHtTsTheMok$d7Ga-qQFk)vcY%U1z+OSOcjDL>520?_Z!Irzf00000NkvXX Hu0mjfBL7)1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/scroll-1.png b/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/scroll-1.png new file mode 100644 index 0000000000000000000000000000000000000000..460c3044664403d40a36eb710e287353401aafeb GIT binary patch literal 694 zcmV;n0!jUeP)Px%a7jc#R9J=WmcMS=P!z_0x8;wl0#OweD#cV5i;+5XXq7ojhs+&#hCD)~Y>CJt z@C*!{Qz;#oQI~A?f~*EqL4_(3q9{P+4$cKT*q2LbrAp1WTwl08=kq!DeCNO;{&$GD zA6u=~#)hp)(+BV}H36`9GC1}W@8t6O<(nXA^~gC^tX4mNabvB1Eabq z*}Hfh2LNM1Dwaen0c+Cq=SBt&&tAU9G^<+9yIqIxqZ_PB6|dt^vUlmb?ZorS6ad(7 z-UD#+?K7#I&1~!{*XK{W{P=0kBQP7gO8bcfW@8t#C~z;%u_{%Dy%D!*2V;7rvHF-r zy=xOoz{}JGz2FWQ(<}OJo7;2&tD=_%uj4T6jiUBw=o65TM&_6C9@%_3@twQt%Q?~6 z*o_d0!;_>xyi83zET3$?Og3NU=~eQ~8F4BdpPV+9NXf5X zr6F2MC^exw@aI*b!rk@d5`iQo)Q&)R;A2&)%J7Gyq6=*TW>MgEoJhEj4i7jvZA6~s zzB|wp&$UtjkjmN0DgbaV&M}MP&!xc2)I?l4g(DFm9MTKfoRXlO0*T{#ed+dx(-4M? znhJj<1+rYjm9TLYNas>$RMoH!)=q&c?BVB)g{b78`2c;fFW$cRPx%B1uF+R9J=WmcMJ;KorNn*IEvuiA^zB1uI2pk)T7D;@L}v%pLrv(~K!W|S(!86pgP0D!)O zDupNour{8^jm&+#dG`UP>5>kQA|F4Ocd%?1Vc^4XhM4hb<$h%d0KoZp1^~GG@fEFO z2Wi5U>)Y26e*HFc52OiK+OGsi6ArV_z^|`h*)A6G5^K$ezFiSk0kcm_n^J(VJ!Xir z9MHEb%=i>*tpm%Zg&_=lEaK(9JzUTMq@{s`M+ z_VoH3ot!EUuY+p@@KkBSaesS5HZ0%1u7=bCgzYhtZj_n*Cq?!^G#BI~{3`%vpEdG8 zG^Z6$GJu4jk zqZXpdUSNnz0RS_0&YHNNUti^)b;5r2NM^gxxhH^KGpf6WmhB=x3mYn{jbzgq!7->yh+PXdq-``^{=SWZEd+Mxsp10VW!s=UvOc!}PiySD;a z4Uisr7Ql?1GXOBOOQDRX*2&^sSb?k;NEPx$JV``BR9J=Wld(#}P!xv0VpO!1qD3lH;nF3A4uV29ArATqZf*{OyU*YgIJgUW z1r;o~IXEXviI5;xq6AWh8i_+mnqnFn9ecm=a{vGQ=iYNbB9TZWvrZ}Nu+!=M+gJ>Y z2*6%ADgo%ao_S9xVp61VUDXH!3tS`0(@zW_21ZnCR8cA_SVPlksjC`x*92f`6e=@B zW&klTqQs8@UM;h@vX$JqS~~~eo_KFejm|nVRudHs>ZAJI5BMQ7XYZ+ z2LSY6?f?h_i|h6+yQv_@&u4^zg;G&jopbp3-b`K~46I!L%xAH0PNQ0*I_#(yA)2kR zEIA*t_3h`RjKdu^zy4eZ=8qX03@^5YK?;`lDb|4r4rsY2BZ;z;pdV8;~wo gR3ni{B$Czopr09xrKC;$Ke literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/scroll-seal-unrolled.png b/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/scroll-seal-unrolled.png new file mode 100644 index 0000000000000000000000000000000000000000..2953b86144064ae41e167f16693d14cc3cf7a095 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}o}Mm_ArY-_ z&u`>CpuppDkz2b`<9vy8rP_)~YNA3+UH`Shm*;Z=6= oGuASOesz^e+Px%a7jc#R9J=WmcMS=P!z_0x8;wl0#OweD#cV5i;+5XXq7ojhs+&#hCD)~Y>CJt z@C*!{Qz;#oQI~A?f~*EqL4_(3q9{P+4$cKT*q2LbrAp1WTwl08=kq!DeCNO;{&$GD zA6u=~#)hp)(+BV}H36`9GC1}W@8t6O<(nXA^~gC^tX4mNabvB1Eabq z*}Hfh2LNM1Dwaen0c+Cq=SBt&&tAU9G^<+9yIqIxqZ_PB6|dt^vUlmb?ZorS6ad(7 z-UD#+?K7#I&1~!{*XK{W{P=0kBQP7gO8bcfW@8t#C~z;%u_{%Dy%D!*2V;7rvHF-r zy=xOoz{}JGz2FWQ(<}OJo7;2&tD=_%uj4T6jiUBw=o65TM&_6C9@%_3@twQt%Q?~6 z*o_d0!;_>xyi83zET3$?Og3NU=~eQ~8F4BdpPV+9NXf5X zr6F2MC^exw@aI*b!rk@d5`iQo)Q&)R;A2&)%J7Gyq6=*TW>MgEoJhEj4i7jvZA6~s zzB|wp&$UtjkjmN0DgbaV&M}MP&!xc2)I?l4g(DFm9MTKfoRXlO0*T{#ed+dx(-4M? znhJj<1+rYjm9TLYNas>$RMoH!)=q&c?BVB)g{b78`2c;fFW$cRPx%!%0LzR9J=WR=;oBKp1`35|EV;R3SktOl7ecsY92FnV}srXW(yO=}ttaqOf=2 zZ(!)0AsI5GF4=qwvIk?HM*Sa3KwEd+Y$1chi4O3sQCZ~m z3e3I%08nl4*46|<_uU9bQz0mcMR{#L| z`%eIX#r+KuCpsLPM~<&v4)ObsDo(($d8GYN0*=k0<{0?hHMCM06Kjg)kpX2hlNep7 zIXT(vC156N4Axcy%4UWU?_qg#3aun}4QAiK#G3l;p(9U#Kt_ZZACO8HL;qRL2ZE?$ zb03j?co8;XCTlDhKB;sOsdN#|M*Y!x`W8j*AOb-+Hpgl{5bvw`0L@0-N5=b1-pAz- zsZ2;YVK{b0R1g`*<~V-y(YJmzABfP4%Y@P=FdVzkO65mhCQfughUS8sM?so^nqx5g z23qY7nvFVA=_1sb@01u0K1wH2kC0) ztqoC1Cj!c5Ccc@;8hf$^yr2jG@F)sMq}f6S*+M4PR%|UGP<8}*$QCkad_MQxyO)SJ z5ye6J1iZb$#F}DaP4VU8LTuh@cZ3cOffRvYV?tw;hq8$%^a}Fsl?wnPcE-eAK6E#} zW(Dwh-fDMtLX>bWx+N=>q42H??8FodFA7V#j@5hsHODX<%QaE4B7FPd96x{T5)O4Z z{{G-pjKDSoWxSUnKqLr@`x^k;FbmcIV0!|jjkr=AOTg?KP&Pdg&vdM#WQ{GyS1!ia zP&PAU3mHtTsTheMok$d7Ga-qQFk)vcY%U1z+OSOcjDL>520?_Z!Irzf00000NkvXX Hu0mjfBL7)1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/spell_default.png b/Resources/Textures/_NF/Objects/Specific/Wizard/scrolls.rsi/spell_default.png deleted file mode 100644 index e7780ff2cafdfce82c61d3e8318616e18267cfbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 633 zcmV-<0*3vGP)_H%aq~MmHeT+}xmP8SK9Dm<@67qmH#6s4!}Q1aCosMQ zN*8GpV`4WK3QRyZh@H=pu|;1WMKyQxcO(GEg_Su9PaAEUO!5INUb-(RJKBxqM8cK; z9C|^j1)5skpja%awRpK)pqF}s5^G82k2uf8yyNqpHDIK6)Yy2sQffd}w{d==Ot0Uu zo&xyZ4UPoh7+VZc@%B>frdFv_Gg6>v>rG=cm9GwL2_Row0|*ESn~_;XL&$m;>MH~1sast{6u&aJ65fBc14oJw|qrl`r zwR?uuWz4)ti@+1yR{2|f!k2MRCMnG zzKnEEIkX_o0UdazV0Ckk9&XOtR_CoozTx1C?%e;sBLG`x_gVy)ME~6VI_B#4YC%r| z$Yr#ZCuB!TuK8>)qJ9@60Gne3B48ylDva-6GhO@u%|~)+ TC*K=w00000NkvXXu0mjfPgo00