From 06a83773d48d149028a1e4d52024b7cf6226edb0 Mon Sep 17 00:00:00 2001 From: EstKemran <157578255+EstKemran@users.noreply.github.com> Date: Mon, 19 Aug 2024 02:04:26 +0300 Subject: [PATCH] Fix weapon path (#1615) --- .../Locale/ru-RU/ss220/weapons/hosgun.ftl | 4 +++ .../ru-RU/ss220/weapons/ntbaton.ftl.ftl | 2 ++ .../Locale/ru-RU/ss220/weapons/oldbroom.ftl | 4 +++ .../{ => Objects}/Weapons/Guns/hosgun.yml | 12 ++++--- .../Objects/Weapons/Melee/jian_sword.yml | 15 -------- .../Weapons/Melee/knuckleduster.yml | 0 .../{ => Objects}/Weapons/Melee/ntbaton.yml | 4 +-- .../Objects/Weapons/Melee/oldbroom.yml | 35 +++++++++++++++++++ .../Entities/Objects/Weapons/Melee/sword.yml | 24 +++++++++++-- .../SS220/Entities/Weapons/Guns/oldbroom.yml | 17 --------- .../SS220/Entities/Weapons/oldbroom.yml | 17 --------- 11 files changed, 76 insertions(+), 58 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/weapons/hosgun.ftl create mode 100644 Resources/Locale/ru-RU/ss220/weapons/ntbaton.ftl.ftl create mode 100644 Resources/Locale/ru-RU/ss220/weapons/oldbroom.ftl rename Resources/Prototypes/SS220/Entities/{ => Objects}/Weapons/Guns/hosgun.yml (75%) delete mode 100644 Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/jian_sword.yml rename Resources/Prototypes/SS220/Entities/{ => Objects}/Weapons/Melee/knuckleduster.yml (100%) rename Resources/Prototypes/SS220/Entities/{ => Objects}/Weapons/Melee/ntbaton.yml (82%) create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/oldbroom.yml delete mode 100644 Resources/Prototypes/SS220/Entities/Weapons/Guns/oldbroom.yml delete mode 100644 Resources/Prototypes/SS220/Entities/Weapons/oldbroom.yml diff --git a/Resources/Locale/ru-RU/ss220/weapons/hosgun.ftl b/Resources/Locale/ru-RU/ss220/weapons/hosgun.ftl new file mode 100644 index 00000000000000..bd28d877294b3e --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/weapons/hosgun.ftl @@ -0,0 +1,4 @@ +ent-WeaponRevolverMatebaSouvenir = уника + .desc = Сувенирная версия авторевольвера Матеба с золотым покрытием. Из-за других материалов обладает конструктивно уменьшенной скорострельностью. Использует патроны калибра .45 магнум. +ent-LockedUnicaBox = защищённый кейс для револьвера + .desc = Ударопрочный кейс с замком для хранения револьвера. Является аксессуаром к сувенирному револьверу "Уника". diff --git a/Resources/Locale/ru-RU/ss220/weapons/ntbaton.ftl.ftl b/Resources/Locale/ru-RU/ss220/weapons/ntbaton.ftl.ftl new file mode 100644 index 00000000000000..701083b15f91f3 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/weapons/ntbaton.ftl.ftl @@ -0,0 +1,2 @@ +ent-NTbaton = телескопическая бита НТ + .desc = А вы знали, что Офицеры ЦК любят играть в бейсбол головами некомпетентного руководства своих активов? diff --git a/Resources/Locale/ru-RU/ss220/weapons/oldbroom.ftl b/Resources/Locale/ru-RU/ss220/weapons/oldbroom.ftl new file mode 100644 index 00000000000000..1dc804328b5538 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/weapons/oldbroom.ftl @@ -0,0 +1,4 @@ +ent-MagicBroom = старая метла + .desc =Обычная, не волшебная метла. Только для реквизита. +ent-OldBroom = старая метла + .desc =Обычная, не волшебная метла. Только для реквизита. diff --git a/Resources/Prototypes/SS220/Entities/Weapons/Guns/hosgun.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/hosgun.yml similarity index 75% rename from Resources/Prototypes/SS220/Entities/Weapons/Guns/hosgun.yml rename to Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/hosgun.yml index 9bc63e8b23d5ca..63642d8d42cf44 100644 --- a/Resources/Prototypes/SS220/Entities/Weapons/Guns/hosgun.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/hosgun.yml @@ -1,8 +1,10 @@ +# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + - type: entity - name: Уника parent: BaseWeaponRevolver id: WeaponRevolverMatebaSouvenir - description: Сувенирная версия авторевольвера Матеба с золотым покрытием. Из-за других материалов обладает конструктивно уменьшенной скорострельностью. Использует патроны калибра .45 магнум. + name: unika + description: A souvenir version of the Mateb auto revolver with a gold coating. Due to other materials, it has a structurally reduced rate of fire. Uses caliber cartridges .45 magnum. components: - type: Sprite sprite: SS220/Objects/Weapons/Guns/hosgun.rsi @@ -22,10 +24,10 @@ price: 5000 - type: entity - name: защищённый кейс для револьвера - description: Ударопрочный кейс с замком для хранения револьвера. Является аксессуаром к сувенирному револьверу "Уника". - id: LockedUnicaBox parent: BaseStorageItem + id: LockedUnicaBox + name: a protected revolver case + description: A shockproof case with a lock for storing a revolver. It is an accessory to the souvenir revolver "Unica". components: - type: Storage grid: diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/jian_sword.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/jian_sword.yml deleted file mode 100644 index 4a6d387d1fa269..00000000000000 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/jian_sword.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - name: jian sword - parent: CaptainSabre - id: JianSword - description: An ancient ceremonial sword. - components: - - type: Sprite - sprite: SS220/Objects/Weapons/Melee/jian_sword.rsi - state: icon - - type: Item - size: Normal - sprite: SS220/Objects/Weapons/Melee/jian_sword.rsi - - type: Tag - tags: - - JianSword diff --git a/Resources/Prototypes/SS220/Entities/Weapons/Melee/knuckleduster.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/knuckleduster.yml similarity index 100% rename from Resources/Prototypes/SS220/Entities/Weapons/Melee/knuckleduster.yml rename to Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/knuckleduster.yml diff --git a/Resources/Prototypes/SS220/Entities/Weapons/Melee/ntbaton.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/ntbaton.yml similarity index 82% rename from Resources/Prototypes/SS220/Entities/Weapons/Melee/ntbaton.yml rename to Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/ntbaton.yml index adfc4980cc04e2..c6019dd7905ad1 100644 --- a/Resources/Prototypes/SS220/Entities/Weapons/Melee/ntbaton.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/ntbaton.yml @@ -1,10 +1,10 @@ # © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt - type: entity - name: телескопическая бита НТ parent: BaseItem id: NTbaton - description: А вы знали, что Офицеры ЦК любят играть в бейсбол головами некомпетентного руководства своих активов? + name: telescopic bat NT + description: Did you know that Central Committee officers like to play baseball with the heads of the incompetent management of their assets? components: - type: Sprite sprite: SS220/Objects/Weapons/Melee/ntbaton.rsi diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/oldbroom.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/oldbroom.yml new file mode 100644 index 00000000000000..e14a76e0a0e08e --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/oldbroom.yml @@ -0,0 +1,35 @@ +- type: entity + parent: BaseItem + id: MagicBroom + name: an old broom + description: An ordinary, non-magical broom. Only for props. + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Melee/oldbroom.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -150 + damage: + types: + Blunt: 0 + - type: Item + size: Normal + sprite: SS220/Objects/Weapons/Melee/oldbroom.rsi + +- type: entity + parent: BaseItem + id: OldBroom + name: an old broom + description: An ordinary, non-magical broom. Only for props. + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Melee/oldbroom.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -150 + damage: + types: + Blunt: 0 + - type: Item + size: Normal + sprite: SS220/Objects/Weapons/Melee/oldbroom.rsi diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml index 80595520cb716d..b60ae34fef92d6 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml @@ -1,3 +1,23 @@ +# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + +# Цзянь +- type: entity + name: jian sword + parent: CaptainSabre + id: JianSword + description: An ancient ceremonial sword. + components: + - type: Sprite + sprite: SS220/Objects/Weapons/Melee/jian_sword.rsi + state: icon + - type: Item + size: Normal + sprite: SS220/Objects/Weapons/Melee/jian_sword.rsi + - type: Tag + tags: + - JianSword + +# Ёримицу - type: entity name: minamoto no yorimitsu parent: CaptainSabre @@ -19,6 +39,7 @@ tags: - MinamotoNoYorimitsu +# Рапира - type: entity parent: BaseItem id: Rapier @@ -37,7 +58,6 @@ types: Piercing: 27 angle: 0 - animation: WeaponArcThrust soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item @@ -58,6 +78,7 @@ types: Piercing: 15 +# Офицерский кортик - type: entity parent: CaptainSabre id: OfficerCutlass @@ -73,7 +94,6 @@ types: Piercing: 12 angle: 0 - animation: WeaponArcThrust - type: Item size: Normal sprite: SS220/Objects/Weapons/Melee/officer_cutlass.rsi diff --git a/Resources/Prototypes/SS220/Entities/Weapons/Guns/oldbroom.yml b/Resources/Prototypes/SS220/Entities/Weapons/Guns/oldbroom.yml deleted file mode 100644 index 1bb731559b38bc..00000000000000 --- a/Resources/Prototypes/SS220/Entities/Weapons/Guns/oldbroom.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - name: старая метла - parent: BaseItem - id: OldBroom - description: Обычная, не волшебная метла. Только для реквизита. - components: - - type: Sprite - sprite: SS220/Objects/Weapons/Melee/oldbroom.rsi - state: icon - - type: MeleeWeapon - wideAnimationRotation: -150 - damage: - types: - Blunt: 0 - - type: Item - size: Normal - sprite: SS220/Objects/Weapons/Melee/oldbroom.rsi diff --git a/Resources/Prototypes/SS220/Entities/Weapons/oldbroom.yml b/Resources/Prototypes/SS220/Entities/Weapons/oldbroom.yml deleted file mode 100644 index 5d79b740f294e6..00000000000000 --- a/Resources/Prototypes/SS220/Entities/Weapons/oldbroom.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - name: старая метла - parent: BaseItem - id: MagicBroom - description: Обычная не волшебная метла. Только для реквизита. - components: - - type: Sprite - sprite: SS220/Objects/Weapons/Melee/oldbroom.rsi - state: icon - - type: MeleeWeapon - wideAnimationRotation: -150 - damage: - types: - Blunt: 0 - - type: Item - size: Normal - sprite: SS220/Objects/Weapons/Melee/oldbroom.rsi