From 707eee5041f28eace0001e872e46de4ba26245e7 Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 27 Jul 2023 18:59:16 +0300 Subject: [PATCH] Restock Fix --- ...go-vending-extra.ftl => cargo-vending.ftl} | 0 .../catalog/fills/crates/vending-crates.ftl | 8 ++ .../catalog/fills/crates/vending-crates.ftl | 55 ++++++------- .../Catalog/Cargo/cargo_vending.yml | 46 +++++------ .../Catalog/Fills/Crates/vending.yml | 74 ++++++++--------- .../Service/vending_machine_restock.yml | 79 +------------------ ...go_vending_extra.yml => cargo_vending.yml} | 6 +- .../_NF/Catalog/Fills/Crates/vending.yml | 26 ++++++ ..._extra.yml => vending_machine_restock.yml} | 14 +--- 9 files changed, 123 insertions(+), 185 deletions(-) rename Resources/Locale/en-US/_NF/prototypes/catalog/cargo/{cargo-vending-extra.ftl => cargo-vending.ftl} (100%) create mode 100644 Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl rename Resources/Prototypes/_NF/Catalog/Cargo/{cargo_vending_extra.yml => cargo_vending.yml} (96%) create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml rename Resources/Prototypes/_NF/Entities/Objects/Specific/Service/{vending_machine_restock_extra.yml => vending_machine_restock.yml} (94%) diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending-extra.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl similarity index 100% rename from Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending-extra.ftl rename to Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-vending.ftl diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl new file mode 100644 index 00000000000..baa70b0a40c --- /dev/null +++ b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl @@ -0,0 +1,8 @@ +ent-CrateVendingMachineRestockAstroVendFilled = AstroVend restock crate + .desc = Contains two restock boxes for the AstroVend vendor. + +ent-CrateVendingMachineRestockAmmoFilled = Liberation restock crate + .desc = Contains two restock boxes for the Liberation vending machine. + +ent-CrateVendingMachineRestockCircuitVendFilled = CircuitVend restock crate + .desc = Contains two restock boxes for a CircuitVend vending machine. \ No newline at end of file diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl index 4419b0feec7..50b984425c4 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl @@ -1,77 +1,68 @@ ent-CrateVendingMachineRestockBoozeFilled = Booze-O-Mat restock crate - .desc = Contains a restock box for the Booze-O-Mat. + .desc = Contains two restock boxes for the Booze-O-Mat. ent-CrateVendingMachineRestockClothesFilled = Clothing restock crate - .desc = Contains a pair of restock boxes, one for the ClothesMate and one for the AutoDrobe. + .desc = Contains eight restock boxes, one for the ClothesMate and one for the AutoDrobe. ent-CrateVendingMachineRestockDinnerwareFilled = Plasteel Chef restock crate - .desc = Contains a restock box for the Plasteel Chef vending machine. + .desc = Contains two restock boxes for the Plasteel Chef vending machine. ent-CrateVendingMachineRestockEngineeringFilled = EngiVend restock crate - .desc = Contains a restock box for the EngiVend. Also supports the YouTool. + .desc = Contains two restock boxes for the EngiVend. Also supports the YouTool. ent-CrateVendingMachineRestockGamesFilled = Good Clean Fun restock crate - .desc = Contains a restock box for the Good Clean Fun vending machine. + .desc = Contains two restock boxes for the Good Clean Fun vending machine. ent-CrateVendingMachineRestockHotDrinksFilled = Solar's Best restock crate - .desc = Contains two restock boxes for Solar's Best Hot Drinks vending machine. + .desc = Contains eight restock boxes for Solar's Best Hot Drinks vending machine. ent-CrateVendingMachineRestockMedicalFilled = NanoMed restock crate - .desc = Contains a restock box, compatible with the NanoMed and NanoMedPlus. + .desc = Contains two restock boxes, compatible with the NanoMed and NanoMedPlus. ent-CrateVendingMachineRestockNutriMaxFilled = NutriMax restock crate - .desc = Contains a restock box for the NutriMax vending machine. + .desc = Contains two restock boxes for the NutriMax vending machine. ent-CrateVendingMachineRestockPTechFilled = PTech restock crate - .desc = Contains a restock box for the PTech bureaucracy dispenser. + .desc = Contains two restock boxes for the PTech bureaucracy dispenser. ent-CrateVendingMachineRestockRobustSoftdrinksFilled = Robust Softdrinks restock crate - .desc = Contains two restock boxes for the Robust Softdrinks LLC vending machine. + .desc = Contains eight restock boxes for the Robust Softdrinks LLC vending machine. ent-CrateVendingMachineRestockSalvageEquipmentFilled = Salvage restock crate - .desc = Contains a restock box for the salvage vendor. - -ent-CrateVendingMachineRestockAstroVendFilled = AstroVend restock crate - .desc = Contains a restock box for the AstroVend vendor. + .desc = Contains two restock boxes for the salvage vendor. ent-CrateVendingMachineRestockSecTechFilled = SecTech restock crate - .desc = Contains a restock box for the SecTech vending machine. - -ent-CrateVendingMachineRestockAmmoFilled = Liberation restock crate - .desc = Contains a restock box for the Liberation vending machine. + .desc = Contains two restock boxes for the SecTech vending machine. ent-CrateVendingMachineRestockSeedsFilled = MegaSeed restock crate - .desc = Contains a restock box for the MegaSeed vending machine. + .desc = Contains two restock boxes for the MegaSeed vending machine. ent-CrateVendingMachineRestockSmokesFilled = ShadyCigs restock crate - .desc = Contains two restock boxes for the ShadyCigs vending machine. + .desc = Contains eight restock boxes for the ShadyCigs vending machine. ent-CrateVendingMachineRestockVendomatFilled = Vendomat restock crate - .desc = Contains a restock box for a Vendomat vending machine. - -ent-CrateVendingMachineRestockCircuitVendFilled = CircuitVend restock crate - .desc = Contains a restock box for a CircuitVend vending machine. + .desc = Contains two restock boxes for a Vendomat vending machine. ent-CrateVendingMachineRestockRoboticsFilled = Robotech Deluxe restock crate - .desc = Contains a restock box for a Robotech Deluxe vending machine. + .desc = Contains two restock boxes for a Robotech Deluxe vending machine. ent-CrateVendingMachineRestockTankDispenserFilled = Tank dispenser restock crate - .desc = Contains a restock box for an Engineering or Atmospherics tank dispenser. + .desc = Contains two restock boxes for an Engineering or Atmospherics tank dispenser. ent-CrateVendingMachineRestockHappyHonkFilled = Happy honk restock crate - .desc = Contains a restock box for a happy honk dispenser. + .desc = Contains two restock boxes for a happy honk dispenser. ent-CrateVendingMachineRestockGetmoreChocolateCorpFilled = Getmore Chocolate Corp restock crate - .desc = Contains a restock box for a Getmore Chocolate Corp dispenser. + .desc = Contains two restock boxes for a Getmore Chocolate Corp dispenser. ent-CrateVendingMachineRestockChangFilled = Chang restock crate - .desc = Contains a restock box for a Mr. Chang dispenser. + .desc = Contains two restock boxes for a Mr. Chang dispenser. ent-CrateVendingMachineRestockDiscountDansFilled = Discount Dans restock crate - .desc = Contains a restock box for a Discount Dan's dispenser. + .desc = Contains two restock boxes for a Discount Dan's dispenser. ent-CrateVendingMachineRestockDonutFilled = Donut restock crate - .desc = Contains a restock box for a Monkin' Donuts dispenser. + .desc = Contains two restock boxes for a Monkin' Donuts dispenser. ent-CrateVendingMachineRestockChemVendFilled = ChemVend restock crate - .desc = Contains a restock box for the ChemVend. + .desc = Contains two restock boxes for the ChemVend. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 7813ee3b2ff..6c05c37b39a 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -12,7 +12,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockBoozeFilled - cost: 3500 + cost: 400 category: Service group: market @@ -22,7 +22,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 4350 + cost: 100 category: Service group: market @@ -32,7 +32,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockDinnerwareFilled - cost: 2000 + cost: 100 category: Service group: market @@ -42,7 +42,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockEngineeringFilled - cost: 3200 + cost: 100 category: Engineering group: market @@ -52,7 +52,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockGamesFilled - cost: 750 + cost: 100 category: Service group: market @@ -62,7 +62,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockHotDrinksFilled - cost: 1200 + cost: 400 category: Service group: market @@ -72,7 +72,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockMedicalFilled - cost: 1750 + cost: 100 category: Medical group: market @@ -82,7 +82,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockChemVendFilled - cost: 3820 + cost: 100 category: Medical group: market @@ -92,7 +92,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockNutriMaxFilled - cost: 2400 + cost: 100 category: Hydroponics group: market @@ -102,7 +102,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockPTechFilled - cost: 1200 + cost: 100 category: Service group: market @@ -112,7 +112,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockRobustSoftdrinksFilled - cost: 1200 + cost: 400 category: Service group: market @@ -122,7 +122,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSalvageEquipmentFilled - cost: 1000 + cost: 100 category: Engineering group: market @@ -132,7 +132,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSecTechFilled - cost: 2200 + cost: 100 category: Security group: market @@ -142,7 +142,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSeedsFilled - cost: 3000 + cost: 100 category: Hydroponics group: market @@ -152,7 +152,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSmokesFilled - cost: 1200 + cost: 400 category: Service group: market @@ -162,7 +162,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockVendomatFilled - cost: 1200 + cost: 100 category: Service group: market @@ -172,7 +172,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockRoboticsFilled - cost: 1600 + cost: 100 category: Science group: market @@ -182,7 +182,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockTankDispenserFilled - cost: 1000 + cost: 100 category: Atmospherics group: market @@ -192,7 +192,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockHappyHonkFilled - cost: 2100 + cost: 400 category: Service group: market @@ -202,7 +202,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockGetmoreChocolateCorpFilled - cost: 1200 + cost: 400 category: Service group: market @@ -212,7 +212,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockChangFilled - cost: 1200 + cost: 400 category: Service group: market @@ -222,7 +222,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockDiscountDansFilled - cost: 1200 + cost: 400 category: Service group: market @@ -232,6 +232,6 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockDonutFilled - cost: 1200 + cost: 400 category: Service group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml index 4a0129948b7..368848788fc 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml @@ -5,6 +5,7 @@ - type: StorageFill contents: - id: VendingMachineRestockBooze + amount: 2 - type: entity id: CrateVendingMachineRestockClothesFilled @@ -13,7 +14,9 @@ - type: StorageFill contents: - id: VendingMachineRestockClothes + amount: 2 - id: VendingMachineRestockCostumes + amount: 2 - type: entity id: CrateVendingMachineRestockDinnerwareFilled @@ -22,14 +25,16 @@ - type: StorageFill contents: - id: VendingMachineRestockDinnerware + amount: 2 - type: entity id: CrateVendingMachineRestockEngineeringFilled - parent: CrateEngineeringSecure + parent: CratePlastic components: - type: StorageFill contents: - id: VendingMachineRestockEngineering + amount: 2 - type: entity id: CrateVendingMachineRestockGamesFilled @@ -38,6 +43,7 @@ - type: StorageFill contents: - id: VendingMachineRestockGames + amount: 2 - type: entity id: CrateVendingMachineRestockHotDrinksFilled @@ -46,31 +52,34 @@ - type: StorageFill contents: - id: VendingMachineRestockHotDrinks - amount: 2 + amount: 8 - type: entity id: CrateVendingMachineRestockMedicalFilled - parent: CrateMedicalSecure + parent: CratePlastic components: - type: StorageFill contents: - id: VendingMachineRestockMedical + amount: 2 - type: entity id: CrateVendingMachineRestockChemVendFilled - parent: CrateMedicalSecure + parent: CratePlastic components: - type: StorageFill contents: - id: VendingMachineRestockChemVend + amount: 2 - type: entity id: CrateVendingMachineRestockNutriMaxFilled - parent: CrateHydroSecure + parent: CratePlastic components: - type: StorageFill contents: - id: VendingMachineRestockNutriMax + amount: 2 - type: entity id: CrateVendingMachineRestockPTechFilled @@ -79,6 +88,7 @@ - type: StorageFill contents: - id: VendingMachineRestockPTech + amount: 2 - type: entity id: CrateVendingMachineRestockRobustSoftdrinksFilled @@ -87,23 +97,16 @@ - type: StorageFill contents: - id: VendingMachineRestockRobustSoftdrinks - amount: 2 + amount: 8 - type: entity id: CrateVendingMachineRestockSalvageEquipmentFilled - parent: CrateGenericSteel + parent: CratePlastic components: - type: StorageFill contents: - id: VendingMachineRestockSalvageEquipment - -- type: entity - id: CrateVendingMachineRestockAstroVendFilled - parent: CrateEngineeringSecure - components: - - type: StorageFill - contents: - - id: VendingMachineRestockAstroVend + amount: 2 - type: entity id: CrateVendingMachineRestockSecTechFilled @@ -112,22 +115,16 @@ - type: StorageFill contents: - id: VendingMachineRestockSecTech - -- type: entity - id: CrateVendingMachineRestockAmmoFilled - parent: CrateWeaponSecure - components: - - type: StorageFill - contents: - - id: VendingMachineRestockAmmo + amount: 2 - type: entity id: CrateVendingMachineRestockSeedsFilled - parent: CrateHydroSecure + parent: CratePlastic components: - type: StorageFill contents: - id: VendingMachineRestockSeeds + amount: 2 - type: entity id: CrateVendingMachineRestockSmokesFilled @@ -136,7 +133,7 @@ - type: StorageFill contents: - id: VendingMachineRestockSmokes - amount: 2 + amount: 8 - type: entity id: CrateVendingMachineRestockVendomatFilled @@ -144,23 +141,17 @@ components: - type: StorageFill contents: - - id: VendingMachineRestockVendomat - -- type: entity - id: CrateVendingMachineRestockCircuitVendFilled - parent: CrateScienceSecure - components: - - type: StorageFill - contents: - - id: VendingMachineRestockCircuitVend + - id: VendingMachineRestockVendomat + amount: 2 - type: entity id: CrateVendingMachineRestockRoboticsFilled - parent: CrateScienceSecure + parent: CratePlastic components: - type: StorageFill contents: - - id: VendingMachineRestockRobotics + - id: VendingMachineRestockRobotics + amount: 2 - type: entity id: CrateVendingMachineRestockTankDispenserFilled @@ -169,6 +160,7 @@ - type: StorageFill contents: - id: VendingMachineRestockTankDispenser + amount: 2 - type: entity id: CrateVendingMachineRestockHappyHonkFilled @@ -177,7 +169,7 @@ - type: StorageFill contents: - id: VendingMachineRestockHappyHonk - amount: 2 + amount: 8 - type: entity id: CrateVendingMachineRestockGetmoreChocolateCorpFilled @@ -186,7 +178,7 @@ - type: StorageFill contents: - id: VendingMachineRestockGetmoreChocolateCorp - amount: 2 + amount: 8 - type: entity id: CrateVendingMachineRestockChangFilled @@ -195,7 +187,7 @@ - type: StorageFill contents: - id: VendingMachineRestockChang - amount: 2 + amount: 8 - type: entity id: CrateVendingMachineRestockDiscountDansFilled @@ -204,7 +196,7 @@ - type: StorageFill contents: - id: VendingMachineRestockDiscountDans - amount: 2 + amount: 8 - type: entity id: CrateVendingMachineRestockDonutFilled @@ -213,4 +205,4 @@ - type: StorageFill contents: - id: VendingMachineRestockDonut - amount: 2 + amount: 8 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml index c5710a01960..3be6427680f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -12,9 +12,9 @@ - state: base - state: green_bit shader: unshaded - - type: StaticPrice - price: 100 - type: CargoSellBlacklist + - type: StaticPrice + price: 0 - type: ItemCooldown - type: MeleeWeapon damage: @@ -63,9 +63,6 @@ - state: green_bit shader: unshaded - state: refill_booze - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -82,9 +79,6 @@ - state: green_bit shader: unshaded - state: refill_chinese - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -118,9 +112,6 @@ - state: green_bit shader: unshaded - state: refill_clothes - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -137,9 +128,6 @@ - state: green_bit shader: unshaded - state: refill_costume - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -156,9 +144,6 @@ - state: green_bit shader: unshaded - state: refill_dinner - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -175,9 +160,6 @@ - state: green_bit shader: unshaded - state: refill_discount - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -194,9 +176,6 @@ - state: green_bit shader: unshaded - state: refill_donuts - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -214,9 +193,6 @@ - state: green_bit shader: unshaded - state: refill_engi - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -233,9 +209,6 @@ - state: green_bit shader: unshaded - state: refill_games - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -252,9 +225,6 @@ - state: green_bit shader: unshaded - state: refill_snack - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -271,9 +241,6 @@ - state: green_bit shader: unshaded - state: refill_joe - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -291,9 +258,6 @@ - state: green_bit shader: unshaded - state: refill_medical - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -310,9 +274,6 @@ - state: green_bit shader: unshaded - state: refill_plant - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -329,9 +290,6 @@ - state: green_bit shader: unshaded - state: refill_ptech - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -354,9 +312,6 @@ - state: green_bit shader: unshaded - state: refill_cola - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -373,9 +328,6 @@ - state: green_bit shader: unshaded - state: refill_sec - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -392,9 +344,6 @@ - state: green_bit shader: unshaded - state: refill_salvage - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -411,9 +360,6 @@ - state: green_bit shader: unshaded - state: refill_plant - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -430,9 +376,6 @@ - state: green_bit shader: unshaded - state: refill_smoke - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -450,9 +393,6 @@ - state: green_bit shader: unshaded - state: refill_tanks - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -469,9 +409,6 @@ - state: green_bit shader: unshaded - state: refill_parts - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -488,9 +425,6 @@ - state: green_bit shader: unshaded - state: refill_robotics - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -507,9 +441,6 @@ - state: green_bit shader: unshaded - state: refill_honk - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - type: entity parent: SecuredVendingMachineRestock @@ -525,8 +456,4 @@ - state: base - state: green_bit shader: unshaded - - state: refill_medical - - type: StaticPrice - price: 100 - - type: CargoSellBlacklist - + - state: refill_medical \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending_extra.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml similarity index 96% rename from Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending_extra.yml rename to Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml index 9124b9271dc..9d74715c531 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending_extra.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml @@ -12,7 +12,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAstroVendFilled - cost: 1000 + cost: 100 category: Engineering group: market @@ -22,7 +22,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAmmoFilled - cost: 4000 + cost: 100 category: Security group: market @@ -32,6 +32,6 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockCircuitVendFilled - cost: 3000 + cost: 100 category: Science group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml new file mode 100644 index 00000000000..8373ba1289a --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml @@ -0,0 +1,26 @@ +- type: entity + id: CrateVendingMachineRestockAstroVendFilled + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: VendingMachineRestockAstroVend + amount: 2 + +- type: entity + id: CrateVendingMachineRestockAmmoFilled + parent: CrateWeaponSecure + components: + - type: StorageFill + contents: + - id: VendingMachineRestockAmmo + amount: 2 + +- type: entity + id: CrateVendingMachineRestockCircuitVendFilled + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: VendingMachineRestockCircuitVend + amount: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock_extra.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml similarity index 94% rename from Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock_extra.yml rename to Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml index f1114b74b62..d9637d573e3 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock_extra.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -12,9 +12,9 @@ - state: base - state: green_bit shader: unshaded - - type: StaticPrice - price: 100 - type: CargoSellBlacklist + - type: StaticPrice + price: 0 - type: ItemCooldown - type: MeleeWeapon damage: @@ -33,13 +33,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 120 + damage: 1200 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 60 + damage: 600 behaviors: - !type:PlaySoundBehavior sound: @@ -62,8 +62,6 @@ - state: green_bit shader: unshaded - state: refill_salvage # Update this later with a new sprite - - type: StaticPrice - price: 100 - type: CargoSellBlacklist - type: entity @@ -81,8 +79,6 @@ - state: green_bit shader: unshaded - state: refill_sec # Update this later with a new sprite - - type: StaticPrice - price: 100 - type: CargoSellBlacklist - type: entity @@ -100,6 +96,4 @@ - state: green_bit shader: unshaded - state: refill_parts # Update this later with a new sprite - - type: StaticPrice - price: 100 - type: CargoSellBlacklist