diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml index 1aa4db81ad..4f48f86b24 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml @@ -103,3 +103,22 @@ sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi - type: Clothing sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/fire_staff.rsi + +- type: entity + id: CP14MagicDruidStaff + parent: CP14MagicHealingStaff + name: magic druid staff + description: A long, half-tech, half-magic stick designed to convert magical energy into spells. + components: + - type: CP14SpellStorage + spells: + - CP14ActionSpellPlantGrowth + - type: Sprite + sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi + - type: Clothing + sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi + - type: CP14MagicEnergyContainer + energy: 0 + maxEnergy: 30 + - type: CP14MagicManacostModify + globalModifier: 0.9 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml index f14060465b..6d723f3113 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml @@ -8,6 +8,7 @@ - CP14ModularCopperSword - CP14ModularCopperRapier - CP14BowCombat + - CP14MagicDruidStaff - type: loadout id: CP14ModularCopperSkimitar @@ -40,3 +41,8 @@ belt2: CP14ClothingBeltQuiverCopperArrow neck: CP14BowCombat +- type: loadout + id: CP14MagicDruidStaff + dummyEntity: CP14MagicDruidStaff + equipment: + neck: CP14MagicDruidStaff \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/equipped-NECK.png new file mode 100644 index 0000000000..98da4dfa57 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/icon.png new file mode 100644 index 0000000000..8096dae640 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/inhand-left.png new file mode 100644 index 0000000000..77779e21e5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/inhand-right.png new file mode 100644 index 0000000000..971df2d023 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/meta.json new file mode 100644 index 0000000000..17c7fcdc0d --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by solaetv", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..6d0eb3675e Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..6d0eb3675e Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/druid_staff.rsi/wielded-inhand-right.png differ