From 172fcaf2d42db4cda25ce7a40df493692a8e4e98 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sun, 7 Jan 2024 02:34:15 +1100 Subject: [PATCH] =?utf8?q?Rename=20Goldschl=C3=A4ger=20to=20Gildlager=20(#?= =?utf8?q?23223)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * add * fix * catalog * migration * conflicts.. * uh * test * m * fix fr * line? * beg * suffering * um * fix --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../reagents/meta/consumable/drink/alcohol.ftl | 4 ++-- .../VendingMachines/Inventories/boozeomat.yml | 2 +- .../Spawners/Random/Food_Drinks/drinks_bottles.yml | 2 +- .../Spawners/Random/Food_Drinks/drinks_glass.yml | 2 +- .../Entities/Objects/Consumable/Drinks/drinks.yml | 8 ++++---- .../Objects/Consumable/Drinks/drinks_bottles.yml | 8 ++++---- .../Reagents/Consumable/Drink/alcohol.yml | 8 ++++---- Resources/Prototypes/Recipes/Reactions/drinks.yml | 4 ++-- .../icon.png | Bin .../meta.json | 0 .../icon.png | Bin .../meta.json | 0 Resources/migration.yml | 4 ++++ 13 files changed, 23 insertions(+), 19 deletions(-) rename Resources/Textures/Objects/Consumable/Drinks/{goldschlagerbottle.rsi => gildlagerbottle.rsi}/icon.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{goldschlagerbottle.rsi => gildlagerbottle.rsi}/meta.json (100%) rename Resources/Textures/Objects/Consumable/Drinks/{goldschlagerglass.rsi => gildlagerglass.rsi}/icon.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{goldschlagerglass.rsi => gildlagerglass.rsi}/meta.json (100%) diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl index 4719e1c611..80bf627f89 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -133,8 +133,8 @@ reagent-desc-gin-fizz = Refreshingly lemony, deliciously dry. reagent-name-gin-tonic = gin and tonic reagent-desc-gin-tonic = An all time classic, mild cocktail. -reagent-name-goldschlager = Goldschlager -reagent-desc-goldschlager = 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break. +reagent-name-gildlager = gildlager +reagent-desc-gildlager = 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break. reagent-name-grog = grog reagent-desc-grog = Watered-down rum, pirate approved! diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 344abbc289..f51f451f5e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -15,7 +15,7 @@ DrinkColaBottleFull: 4 DrinkCreamCarton: 5 DrinkGinBottleFull: 3 - DrinkGoldschlagerBottleFull: 1 + DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two DrinkGrenadineBottleFull: 2 DrinkJuiceLimeCarton: 3 DrinkJuiceOrangeCarton: 3 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml index 8db39e4cc9..3f7a35e6f1 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml @@ -19,7 +19,7 @@ - DrinkCognacBottleFull - DrinkGrenadineBottleFull - DrinkGinBottleFull - - DrinkGoldschlagerBottleFull + - DrinkGildlagerBottleFull - DrinkCoffeeLiqueurBottleFull - DrinkMelonLiquorBottleFull - DrinkPatronBottleFull diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index deaf9cd49d..1104214668 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -44,7 +44,7 @@ - DrinkGinFizzGlass - DrinkGinGlass - DrinkGinTonicglass - - DrinkGoldschlagerGlass + - DrinkGildlagerGlass - DrinkGrapeJuice - DrinkGreenTeaGlass - DrinkGrogGlass diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 118f149042..8274c5421c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -786,8 +786,8 @@ - type: entity parent: DrinkGlassBase - id: DrinkGoldschlagerGlass - name: goldschlager glass + id: DrinkGildlagerGlass + name: gildlager glass description: 100 proof that teen girls will drink anything with gold in it. components: - type: SolutionContainerManager @@ -795,11 +795,11 @@ drink: maxVol: 30 reagents: - - ReagentId: Goldschlager + - ReagentId: Gildlager Quantity: 30 - type: Drink - type: Sprite - sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi + sprite: Objects/Consumable/Drinks/gildlagerglass.rsi - type: entity parent: DrinkGlassBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 9954aa6e86..158a20461b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -200,18 +200,18 @@ - type: entity parent: DrinkBottleGlassBaseFull - id: DrinkGoldschlagerBottleFull - name: goldschlager bottle + id: DrinkGildlagerBottleFull + name: gildlager bottle description: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break. components: - type: SolutionContainerManager solutions: drink: reagents: - - ReagentId: Goldschlager + - ReagentId: Gildlager Quantity: 100 - type: Sprite - sprite: Objects/Consumable/Drinks/goldschlagerbottle.rsi + sprite: Objects/Consumable/Drinks/gildlagerbottle.rsi - type: entity parent: DrinkBottleGlassBaseFull diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index d010588e5f..8309369fa1 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -796,15 +796,15 @@ amount: 0.07 - type: reagent - id: Goldschlager - name: reagent-name-goldschlager + id: Gildlager + name: reagent-name-gildlager parent: BaseAlcohol - desc: reagent-desc-goldschlager + desc: reagent-desc-gildlager physicalDesc: reagent-physical-desc-strong-smelling flavor: alcohol color: "#FFFF91" metamorphicSprite: - sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi + sprite: Objects/Consumable/Drinks/gildlagerglass.rsi state: icon metabolisms: Drink: diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index d278ef24c4..e5afdbd6de 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -324,14 +324,14 @@ GinTonic: 3 - type: reaction - id: Goldschlager + id: Gildlager reactants: Gold: amount: 1 Vodka: amount: 10 products: - Goldschlager: 10 + Gildlager: 10 - type: reaction id: Grog diff --git a/Resources/Textures/Objects/Consumable/Drinks/goldschlagerbottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/goldschlagerbottle.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/goldschlagerbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/goldschlagerbottle.rsi/meta.json rename to Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json diff --git a/Resources/Textures/Objects/Consumable/Drinks/goldschlagerglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/goldschlagerglass.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/goldschlagerglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/goldschlagerglass.rsi/meta.json rename to Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/meta.json diff --git a/Resources/migration.yml b/Resources/migration.yml index afda72d014..d54dbd6eab 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -123,3 +123,7 @@ WarpPointBeaconService: null # 2023-12-30 ClothingEyesGlassesCosmeticSunglasses: ClothingEyesGlassesSunglasses SpawnPointAssistant: SpawnPointPassenger + +# 2024-01-05 +DrinkGoldschlagerBottleFull: DrinkGildlagerBottleFull +DrinkGoldschlagerGlass: DrinkGildlagerGlass -- 2.51.2