From 7fb8d47dc5bd16481b593f1085c005b5cbc84e33 Mon Sep 17 00:00:00 2001 From: Alex Sampaio Date: Thu, 21 Nov 2024 06:31:13 -0300 Subject: [PATCH] Feat/crimson caravan cargo (#667) * feat: add TradeStation component * feat: adds value to bottlecaps * feat: adjusts values to NCR dollar + prewar money * feat: change appraisal tool from spesos to caps * refactor: NcrCredit material name * feat: cash component to NCR dollar * feat: cargo sales outputs caps * feat: adds crates steel, plastic, wood, mechanic parts * feat: adhesives crate * feat: remove old cargo products * feat: stimpak crate * feat: desc to N14 crates * feat: crates - rations, rifles, water * feat: entity 20 lead bars * feat: gunpowder 20 entity * feat: crates - nuka cola, gunpowder and lead bars * feat: cargo products steel, plastic, glass, wood * feat: cargo product stimpak * feat: cargo products - gunpowder, lead bar * feat: cargo products - mechanic parts, adhesives * feat: cargo products livestock * feat: cargo product varmint rifle * feat: cargo products - rations, water, cigarrets, nuka cola * feat: abraxo cleaner crate and cargo product * feat: adjusts caps income cargo * fix: varmint rifle crate * feat: adjusts materials selling prices * feat: adjusts weapons selling prices * feat: adjusts batteries pricings * feat: adjusts silver, iron and gold ingot prices * feat: adjusts rifles prices * feat: adds pricing to stimpaks * feat: adjusts lead and gold pricing * feat: adjusts ammo price * feat: adjusts tools pricing * feat: adjusts bandages and radaway pricing * fix: varming rifles crate product * feat: orders access to caravan * feat: remove caps maxCount * fix: varmint crate * Update currency.yml * fix: ncrCredit material icon * fix: tradestation components * Revert "fix: tradestation components" This reverts commit bd863706a805babb3584007c9d20ee3d438acf51. * feat: starting ballance 500 * feat: cargo console spesos text to caps --------- Co-authored-by: Peptide90 <78795277+Peptide90@users.noreply.github.com> --- .../Components/CargoPalletConsoleComponent.cs | 4 +- .../Components/StationBankAccountComponent.cs | 4 +- .../Cargo/Systems/CargoSystem.Orders.cs | 4 +- .../en-US/cargo/cargo-console-component.ftl | 2 +- .../en-US/cargo/price-gun-component.ftl | 2 +- Resources/Maps/N14/MercerIslandSewers.yml | 1 + Resources/Maps/N14/MercerIslandSurface.yml | 1 + Resources/Maps/N14/SunnyvaleSurface.yml | 1 + Resources/Maps/N14/SunnyvaleUnderground.yml | 1 + .../DeltaV/Catalog/Cargo/cargo_armory.yml | 49 ----- .../DeltaV/Catalog/Cargo/cargo_food.yml | 29 --- .../DeltaV/Catalog/Cargo/cargo_fun.yml | 19 -- .../DeltaV/Catalog/Cargo/cargo_livestock.yml | 9 - .../DeltaV/Catalog/Cargo/cargo_medical.yml | 9 - .../DeltaV/Catalog/Cargo/cargo_vending.yml | 9 - .../Entities/Objects/Power/powercells.yml | 2 +- .../Objects/Specific/Medical/healing.yml | 4 +- .../Entities/Objects/Tools/tools.yml | 16 +- .../Ammunition/Cartridges/base_cartridge.yml | 2 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 2 +- .../Objects/Weapons/Guns/SMGs/smgs.yml | 2 +- .../Weapons/Guns/Shotguns/shotguns.yml | 2 +- .../Objects/Weapons/Guns/Snipers/snipers.yml | 2 +- .../Catalog/Cargo/cargo_epistemics.yml | 9 - .../Catalog/Cargo/cargo_service.yml | 19 -- .../Prototypes/Reagents/Materials/glass.yml | 4 +- .../Reagents/Materials/materials.yml | 4 +- .../Prototypes/Reagents/Materials/metals.yml | 10 +- .../_Nuclear14/Access/caravancompany.yml | 3 +- .../_Nuclear14/Catalog/Cargo/cargo_armory.yml | 9 + .../_Nuclear14/Catalog/Cargo/cargo_chems.yml | 9 + .../Catalog/Cargo/cargo_consumables.yml | 39 ++++ .../Catalog/Cargo/cargo_livestock.yml | 19 ++ .../Catalog/Cargo/cargo_materials.yml | 79 ++++++++ .../Catalog/Cargo/cargo_medical.yml | 9 + .../Catalog/Cargo/cargo_wavesurvival.yml | 175 ------------------ .../_Nuclear14/Catalog/Fills/crates.yml | 165 ++++++++++++++++- .../Entities/Objects/Materials/materials.yml | 8 + .../Entities/Objects/Materials/metals.yml | 11 ++ .../Entities/Objects/Misc/currency.yml | 25 ++- .../Objects/Specific/Medical/chemicals.yml | 8 + .../Guns/Ammunition/Battery/Battery.yml | 4 +- .../Weapons/Guns/Battery/battery_guns.yml | 2 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 2 +- .../_Nuclear14/Reagents/materials.yml | 44 ++--- .../Jobs/CaravanCompany/caravan_guard.yml | 1 + .../Jobs/CaravanCompany/caravan_trader.yml | 1 + 47 files changed, 444 insertions(+), 391 deletions(-) delete mode 100644 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml delete mode 100644 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml delete mode 100644 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml delete mode 100644 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml delete mode 100644 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml delete mode 100644 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_service.yml create mode 100644 Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_armory.yml create mode 100644 Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_chems.yml create mode 100644 Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml create mode 100644 Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_livestock.yml create mode 100644 Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_materials.yml create mode 100644 Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml delete mode 100644 Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_wavesurvival.yml diff --git a/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs b/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs index 6092ea0c3ed..5eee23d0604 100644 --- a/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs +++ b/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs @@ -8,6 +8,6 @@ namespace Content.Server.Cargo.Components; [Access(typeof(CargoSystem))] public sealed partial class CargoPalletConsoleComponent : Component { - [ViewVariables(VVAccess.ReadWrite), DataField("cashType", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string CashType = "Credit"; + [ViewVariables(VVAccess.ReadWrite), DataField("cashType", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string CashType = "Caps"; } diff --git a/Content.Server/Cargo/Components/StationBankAccountComponent.cs b/Content.Server/Cargo/Components/StationBankAccountComponent.cs index fe9be19b19a..4060885afec 100644 --- a/Content.Server/Cargo/Components/StationBankAccountComponent.cs +++ b/Content.Server/Cargo/Components/StationBankAccountComponent.cs @@ -9,11 +9,11 @@ namespace Content.Server.Cargo.Components; public sealed partial class StationBankAccountComponent : Component { [ViewVariables(VVAccess.ReadWrite), DataField("balance")] - public int Balance = 2000; + public int Balance = 500; /// /// How much the bank balance goes up per second, every Delay period. Rounded down when multiplied. /// [ViewVariables(VVAccess.ReadWrite), DataField("increasePerSecond")] - public int IncreasePerSecond = 1; + public float IncreasePerSecond = 0.05f; } diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs index d8b55a7237f..0280e628ece 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs @@ -23,7 +23,7 @@ public sealed partial class CargoSystem /// /// How much time to wait (in seconds) before increasing bank accounts balance. /// - private const int Delay = 10; + private const int Delay = 200; /// /// Keeps track of how much time has elapsed since last balance increase. @@ -84,7 +84,7 @@ private void UpdateConsole(float frameTime) foreach (var account in EntityQuery()) { - account.Balance += account.IncreasePerSecond * Delay; + account.Balance += (int) (account.IncreasePerSecond * Delay); } var query = EntityQueryEnumerator(); diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl index b56f4730ccd..357c7093748 100644 --- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl +++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl @@ -4,7 +4,7 @@ cargo-console-menu-account-name-label = Account name:{" "} cargo-console-menu-account-name-none-text = None cargo-console-menu-shuttle-name-label = Shuttle name:{" "} cargo-console-menu-shuttle-name-none-text = None -cargo-console-menu-points-label = Spesos:{" "} +cargo-console-menu-points-label = Caps:{" "} cargo-console-menu-points-amount = ${$amount} cargo-console-menu-shuttle-status-label = Shuttle status:{" "} cargo-console-menu-shuttle-status-away-text = Away diff --git a/Resources/Locale/en-US/cargo/price-gun-component.ftl b/Resources/Locale/en-US/cargo/price-gun-component.ftl index 29a1482d19c..6b26ef7a751 100644 --- a/Resources/Locale/en-US/cargo/price-gun-component.ftl +++ b/Resources/Locale/en-US/cargo/price-gun-component.ftl @@ -1,4 +1,4 @@ -price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} spesos. +price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} caps. price-gun-verb-text = Appraisal price-gun-verb-message = Appraise {THE($object)}. price-gun-bounty-complete = The device confirms that the bounty contained within is completed. diff --git a/Resources/Maps/N14/MercerIslandSewers.yml b/Resources/Maps/N14/MercerIslandSewers.yml index 6f9cbc50f11..121c2aceb83 100644 --- a/Resources/Maps/N14/MercerIslandSewers.yml +++ b/Resources/Maps/N14/MercerIslandSewers.yml @@ -112,6 +112,7 @@ entities: - 0 - uid: 2 components: + - type: TradeStation - type: MetaData name: grid - type: Transform diff --git a/Resources/Maps/N14/MercerIslandSurface.yml b/Resources/Maps/N14/MercerIslandSurface.yml index c1d9870ed72..dc01ed0774b 100644 --- a/Resources/Maps/N14/MercerIslandSurface.yml +++ b/Resources/Maps/N14/MercerIslandSurface.yml @@ -159,6 +159,7 @@ entities: - type: RadiationGridResistance - uid: 2 components: + - type: TradeStation - type: MetaData name: grid - type: Transform diff --git a/Resources/Maps/N14/SunnyvaleSurface.yml b/Resources/Maps/N14/SunnyvaleSurface.yml index d5365eddec0..69dbaa30141 100644 --- a/Resources/Maps/N14/SunnyvaleSurface.yml +++ b/Resources/Maps/N14/SunnyvaleSurface.yml @@ -180,6 +180,7 @@ entities: entities: - uid: 1 components: + - type: TradeStation - type: MetaData name: Sunnyvale - type: Transform diff --git a/Resources/Maps/N14/SunnyvaleUnderground.yml b/Resources/Maps/N14/SunnyvaleUnderground.yml index 62b4f301b5c..2db6de97d05 100644 --- a/Resources/Maps/N14/SunnyvaleUnderground.yml +++ b/Resources/Maps/N14/SunnyvaleUnderground.yml @@ -107,6 +107,7 @@ entities: - 0 - uid: 2 components: + - type: TradeStation - type: MetaData name: SunnyvaleUnderground - type: Transform diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml deleted file mode 100644 index 1dae88730c1..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml +++ /dev/null @@ -1,49 +0,0 @@ -- type: cargoProduct - id: ArmoryGrand - icon: - sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi - state: base - product: CrateArmoryGrand - cost: 5500 - category: Armory - group: market - -- type: cargoProduct - id: ArmoryUniversal - icon: - sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi - state: icon - product: CrateArmoryUniversal - cost: 6500 - category: Armory - group: market - -- type: cargoProduct - id: ArmoryShotgunAdjutant - icon: - sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi - state: icon - product: CrateArmoryAdjutant - cost: 10000 - category: Armory - group: market - -- type: cargoProduct - id: ArmoryEnergyGun - icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi - state: icon - product: CrateArmoryEnergyGun - cost: 5500 - category: Armory - group: market - -- type: cargoProduct - id: ArmoryEnergyGunMini - icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi - state: icon - product: CrateArmoryEnergyGunMini - cost: 3500 - category: Armory - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml deleted file mode 100644 index 42b4d57e910..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: cargoProduct - id: FoodCrateKvassTank - icon: - sprite: DeltaV/Structures/Storage/kvass.rsi - state: kvass - product: KvassTankFull - cost: 2000 - category: Food - group: market - -- type: cargoProduct - id: FoodDonkpocketSavory - icon: - sprite: Objects/Consumable/Food/Baked/donkpocket.rsi - state: pizza-box - product: CrateFoodDonkpocketSavory - cost: 6000 # Thanks bounties - category: Food - group: market - -- type: cargoProduct - id: FoodDonkpocketSweet - icon: - sprite: Objects/Consumable/Food/Baked/donkpocket.rsi - state: berry-box - product: CrateFoodDonkpocketSweet - cost: 6000 # Thanks bounties - category: Food - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml deleted file mode 100644 index ddf3ebdb9e1..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: cargoProduct - id: CrateFunBBGun - icon: - sprite: Objects/Weapons/Guns/Pistols/water_pistol.rsi - state: display - product: CrateFunBBGun - cost: 1000 - category: Fun - group: market - -- type: cargoProduct - id: CapGunSet - icon: - sprite: Objects/Fun/caps.rsi - state: icon - product: CrateCapGunSet - cost: 1000 - category: Fun - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml deleted file mode 100644 index c025efd4f6a..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: LivestockSecDog - icon: - sprite: DeltaV/Mobs/Pets/secdog.rsi - state: secdog - product: CrateNPCSecDog - cost: 3500 - category: Livestock - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml deleted file mode 100644 index 503fb675ff1..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: MedicalScrubsCrate - icon: - sprite: Clothing/Uniforms/Scrubs/blue.rsi - state: icon - product: CrateMedicalScrubs - cost: 500 - category: Medical - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml deleted file mode 100644 index 343ec4d5333..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: CrateVendingMachineRestockPride - icon: - sprite: Objects/Specific/Service/vending_machine_restock.rsi - state: base - product: CrateVendingMachineRestockPrideFilled - cost: 1100 - category: Service - group: market diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 7397bcaa517..7d5e389c638 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -6,7 +6,7 @@ - type: Item storedRotation: -90 - type: Battery - pricePerJoule: 0.15 + pricePerJoule: 0.009 - type: PowerCell - type: Explosive explosionType: Default diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 252f2f48eae..1b6a8510394 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -132,7 +132,7 @@ stackType: Brutepack count: 10 - type: StackPrice - price: 5 + price: 1 - type: entity id: Brutepack1 @@ -287,7 +287,7 @@ stackType: Gauze count: 10 - type: StackPrice - price: 10 + price: 1 - type: entity id: Gauze1 diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 561b1faa094..1d65f918f9f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -60,7 +60,7 @@ materialComposition: Steel: 100 - type: StaticPrice - price: 30 + price: 1 - type: entity name: screwdriver @@ -121,7 +121,7 @@ materialComposition: Steel: 100 - type: StaticPrice - price: 30 + price: 1 - type: entity name: wrench @@ -177,7 +177,7 @@ materialComposition: Steel: 100 - type: StaticPrice - price: 22 + price: 1 - type: entity name: crowbar @@ -232,7 +232,7 @@ materialComposition: Steel: 100 - type: StaticPrice - price: 22 + price: 1 - type: Prying - type: entity @@ -312,7 +312,7 @@ Steel: 100 Plastic: 100 - type: StaticPrice - price: 56 + price: 2 - type: entity name: network configurator @@ -360,7 +360,7 @@ - key: enum.NetworkConfiguratorUiKey.Link type: NetworkConfiguratorBoundUserInterface - type: StaticPrice - price: 56 + price: 2 # - type: GuideHelp # guides: # - NetworkConfigurator @@ -413,7 +413,7 @@ # - type: DynamicPrice # price: 100 - type: StaticPrice - price: 100 + price: 10 - type: MeleeWeapon wideAnimationRotation: -90 attackRate: 0.9 @@ -659,7 +659,7 @@ Steel: 100 Wood: 50 - type: StaticPrice - price: 25 + price: 1 # Delta V: Adds tool quality for digging - type: Tool qualities: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml index 3bef413dffa..0d65952d8f9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml @@ -33,4 +33,4 @@ params: volume: -1 - type: StaticPrice - price: 1 + price: 0.2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index d03d91966d0..64bc8489d25 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -48,7 +48,7 @@ gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot - type: StaticPrice - price: 500 + price: 30 - type: entity name: AKMS diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 3962f6e1f57..550d7841016 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -53,7 +53,7 @@ gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot - type: StaticPrice - price: 500 + price: 10 - type: entity name: Atreides diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 52b05b6d60b..5172301feb6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -42,7 +42,7 @@ ballistic-ammo: !type:Container ents: [] - type: StaticPrice - price: 500 + price: 10 - type: entity name: Bulldog diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 4b58642c307..620c3f75e47 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -36,7 +36,7 @@ ballistic-ammo: !type:Container ents: [] - type: StaticPrice - price: 500 + price: 10 - type: entity name: Kardashev-Mosin diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml deleted file mode 100644 index d7d0b665381..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: EpistemicsHolyWaterKit - icon: - sprite: Nyanotrasen/Objects/Consumable/Drinks/flaskholywater.rsi - state: icon - product: CrateHolyWaterKit - cost: 3000 - category: Epistemics - group: market diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_service.yml deleted file mode 100644 index dd7e7b0dc1e..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_service.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: cargoProduct - id: ServiceColoredLightsReplacement - icon: - sprite: Objects/Power/light_bulb.rsi - state: normal - product: CrateServiceReplacementColoredLights - cost: 600 - category: Service - group: market - -- type: cargoProduct - id: ServiceMaintenanceLightsReplacement - icon: - sprite: Objects/Power/light_bulb.rsi - state: normal - product: CrateServiceReplacementMaintenanceLights - cost: 600 - category: Service - group: market diff --git a/Resources/Prototypes/Reagents/Materials/glass.yml b/Resources/Prototypes/Reagents/Materials/glass.yml index 30e7762a81e..425719e8632 100644 --- a/Resources/Prototypes/Reagents/Materials/glass.yml +++ b/Resources/Prototypes/Reagents/Materials/glass.yml @@ -4,7 +4,7 @@ name: materials-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: glass } color: "#a8ccd7" - price: 0.075 + price: 0.01 - type: material id: ReinforcedGlass @@ -12,7 +12,7 @@ name: materials-reinforced-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rglass } color: "#549bb0" - price: 0.16 # 1-0.5 mix of glass and metal. + price: 0.015 # 1-0.5 mix of glass and metal. - type: material id: PlasmaGlass diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml index fa51608a224..f410e016bcb 100644 --- a/Resources/Prototypes/Reagents/Materials/materials.yml +++ b/Resources/Prototypes/Reagents/Materials/materials.yml @@ -56,7 +56,7 @@ name: materials-plastic icon: { sprite: Objects/Materials/Sheets/other.rsi, state: plastic } color: "#d9d9d9" - price: 0.1 + price: 0.01 - type: material id: Wood @@ -65,7 +65,7 @@ unit: materials-unit-plank icon: { sprite: Objects/Materials/materials.rsi, state: wood } color: "#966F33" - price: 0.05 + price: 0.0033 - type: material id: Uranium diff --git a/Resources/Prototypes/Reagents/Materials/metals.yml b/Resources/Prototypes/Reagents/Materials/metals.yml index a2d2397dcde..c860d6d9b61 100644 --- a/Resources/Prototypes/Reagents/Materials/metals.yml +++ b/Resources/Prototypes/Reagents/Materials/metals.yml @@ -3,7 +3,7 @@ stackEntity: SheetSteel1 name: materials-steel icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: steel } - price: 0.05 + price: 0.01 - type: material id: Gold @@ -12,7 +12,7 @@ unit: materials-unit-bar icon: { sprite: Objects/Materials/ingots.rsi, state: gold } color: "#FFD700" - price: 0.2 + price: 0.05 - type: material id: Silver @@ -21,7 +21,7 @@ unit: materials-unit-bar icon: { sprite: Objects/Materials/ingots.rsi, state: silver } color: "#C0C0C0" - price: 0.15 + price: 0.03 - type: material id: Brass @@ -29,7 +29,7 @@ name: materials-brass icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: brass } color: "#b18b25" - price: 0.1 + price: 0.01 - type: material id: Plasteel @@ -37,4 +37,4 @@ name: materials-plasteel icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plasteel } color: "#696969" #Okay, this is epic - price: 0.28 # 1-1 mix of plasma and steel. + price: 0.03 # 1-1 mix of plasma and steel. diff --git a/Resources/Prototypes/_Nuclear14/Access/caravancompany.yml b/Resources/Prototypes/_Nuclear14/Access/caravancompany.yml index 7b17ea25c52..4cc3a4fb7cc 100644 --- a/Resources/Prototypes/_Nuclear14/Access/caravancompany.yml +++ b/Resources/Prototypes/_Nuclear14/Access/caravancompany.yml @@ -15,4 +15,5 @@ tags: - CaravanCompanyLeader - CaravanCompanyTrader - - CaravanCompanyGuard \ No newline at end of file + - CaravanCompanyGuard + - Orders # Delta V - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_armory.yml new file mode 100644 index 00000000000..7fe69453137 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_armory.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: SmallGameRifleCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi + state: base + product: N14CrateArmyFilledSmallGameRifle + cost: 100 + category: Armory + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_chems.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_chems.yml new file mode 100644 index 00000000000..018073f2e0c --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_chems.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: AbraxoCleanerCrate + icon: + sprite: _Nuclear14/Objects/Misc/crafting_junk.rsi + state: abraxo + product: N14CrateBreakPlainFilledAbraxo + cost: 100 + category: Chems + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml new file mode 100644 index 00000000000..d15a78882e9 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml @@ -0,0 +1,39 @@ +- type: cargoProduct + id: EmergencyRationsCrate + icon: + sprite: _Nuclear14/Objects/Consumable/Food/pre-war.rsi + state: porknbeans + product: N14CrateBreakPlainFilledEmergencyRations + cost: 60 + category: Consumables + group: market + +- type: cargoProduct + id: WaterBottlesCrate + icon: + sprite: Objects/Consumable/Drinks/waterbottle.rsi + state: icon + product: N14CrateBreakPlainFilledWatterBottle + cost: 200 + category: Consumables + group: market + +- type: cargoProduct + id: RepublicsCrate + icon: + sprite: _Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi + state: closed + product: N14CrateBreakPlainFilledCigarettesRepublic + cost: 50 + category: Consumables + group: market + +- type: cargoProduct + id: NukaColaCrate + icon: + sprite: _Nuclear14/Objects/Consumable/Drinks/nuka_cola.rsi + state: icon + product: N14CrateBreakPlainFilledNukaCola + cost: 80 + category: Consumables + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_livestock.yml new file mode 100644 index 00000000000..48f1b8707f9 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_livestock.yml @@ -0,0 +1,19 @@ +- type: cargoProduct + id: Brahmin + icon: + sprite: _Nuclear14/Mobs/Animals/brahmin.rsi + state: brahmin-2 + product: N14MobBrahmin + cost: 80 + category: Livestock + group: market + +- type: cargoProduct + id: Chicken + icon: + sprite: _Nuclear14/Mobs/Animals/chicken.rsi + state: chicken + product: N14MobChicken + cost: 30 + category: Livestock + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_materials.yml new file mode 100644 index 00000000000..e1a720a272f --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_materials.yml @@ -0,0 +1,79 @@ +- type: cargoProduct + id: SteelSheetCrate + icon: + sprite: /Textures/Objects/Materials/Sheets/metal.rsi + state: steel + product: N14CrateBreakPlainFilledSteelSheet + cost: 60 + category: Materials + group: market + +- type: cargoProduct + id: PlasticSheetCrate + icon: + sprite: /Textures/Objects/Materials/Sheets/other.rsi + state: plastic + product: N14CrateBreakPlainFilledPlasticSheet + cost: 60 + category: Materials + group: market + +- type: cargoProduct + id: GlassSheetCrate + icon: + sprite: /Textures/Objects/Materials/Sheets/glass.rsi + state: glass + product: N14CrateBreakPlainFilledGlassSheet + cost: 60 + category: Materials + group: market + +- type: cargoProduct + id: WoodPlankCrate + icon: + sprite: /Textures/Objects/Materials/materials.rsi + state: wood + product: N14CrateBreakPlainFilledWood + cost: 20 + category: Materials + group: market + +- type: cargoProduct + id: GunpowderCrate + icon: + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: powder_lead + product: N14CrateBreakPlainFilledGunpowder + cost: 300 + category: Materials + group: market + +- type: cargoProduct + id: LeadBarCrate + icon: + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: ingot_lead + product: N14CrateBreakPlainFilledLeadBar + cost: 160 + category: Materials + group: market + +- type: cargoProduct + id: AdhesivesCrate + icon: + sprite: _Nuclear14/Objects/Misc/crafting_junk.rsi + state: duct_tape + product: N14CrateBreakPlainFilledAdhesive + cost: 40 + category: Materials + group: market + +- type: cargoProduct + id: MechanicPartsCrate + icon: + sprite: _Nuclear14/Objects/Misc/crafting_junk.rsi + state: gear_small + product: N14CrateBreakPlainFilledMechanicParts + cost: 60 + category: Materials + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml new file mode 100644 index 00000000000..996d53d2a05 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: StimpakCrate + icon: + sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi + state: stimpak + product: N14CrateBreakPlainFilledStimpak + cost: 300 + category: Medical / Aid + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_wavesurvival.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_wavesurvival.yml deleted file mode 100644 index 905d828655b..00000000000 --- a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_wavesurvival.yml +++ /dev/null @@ -1,175 +0,0 @@ -# Supplies -- type: cargoProduct - id: CargoWastelanderBox - icon: - sprite: _Nuclear14/Objects/Misc/storage.rsi - state: box - product: N14BoxPlasticFilledWastelander - cost: 500 - category: Supplies - group: market - - -# Medical / Aid -- type: cargoProduct - id: CargoMedicalStimpak - icon: - sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi - state: stimpak - product: N14Stimpak - cost: 500 - category: Medical / Aid - group: market - -- type: cargoProduct - id: CargoMedicalStimpakSuper - icon: - sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi - state: superstimpak - product: N14SuperStimpak - cost: 1000 - category: Medical / Aid - group: market - -- type: cargoProduct - id: CargoMedicalRadaway - icon: - sprite: _Nuclear14/Objects/Specific/Medical/bloodbags.rsi - state: radaway - product: N14RadAwayBloodbag - cost: 500 - category: Medical / Aid - group: market - -- type: cargoProduct - id: CargoMedicalAntidote - icon: - sprite: _Nuclear14/Objects/Specific/Medical/fallout2.rsi - state: antidote - product: N14Antidote - cost: 750 - category: Medical / Aid - group: market - -- type: cargoProduct - id: CargoMedicalAntidoteSyringe - icon: - sprite: _Nuclear14/Objects/Specific/Medical/antidote-injector.rsi - state: icon - product: N14ChemicalSyringeAntidote - cost: 2000 - category: Medical / Aid - group: market - - -# Weapons -- type: cargoProduct - id: CargoWeaponRifleR91 - icon: - sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi - state: base - product: N14WeaponRifle556R91 - cost: 2000 - category: Weapons - group: market - -- type: cargoProduct - id: CargoWeaponChineseRifle - icon: - sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi - state: base - product: N14WeaponRifle762Chinese - cost: 2500 - category: Weapons - group: market - -- type: cargoProduct - id: CargoWeaponCarbine - icon: - sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi - state: base - product: N14WeaponRifle556Carbine - cost: 2500 - category: Weapons - group: market - -- type: cargoProduct - id: CargoWeaponMarksman - icon: - sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi - state: base - product: N14WeaponRifle762Marksman - cost: 3000 - category: Weapons - group: market - -# Ammo - - -# Clothing / Armor -- type: cargoProduct - id: CargoClothingPowerArmorT45 - icon: - sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t45.rsi - state: icon - product: N14ClothingOuterPowerArmorT45 - cost: 3000 - category: Clothing - group: market - -- type: cargoProduct - id: CargoClothingPowerArmorT51 - icon: - sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t51.rsi - state: icon - product: N14ClothingOuterPowerArmorT51 - cost: 4000 - category: Clothing - group: market - -- type: cargoProduct - id: CargoClothingPowerArmorT60 - icon: - sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t60.rsi - state: icon - product: N14ClothingOuterPowerArmorT60 - cost: 5000 - category: Clothing - group: market - -- type: cargoProduct - id: CargoClothingPowerArmorT60Tesla - icon: - sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t60tesla.rsi - state: icon - product: N14ClothingOuterPowerArmorT60Tesla - cost: 6000 - category: Clothing - group: market - -- type: cargoProduct - id: CargoClothingPowerArmorAdvanced1 - icon: - sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/advanced1.rsi - state: icon - product: N14ClothingOuterPowerArmorAdvanced1 - cost: 6000 - category: Clothing - group: market - -- type: cargoProduct - id: CargoClothingPowerArmorAdvanced2 - icon: - sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/advanced2.rsi - state: icon - product: N14ClothingOuterPowerArmorAdvanced2 - cost: 7000 - category: Clothing - group: market - -# Companions - - -# Crafting - - diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml index d706ceb1c11..60b439fb32c 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml @@ -31,8 +31,171 @@ id: N14CrateBreakPlainFilledCigarettesRepublic suffix: republics name: Republic cigarette crate + description: Crate containing 6 republic cig packs components: - type: StorageFill contents: - id: N14CigarettePackRepublics - amount: 6 \ No newline at end of file + amount: 6 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledSteelSheet + name: Steel sheets crate + description: Crate containing 30 steel sheets + components: + - type: StorageFill + contents: + - id: SheetSteel + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledPlasticSheet + name: Plastic sheets crate + description: Crate containing 30 plastic sheets + components: + - type: StorageFill + contents: + - id: SheetPlastic + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledGlassSheet + name: Glass sheets crate + description: Crate containing 30 glass sheets + components: + - type: StorageFill + contents: + - id: SheetGlass + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledWood + name: Wood crate + description: Crate containing 30 wood planks + components: + - type: StorageFill + contents: + - id: MaterialWoodPlank + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledMechanicParts + name: Mechanic parts crate + description: Crate containing 4 screws, 2 small gears and 2 large gears + components: + - type: StorageFill + contents: + - id: N14JunkComponentScrew + amount: 4 + - id: N14JunkComponentGearSmall + amount: 2 + - id: N14JunkComponentGearLarge + amount: 2 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledAdhesive + name: Adhesives crate + description: Crate containing 4 duct tapes + components: + - type: StorageFill + contents: + - id: N14JunkDuctTape + amount: 4 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledStimpak + name: Stimpak crate + description: Crate containing 6 stimpaks + components: + - type: StorageFill + contents: + - id: N14Stimpak + amount: 6 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledEmergencyRations + name: Emergency rations crate + description: Crate containing 2 Pork n' Beans, 2 BlamCo Mac & Cheese, 2 Salisbury Steak and 2 Dandy Boy Apples. + components: + - type: StorageFill + contents: + - id: N14FoodPorkBeans + amount: 2 + - id: N14FoodSalisburysteak + amount: 2 + - id: N14FoodBlamcomaccheese + amount: 2 + - id: N14FoodDandyboyapples + amount: 2 + +- type: entity + parent: N14CrateArmy + id: N14CrateArmyFilledSmallGameRifle + name: Small game rifle crate + description: Crate containing 4 Varmint rifles. + components: + - type: StorageFill + contents: + - id: N14WeaponSniper556VarmintRifle + amount: 4 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledWatterBottle + name: Water bottles crate + description: Crate containing 10 water bottles + components: + - type: StorageFill + contents: + - id: DrinkWaterBottleFull + amount: 10 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledNukaCola + name: Nuka cola crate + description: Crate containing 10 nuka colas + components: + - type: StorageFill + contents: + - id: N14DrinkNukaCola + amount: 10 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledGunpowder + name: Gunpowder crate + description: Crate containing 20 gunpowder + components: + - type: StorageFill + contents: + - id: Gunpowder20 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledLeadBar + name: Lead bars crate + description: Crate containing 20 lead bars + components: + - type: StorageFill + contents: + - id: N14IngotLead20 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledAbraxo + name: Abraxo cleaner crate + description: Crate containing 4 Abraxo Cleaners + components: + - type: StorageFill + contents: + - id: N14JunkAbraxoCleaner + amount: 4 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml index 13557001fad..b1f4cf06c17 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml @@ -63,6 +63,14 @@ - type: Stack count: 10 +- type: entity + parent: Gunpowder + id: Gunpowder20 + suffix: 20 + components: + - type: Stack + count: 20 + - type: entity parent: Gunpowder id: Gunpowder1 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml index 64b7a452ece..070e60547ca 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml @@ -56,6 +56,17 @@ - type: Stack count: 1 +- type: entity + parent: N14IngotLead + id: N14IngotLead20 + name: lead bar + suffix: 20 + components: + - type: Sprite + state: ingot_lead + - type: Stack + count: 20 + #MARK: Aluminum - type: entity parent: IngotBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml index 2660f34fcd3..21b5f0bc822 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml @@ -39,6 +39,11 @@ name: bottlecap description: A bottlecap from a bottle of Nuka-Cola. components: + - type: Cash + - type: Material + - type: PhysicalComposition + materialComposition: + Credit: 1 - type: StaticPrice price: 0 - type: Tag @@ -79,9 +84,8 @@ - type: stack id: Caps name: caps - icon: { sprite: /Textures/_Nuclear14/Objects/Misc/currency.rsi, state: caps3 } + icon: { sprite: _Nuclear14/Objects/Misc/currency.rsi, state: caps3 } spawn: N14CurrencyCap - maxCount: 500 - type: entity parent: N14CurrencyCap @@ -134,6 +138,9 @@ name: pre-war money description: Wads of useless paper. Make it rain! components: + - type: PhysicalComposition + materialComposition: + Credit: 0 - type: Stack stackType: PrewarMoney count: 1 @@ -199,7 +206,15 @@ state: prewar3 - type: Stack count: 500 - + +- type: material + id: NcrCredit + name: ncrCredit + unit: materials-unit-bill + stackEntity: N14CurrencyNCRDollar + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/currency.rsi, state: ncr3 } + price: 0.66 + # NCR Dollars - type: entity parent: N14CurrencyCap @@ -207,6 +222,10 @@ name: NCR dollar description: Wads of paper, these ones bear the insignia of the NCR. Make it rain! components: + - type: Cash + - type: PhysicalComposition + materialComposition: + NcrCredit: 1 - type: Stack stackType: NCRDollar count: 1 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml index ac2373ad5fa..ae0f228b071 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml @@ -92,6 +92,8 @@ name: stimpak description: A syringe filled with a wondrous mixture of medical reagents. Essential for those with little to no medical knowledge. components: + - type: StaticPrice + price: 15 - type: Sprite layers: - state: stimpak @@ -120,6 +122,8 @@ name: dirty stimpak description: A syringe filled with a once-wondrous mixture of medical reagents, now tainted by the wastes. Essential for those with little to no medical knowledge. components: + - type: StaticPrice + price: 8 - type: SolutionContainerManager solutions: pen: @@ -134,6 +138,8 @@ name: super stimpak description: A stronger version of the stimpak. Be careful, however, as you can overdose from taking too much. components: + - type: StaticPrice + price: 25 - type: Sprite layers: - state: superstimpak @@ -371,6 +377,8 @@ name: RadAway description: A bloodbag filled with an odd oily reagent that cures any radiation you've sustained. components: + - type: StaticPrice + price: 20 - type: Sprite sprite: _Nuclear14/Objects/Specific/Medical/bloodbags.rsi netsync: false diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml index 27ea27bd0ec..99c1fa86a4f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml @@ -6,7 +6,7 @@ parent: BaseItem components: - type: Battery - pricePerJoule: 0.15 + pricePerJoule: 0.015 - type: Explosive explosionType: Default maxIntensity: 200 @@ -184,7 +184,7 @@ parent: BaseItem components: - type: Battery - pricePerJoule: 0.15 + pricePerJoule: 0.015 - type: Explosive explosionType: Default maxIntensity: 200 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index a33923e557b..8bbcdd3a935 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -34,7 +34,7 @@ - PowerCell - type: Appearance - type: StaticPrice - price: 500 + price: 25 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index fa9654b6cb3..5d9069181b7 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -64,7 +64,7 @@ zeroVisible: true - type: Appearance - type: StaticPrice - price: 500 + price: 8 - type: FollowDistance backStrength: 6 diff --git a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml index c79ed2b3d34..cc240bb9a12 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml @@ -14,7 +14,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_lead } color: "#C0C0C0" - price: 0.15 + price: 0.04 - type: material id: Sulfur @@ -23,7 +23,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: powder_brass } color: "#FDD805" - price: 0.15 + price: 0.01 - type: material id: Aluminum @@ -32,7 +32,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_aluminum } color: "#C0C0C0" - price: 0.15 + price: 0.01 - type: material id: N14Copper @@ -41,7 +41,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_copper } color: "#B87333" - price: 0.15 + price: 0.01 - type: material id: N14Brass @@ -50,7 +50,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_brass } color: "#B5A642" - price: 0.20 + price: 0.01 - type: material id: N14Gold @@ -59,7 +59,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_gold } color: "#FFD700" - price: 1.00 + price: 0.14 - type: material id: N14Iron @@ -68,7 +68,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_iron } color: "#B0C4DE" - price: 0.15 + price: 0.02 - type: material id: N14Silver @@ -77,7 +77,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_silver } color: "#C0C0C0" - price: 0.50 + price: 0.1 # Materials - type: material @@ -86,7 +86,7 @@ name: materials-gunpowder icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: powder_lead } color: "#3E201D" - price: 0.15 + price: 0.075 - type: material id: ScrapElectronic @@ -94,7 +94,7 @@ name: materials-scrap-electronic unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_electronic_3 } - price: 0.15 + price: 0.005 - type: material id: ScrapSteel @@ -102,7 +102,7 @@ name: materials-scrap-steel unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_steel_3 } - price: 0.1 + price: 0.005 - type: material id: ScrapGold @@ -111,7 +111,7 @@ unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_gold } color: "#FFD700" - price: 0.15 + price: 0.007 - type: material id: ScrapCopper @@ -120,7 +120,7 @@ unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_copper } color: "#B87333" - price: 0.1 + price: 0.005 - type: material id: ScrapBrass @@ -129,7 +129,7 @@ unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_brass } color: "#B5A642" - price: 0.1 + price: 0.005 - type: material id: Scrap @@ -138,7 +138,7 @@ unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_3 } color: "#4A4A4A" - price: 0.1 + price: 0.003 - type: material id: ScrapLead @@ -147,7 +147,7 @@ unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_lead } color: "#C0C0C0" - price: 0.1 + price: 0.005 - type: reagent id: Gunpowder @@ -172,7 +172,7 @@ name: materials-charcoal icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: powder_lead } color: "#1D3B3E" - price: 0.15 + price: 0.005 - type: material id: Fertilizer @@ -180,7 +180,7 @@ name: materials-fertilizer icon: { sprite: /Textures/_Nuclear14/Objects/Misc/Sacks/daesack2.rsi, state: icon } color: "#1D3B3E" - price: 0.15 + price: 0.05 - type: reagent id: Fertilizer @@ -236,7 +236,7 @@ name: materials-timber icon: { sprite: _Nuclear14/Structures/Decoration/flora.rsi, state: tree_timber } color: "#1D3B3E" - price: 0.15 + price: 0.003 - type: material id: Leather @@ -244,7 +244,7 @@ name: materials-leather unit: materials-unit-roll icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: leather_3 } - price: 0.15 + price: 0.02 - type: material id: Exoskeleton @@ -268,7 +268,7 @@ name: materials-raw-leather unit: materials-unit-roll icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: raw_leather_2 } - price: 0.10 + price: 0.01 - type: material id: Thread @@ -277,4 +277,4 @@ unit: materials-unit-roll icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: thread } color: "#d2691e" - price: 0.10 \ No newline at end of file + price: 0.01 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml index 524ffe37e11..7fd1ed71466 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml @@ -10,6 +10,7 @@ alwaysUseSpawner: true access: - CaravanCompanyGuard + - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml index 6b4d50100eb..1983f0dd538 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml @@ -11,6 +11,7 @@ access: - CaravanCompanyTrader - CaravanCompanyGuard + - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml special: - !type:AddComponentSpecial components: