diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index 2db4c83977..335bc384cb 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -60,4 +60,5 @@ cp14-loadout-guildmaster-cloak = Guildmaster cloak cp14-loadout-guildmaster-shirt = Guildmaster shirt cp14-loadout-guildmaster-pants = Guildmaster pants cp14-loadout-guildmaster-shoes = Guildmaster shoes -cp14-loadout-guildmaster-spells = Guildmaster spells \ No newline at end of file +cp14-loadout-guildmaster-spells = Guildmaster spells +cp14-loadout-guildmaster-weapons = Guildmaster weapon \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index 40d70111b8..45c464b0cc 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -60,4 +60,5 @@ cp14-loadout-guildmaster-cloak = Накидка гильдмастера cp14-loadout-guildmaster-shirt = Рубашка гильдмастера cp14-loadout-guildmaster-pants = Штаны гильдмастера cp14-loadout-guildmaster-shoes = Ботинки гильдмастера -cp14-loadout-guildmaster-spells = Заклинания гильдмастера \ No newline at end of file +cp14-loadout-guildmaster-spells = Заклинания гильдмастера +cp14-loadout-guildmaster-weapons = Оружие гильдмастера \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/guildmaster.yml new file mode 100644 index 0000000000..c1b64365be --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/guildmaster.yml @@ -0,0 +1,13 @@ +- type: entity + parent: CP14ModularGardeBase + id: CP14ModularGardeGuildmaster + categories: [ ForkFiltered ] + name: guildmaster's rapier garde + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi + layers: + - state: icon + - type: CP14ModularCraftPart + possibleParts: + - GardeGuildmaster \ 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 2b9a8badc5..c67cd8604e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml @@ -231,6 +231,30 @@ - !type:DoActsBehavior acts: ["Destruction"] +- type: entity + parent: CP14ModularGripShort + id: CP14ModularGripGuildmaster + name: guildmaster's rapier grip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi + layers: + - state: icon + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ModularGripIron + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 120 #x2.4 durability + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:CP14ModularDisassembleBehavior + - !type:DoActsBehavior + acts: ["Destruction"] + # Long - type: entity parent: CP14ModularGripLong diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml new file mode 100644 index 0000000000..f0182668ac --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml @@ -0,0 +1,17 @@ +- type: entity + id: CP14ModularGuildmasterRapier + parent: CP14ModularGripGuildmaster + name: guildmaster's personal rapier + description: A personal weapon issued to each guildmaster. Combines reliability and killing power. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi + state: icon + - sprite: _CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - BladeIronRapier + - GardeGuildmaster \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml index b4fe3a7a14..5bdf5bdd6d 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml @@ -82,4 +82,18 @@ id: CP14ActionSpellMonolithWarp dummyEntity: CP14ActionSpellMonolithWarp actions: - - CP14ActionSpellMonolithWarp \ No newline at end of file + - CP14ActionSpellMonolithWarp + +#Weapons + +- type: loadoutGroup + id: CP14GuildmasterWeapons + name: cp14-loadout-guildmaster-weapons + loadouts: + - CP14ModularGuildmasterRapier + +- type: loadout + id: CP14ModularGuildmasterRapier + storage: + back: + - CP14ModularGuildmasterRapier diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index aff9e7fc4d..e5331881db 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -126,6 +126,7 @@ id: JobCP14Guildmaster groups: - CP14GeneralSpells + - CP14GuildmasterWeapons - CP14GuildmasterOuterClothing - CP14GeneralEyes - CP14GuildmasterHead diff --git a/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml b/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml new file mode 100644 index 0000000000..556e8571d0 --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml @@ -0,0 +1,25 @@ +# Concept +# + Damage + durability + +- type: modularPart + id: BaseGardeGuildmaster + modifiers: + - !type:EditDamageableModifier + multiplier: 0.8 + - !type:EditSharpened + sharpnessDamageMultiplier: 0.8 + - !type:EditMeleeWeapon + damageMultiplier: 1.2 + - !type:EditIncreaseDamageOnWield + damageMultiplier: 1.2 + +- type: modularPart + id: GardeGuildmaster + slots: + - Garde + rsiPath: _CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseGardeGuildmaster + diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT1.png index 9008c58a6a..cda538ccd4 100644 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT1.png and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT2.png index f54e664fe5..caa9f978d7 100644 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT2.png and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..d63c0f3e56 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..5fcca87825 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/icon.png new file mode 100644 index 0000000000..676a6a1061 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/inhand-left.png new file mode 100644 index 0000000000..75f905eba0 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/inhand-right.png new file mode 100644 index 0000000000..9a5990675c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/meta.json new file mode 100644 index 0000000000..be51eceff7 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT1", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..e340af141c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..7ff79c3632 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/icon.png new file mode 100644 index 0000000000..5c39bebb46 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/inhand-left.png new file mode 100644 index 0000000000..281da0cda7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/inhand-right.png new file mode 100644 index 0000000000..e1548a7305 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/meta.json new file mode 100644 index 0000000000..0d7bf1d8d4 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT1", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + } + ] +}