Red bool update (#27597)

* the meat and potatoes yuh yuh yuh * what the hell is a copyright? am I right?
2024-05-03 02:57:37 -04:00
parent a28296433b
commit a8bf2689a4
30 changed files with 465 additions and 1 deletions
--- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
+++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
@@ -6,6 +6,7 @@
  - DrinkColaBottleFull
  - DrinkCreamCartonXL
  - DrinkDrGibbJug
+  - DrinkEnergyDrinkJug
  - DrinkGreenTeaJug
  - DrinkIceJug
  - DrinkJuiceLimeCartonXL
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -18,6 +18,7 @@
    DrinkCognacBottleFull: 4
    DrinkCoconutWaterCarton: 3
    DrinkColaBottleFull: 4
+    DrinkEnergyDrinkCan: 8
    DrinkMilkCarton: 2
    DrinkCreamCarton: 5
    DrinkGinBottleFull: 3
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
@@ -4,6 +4,7 @@
    FoodSnackCheesie: 3
    FoodSnackChips: 3
    FoodSnackBoritos: 3
+    DrinkEnergyDrinkCan: 4
    FoodSnackPopcorn: 3
    FoodSnackEnergy: 3
    CigPackMixed: 2
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -32,6 +32,7 @@
      - DrinkBloodyMaryGlass
      - DrinkBooger
      - DrinkBraveBullGlass
+      - BudgetInsulsDrinkGlass
      - DrinkCarrotJuice
      - DrinkCoconutRum
      - DrinkChocolateGlass
@@ -57,6 +58,7 @@
      - DrinkIcedGreenTeaGlass
      - DrinkIcedBeerGlass
      - DrinkIceCreamGlass
+      - IrishBoolGlass
      - DrinkIrishCarBomb
      - DrinkIrishCoffeeGlass
      - DrinkLemonadeGlass
@@ -78,6 +80,7 @@
      - DrinkRewriter
      - DrinkRoyRogersGlass
      - DrinkRootBeerFloatGlass
+      - RubberneckGlass
      - DrinkRumGlass
      - DrinkSakeGlass
      - DrinkSbitenGlass
@@ -91,12 +94,15 @@
      - DrinkThreeMileIslandGlass
      - DrinkToxinsSpecialGlass
      - DrinkVodkaMartiniGlass
+      - DrinkVodkaRedBool
      - DrinkVodkaTonicGlass
      - DrinkWatermelonJuice
+      - DrinkWatermelonWakeup
      - DrinkWhiskeyColaGlass
      - DrinkWhiskeySodaGlass
      - DrinkWhiteRussianGlass
      - DrinkWineGlass
+      - XenoBasherGlass
      - DrinkShakeBlue
      - DrinkShakeWhite
      - DrinkTheMartinez
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -503,6 +503,22 @@
    sprite: Objects/Consumable/Drinks/bravebullglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: BudgetInsulsDrinkGlass
+  suffix: budget insuls
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: BudgetInsulsDrink
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/budgetinsulsdrink.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkCarrotJuice
@@ -535,6 +551,22 @@
    sprite: Objects/Consumable/Drinks/chocolateglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: RubberneckGlass
+  suffix: rubberneck
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Rubberneck
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/rubberneck.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkCoconutRum
@@ -1061,6 +1093,22 @@
    sprite: Objects/Consumable/Drinks/icecreamglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: IrishBoolGlass
+  suffix: irish bool
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: IrishBool
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/beerglass.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkIrishCarBomb
@@ -2054,6 +2102,22 @@
    sprite: Objects/Consumable/Drinks/martiniglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkVodkaRedBool
+  suffix: vodka red bool
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: VodkaRedBool
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkVodkaTonicGlass
@@ -2100,6 +2164,22 @@
        - ReagentId: JuiceWatermelon
          Quantity: 30

+- type: entity
+  parent: DrinkGlass
+  id: DrinkWatermelonWakeup
+  suffix: watermelon wakeup
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: WatermelonWakeup
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/champagneglass.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkWhiskeyColaGlass
@@ -2180,6 +2260,22 @@
    sprite: Objects/Consumable/Drinks/wineglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: XenoBasherGlass
+  suffix: xeno basher
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: XenoBasher
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/xenobasher.rsi
+    state: icon
+
 # TODO: MOVE

 - type: entity
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -589,6 +589,36 @@
  flavorType: Complex
  description: flavor-complex-irish-car-bomb

+- type: flavor
+  id: vodkaredbool
+  flavorType: Complex
+  description: flavor-complex-vodka-red-bool
+
+- type: flavor
+  id: xenobasher
+  flavorType: Complex
+  description: flavor-complex-xeno-basher
+
+- type: flavor
+  id: irishbool
+  flavorType: Complex
+  description: flavor-complex-irish-bool
+
+- type: flavor
+  id: budgetinsulsdrink
+  flavorType: Complex
+  description: flavor-complex-budget-insuls-drink
+
+- type: flavor
+  id: watermelonwakeup
+  flavorType: Complex
+  description: flavor-complex-watermelon-wakeup
+
+- type: flavor
+  id: rubberneck
+  flavorType: Complex
+  description: flavor-complex-rubberneck
+
 - type: flavor
  id: blackrussian
  flavorType: Complex
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -1769,3 +1769,165 @@
      - !type:AdjustReagent
        reagent: Ethanol
        amount: 0.15
+
+- type: reagent
+  id: VodkaRedBool
+  name: reagent-name-vodka-red-bool
+  parent: BaseAlcohol
+  desc: reagent-desc-vodka-red-bool
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: vodkaredbool
+  color: "#c4c27655"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.10
+        - !type:AdjustReagent
+          reagent: Theobromine
+          amount: 0.05
+  fizziness: 0.25
+
+- type: reagent
+  id: XenoBasher
+  name: reagent-name-xeno-basher
+  parent: BaseAlcohol
+  desc: reagent-desc-xeno-basher
+  physicalDesc: reagent-physical-desc-fizzy-and-creamy
+  flavor: xenobasher
+  color: "#4d6600"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/xenobasher.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 2
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.15
+        - !type:AdjustReagent
+          reagent: Theobromine
+          amount: 0.05
+  fizziness: 0.15
+
+- type: reagent
+  id: IrishBool
+  name: reagent-name-irish-bool
+  parent: BaseAlcohol
+  desc: reagent-desc-irish-bool
+  physicalDesc: reagent-physical-desc-bubbly
+  flavor: irishbool
+  color: "#71672e99"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/beerglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.10
+        - !type:AdjustReagent
+          reagent: Theobromine
+          amount: 0.05
+  fizziness: 0.15
+
+- type: reagent
+  id: BudgetInsulsDrink
+  name: reagent-name-budget-insuls
+  parent: BaseAlcohol
+  desc: reagent-desc-budget-insuls
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: budgetinsulsdrink
+  color: "#dede73"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/budgetinsulsdrink.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.15
+        - !type:AdjustReagent
+          reagent: Theobromine
+          amount: 0.05
+  fizziness: 0.25
+
+- type: reagent
+  id: WatermelonWakeup
+  name: reagent-name-watermelon-wakeup
+  parent: BaseAlcohol
+  desc: reagent-desc-watermelon-wakeup
+  physicalDesc: reagent-physical-desc-sweet
+  flavor: watermelonwakeup
+  color: "#d49dca"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/champagneglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.07
+        - !type:AdjustReagent
+          reagent: Theobromine
+          amount: 0.05
+  fizziness: 0.15
+
+- type: reagent
+  id: Rubberneck
+  name: reagent-name-rubberneck
+  parent: BaseAlcohol
+  desc: reagent-desc-rubberneck
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: rubberneck
+  color: "#f0d74a"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/rubberneck.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.15
+        - !type:AdjustReagent
+          reagent: Theobromine
+          amount: 0.05
+  fizziness: 0.25
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -70,7 +70,7 @@
        factor: 2
      - !type:AdjustReagent
        reagent: Theobromine
-        amount: 0.05
+        amount: 0.1
  fizziness: 0.4

 - type: reagent
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -86,6 +86,16 @@
  products:
    B52: 3

+- type: reaction
+  id: BudgetInsulsDrink
+  reactants:
+    Tequila:
+      amount: 1
+    VodkaRedBool:
+      amount: 2
+  products:
+    BudgetInsulsDrink: 3
+
 - type: reaction
  id: BlueHawaiian
  reactants:
@@ -516,6 +526,16 @@
  products:
    IcedTea: 3

+- type: reaction
+  id: IrishBool
+  reactants:
+    EnergyDrink:
+      amount: 1
+    IrishCarBomb:
+      amount: 1
+  products:
+    IrishBool: 2
+
 - type: reaction
  id: IrishCarBomb
  reactants:
@@ -794,6 +814,18 @@
  products:
    RoyRogers: 3

+- type: reaction
+  id: Rubberneck
+  reactants:
+    EnergyDrink:
+      amount: 2
+    Moonshine:
+      amount: 1
+    Sugar:
+      amount: 1
+  products:
+    Rubberneck: 4
+
 - type: reaction
  id: Sbiten
  reactants:
@@ -943,6 +975,16 @@
  products:
    VodkaMartini: 3

+- type: reaction
+  id: VodkaRedBool
+  reactants:
+    Vodka:
+      amount: 1
+    EnergyDrink:
+      amount: 2
+  products:
+    VodkaRedBool: 3
+
 - type: reaction
  id: VodkaTonic
  reactants:
@@ -963,6 +1005,18 @@
  products:
    WhiskeyCola: 3

+- type: reaction
+  id: WatermelonWakeup
+  reactants:
+    JuiceWatermelon:
+      amount: 1
+    Whiskey:
+      amount: 1
+    EnergyDrink:
+      amount: 1
+  products:
+    WatermelonWakeup: 3
+
 - type: reaction
  id: WhiteRussian
  reactants:
@@ -983,6 +1037,16 @@
  products:
    WhiskeySoda: 3

+- type: reaction
+  id: XenoBasher
+  reactants:
+    ManlyDorf:
+      amount: 2
+    EnergyDrink:
+      amount: 1
+  products:
+    XenoBasher: 3
+
 - type: reaction
  id: HotRamen
  minTemp: 323.15