Rename Goldschläger to Gildlager (#23223)

* 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>

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 4719e1c611a9ab727f832159db1dbe0b20eebd6f..80bf627f89673b9bee8364ff84afc4fe59f531a5 100644 (file)
--- 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 344abbc2892324b578ac6e612bbb2a5c60d854a5..f51f451f5ec7ac74eb42ec4b6db03a86d1fbfaf3 100644 (file)
--- 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 8db39e4cc9b00a4b07419b9a33414062f2519b3f..3f7a35e6f1d90153d9e00d18865f8ad763597dd6 100644 (file)
--- 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 deaf9cd49db0ca756306bbff81053f097f36b4a2..110421466894ec8c139fcdddac74b7ba764d6080 100644 (file)
--- 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 118f14904254e02c01ca1b27032a6a3f6a349690..8274c5421c3cfecdd494cfbe9d6a913b4319aa29 100644 (file)
--- 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 9954aa6e86aee070c607453d2d7ff120da8f0067..158a20461beeffc3ef4e5968af4af569213ac8ac 100644 (file)
--- 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 d010588e5f68e9113a755f530c6676eebb9ec7d5..8309369fa1d27d1279f485e76fcc3cbd2c8aecd8 100644 (file)
--- 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 d278ef24c41460ff2c01ae69a2578ccb8e58a56c..e5afdbd6defbd7219255d1b7b128b54a4b9327b8 100644 (file)
--- 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 afda72d0145106c45408d97d80a69cd7b7eff14e..d54dbd6eab41435eccd399e0d7efe55a39bf113a 100644 (file)
--- 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