From 85d4e4dc0d04b3732f5dfd087fd7682aa0e9bb9f Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Thu, 1 Aug 2024 03:36:17 +0300 Subject: [PATCH] Add: Krait (#523) --- .../Locale/en-US/store/uplink-catalog.ftl | 5 ++- .../catalog/fills/backpacks/duffelbag.ftl | 4 +- .../launchers/{shinano.ftl => launchers.ftl} | 5 ++- .../Locale/ru-RU/store/uplink-catalog.ftl | 5 ++- .../Catalog/Fills/Backpacks/duffelbag.yml | 7 ++-- .../Prototypes/Catalog/uplink_catalog.yml | 2 +- .../Objects/Weapons/Guns/Launcher/krait.yml | 35 ++++++++++++++++++ .../Weapons/Guns/{ => Launcher}/shinano.yml | 0 .../Launchers/krait-icons.rsi/bolt-open.png | Bin 0 -> 602 bytes .../Guns/Launchers/krait-icons.rsi/icon.png | Bin 0 -> 590 bytes .../Guns/Launchers/krait-icons.rsi/meta.json | 17 +++++++++ .../krait-inhands.rsi/equipped-BACKPACK.png | Bin 0 -> 1016 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1016 bytes .../krait-inhands.rsi/inhand-left.png | Bin 0 -> 665 bytes .../krait-inhands.rsi/inhand-right.png | Bin 0 -> 648 bytes .../Launchers/krait-inhands.rsi/meta.json | 27 ++++++++++++++ 16 files changed, 96 insertions(+), 11 deletions(-) rename Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/{shinano.ftl => launchers.ftl} (51%) create mode 100644 Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/krait.yml rename Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/{ => Launcher}/shinano.yml (100%) create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/bolt-open.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/icon.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/meta.json diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index a51d8a2af1..d48852823d 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -228,8 +228,9 @@ uplink-c20r-bundle-desc = Old faithful: The classic C-20r Submachine Gun, bundle uplink-buldog-bundle-name = Bulldog Bundle uplink-buldog-bundle-desc = Lean and mean: Contains the popular Bulldog Shotgun, a 12g beanbag drum and three 12g buckshot drums. -uplink-grenade-launcher-bundle-name = China-Lake Bundle -uplink-grenade-launcher-bundle-desc = An old China-Lake grenade launcher bundled with 11 rounds of various destruction capability. +# WD EDIT +uplink-grenade-launcher-bundle-name = Krait Bundle +uplink-grenade-launcher-bundle-desc = An old Krait grenade launcher bundled with 11 rounds of various destruction capability. uplink-l6-saw-bundle-name = L6 Saw Bundle uplink-l6-saw-bundle-desc = More dakka: The iconic L6 light machine gun, bundled with 2 box magazines. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl index 082710db4a..a4956f9ad1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl @@ -10,8 +10,8 @@ ent-ClothingBackpackDuffelSyndicateFilledRevolver = набор "Питон" .desc = Выступите громко и гордо с заряженным Магнум Питон и двумя спидлоадерами. ent-ClothingBackpackDuffelSyndicateFilledLMG = набор "L6 Saw" .desc = Еще больше дакки: культовый лёгкий пулемет L6 в комплекте с 2 коробами патронов. -ent-ClothingBackpackDuffelSyndicateFilledGrenadeLauncher = набор "China-Lake" - .desc = Старый гранатомет China-Lake, снабженный 11 гранатами различной поражающей способности. +ent-ClothingBackpackDuffelSyndicateFilledGrenadeLauncher = набор "Крайт" + .desc = Старый гранатомет Крайт, снабженный 11 гранатами различной поражающей способности. ent-ClothingBackpackDuffelSyndicateFilledCarbine = набор "М-90gl" .desc = Универсальная боевая винтовка с подствольным гранатометом, в комплекте с 3 магазинами и 6 гранатами различной мощности. ent-ClothingBackpackDuffelSyndicateAmmoFilled = набор боеприпасов diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/shinano.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/launchers.ftl similarity index 51% rename from Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/shinano.ftl rename to Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/launchers.ftl index ff1e63ee15..e86cd290c5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/shinano.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/launchers.ftl @@ -1,2 +1,5 @@ ent-WeaponLauncherShinano = Синано - .desc = Однозарядный гранатомёт, которым снаряжаются колониальные полиции, охранные подразделения и наёмники везде, где есть влияние Нанотрейзен. Печально известен среди пикетирующих и революционеров, так как БЛУП - это первое, что они слышут, перед тем как начинается насилие. \ No newline at end of file + .desc = Однозарядный гранатомёт, которым снаряжаются колониальные полиции, охранные подразделения и наёмники везде, где есть влияние Нанотрейзен. Печально известен среди пикетирующих и революционеров, так как БЛУП - это первое, что они слышут, перед тем как начинается насилие. + +ent-WeaponLauncherKrait = Крайт + .desc = Лёгкий штурмовой трёхзарядный гранатомёт, который в прошлом был на вооружении многих наёмнических отрядов. Неизвестным образом, большие партии этого оружия оказались в руках Синдиката. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index 4c35d521d9..d04c337310 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -239,8 +239,9 @@ uplink-c20r-bundle-desc = Старый добрый: классический п uplink-buldog-bundle-name = Набор Бульдога uplink-buldog-bundle-desc = Простое и эффективное: Содержит популярное ружье дробовик Бульдог, барабан дроби 12g и 3 барабана с картечью 12g. -uplink-grenade-launcher-bundle-name = Набор China Lake -uplink-grenade-launcher-bundle-desc = Старый гранатомет China Lake в комплекте с 11 снарядами различной разрушительной силы. +# WD EDIT +uplink-grenade-launcher-bundle-name = Набор Крайта +uplink-grenade-launcher-bundle-desc = Старый гранатомет Крайт в комплекте с 11 снарядами различной разрушительной силы. uplink-l6-saw-bundle-name = Набор L6 Saw uplink-l6-saw-bundle-desc = Еще имба: культовый ручной пулемет L6 в комплекте с 2 коробчатыми магазинами. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index a91c3b2644..1b341ba8ef 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -97,15 +97,16 @@ - id: WeaponLightMachineGunL6 - id: MagazineLightRifleBox +# WD EDIT - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher - name: China-Lake bundle - description: "An old China-Lake grenade launcher bundled with 11 rounds of various destruction capability." + name: Krait Bundle + description: "An old Krait grenade launcher bundled with 11 rounds of various destruction capability." components: - type: StorageFill contents: - - id: WeaponLauncherChinaLake + - id: WeaponLauncherKrait - id: GrenadeBlast amount: 4 - id: GrenadeFrag diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index af227990a0..beaa38cbcd 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -172,7 +172,7 @@ id: UplinkGrenadeLauncherBundle name: uplink-grenade-launcher-bundle-name description: uplink-grenade-launcher-bundle-desc - icon: { sprite: /Textures/White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi, state: icon } + icon: { sprite: /Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher cost: Telecrystal: 25 diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/krait.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/krait.yml new file mode 100644 index 0000000000..1c7008e138 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/krait.yml @@ -0,0 +1,35 @@ +- type: entity + name: Krait + parent: BaseWeaponLauncher + id: WeaponLauncherKrait + description: A light assault three-shot grenade launcher, which in the past was in service with many mercenary units. In an unknown way, large quantities of these weapons ended up in the hands of the Syndicate. + components: + - type: Sprite + sprite: White/Objects/Weapons/Guns/Launchers/krait-icons.rsi + layers: + - state: icon + map: ["enum.GunVisualLayers.Base"] + - type: Item + sprite: White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi + - type: Clothing + sprite: White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi + slots: + - Back + - suitStorage + - type: AmmoCounter + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: BallisticAmmoProvider + whitelist: + tags: + - Grenade + capacity: 3 + proto: GrenadeFrag + soundInsert: + path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + autoCycle: false \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/shinano.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/shinano.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/bolt-open.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..6c9034146083414560e51975b4778399f221e047 GIT binary patch literal 602 zcmV-g0;TdB8sCC1i{=y*u3e%kK(uVu$u?H zZGzVxyfsb{p+;ed#DnWh(wD7Ug;MAb23wk!zJFfcdl@svpvkP&?Lbvp0d>;~sGC+m z-85dn1~qtc(t{B3LgV}4$aG_O-aNZBRS+U(OZqrtFt{#^F{%@HI=t+fCgQ(yGpzvt z`EQ?Y97Bj0X{wMU$x0$76I~c1BM@<3*jbygQULy(&XH0w`?+UhLeHu|3dnbB5m}O8 zCRC}JlZ%j2E`0%;3NJ*C6cE_Kc?%=c8WHE9A~#kFy|X@m`8l!*q<{*rkkI?#sM599 zKdw2XfJ|$^b7Z;z^ODqY>T37E+`ehNcefnd|33FNr6Q0!Zw-;VdAipD06d6p;aQR- zq2(E|Ug;_oDx<*#?Fuzk3ikKowQan8eBpKT(=pDphLmzPFVot0(AfDCDzj7>4RvDX zeH>@TzZD0W*0{VphY)e_jON%j)cY3Mhp3#yH#c{AcQqF~9JkOo?Dd^FX{t))!7913 zY$x_RuXBF;(LwMCMVvDLczJ!I-eCZzi<1#4-HDeW@4nL{{g+Z1x{gq+au>1KK0w!fDgvZ{Ceir+1Fe9%X$90xE1+%~FW?7WL+a5t^|B%W o000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f{tnkVE_OC literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-icons.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f2dcc7807ecb82239a06b0a537e3d9434d07e725 GIT binary patch literal 590 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/krait-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8e223cc9f98c01051b82fdfa33ea8a3a2a1034c6 GIT binary patch literal 648 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QL70(Y)*J~21}0`t7srr_xVN*c`wkh1xY}NJVCB^nby~D! z@sfqfnmX(oMZ_FgRfUq+O-ce%pG8z^EbysQQBHp*r&)C7_>Z`Gx<|GOJ8>ws2mpy& zCrhk)#kyTZ%Dq2IZlCF+Hn~Il9UJQ-_U1p7{3L zZ|~%oY3DjEW9*1u8}_em|NY-)E(VR?YV4|oPkmU-sP?bKs`BIEhX!?OK5K*w4o0lM zzSGSo_EwvGJ}gbHneJb*H|}qhyM-?ECkdJUr(gmlFJeJGPTU?QF z?~J_c3rF!^anlbUX3!QD_J4W%-L0^kWE0_>$aJIm=ND_)YdEplzUbNw^ElY|E^_s6 z*B2=p%b5%K@A$CZb9KYhqL+`KU*EBk^9RqPcRQk`TeTQ2B^jOL6)=73dg1+{8)Db5 z`zA8;XdUEJ`C4V0?=(?npO)vxl%W_}d8KNg-@MQb4Z;Qs z&mH--w(*U$xv);{QeW$y0JdZQdN*@zt<#fZwN8I8`;x#f22O!>-ZodP zR{V`iI26L