hotfix translation and description

Corvax-Frontier · May 27, 2024 · 508d49e · 508d49e
1 parent 061ffe0
commit 508d49e
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 56 deletions.
diff --git a/...urces/Locale/ru-RU/ss14-ru/prototypes/_nf/catalog/fills/items/weapon_cases_expedition.ftl b/...urces/Locale/ru-RU/ss14-ru/prototypes/_nf/catalog/fills/items/weapon_cases_expedition.ftl
@@ -67,3 +67,10 @@ ent-WeaponCaseShortEnergyCutlassExpedition = { ent-WeaponCaseShort }
 ent-WeaponCaseShortEnergySwordDoubleExpedition = { ent-WeaponCaseShort }
     .suffix = Экспедиция, Двухклинковый энергомеч
     .desc = { ent-WeaponCaseShort.desc }
+ent-WeaponCaseWeaponSubMachineGunVector22Expedition = { ent-WeaponCaseLong }
+    .suffix = Экспедиция, Вектор .22 LR
+    .desc = { ent-WeaponCaseLong.desc }
+ent-WeaponCaseWeaponSubMachineGunVector45Expedition = { ent-WeaponCaseLong }
+    .suffix = Экспедиция, Вектор .45 ACP
+    .desc = { ent-WeaponCaseLong.desc }
+
diff --git a/...ces/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/expedition_guns.ftl b/...ces/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/weapons/guns/expedition_guns.ftl
@@ -24,4 +24,8 @@ ent-WeaponLaserCarbineExpedition = { ent-WeaponLaserCarbine }
 ent-WeaponAdvancedLaserExpedition = { ent-WeaponAdvancedLaser }
     .desc = { ent-WeaponAdvancedLaser.desc }
 ent-WeaponSniperRepeaterExpedition = { ent-WeaponSniperRepeater }
-    .desc = { ent-WeaponSniperRepeater.desc }
+    .desc = { ent-WeaponSniperRepeater.desc }
+ent-WeaponSubMachineGunVector22Expedition = { ent-WeaponSubMachineGunVector22 }
+    .desc = { ent-WeaponSubMachineGunVector22.desc }
+ent-WeaponSubMachineGunVector45Expedition = { ent-WeaponSubMachineGunVector45 }
+    .desc = { ent-WeaponSubMachineGunVector45.desc }
diff --git a/...e/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/vector.ftl b/...e/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/vector.ftl
@@ -1,10 +1,10 @@
 ent-CartridgeVector22 = патрон (.22 LR)
     .desc = { ent-BaseCartridgePistol.desc }
-ent-CartridgeVector45 = патрон (.45 APC)
+ent-CartridgeVector45 = патрон (.45 ACP)
     .desc = { ent-BaseCartridgePistol.desc }
-ent-CartridgeVector45Incendiary = патрон (.45 APC зажигательный)
+ent-CartridgeVector45Incendiary = патрон (.45 ACP зажигательный)
     .desc = { ent-BaseCartridgePistol.desc }
-ent-CartridgeVector45Practice = патрон (.45 APC учебный)
+ent-CartridgeVector45Practice = патрон (.45 ACP учебный)
     .desc = { ent-BaseCartridgePistol.desc }
-ent-CartridgeVector45Uranium = патрон (.45 APC урановый)
+ent-CartridgeVector45Uranium = патрон (.45 ACP урановый)
     .desc = { ent-BaseCartridgePistol.desc } 
diff --git a/...le/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/vector.ftl b/...le/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/vector.ftl
@@ -1,16 +1,16 @@
 ent-MagazineVector22 = магазин (.22 LR)
-    .desc = { ent-BaseItem.desc }
+    .desc = До смешного большой магазин с до смешного маленькими и нелепыми патронами калибра .22 LR.
 ent-MagazineVector22Empty = { ent-MagazineVector22 }
     .desc = { ent-BaseItem.desc }
     .suffix = Пустой
-ent-MagazineVector45 = магазин (.45 APC)
-    .desc = { ent-BaseItem.desc }
+ent-MagazineVector45 = магазин (.45 ACP)
+    .desc = Стандартный магазин на 13 маленьких (больших и медленных) друзей калибра .45 ACP.
 ent-MagazineVector45Empty = { ent-MagazineVector45 }
     .desc = { ent-BaseItem.desc }
     .suffix = Пустой
-ent-MagazineVector45Incendiary = магазин (.45 APC зажигательные)
+ent-MagazineVector45Incendiary = магазин (.45 ACP зажигательные)
     .desc = { ent-MagazineVector45 .desc }
-ent-MagazineVector45Practice = магазин (.45 APC учебные)
+ent-MagazineVector45Practice = магазин (.45 ACP учебные)
     .desc = { ent-MagazineVector45 .desc }
-ent-MagazineVector45Uranium =магазин (.45 APC урановые)
+ent-MagazineVector45Uranium = магазин (.45 ACP урановые)
     .desc = { ent-MagazineVector45 .desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/vector.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/vector.ftl
@@ -1,6 +1,6 @@
-ent-WeaponSubMachineGunVector22 = Вектор (.22)
-    .desc = Вектор.
+ent-WeaponSubMachineGunVector22 = Вектор (.22 LR)
+    .desc = Версия легендарного пистолета-пулемёта для спортивной стрельбы. Возможно сможет подстрелить даже белку. Использует патроны калибра .22 LR.
     .suffix = Пистолет-пулемёт
-ent-WeaponSubMachineGunVector45 = Вектор (.45 APC)
+ent-WeaponSubMachineGunVector45 = Вектор (.45 ACP)
     .desc = Гражданская версия уже легендарного и забытого пистолета-пулемёта. Использует патроны калибра .45 ACP. Автоматический огонь в комплект не входит.
     .suffix = Пистолет-пулемёт
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Vector/vector.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Vector/vector.yml
@@ -1,7 +1,7 @@
-- type: entity
+- type: entity #FrontierCorvax
   parent: BaseItem
   id: MagazineBoxVector45
-  name: ammunition box (.45 APC)
+  name: ammunition box (.45 ACP)
   components:
   - type: BallisticAmmoProvider
     mayTransfer: true
@@ -28,10 +28,10 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
+- type: entity #FrontierCorvax
   parent: MagazineBoxVector45
   id: MagazineBoxVector45Incendiary
-  name: ammunition box (.45 APC incendiary)
+  name: ammunition box (.45 ACP incendiary)
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeVector45Incendiary
@@ -43,10 +43,10 @@
       map: ["enum.GunVisualLayers.Mag"]
     - state: incendiary
 
-- type: entity
+- type: entity #FrontierCorvax
   parent: MagazineBoxVector45
   id: MagazineBoxVector45Practice
-  name: ammunition box (.45 APC practice)
+  name: ammunition box (.45 ACP practice)
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeVector45Practice
@@ -58,10 +58,10 @@
       map: ["enum.GunVisualLayers.Mag"]
     - state: practice
 
-- type: entity
+- type: entity #FrontierCorvax
   parent: MagazineBoxVector45
   id: MagazineBoxVector45Uranium
-  name: ammunition box (.45 APC uranium)
+  name: ammunition box (.45 ACP uranium)
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeVector45Uranium
@@ -73,7 +73,7 @@
       map: ["enum.GunVisualLayers.Mag"]
     - state: uranium
 
-- type: entity
+- type: entity #FrontierCorvax
   parent: BaseItem
   id: MagazineBoxVector22
   name: ammunition box (.22 LR)

diff --git a/...s/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/SMGs/SMGsAmmo.yml b/...s/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/SMGs/SMGsAmmo.yml
@@ -1,4 +1,4 @@
-- type: entity #Vector
+- type: entity #FrontierCorvax
   id: CartridgeVector22
   name: cartridge (.22 LR)
   parent: BaseCartridgePistol
@@ -9,9 +9,9 @@
   - type: CartridgeAmmo
     proto: BulletVector22
 
-- type: entity #Vector
+- type: entity #FrontierCorvax
   id: CartridgeVector45
-  name: cartridge (.45 APC)
+  name: cartridge (.45 ACP)
   parent: BaseCartridgePistol
   components:
   - type: Tag
@@ -20,9 +20,9 @@
   - type: CartridgeAmmo
     proto: BulletVector45
 
-- type: entity
+- type: entity #FrontierCorvax
   id: CartridgeVector45Incendiary
-  name: cartridge (.45 APC incendiary)
+  name: cartridge (.45 ACP incendiary)
   parent: CartridgeVector45
   components:
   - type: CartridgeAmmo
@@ -35,9 +35,9 @@
         map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#ff6e52"
 
-- type: entity
+- type: entity #FrontierCorvax
   id: CartridgeVector45Practice
-  name: cartridge (.45 APC practice)
+  name: cartridge (.45 ACP practice)
   parent: CartridgeVector45
   components:
   - type: CartridgeAmmo
@@ -50,9 +50,9 @@
         map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#dbdbdb"
 
-- type: entity
+- type: entity #FrontierCorvax
   id: CartridgeVector45Uranium
-  name: cartridge (.45 APC uranium)
+  name: cartridge (.45 ACP uranium)
   parent: CartridgeVector45
   components:
   - type: CartridgeAmmo

diff --git a/...types/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Magazines/VectorMags/VectorMags.yml b/...types/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Magazines/VectorMags/VectorMags.yml
@@ -1,7 +1,8 @@
-- type: entity #Vector
+- type: entity #FrontierCorvax
   id: MagazineVector22
   name: magazine (.22 LR)
   parent: BaseItem
+  description: A ridiculously large magazine with ridiculously small and ridiculous .22 ammo
   components:
   - type: Tag
     tags:
@@ -31,7 +32,7 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
+- type: entity #FrontierCorvax
   id: MagazineVector22Empty
   parent: MagazineVector22
   suffix: Empty
@@ -43,10 +44,11 @@
     - state: base
       map: ["enum.GunVisualLayers.Base"]
 
-- type: entity #Vector
+- type: entity #FrontierCorvax
   id: MagazineVector45
-  name: magazine (.45 APC)
+  name: magazine (.45 ACP)
   parent: BaseItem
+  description: Standard magazine for 13 small (big and slow) friends in .45 ACP
   components:
   - type: Tag
     tags:
@@ -76,7 +78,7 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
+- type: entity #FrontierCorvax
   id: MagazineVector45Empty
   parent: MagazineVector45
   suffix: Empty
@@ -88,9 +90,9 @@
     - state: base
       map: ["enum.GunVisualLayers.Base"]
 
-- type: entity
+- type: entity #FrontierCorvax
   id: MagazineVector45Incendiary
-  name: magazine (.45 APC incendiary)
+  name: magazine (.45 ACP incendiary)
   parent: MagazineVector45
   components:
   - type: Sprite
@@ -100,9 +102,9 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
+- type: entity #FrontierCorvax
   id: MagazineVector45Practice
-  name: magazine (.45 APC practice)
+  name: magazine (.45 ACP practice)
   parent: MagazineVector45
   components:
   - type: Sprite
@@ -112,9 +114,9 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
+- type: entity #FrontierCorvax
   id: MagazineVector45Uranium
-  name: magazine (.45 APC uranium)
+  name: magazine (.45 ACP uranium)
   parent: MagazineVector45
   components:
   - type: Sprite

diff --git a/...urces/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml b/...urces/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml
@@ -1,6 +1,6 @@
-- type: entity     #Vector
+- type: entity #FrontierCorvax
   id: BulletVector22
-  name: Пуля (.22 авто)
+  name: Пуля (.22 LR)
   parent: BaseBullet
   noSpawn: true
   components:
@@ -10,7 +10,7 @@
         Piercing: 7
         Blunt: 3
 
-- type: entity     #Vector
+- type: entity #FrontierCorvax
   id: BulletVector45
   name: Пуля (.45 ACP)
   parent: BaseBullet
@@ -22,10 +22,10 @@
         Piercing: 15
         Blunt: 5
 
-- type: entity
+- type: entity #FrontierCorvax
   id: BulletVector45Incendiary
   parent: BaseBulletIncendiary
-  name: Пуля .45ACP (Зажигательная)
+  name: Пуля .45 ACP (Зажигательная)
   noSpawn: true
   components:
   - type: Projectile
@@ -34,9 +34,9 @@
         Blunt: 3
         Heat: 16
 
-- type: entity
+- type: entity #FrontierCorvax
   id: BulletVector45Practice
-  name: Пуля .45ACP (Учебная)
+  name: Пуля .45 ACP (Учебная)
   parent: BaseBulletPractice
   noSpawn: true
   components:
@@ -45,9 +45,9 @@
       types:
         Blunt: 1
 
-- type: entity
+- type: entity #FrontierCorvax
   id: BulletVector45Uranium
-  name: Пуля .45ACP (Урановая)
+  name: Пуля .45 ACP (Урановая)
   parent: BaseBulletUranium
   noSpawn: true
   components:

diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/SMGs/vector.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/SMGs/vector.yml
@@ -1,8 +1,8 @@
 - type: entity #FrontierCorvax
-  name: Vector (.22)
+  name: Vector (.22 LR)
   parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunVector22
-  description: Vector.
+  description: Version of the legendary submachine gun for sport shooting. He might even be able to shoot a squirrel. Uses .22lr ammunition.
   components:
   - type: Sprite
     sprite: Corvax/Objects/Weapons/Guns/SMGs/vector22.rsi
@@ -48,8 +48,8 @@
     zeroVisible: true
   - type: Appearance
 
-- type: entity #Vector
-  name: Vector (.45 APC)
+- type: entity #FrontierCorvax
+  name: Vector (.45 ACP)
   parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunVector45
   description: A civilian version of the already legendary and forgotten submachine gun. Uses caliber cartridges .45 ACP. Automatic fire is not included in the package.