From 1aa71c39afe7233861e9bdefe79e347f4c48c000 Mon Sep 17 00:00:00 2001 From: Svarshik Date: Tue, 15 Oct 2024 01:40:29 +0500 Subject: [PATCH 1/9] exotic meat crate just filling --- .../SS220/Catalog/Fills/Crates/food.yml | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml index 5c6f2b0ad5fd..b34edda88d8e 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml @@ -10,3 +10,76 @@ amount: 3 - id: FoodMeatSalami prob: 0.04 + +- type: entity + id: CrateExoticMeat + parent: CrateFreezer + name: exotic meat crate + description: Contains 10-15 pieces of unusual meat from all corners of the galaxy. + components: + - type: StorageFill + contents: + #base + - id: FoodMeatFish + amount: 4 + - id: FoodMeatXeno + amount: 4 + #random common one + - id: FoodMeatCrab + amount: 3 + prob: 0.1 + orGroup: commonMeat + - id: FoodMeatSnail + amount: 3 + prob: 0.1 + orGroup: commonMeat + - id: FoodMeatSpider + amount: 3 + prob: 0.1 + orGroup: commonMeat + - id: FoodMeatRat + amount: 3 + prob: 0.1 + orGroup: commonMeat + - id: FoodMeatSnake + amount: 3 + prob: 0.1 + orGroup: commonMeat + # rare ones. Small chance to get some + - id: FoodMeatGoliath + amount: 3 + prob: 0.25 + - id: FoodMeatTomato + amount: 3 + prob: 0.25 + - id: FoodMeatPenguin + amount: 3 + prob: 0.25 + - id: FoodMeatBear + amount: 3 + prob: 0.25 + # flesh + - id: FoodMeatHuman + amount: 2 + prob: 0.1 + orGroup: flesh + - id: FoodMeatSlime + amount: 2 + prob: 0.1 + orGroup: flesh + - id: FoodMeatLizard + amount: 2 + prob: 0.1 + orGroup: flesh + - id: FoodMeatPlant + amount: 2 + prob: 0.1 + orGroup: flesh + # very rare + - id: FoodMeatClown + amount: 3 + prob: 0.01 + # funny + - id: FoodMeatCorgi + amount: 1 + prob: 0.0001 # never. 0.01% From 806b15e8b4425686e05a0dfb95a945b95a874e56 Mon Sep 17 00:00:00 2001 From: Svarshik Date: Wed, 16 Oct 2024 10:43:50 +0500 Subject: [PATCH 2/9] second crate, locale, cargo listing --- .../catalog/fills/crates/meat_crates.ftl | 4 +++ .../SS220/Catalog/Cargo/cargo_food.yml | 20 +++++++++++++ .../SS220/Catalog/Fills/Crates/food.yml | 28 +++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/crates/meat_crates.ftl diff --git a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/crates/meat_crates.ftl b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/crates/meat_crates.ftl new file mode 100644 index 000000000000..d3c273b4c856 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/crates/meat_crates.ftl @@ -0,0 +1,4 @@ +ent-CrateExoticMeat = ящик с экзотическим мясом + .desc = Содержит 10-15 кусков необычного мяса со всех краёв галактики! +ent-CrateMeat = ящик с мясом + .desc = Содержит 10 кусков мяса с колониальных ферм NanoTrasen! diff --git a/Resources/Prototypes/SS220/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/SS220/Catalog/Cargo/cargo_food.yml index d975ddb1ad68..d6f76c961c9a 100644 --- a/Resources/Prototypes/SS220/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/SS220/Catalog/Cargo/cargo_food.yml @@ -17,3 +17,23 @@ cost: 3200 category: cargoproduct-category-name-food group: market + +- type: cargoProduct + id: MeatCrate + icon: + sprite: Objects/Consumable/Food/meat.rsi + state: plain + product: CrateMeat + cost: 2000 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ExoticMeatCrate + icon: + sprite: Objects/Consumable/Food/meat.rsi + state: xeno + product: CrateExoticMeat + cost: 4000 + category: cargoproduct-category-name-food + group: market diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml index b34edda88d8e..fdbab328707a 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml @@ -79,7 +79,35 @@ - id: FoodMeatClown amount: 3 prob: 0.01 + - id: FoodMeatRouny + amount: 1 + prob: 0.01 # funny - id: FoodMeatCorgi amount: 1 prob: 0.0001 # never. 0.01% + + +- type: entity + id: CrateMeat + parent: CrateFreezer + name: meat crate + description: Contains 10 pieces of meat from NanoTrasen colonial farms! + components: + - type: StorageFill + contents: + # basic boring meat + - id: FoodMeat + amount: 5 + # bird meat + - id: FoodMeatChicken + amount: 4 + prob: 0.3 + orGroup: BirdMeat + - id: FoodMeatDuck + amount: 4 + prob: 0.3 + orGroup: BirdMeat + # some bacon + - id: FoodMeatBacon + amount: 2 From 9b44d2c5ef15deaf8f9a1193dca52e117b0f369c Mon Sep 17 00:00:00 2001 From: Svarshik Date: Wed, 16 Oct 2024 11:17:19 +0500 Subject: [PATCH 3/9] cargo gists event --- .../station-events/events/cargo-gifts.ftl | 2 ++ .../station-events/events/cargo-gifts.ftl | 2 ++ .../Prototypes/GameRules/cargo_gifts.yml | 21 +++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 Resources/Locale/en-US/ss220/station-events/events/cargo-gifts.ftl create mode 100644 Resources/Locale/ru-RU/ss220/station-events/events/cargo-gifts.ftl diff --git a/Resources/Locale/en-US/ss220/station-events/events/cargo-gifts.ftl b/Resources/Locale/en-US/ss220/station-events/events/cargo-gifts.ftl new file mode 100644 index 000000000000..f7a7363f70da --- /dev/null +++ b/Resources/Locale/en-US/ss220/station-events/events/cargo-gifts.ftl @@ -0,0 +1,2 @@ +cargo-gift-dest-kitchen = kitchen +cargo-gift-kitchen = cooking supplies diff --git a/Resources/Locale/ru-RU/ss220/station-events/events/cargo-gifts.ftl b/Resources/Locale/ru-RU/ss220/station-events/events/cargo-gifts.ftl new file mode 100644 index 000000000000..5027eda5467e --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/station-events/events/cargo-gifts.ftl @@ -0,0 +1,2 @@ +cargo-gift-dest-kitchen = кухне +cargo-gift-kitchen = поварские припасы diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml index 4cc9ed5b8c23..e25e83627a55 100644 --- a/Resources/Prototypes/GameRules/cargo_gifts.yml +++ b/Resources/Prototypes/GameRules/cargo_gifts.yml @@ -234,3 +234,24 @@ ArmorySmg: 3 ArmoryShotgun: 3 #ss220-gammaend + +#ss220-chef supplies begin +- type: entity + id: GiftsKitchen + parent: CargoGiftsBase + components: + - type: StationEvent + weight: 6 + duration: 120 + minimumPlayers: 30 + earliestStart: 20 + - type: CargoGiftsRule + description: cargo-gift-kitchen + dest: cargo-gift-dest-kitchen + gifts: + CrateMeat: 1 + CrateExoticMeat: 1 + CrateFoodDinnerware: 1 + CrateFoodCooking: 1 + CrateVendingMachineRestockChefvendFilled: 1 +#ss220-chef supplies end From fefd702879dda927b9f0b3614d0fe7fb0fc5bf88 Mon Sep 17 00:00:00 2001 From: Svarshik Date: Wed, 16 Oct 2024 11:21:00 +0500 Subject: [PATCH 4/9] better comments --- Resources/Prototypes/GameRules/cargo_gifts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml index e25e83627a55..3694482603d8 100644 --- a/Resources/Prototypes/GameRules/cargo_gifts.yml +++ b/Resources/Prototypes/GameRules/cargo_gifts.yml @@ -235,7 +235,7 @@ ArmoryShotgun: 3 #ss220-gammaend -#ss220-chef supplies begin +#ss220 cooking supplies begin - type: entity id: GiftsKitchen parent: CargoGiftsBase @@ -254,4 +254,4 @@ CrateFoodDinnerware: 1 CrateFoodCooking: 1 CrateVendingMachineRestockChefvendFilled: 1 -#ss220-chef supplies end +#ss220 cooking supplies end From 90f069f2bcd397d3c3e9a1c1ada5f95c9e9a57c6 Mon Sep 17 00:00:00 2001 From: Svarshik Date: Wed, 16 Oct 2024 11:29:59 +0500 Subject: [PATCH 5/9] locale update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Иногда ящик насыпает больше 15 кусков. 16 там, очень редко, в 1% может насыпать 17-18. Локализация поточнее. --- .../ru-RU/ss220/prototypes/catalog/fills/crates/meat_crates.ftl | 2 +- Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/crates/meat_crates.ftl b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/crates/meat_crates.ftl index d3c273b4c856..e88272dbc677 100644 --- a/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/crates/meat_crates.ftl +++ b/Resources/Locale/ru-RU/ss220/prototypes/catalog/fills/crates/meat_crates.ftl @@ -1,4 +1,4 @@ ent-CrateExoticMeat = ящик с экзотическим мясом - .desc = Содержит 10-15 кусков необычного мяса со всех краёв галактики! + .desc = Содержит более 10 кусков необычного мяса со всех краёв галактики! ent-CrateMeat = ящик с мясом .desc = Содержит 10 кусков мяса с колониальных ферм NanoTrasen! diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml index fdbab328707a..4c3bbb3a239f 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml @@ -15,7 +15,7 @@ id: CrateExoticMeat parent: CrateFreezer name: exotic meat crate - description: Contains 10-15 pieces of unusual meat from all corners of the galaxy. + description: Contains over 10 of unusual meat from all corners of the galaxy. components: - type: StorageFill contents: From 721cef63efebfb0d196d987a128e1b3fde1acc50 Mon Sep 17 00:00:00 2001 From: Svarshik Date: Wed, 16 Oct 2024 12:06:42 +0500 Subject: [PATCH 6/9] check fix --- Resources/Prototypes/GameRules/cargo_gifts.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml index 3694482603d8..cec2a3a538c5 100644 --- a/Resources/Prototypes/GameRules/cargo_gifts.yml +++ b/Resources/Prototypes/GameRules/cargo_gifts.yml @@ -16,7 +16,7 @@ - id: GiftsVendingRestock # Game Rules - + - type: entity id: CargoGiftsBase parent: BaseGameRule @@ -249,9 +249,9 @@ description: cargo-gift-kitchen dest: cargo-gift-dest-kitchen gifts: - CrateMeat: 1 - CrateExoticMeat: 1 - CrateFoodDinnerware: 1 - CrateFoodCooking: 1 - CrateVendingMachineRestockChefvendFilled: 1 + MeatCrate: 1 + ExoticMeatCrate: 1 + FoodDinnerware: 1 + FoodCook: 1 + CrateVendingMachineRestockChefvend: 1 #ss220 cooking supplies end From b17585fd93ceb0e9faf07c05fee12811b04b8a1d Mon Sep 17 00:00:00 2001 From: Svarshik Date: Wed, 16 Oct 2024 15:03:01 +0500 Subject: [PATCH 7/9] prices down MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit До этого цены были ну больно высоки, учитывая, что там мяса на 3-4 блюда. --- Resources/Prototypes/SS220/Catalog/Cargo/cargo_food.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/SS220/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/SS220/Catalog/Cargo/cargo_food.yml index d6f76c961c9a..dcb3cf6943a3 100644 --- a/Resources/Prototypes/SS220/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/SS220/Catalog/Cargo/cargo_food.yml @@ -24,7 +24,7 @@ sprite: Objects/Consumable/Food/meat.rsi state: plain product: CrateMeat - cost: 2000 + cost: 1200 category: cargoproduct-category-name-food group: market @@ -34,6 +34,6 @@ sprite: Objects/Consumable/Food/meat.rsi state: xeno product: CrateExoticMeat - cost: 4000 + cost: 2500 category: cargoproduct-category-name-food group: market From 2142bab0d580188961a66a274fe445edac6610e6 Mon Sep 17 00:00:00 2001 From: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> Date: Thu, 17 Oct 2024 00:00:49 +0500 Subject: [PATCH 8/9] Update Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com> --- Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml index 4c3bbb3a239f..1457bc080380 100644 --- a/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/SS220/Catalog/Fills/Crates/food.yml @@ -15,7 +15,7 @@ id: CrateExoticMeat parent: CrateFreezer name: exotic meat crate - description: Contains over 10 of unusual meat from all corners of the galaxy. + description: Contains over 10 pieces of unusual meat from all corners of the galaxy. components: - type: StorageFill contents: From 4ac2adbe5fe7f402479c79730ac569f8d7792cfc Mon Sep 17 00:00:00 2001 From: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> Date: Thu, 17 Oct 2024 12:12:37 +0500 Subject: [PATCH 9/9] Update cargo_gifts.yml --- Resources/Prototypes/GameRules/cargo_gifts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml index cec2a3a538c5..318ebcb430c3 100644 --- a/Resources/Prototypes/GameRules/cargo_gifts.yml +++ b/Resources/Prototypes/GameRules/cargo_gifts.yml @@ -16,7 +16,7 @@ - id: GiftsVendingRestock # Game Rules - + - type: entity id: CargoGiftsBase parent: BaseGameRule