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 0000000000..d42518aa34 Binary files /dev/null and b/Resources/Textures/_CP14/Actions/Spells/electromancy.rsi/lightning_strike_small.png differ diff --git a/Resources/Textures/_CP14/Actions/Spells/electromancy.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/electromancy.rsi/meta.json index 1719ce5e11..5b64746ebc 100644 --- a/Resources/Textures/_CP14/Actions/Spells/electromancy.rsi/meta.json +++ b/Resources/Textures/_CP14/Actions/Spells/electromancy.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "lightning_strike" }, + { + "name": "lightning_strike_small" + }, { "name": "speed_music" }, diff --git a/Resources/Textures/_CP14/Effects/Beams/lightning.rsi/lightning_small.png b/Resources/Textures/_CP14/Effects/Beams/lightning.rsi/lightning_small.png new file mode 100644 index 0000000000..7ac90e906e Binary files /dev/null and b/Resources/Textures/_CP14/Effects/Beams/lightning.rsi/lightning_small.png differ 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 0000000000..a838af02c2 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/equipped-BELT.png differ 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 0000000000..e134255de3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/icon.png new file mode 100644 index 0000000000..c797a0368e Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/inhand-left.png new file mode 100644 index 0000000000..99cdf7561b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/inhand-right.png new file mode 100644 index 0000000000..632e19da11 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi/inhand-right.png differ 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 0000000000..82617fb119 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/icon.png new file mode 100644 index 0000000000..480e78a29d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/icon.png differ 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 0000000000..60561ccf4d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/inhand-right.png new file mode 100644 index 0000000000..4d71a19108 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/inhand-right.png differ 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 0000000000..487b6fcea6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/wielded-inhand-left.png differ 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 0000000000..487b6fcea6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Magic/TwoHandedStaff/guard_electro_staff.rsi/wielded-inhand-right.png differ