Ammo stuff (#111)

* - add: Magazines in emagged autholathe.

* - tweak: Cheaper uplink ammo & more listings.
This commit is contained in:
Aviu00
2024-02-24 01:06:01 +09:00
committed by GitHub
parent 34d4c529fa
commit 6d26bf8e5d
7 changed files with 305 additions and 118 deletions

View File

@@ -100,6 +100,21 @@ uplink-sniper-ammo-desc = Коробка с 10 патронами для сна
uplink-ak-ammo-name = Магазин для штурмовой винтовки (.30 винтовчные)
uplink-ak-ammo-desc = Магазин с 30 патронами калибра .30 винтовочные. Совместим с АК-74.
uplink-magazine-bulldog-name = Барабан для дробовика (.50 дробь)
uplink-magazine-bulldog-desc = Барабан с 8 патронами. Совместим с Бульдогом.
uplink-magazine-slug-bulldog-name = Барабан для дробовика (.50 пуля)
uplink-magazine-slug-bulldog-desc = Барабан с 8 патронами. Совместим с Бульдогом.
uplink-magazine-l6-name = Короб для пулемета (.30 винтовчные)
uplink-magazine-l6-desc = Короб со 100 патронами. Совместим с L6 SAW.
uplink-pistol-box-name = Коробка с пистолетными магазинами (.35 авто)
uplink-pistol-box-desc = Содержит 3 магазина на 10 патронов. Совместимо с Гадюкой.
uplink-pistol-box-caseless-name = Коробка с пистолетными магазинами (.25 безгильзовые)
uplink-pistol-box-caseless-desc = Содержит 3 магазина на 10 патронов. Совместимо с Коброй.
# Utility
uplink-holopara-kit-name = Набор Голопаразита
uplink-holopara-kit-desc =

View File

@@ -20,7 +20,7 @@
- type: StorageFill
contents:
- id: MagazinePistolCaselessRifle
amount: 4
amount: 3
- type: entity
name: box of .25 caseless (practice) magazines
@@ -31,7 +31,7 @@
- type: StorageFill
contents:
- id: MagazinePistolCaselessRiflePractice
amount: 4
amount: 3
- type: entity
name: box of .25 caseless (rubber) magazines
@@ -42,7 +42,7 @@
- type: StorageFill
contents:
- id: MagazineCaselessRifleRubber
amount: 4
amount: 3
# LightRifle
- type: entity
@@ -54,7 +54,7 @@
- type: StorageFill
contents:
- id: MagazineLightRifle
amount: 4
amount: 3
- type: entity
name: box of .30 rifle (practice) magazines
@@ -65,7 +65,7 @@
- type: StorageFill
contents:
- id: MagazineLightRiflePractice
amount: 4
amount: 3
- type: entity
name: box of .30 rifle (rubber) magazines
@@ -76,7 +76,7 @@
- type: StorageFill
contents:
- id: MagazineLightRifleRubber
amount: 4
amount: 3
- type: entity
name: box of Vector magazines
@@ -132,7 +132,7 @@
- type: StorageFill
contents:
- id: MagazinePistol
amount: 4
amount: 3
- type: entity
name: box of pistol .35 auto (practice) magazines
@@ -143,7 +143,7 @@
- type: StorageFill
contents:
- id: MagazinePistolPractice
amount: 4
amount: 3
- type: entity
name: box of pistol .35 auto (rubber) magazines
@@ -154,7 +154,7 @@
- type: StorageFill
contents:
- id: MagazinePistolRubber
amount: 4
amount: 3
- type: entity
name: box of machine pistol .35 auto magazines
@@ -165,7 +165,7 @@
- type: StorageFill
contents:
- id: MagazinePistolHighCapacity
amount: 4
amount: 3
- type: entity
name: box of machine pistol .35 auto (practice) magazines
@@ -176,7 +176,7 @@
- type: StorageFill
contents:
- id: MagazinePistolHighCapacityPractice
amount: 4
amount: 3
- type: entity
name: box of machine pistol .35 auto (rubber) magazines
@@ -187,7 +187,7 @@
- type: StorageFill
contents:
- id: MagazinePistolHighCapacityRubber
amount: 4
amount: 3
- type: entity
@@ -233,7 +233,7 @@
- type: StorageFill
contents:
- id: MagazineShotgun
amount: 4
amount: 3
- type: entity
name: box of (.50 beanbag) ammo drums
@@ -244,7 +244,7 @@
- type: StorageFill
contents:
- id: MagazineShotgunBeanbag
amount: 4
amount: 3
- type: entity
name: box of (.50 slug) ammo drums
@@ -255,7 +255,7 @@
- type: StorageFill
contents:
- id: MagazineShotgunSlug
amount: 4
amount: 3
- type: entity
name: box of (.50 incendiary) ammo drums
@@ -266,7 +266,7 @@
- type: StorageFill
contents:
- id: MagazineShotgunIncendiary
amount: 4
amount: 3
# Rifle
- type: entity
@@ -278,7 +278,7 @@
- type: StorageFill
contents:
- id: MagazineRifle
amount: 4
amount: 3
- type: entity
name: box of .20 rifle (practice) magazines
@@ -289,7 +289,7 @@
- type: StorageFill
contents:
- id: MagazineRiflePractice
amount: 4
amount: 3
- type: entity
name: box of .20 rifle (rubber) magazines
@@ -300,4 +300,4 @@
- type: StorageFill
contents:
- id: MagazineRifleRubber
amount: 4
amount: 3

View File

@@ -307,16 +307,16 @@
# Ammo
- type: listing
id: UplinkPistol9mmMagazine
name: uplink-pistol-magazine-name
description: uplink-pistol-magazine-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon }
productEntity: MagazinePistol
cost:
Telecrystal: 1
categories:
- UplinkAmmo
#- type: listing
# id: UplinkPistol9mmMagazine
# name: uplink-pistol-magazine-name
# description: uplink-pistol-magazine-desc
# icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon }
# productEntity: MagazinePistol
# cost:
# Telecrystal: 1
# categories:
# - UplinkAmmo
# For the C20R
- type: listing
@@ -325,28 +325,23 @@
description: uplink-pistol-magazine-c20r-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon }
productEntity: MagazinePistolSubMachineGun
cost:
Telecrystal: 2
categories:
- UplinkAmmo
conditions:
- !type:StoreWhitelistCondition
whitelist:
tags:
- NukeOpsUplink
# For the Cobra
- type: listing
id: UplinkMagazinePistolCaselessRifle
name: uplink-pistol-magazine-caseless-name
description: uplink-pistol-magazine-caseless-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi, state: red-icon }
productEntity: MagazinePistolCaselessRifle
cost:
Telecrystal: 1
categories:
- UplinkAmmo
# For the Cobra
#- type: listing
# id: UplinkMagazinePistolCaselessRifle
# name: uplink-pistol-magazine-caseless-name
# description: uplink-pistol-magazine-caseless-desc
# icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi, state: red-icon }
# productEntity: MagazinePistolCaselessRifle
# cost:
# Telecrystal: 1
# categories:
# - UplinkAmmo
# For the Python
- type: listing
id: UplinkSpeedLoaderMagnumAP
@@ -355,20 +350,20 @@
icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon }
productEntity: SpeedLoaderMagnumAP
cost:
Telecrystal: 3
Telecrystal: 1
categories:
- UplinkAmmo
# For the mosin
- type: listing
id: UplinkMosinAmmo
name: uplink-mosin-ammo-name
description: uplink-mosin-ammo-desc
productEntity: MagazineBoxLightRifle
cost:
Telecrystal: 1
categories:
- UplinkAmmo
#- type: listing
# id: UplinkMosinAmmo
# name: uplink-mosin-ammo-name
# description: uplink-mosin-ammo-desc
# productEntity: MagazineBoxLightRifle
# cost:
# Telecrystal: 1
# categories:
# - UplinkAmmo
# for the hristov
- type: listing
@@ -377,7 +372,7 @@
description: uplink-sniper-ammo-desc
productEntity: MagazineBoxAntiMateriel
cost:
Telecrystal: 6 # WD edit
Telecrystal: 3
categories:
- UplinkAmmo
@@ -780,25 +775,25 @@
categories:
- UplinkBundles
- type: listing
id: UplinkAmmoBundle
name: uplink-ammo-bundle-name
description: uplink-ammo-bundle-desc
productEntity: ClothingBackpackDuffelSyndicateAmmoFilled
cost:
Telecrystal: 15
categories:
- UplinkBundles
conditions:
- !type:StoreWhitelistCondition
whitelist:
tags:
- NukeOpsUplink
- !type:BuyerWhitelistCondition
blacklist:
components:
- SurplusBundle
saleLimit: 1
#- type: listing
# id: UplinkAmmoBundle
# name: uplink-ammo-bundle-name
# description: uplink-ammo-bundle-desc
# productEntity: ClothingBackpackDuffelSyndicateAmmoFilled
# cost:
# Telecrystal: 15
# categories:
# - UplinkBundles
# conditions:
# - !type:StoreWhitelistCondition
# whitelist:
# tags:
# - NukeOpsUplink
# - !type:BuyerWhitelistCondition
# blacklist:
# components:
# - SurplusBundle
# saleLimit: 1
- type: listing
id: UplinkChemistryKitBundle
@@ -850,7 +845,7 @@
icon: { sprite: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateFilledSMG
cost:
Telecrystal: 17
Telecrystal: 15
categories:
- UplinkBundles
saleLimit: 1
@@ -862,7 +857,7 @@
icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateFilledShotgun
cost:
Telecrystal: 20
Telecrystal: 17
categories:
- UplinkBundles
saleLimit: 1
@@ -886,7 +881,7 @@
icon: { sprite: /Textures/Objects/Weapons/Guns/LMGs/l6.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateFilledLMG
cost:
Telecrystal: 30
Telecrystal: 25
categories:
- UplinkBundles
saleLimit: 1

View File

@@ -158,21 +158,38 @@
- CellRechargerCircuitboard
- BorgChargerCircuitboard
- WeaponCapacitorRechargerCircuitboard
- OxygenTank
- PlasmaTank
- type: EmagLatheRecipes
emagStaticRecipes:
- MagazinePistol
- MagazinePistolSubMachineGun
- MagazinePistolSubMachineGunTopMounted
- MagazineRifle
- MagazineLightRifle
- SpeedLoaderMagnum
- MagazineShotgun
- MagazineShotgunSlug
- MagazineLightRifleBox
- MagazinePistolCaselessRifle
- CartridgePistol
- CartridgeMagnum
- ShellShotgun
- ShellShotgunSlug
- ShellShotgunFlare
- ShellTranquilizer
- CartridgeLightRifle
- CartridgeRifle
- CartridgeMagnumAP
- CartridgeAntiMateriel
- CartridgeCaselessRifle
- MagazineBoxMagnumAP
- MagazineBoxAntiMateriel
- MagazineBoxCaselessRifle
- MagazineBoxPistol
- MagazineBoxMagnum
- MagazineBoxRifle
- MagazineBoxLightRifle
- OxygenTank
- PlasmaTank
- GrenadeBlast
emagDynamicRecipes:
- CartridgePistolRubber
@@ -670,6 +687,8 @@
- MagazineBoxRifle
- MagazineBoxLightRifle
- SpeedLoaderMagnum
- MagazineShotgun # WD EDIT
- MagazineShotgunSlug # WD EDIT
- TargetHuman
- TargetSyndicate
- TargetClown
@@ -735,6 +754,16 @@
- ShuttleGunPerforatorCircuitboard
- ShuttleGunFriendshipCircuitboard
- ShuttleGunDusterCircuitboard
- type: EmagLatheRecipes
emagStaticRecipes:
- MagazineLightRifleBox
- MagazinePistolCaselessRifle
- CartridgeMagnumAP
- CartridgeAntiMateriel
- CartridgeCaselessRifle
- MagazineBoxMagnumAP
- MagazineBoxAntiMateriel
- MagazineBoxCaselessRifle
- type: MaterialStorage
whitelist:
tags:
@@ -779,6 +808,14 @@
- MagazineBoxMagnum
- MagazineBoxRifle
- MagazineBoxLightRifle
- type: EmagLatheRecipes
emagStaticRecipes:
- CartridgeMagnumAP
- CartridgeAntiMateriel
- CartridgeCaselessRifle
- MagazineBoxMagnumAP
- MagazineBoxAntiMateriel
- MagazineBoxCaselessRifle
- type: MaterialStorage
whitelist:
tags:

View File

@@ -209,6 +209,7 @@
- type: latheRecipe
id: ShellShotgunSlug
result: ShellShotgunSlug
category: Ammo
completetime: 2
materials:
Steel: 25
@@ -227,7 +228,7 @@
category: Ammo
completetime: 2
materials:
Steel: 30
Steel: 15
- type: latheRecipe
id: ShellShotgunFlare
@@ -304,7 +305,7 @@
category: Ammo
completetime: 5
materials:
Steel: 650
Steel: 600
- type: latheRecipe
id: MagazineBoxPistolRubber
@@ -312,7 +313,7 @@
category: Ammo
completetime: 5
materials:
Steel: 350
Steel: 300
Plastic: 300
- type: latheRecipe
@@ -321,7 +322,7 @@
category: Ammo
completetime: 5
materials:
Steel: 1250
Steel: 1200
- type: latheRecipe
id: MagazineBoxMagnumRubber
@@ -329,8 +330,8 @@
category: Ammo
completetime: 5
materials:
Steel: 350
Plastic: 300
Steel: 500
Plastic: 700
- type: latheRecipe
id: MagazineRifle
@@ -338,7 +339,7 @@
category: Ammo
completetime: 5
materials:
Steel: 375
Steel: 450
- type: latheRecipe
id: MagazineLightRifle
@@ -346,7 +347,7 @@
category: Ammo
completetime: 5
materials:
Steel: 375
Steel: 450
- type: latheRecipe
id: MagazineBoxRifle
@@ -354,7 +355,7 @@
category: Ammo
completetime: 5
materials:
Steel: 950
Steel: 900
- type: latheRecipe
id: MagazineBoxRifleRubber
@@ -363,7 +364,7 @@
completetime: 5
materials:
Steel: 350
Plastic: 600
Plastic: 550
- type: latheRecipe
id: MagazineBoxLightRifle
@@ -371,7 +372,7 @@
category: Ammo
completetime: 5
materials:
Steel: 1800
Steel: 900
- type: latheRecipe
id: MagazineBoxLightRifleRubber
@@ -380,7 +381,7 @@
completetime: 5
materials:
Steel: 350
Plastic: 600
Plastic: 550
- type: latheRecipe
id: SpeedLoaderMagnum
@@ -388,7 +389,7 @@
category: Ammo
completetime: 5
materials:
Steel: 200
Steel: 120
- type: latheRecipe
id: ShellShotgunIncendiary
@@ -436,7 +437,7 @@
category: Ammo
completetime: 5
materials:
Plastic: 650
Plastic: 600
- type: latheRecipe
id: MagazineBoxMagnumIncendiary
@@ -444,7 +445,7 @@
category: Ammo
completetime: 5
materials:
Plastic: 1250
Plastic: 1200
- type: latheRecipe
id: MagazineBoxLightRifleIncendiary
@@ -452,7 +453,7 @@
category: Ammo
completetime: 5
materials:
Plastic: 1800
Plastic: 900
- type: latheRecipe
id: MagazineBoxRifleIncendiary
@@ -460,7 +461,7 @@
category: Ammo
completetime: 5
materials:
Plastic: 950
Plastic: 900
- type: latheRecipe
id: ShellShotgunPractice
@@ -492,7 +493,7 @@
category: Ammo
completetime: 5
materials:
Plastic: 1000
Plastic: 900
- type: latheRecipe
id: MagazineBoxRiflePractice
@@ -529,7 +530,7 @@
completetime: 2
materials:
Plastic: 15
Uranium: 10
Uranium: 5
- type: latheRecipe
id: CartridgePistolUranium
@@ -538,7 +539,7 @@
completetime: 2
materials:
Plastic: 5
Uranium: 10
Uranium: 5
- type: latheRecipe
id: CartridgeMagnumUranium
@@ -547,7 +548,7 @@
completetime: 2
materials:
Plastic: 20
Uranium: 10
Uranium: 5
- type: latheRecipe
id: CartridgeLightRifleUranium
@@ -555,8 +556,8 @@
category: Ammo
completetime: 2
materials:
Plastic: 20
Uranium: 10
Plastic: 15
Uranium: 5
- type: latheRecipe
id: CartridgeRifleUranium
@@ -565,7 +566,7 @@
completetime: 2
materials:
Plastic: 15
Uranium: 10
Uranium: 5
- type: latheRecipe
id: MagazineBoxPistolUranium
@@ -573,8 +574,8 @@
category: Ammo
completetime: 5
materials:
Plastic: 650
Uranium: 65
Plastic: 300
Uranium: 300
- type: latheRecipe
id: MagazineBoxMagnumUranium
@@ -582,8 +583,8 @@
category: Ammo
completetime: 5
materials:
Plastic: 1250
Uranium: 125
Plastic: 1200
Uranium: 300
- type: latheRecipe
id: MagazineBoxLightRifleUranium
@@ -591,8 +592,8 @@
category: Ammo
completetime: 5
materials:
Plastic: 1800
Uranium: 180
Plastic: 900
Uranium: 300
- type: latheRecipe
id: MagazineBoxRifleUranium
@@ -600,8 +601,8 @@
category: Ammo
completetime: 5
materials:
Plastic: 950
Uranium: 95
Plastic: 900
Uranium: 300
- type: latheRecipe
id: WeaponDisablerSMG
@@ -612,7 +613,7 @@
Steel: 1000
Glass: 500
Plastic: 500
- type: latheRecipe
id: MagazineGrenadeEmpty
result: MagazineGrenadeEmpty
@@ -620,7 +621,7 @@
materials:
Steel: 150
Plastic: 50
- type: latheRecipe
id: GrenadeEMP
result: GrenadeEMP
@@ -629,7 +630,7 @@
Steel: 150
Plastic: 100
Glass: 20
- type: latheRecipe
id: GrenadeBlast
result: GrenadeBlast
@@ -638,7 +639,7 @@
Steel: 150
Plastic: 100
Gold: 50
- type: latheRecipe
id: GrenadeFlash
result: GrenadeFlash
@@ -647,4 +648,4 @@
Steel: 150
Plastic: 100
Glass: 20

View File

@@ -111,3 +111,58 @@
# categories:
# - UplinkWeapons
# saleLimit: 1
- type: listing
id: UplinkMagazineShotgun
name: uplink-magazine-bulldog-name
description: uplink-magazine-bulldog-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi, state: pellets }
productEntity: MagazineShotgun
cost:
Telecrystal: 1
categories:
- UplinkAmmo
- type: listing
id: UplinkMagazineShotgunSlug
name: uplink-magazine-slug-bulldog-name
description: uplink-magazine-slug-bulldog-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi, state: slug }
productEntity: MagazineShotgunSlug
cost:
Telecrystal: 1
categories:
- UplinkAmmo
- type: listing
id: UplinkMagazineLightRifleBox
name: uplink-magazine-l6-name
description: uplink-magazine-l6-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: base }
productEntity: MagazineLightRifleBox
cost:
Telecrystal: 3
categories:
- UplinkAmmo
- type: listing
id: UplinkBoxMagazinePistol
name: uplink-pistol-box-name
description: uplink-pistol-box-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon }
productEntity: BoxMagazinePistol
cost:
Telecrystal: 1
categories:
- UplinkAmmo
- type: listing
id: UplinkBoxMagazinePistolCaselessRifle
name: uplink-pistol-box-caseless-name
description: uplink-pistol-box-caseless-desc
icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi, state: red-icon }
productEntity: BoxMagazinePistolCaselessRifle
cost:
Telecrystal: 1
categories:
- UplinkAmmo

View File

@@ -30,3 +30,87 @@
Steel: 1500
Glass: 1000
Silver: 200
- type: latheRecipe
id: CartridgeCaselessRifle
result: CartridgeCaselessRifle
category: Ammo
completetime: 2
materials:
Steel: 15
- type: latheRecipe
id: CartridgeAntiMateriel
result: CartridgeAntiMateriel
category: Ammo
completetime: 2
materials:
Steel: 40
Silver: 10
- type: latheRecipe
id: CartridgeMagnumAP
result: CartridgeMagnumAP
category: Ammo
completetime: 2
materials:
Steel: 20
Silver: 5
- type: latheRecipe
id: MagazineBoxCaselessRifle
result: MagazineBoxCaselessRifle
category: Ammo
completetime: 5
materials:
Steel: 900
- type: latheRecipe
id: MagazineBoxAntiMateriel
result: MagazineBoxAntiMateriel
category: Ammo
completetime: 5
materials:
Steel: 400
Silver: 100
- type: latheRecipe
id: MagazineBoxMagnumAP
result: MagazineBoxMagnumAP
category: Ammo
completetime: 5
materials:
Steel: 1200
Silver: 300
- type: latheRecipe
id: MagazineShotgun
result: MagazineShotgun
category: Ammo
completetime: 5
materials:
Steel: 160
- type: latheRecipe
id: MagazineShotgunSlug
result: MagazineShotgunSlug
category: Ammo
completetime: 5
materials:
Steel: 200
- type: latheRecipe
id: MagazinePistolCaselessRifle
result: MagazinePistolCaselessRifle
category: Ammo
completetime: 5
materials:
Steel: 150
- type: latheRecipe
id: MagazineLightRifleBox
result: MagazineLightRifleBox
category: Ammo
completetime: 5
materials:
Steel: 1500