From 29a7234ae69648f0a7fdfeee152242b1f2d4ab68 Mon Sep 17 00:00:00 2001 From: Red <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 12 Jul 2025 14:52:12 +0300 Subject: [PATCH] Add guard weapon loadouts and new electric staff (#1525) Introduces new guard weapon loadouts including guard's sword, halberd, rapier, and a magic electric staff. Adds the 'lightning strike small' spell and related assets, updates spell damage values, and provides new modular grip and staff sprites. Updates localization, trading positions, and integrates new equipment into guard roles. --- .../Locale/en-US/_CP14/loadouts/loadout.ftl | 1 + .../Locale/ru-RU/_CP14/loadouts/loadout.ftl | 1 + .../Spells/Electric/lightning_strike.yml | 6 +- .../Electric/lightning_strike_small.yml | 86 ++++++++++++++++++ .../Entities/Objects/ModularTools/grips.yml | 12 +++ .../Objects/Weapons/Magic/twoHandedStaffs.yml | 18 ++++ .../Objects/Weapons/ModularPresets/rapier.yml | 18 ++++ .../Objects/Weapons/ModularPresets/sword.yml | 20 +++- .../Prototypes/_CP14/Loadouts/Jobs/guard.yml | 43 +++++++++ .../_CP14/Loadouts/role_loadouts.yml | 3 + .../_CP14/Skill/Basic/electromancy.yml | 14 +++ .../_CP14/Trading/BuyPositions/guards.yml | 33 +++++++ .../lightning_strike_small.png | Bin 0 -> 443 bytes .../Actions/Spells/electromancy.rsi/meta.json | 3 + .../Beams/lightning.rsi/lightning_small.png | Bin 0 -> 2605 bytes .../Effects/Beams/lightning.rsi/meta.json | 12 +++ .../iron_guard_grip.rsi/equipped-BELT.png | Bin 0 -> 351 bytes .../iron_guard_grip.rsi/equipped-BELT2.png | Bin 0 -> 355 bytes .../Grip/iron_guard_grip.rsi/icon.png | Bin 0 -> 306 bytes .../Grip/iron_guard_grip.rsi/inhand-left.png | Bin 0 -> 548 bytes .../Grip/iron_guard_grip.rsi/inhand-right.png | Bin 0 -> 555 bytes .../Grip/iron_guard_grip.rsi/meta.json | 30 ++++++ .../guard_electro_staff.rsi/equipped-NECK.png | Bin 0 -> 569 bytes .../guard_electro_staff.rsi/icon.png | Bin 0 -> 705 bytes .../guard_electro_staff.rsi/inhand-left.png | Bin 0 -> 772 bytes .../guard_electro_staff.rsi/inhand-right.png | Bin 0 -> 800 bytes .../guard_electro_staff.rsi/meta.json | 34 +++++++ .../wielded-inhand-left.png | Bin 0 -> 958 bytes .../wielded-inhand-right.png | Bin 0 -> 958 bytes 29 files changed, 330 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike_small.yml create mode 100644 Resources/Textures/_CP14/Actions/Spells/electromancy.rsi/lightning_strike_small.png create mode 100644 Resources/Textures/_CP14/Effects/Beams/lightning.rsi/lightning_small.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/wielded-inhand-right.png diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index f1d14fde29..d6b1f08e02 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -49,6 +49,7 @@ cp14-loadout-guard-head = Guard's head cp14-loadout-guard-pants = Guard's pants cp14-loadout-guard-shirt = Guard's shirt cp14-loadout-guard-spells = Guard's spells +cp14-loadout-guard-equip = Guard's equipment cp14-loadout-merchant-head = Merchant's hat cp14-loadout-merchant-cloak = Merchant's cloak diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index a21a77a620..7e692c2624 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -49,6 +49,7 @@ cp14-loadout-guard-head = Шляпа стражи cp14-loadout-guard-pants = Штаны стражи cp14-loadout-guard-shirt = Рубашка стражи cp14-loadout-guard-spells = Заклинания стражи +cp14-loadout-guard-equip = Экипировка стражи cp14-loadout-merchant-head = Шляпа торговца cp14-loadout-merchant-cloak = Накидка торговца diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike.yml index d68b511632..9356a5b101 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike.yml @@ -21,7 +21,7 @@ - !type:HealthChange damage: types: - Shock: 15 + Shock: 20 - !type:Jitter - !type:CP14StaminaChange staminaDelta: -75 @@ -86,10 +86,10 @@ - !type:HealthChange damage: types: - Shock: 5 + Shock: 10 - !type:Jitter - !type:CP14StaminaChange - staminaDelta: -15 + staminaDelta: -20 - type: entity id: CP14RuneLightningStrike diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike_small.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike_small.yml new file mode 100644 index 0000000000..d88825eee4 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike_small.yml @@ -0,0 +1,86 @@ +- type: entity + id: CP14ActionSpellLightningStrikeSmall + parent: CP14ActionSpellBase + name: Small lightning strike + description: You charge a lightning bolt that burns a medium amount of stamina from the target. + components: + - type: CP14MagicEffectCastSlowdown + speedMultiplier: 0.5 + - type: CP14MagicEffectManaCost + manaCost: 7 + - type: CP14MagicEffect + magicType: Energia + effects: + - !type:CP14SpellSpawnEntityOnTarget + spawns: + - CP14ElectrifiedEffect + - !type:CP14SpellCreateBeam + beamProto: CP14LightningStrikeSmallBeam + - !type:CP14SpellApplyEntityEffect + effects: + - !type:HealthChange + damage: + types: + Shock: 8 + - !type:Jitter + - !type:CP14StaminaChange + staminaDelta: -15 + - !type:CP14SpellThrowFromUser + throwPower: 2 + distance: 0.5 + - type: CP14MagicEffectPacifiedBlock + - type: Action + icon: + sprite: _CP14/Actions/Spells/electromancy.rsi + state: lightning_strike_small + - type: TargetAction + range: 3 + - type: EntityTargetAction + canTargetSelf: false + event: !type:CP14EntityTargetActionEvent + cooldown: 4 + +- type: entity + name: lightning + id: CP14LightningStrikeSmallBeam + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: /Textures/_CP14/Effects/Beams/lightning.rsi + drawdepth: Effects + layers: + - state: lightning_small + shader: unshaded + - type: Physics + canCollide: false + - type: PointLight + enabled: true + color: "#e8ff4c" + radius: 1.2 + softness: 1 + autoRot: true + castShadows: false + - type: Beam + sound: + collection: sparks + - type: TimedDespawn + lifetime: 1 + - type: LightFade + duration: 1 + - type: Tag + tags: + - HideContextMenu + - type: CP14SpellEffectOnCollide + effects: + - !type:CP14SpellSpawnEntityOnTarget + spawns: + - CP14ElectrifiedEffect + - !type:CP14SpellApplyEntityEffect + effects: + - !type:HealthChange + damage: + types: + Shock: 7 + - !type:Jitter + - !type:CP14StaminaChange + staminaDelta: -8 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml index ef7b6779bf..8f812d4e2b 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml @@ -191,6 +191,18 @@ materialComposition: CP14Iron: 10 +- type: entity + parent: CP14ModularGripIron + id: CP14ModularGripIronGuard + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi + state: icon + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ModularGripIronGuard + - type: StaticPrice + price: 10 + - type: entity parent: CP14ModularGripShort id: CP14ModularGripGolden diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml index 7728f0feff..54c5e88d4f 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml @@ -108,6 +108,24 @@ - type: StaticPrice price: 300 +- type: entity + id: CP14MagicGuardElectroStaff + parent: CP14MagicShadowStaff + name: guards electric staff + description: A long, half-tech, half-magic stick designed to convert magical energy into eletric spells. + components: + - type: CP14SpellStorage + spells: + - CP14ActionSpellLightningStrike + - CP14ActionSpellLightningStrikeSmall + - CP14ActionSpellLightningStrikeSmall + - type: Sprite + sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi + - type: Clothing + sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi + - type: StaticPrice + price: 150 + - type: entity id: CP14MagicDruidStaff parent: CP14MagicHealingStaff diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml index b7b2772036..5b58bb1851 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml @@ -47,6 +47,24 @@ - CP14ModularBladeIronRapier - CP14ModularGardeGuildmaster +- type: entity + id: CP14ModularGuardRapier + parent: CP14ModularGripIronGuard + name: "guard's rapier" + description: The standard issue armament of the imperial guard. A short rapier adorned with blue feathers and brass. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi + state: icon + - sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - CP14ModularBladeIronRapier + - CP14ModularGardeSharpIron + - type: entity id: CP14ModularWoodenRapier parent: CP14ModularGripWooden diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml index 187b822581..2cab412b08 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml @@ -33,7 +33,25 @@ id: CP14ModularGuardHalberd parent: CP14ModularGripIronLongGuard name: "guard's halberd" - description: The standard issue armament of the imperial guard. A long iron halberd adorned with blue feathers and brass + description: The standard issue armament of the imperial guard. A long iron halberd adorned with blue feathers and brass. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi + state: icon + - sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - CP14ModularBladeIronSword + - CP14ModularGardeSharpIron + +- type: entity + id: CP14ModularGuardSword + parent: CP14ModularGripIronGuard + name: "guard's sword" + description: The standard issue armament of the imperial guard. A short sword adorned with blue feathers and brass. components: - type: Sprite layers: diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guard.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guard.yml index d87d5696b5..40d506a400 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guard.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guard.yml @@ -76,3 +76,46 @@ id: CP14ClothingShirtGuardsChainmailShirtB equipment: shirt: CP14ClothingShirtGuardsChainmailShirtB + +# Weapon + +- type: loadoutGroup + id: CP14GuardEquip + name: cp14-loadout-guard-equip + minLimit: 1 + maxLimit: 1 + loadouts: + - CP14ModularGuardSword + - CP14ModularGuardHalberd + - CP14ModularGuardRapier + - CP14BowCombat + - CP14MagicGuardElectroStaff + +- type: loadout + id: CP14ModularGuardSword + dummyEntity: CP14ModularGuardSword + equipment: + belt2: CP14ModularGuardSword + skills: + - SwordMastery + +- type: loadout + id: CP14MagicGuardElectroStaff + equipment: + belt2: CP14MagicGuardElectroStaff + +- type: loadout + id: CP14ModularGuardHalberd + dummyEntity: CP14ModularGuardHalberd + equipment: + belt2: CP14ModularGuardHalberd + skills: + - SwordMastery + +- type: loadout + id: CP14ModularGuardRapier + dummyEntity: CP14ModularGuardRapier + equipment: + belt2: CP14ModularGuardRapier + skills: + - RapierMastery diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 32874effd9..96503e4c60 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -85,6 +85,7 @@ - CP14GeneralShoes - CP14GeneralBack - CP14GeneralTrinkets + - CP14GuardEquip - type: roleLoadout id: JobCP14Investigator @@ -99,6 +100,7 @@ - CP14GeneralShoes - CP14GeneralBack - CP14GeneralTrinkets + - CP14GuardEquip - type: roleLoadout id: JobCP14Guard @@ -113,6 +115,7 @@ - CP14GeneralShoes - CP14GeneralBack - CP14GeneralTrinkets + - CP14GuardEquip - type: roleLoadout id: JobCP14Commandant diff --git a/Resources/Prototypes/_CP14/Skill/Basic/electromancy.yml b/Resources/Prototypes/_CP14/Skill/Basic/electromancy.yml index d7d6d62a8d..35f5d0a1ce 100644 --- a/Resources/Prototypes/_CP14/Skill/Basic/electromancy.yml +++ b/Resources/Prototypes/_CP14/Skill/Basic/electromancy.yml @@ -24,6 +24,20 @@ - !type:NeedPrerequisite prerequisite: ElectromancyT1 +- type: cp14Skill + id: CP14ActionSpellLightningStrikeSmall + skillUiPosition: 2, 4 + tree: Electromancy + icon: + sprite: _CP14/Actions/Spells/electromancy.rsi + state: lightning_strike_small + effects: + - !type:AddAction + action: CP14ActionSpellLightningStrikeSmall + restrictions: + - !type:NeedPrerequisite + prerequisite: ElectromancyT1 + # T2 - type: cp14Skill diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/guards.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/guards.yml index 64364d39ba..5b598ac690 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/guards.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/guards.yml @@ -53,3 +53,36 @@ service: !type:CP14BuyItemsService product: CP14Rope count: 1 + +- type: cp14TradingPosition + id: CP14MagicGuardElectroStaff + faction: Guards + uiPosition: 5 + icon: + sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14MagicGuardElectroStaff + count: 1 + +- type: cp14TradingPosition + id: CP14ModularGripIronGuard + faction: Guards + uiPosition: 6 + icon: + sprite: _CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14ModularGripIronGuard + count: 1 + +- type: cp14TradingPosition + id: CP14ModularGripIronLongGuard + faction: Guards + uiPosition: 7 + icon: + sprite: _CP14/Objects/ModularTools/GripLong/iron_grip_long_guard.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14ModularGripIronLongGuard + count: 1 diff --git a/Resources/Textures/_CP14/Actions/Spells/electromancy.rsi/lightning_strike_small.png b/Resources/Textures/_CP14/Actions/Spells/electromancy.rsi/lightning_strike_small.png new file mode 100644 index 0000000000000000000000000000000000000000..d42518aa3407938263cb537729bfe0249f7cd64e GIT binary patch literal 443 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Effects/Beams/lightning.rsi/meta.json b/Resources/Textures/_CP14/Effects/Beams/lightning.rsi/meta.json index 33501e2f3e..fd1c605393 100644 --- a/Resources/Textures/_CP14/Effects/Beams/lightning.rsi/meta.json +++ b/Resources/Textures/_CP14/Effects/Beams/lightning.rsi/meta.json @@ -23,6 +23,18 @@ 2 ] ] + }, + { + "name": "lightning_small", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 2 + ] + ] } ] } diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..a838af02c2e96d92abb61312f9edbd1c8a9cd8b1 GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zB|TjnLn`LH zy|vMsDN*A1$M}ar7lqhZJA1V{oH-jU?%vYM`^RX0n#_UPy>+e|&08Xu_j z=1=Z!-n0H&+0Q%QH{barWApxS@$rLyRe%;SFf{09eciVD>TSLEc6FBvJwAST7~{V^ z{o}5aj+#pndLg?Z z%I9(EB;oapb7JDMx6XL=J6ml3V*6*N4VSxDsbv2ADY$$7|K(TT?*6*9s5t$Vw1US% z{{8ou!1e=uJTdYFH_Kn?J1L6#0#o>J0I3bv*&@zxvv^*5vtWMx+s%xgvn;tQ8|ShW u+^;SR`^03;+pveBlJOJMQCk~^h)>L4_&oJ|1!nyQ8R+Ti=d#Wzp$P!u+nDG8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/equipped-BELT2.png new file mode 100644 index 0000000000000000000000000000000000000000..e134255de334c5076e9c0e3482b4fb036063fe9a GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zWj$RSLn`LH zy=Cad>?m>c~$5|uu-UA;iZkkERlIfWEAH<7dS2Ac;S?iN`gX? zvf|TQI}&EUxjixQ-~P1S$IqE>zI|pg(0CvyyOQ;NQ`qk5f4^7fygndm@+PD-Z1sz0 zXQxUW+o$~^@zdIm$9HP$N!(^=o4e{=*7{v?J&S(ve4CT_^O1f0Jk#2$Eosw_mNBVh z?ww`%xM{;*7S+tnF&>ln{Qc%`T)Jsq!}_1QRbIZ>@vx`Yeecb)dh348RC#*-$(7l6 zO~n6&Z`#cdaRh_L#Kn^n_DXS|z390iuDA8s3l$gJhCP!fY+2OWv%z8Q*_i0QQ!rtDnm{r-UW|d%e>C{+*IOQ>>isUYyk^Tikrd#evFShM2Lho_fhCdoQ(W8SyFf~ovO@9X7~ zk5$$i?y3INbMVxy@B7=9XB>(Wn#j`z6 zX8D>-2sQZG?{itUqiZ!!&(Y>{fPx$-bqA3RCt{2+ObPQQ4|L7??nwFGzfu$QjZ#Ra>=D|F{B}aHWy!e4T3@cL(o)1 z{Qz-ZPw6I4N6HufzT2UgNEDU3n7Af_uQwCzTfWkyXRi6;5h&h5fKp)5fKsT zo10%&!@OR<5$OffnVfQLS1j~?xuB-)8Kg5gBSjD|!2Mm_+PQv%W4k!pT+|9(*f;?I ztR`-8e^Px$_lgcha1ewFiUvE>sf#X(iy{spxOHjV>rhbeKL}1b z=nv3E5Ol6?_k~BSOjlR!(Ih>sPG2|S8h=_=Yh=_=Y zzFJt^(EZM#6P@Hc;3b%8ScuQghoT7a*?B!<#Bh>Y_LQ$<0j~Gfv}ss4EWDsp%qy`h z15_&J)zV^0ND`Ca34LegDJu4optZ$>b{*sE5QiD{Q+@ zL_|bHL_|bH^am^~ZfG;LBmQg7wLAP$2JWAjlr2?*iEO zF{sDsvv#wA>~Tg(zXOBa2I$2MLH+Sg0nh+&e{(K6uH*XzbTWh>q5gO$zWeB=0G$jW tNRi%s-#*R^gt2`t=3jq2X9kG=gm)PSt2e+JNk{+y002ovPDHLkV1hN@{apY6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/meta.json new file mode 100644 index 0000000000..007785e73f --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by dinazewwr", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..82617fb119fce96b3af1c0e455f8121c17d2230b GIT binary patch literal 569 zcmV-90>=G`P)Px$^GQTORCt{2+CfVKK^O+$*N8fJQ`(4xhzzttodiKTEFSs=5=heBn@FBK1f9G1 zD}sJPQYR_sC}>0>b*M1$){Qx4T+P7GbHJH~q z{?lU(R_$Ak^UaOgA)T)<061&4RdTtG=L3E-irYpRS%6Nx242~Pz*ayZqpNtnE=mA? zW@@KilO8{^002j2}TvH${8RDhYqZ-G_E&-@JVeF56-SFQ2BFMwsO zXpQ%M0d!}8uZ6-9779nSo>F~31Lzc(^+iyZuM2Rvy@uzjW36LI{U&It%g+d|PnurG zAcT+^VS1B<3aR^mznUbR{s(6&sRD>i5?z!WHzAlz`c6=6k{D|fg6UjuLNMKMlSIKz zxzmJTI-Mp2lSw}eO{59IbgE4Vgb+dqA%qY@2qAPx%dr3q=R9J=0m(5EQVI0Rl&#*zu7|4L`2rDYPfg6GccSU@O!h{f|lL(>x0bU}k zPTmRv&C8xT1RVk)7EhKD1Y)H~tA|8d(G}TPZP&dNIlY+hbdVX=cXxMY>3e#Z=jHqP z{eI6g&kXzzdi%Fr?#RzFCA%a*Wpz;2xAn?mcq;&D!{FWS6*PuP$u9Y9^$Tv@OZz}r zHuVfT3ZejbRF$-05cwWLW0*QuBM--(1E7{w;bb-xfNSTr1i;kR9t1$0s}X?3@i1=P z>llOrdo}l{Dp$)@rnU@*R$sET`w@V#TR!F@qhfPqfy(Nj?GOrpR_SBtWlt736H zOy4CBoxu{z+)3?=s=lpPx^*vekx>Cq8wg1NP1Et!_*wm;KpZN;X@`Z5Zip{>nPJ?g+03hJ?N_n9I;KXkU#{kX>Vaq8vPO)TC zh#y}qn4`uxngLVU=CNdQpJ!13PJ(c>1lcl8uV1WUd-16SQ#1e*qBB^+jVC`bfBA|E n0MIe=Mi`j{zf#F!TOX}|n{WIAI4zbs00000NkvXXu0mjfJ=Q+K literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..60561ccf4dd166d0d6cd8f869284880674d7087c GIT binary patch literal 772 zcmV+f1N;1mP)Px%zDYzuRCt{2n$JrcK^(E^I7J{C7 z5ImM%>_1WIv8Q6FP)%D1If!72SVR$oD%4WaAZ%-QkY#TMy;}Gc&g++}~WjD02Ct z_;Z_I8i6r-Khy7E!JZY{s|(_`eO@)TR~JOVo*h~vaOPJwg=uAlX=R1%!;3=03wJm~ z+s#vq*-pP5lt!Sq^EYUXL9o0903dmBgsG7mC5@?(8+?8DIziN>TVXQ*0KT6b2YS30 z*bHd3>X@9!C~15yzh}MsY?xM7I7@{{ys}uQKormha0&bI01GXqm5s#wj}%;{l1~AS zj&hDDmS;eerU1DCjm8gZNmgBQ0}SHfy>Y`~f`z^tS-H z0n5|lINMn#)jZo-$MWeh z41yv^5z2&!S15uMp-hMjgKCf>vRc!0rxAgaPD=Omv3QH!<2W>GXMQ%Px%+DSw~RCt{2nz2h8Q2@rjlY&FGwq7X;B1W1lIt2p3;n3pR#R|pXR48@|qEiQ< zW65IwiAu&!B>_R3HV`_9Vx(9kB5j&Ta0vlZd>!OMpvm2PFYn#myT0Gzad+JP{Cs&i z?|pzqGmt{ZBsb)Q`0c^N4LKo&j_K+?(r@R&`VIkr59jrN_640@Put(gy>9?lM@87_ zHL-<4$0S!rMZv0au-%*30svR{z5xKhn-^(VW~95V61J~pM%dlw=2wXQGr7D$lFJ*U zcb{Nap$Kswdlc=SnBQC?87oEl9Sb78eignE-8A-0uxK z&}vjMZl$~1Dk03>{u~MN@)TP4f!_iEFf)3Kk)PkiS$Rk)mo;WaZ(YxG4B*H4nJ^(g zpz(JMV0tQwX0s+t$ZNh7KN>?{B)ys;v3Nqsd4LAT5%52t18_S*^@&gjVV(m*2kRe; zdJa%&6tK8b1)$O|&kFSjsMmkV^biKCCv^a(`IuS84_H0*2#|46zhUvE3P6?NZ^PoN zM}R~RC7=r6Vs9I3vy-x2gs?U{iHp5$>hlM_6zyg4Z3XQ=6TD8I^7Ua7sn>bGH8dJc zn4v8nr~uP*0BiX`1hQKyOaZW#4~D_3mJ0Ke;85iQ2E1yiPzNwKzd{ZVc8zxJ63?DL z!TXo5(5_wL@L<=FRh$S^OGRk;z=c4!RJ>mo=`B_c1*cm2&;S2LJ%4m9kO(_8IBbjQ7j2yY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/meta.json new file mode 100644 index 0000000000..669cb9d0f4 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..487b6fcea664cfcf9d6e400ba4dfd67a2dc0e2e0 GIT binary patch literal 958 zcmV;v13~Px&cu7P-RCt{2nqNp$Q5?s=S275NV!5l8WYQ=n)*fT3b43^3?>k)><(BwFG768oUh!(A8|h`PU6Nb@K*7u~`7X(OMOr(wLH< zVFG|S&H?}qAK8xGp9atuO<;5+oYVL+v1%zd?QtBEv$M6-kj5fXRcY>V}Mo{w-pItJvYdgYNc>W7wQtdN($Nj~^!T{`eP+KfMMShG7_n zVHk#C7=~dOhWWqAr1}&~2`bphYx1FJ_|XLbKgAHC6WI4%lJ?6z9$!(ID=pN2<^XBB zK?xeBC^b{t7$`Wel90xt)JzE)meN?E6yhZ*LyM)QzEZY(KHCwB%}Qwu_@N4o--k;L z0XQk|>HIK}_t^4Q0HF%K4F%-2xo8AkCr(OrNUVELX}gjvjbY1zeVx@#n_R7!{Wz5( zXXTQ-tuswG2!Iqw4_2*4Q)4+!53G|mVx1@N57)FA^bUSOUo-)cJb-_z0Ie+@6drnl zbq)IfEEGXVVK%3ivTbn5eQuwhMDjB)AHlwBF9NqaSMJ8R$8m^+c$!Vy|C^01n~fMV z*-tK5c16>Z&9|msXn((@&T1#q`f5s-p$mcVTc|%tvIbE!=Y@`;sFhwMi;4A*>nFX! z;)jWqO3vcdbb~rvj-svcb g8HQmPhGEk94#?7wKZRtMfdBvi07*qoM6N<$f(}>6{{R30 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..487b6fcea664cfcf9d6e400ba4dfd67a2dc0e2e0 GIT binary patch literal 958 zcmV;v13~Px&cu7P-RCt{2nqNp$Q5?s=S275NV!5l8WYQ=n)*fT3b43^3?>k)><(BwFG768oUh!(A8|h`PU6Nb@K*7u~`7X(OMOr(wLH< zVFG|S&H?}qAK8xGp9atuO<;5+oYVL+v1%zd?QtBEv$M6-kj5fXRcY>V}Mo{w-pItJvYdgYNc>W7wQtdN($Nj~^!T{`eP+KfMMShG7_n zVHk#C7=~dOhWWqAr1}&~2`bphYx1FJ_|XLbKgAHC6WI4%lJ?6z9$!(ID=pN2<^XBB zK?xeBC^b{t7$`Wel90xt)JzE)meN?E6yhZ*LyM)QzEZY(KHCwB%}Qwu_@N4o--k;L z0XQk|>HIK}_t^4Q0HF%K4F%-2xo8AkCr(OrNUVELX}gjvjbY1zeVx@#n_R7!{Wz5( zXXTQ-tuswG2!Iqw4_2*4Q)4+!53G|mVx1@N57)FA^bUSOUo-)cJb-_z0Ie+@6drnl zbq)IfEEGXVVK%3ivTbn5eQuwhMDjB)AHlwBF9NqaSMJ8R$8m^+c$!Vy|C^01n~fMV z*-tK5c16>Z&9|msXn((@&T1#q`f5s-p$mcVTc|%tvIbE!=Y@`;sFhwMi;4A*>nFX! z;)jWqO3vcdbb~rvj-svcb g8HQmPhGEk94#?7wKZRtMfdBvi07*qoM6N<$f(}>6{{R30 literal 0 HcmV?d00001