Merge pull request #180 from neuPanda/Axel-and-Luna

Axel and Luna
Fansana · Sep 17, 2024 · 907ae99 · 907ae99
2 parents ffcc89f + a9f1b2d
commit 907ae99
Show file tree

Hide file tree

Showing 5 changed files with 179 additions and 0 deletions.
diff --git a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl
@@ -63,3 +63,7 @@ flavor-complex-thewaterslide = like unsanitary depravity
 flavor-complex-whiskeysour = sour and like molasses
 flavor-complex-whitechocolatechip = like white chocolate chips
 flavor-complex-yeolhandy = like oranges and solitude
+flavor-complex-thecutecaptain = like moonlight
+flavor-complex-axelsale = like a long day on the frontier
+flavor-complex-jenntonic = sweet with a hidden bite
+flavor-complex-hallelujah = a moment of peace
diff --git a/Resources/Locale/en-US/Floof/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/Floof/reagents/meta/consumable/drink/alcohol.ftl
@@ -177,3 +177,15 @@ reagent-desc-whiskeysour = Shelter from the Noöspheric Storm.
 
 reagent-name-yeolhandy = ye ol handy
 reagent-desc-yeolhandy = The loner's choice, cold as their bed.
+
+reagent-name-the-cute-captain = The Cute Captain
+reagent-desc-the-cute-captain = Light blue liquid with a sweet floral scent and a hint of pomegranate
+
+reagent-name-axels-ale = Axel's Ale
+reagent-desc-axels-ale = Red like the color of a setting sun on a beach
+
+reagent-name-jenn-tonic = Jenn in Tonic
+reagent-desc-jenn-tonic = Light golden and bubbly, what could go wrong?
+
+reagent-name-hallelujah = Hallelujah
+reagent-desc-hallelujah = Exactly what you need.
diff --git a/Resources/Prototypes/Floof/Flavors/flavors.yml b/Resources/Prototypes/Floof/Flavors/flavors.yml
@@ -322,3 +322,23 @@
   id: yeolhandy
   flavorType: Complex
   description: flavor-complex-yeolhandy
+
+- type: flavor
+  id: thecutecaptain
+  flavorType: Complex
+  description: flavor-complex-thecutecaptain
+
+- type: flavor
+  id: axelsale
+  flavorType: Complex
+  description: flavor-complex-axelsale
+
+- type: flavor
+  id: jenntonic
+  flavorType: Complex
+  description: flavor-complex-jenntonic
+
+- type: flavor
+  id: hallelujah
+  flavorType: Complex
+  description: flavor-complex-hallelujah
diff --git a/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml
@@ -1395,3 +1395,99 @@
       - !type:AdjustReagent
         reagent: Ethanol
         amount: 0.05
+
+- type: reagent
+  id: TheCuteCaptain
+  name: reagent-name-the-cute-captain
+  parent: BaseAlcohol
+  desc: reagent-desc-the-cute-captain
+  physicalDesc: reagent-physical-desc-starry
+  flavor: thecutecaptain
+  color: "#87cefa"
+  metamorphicSprite:
+    sprite: Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 3
+      - !type:AdjustReagent
+        reagent: Pomelustine
+        amount: 0.5
+
+- type: reagent
+  id: AxelsAle
+  name: reagent-name-axels-ale
+  parent: BaseAlcohol
+  desc: reagent-desc-axels-ale
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: axelsale
+  color: "#E43414"
+  metamorphicSprite:
+    sprite: Floof/Objects/Consumable/Drinks/deadmansdraught.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Pomelustine
+        amount: 0.5
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.1
+
+- type: reagent
+  id: JennTonic
+  name: reagent-name-jenn-tonic
+  parent: BaseAlcohol
+  desc: reagent-desc-jenn-tonic
+  physicalDesc: reagent-physical-desc-fizzy
+  flavor: jenntonic
+  color: "#C1C071"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/ginfizzglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.08
+
+- type: reagent
+  id: Hallelujah
+  name: reagent-name-hallelujah
+  parent: BaseAlcohol
+  desc: reagent-desc-hallelujah
+  physicalDesc: reagent-physical-desc-soothing
+  flavor: hallelujah
+  color: "#87757E"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/wineglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 5
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.06
+
diff --git a/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml
@@ -773,3 +773,50 @@
       catalyst: true
   products:
     Sake: 1
+
+- type: reaction
+  id: TheCuteCaptain
+  reactants:
+    Tea:
+      amount: 2
+    Pomelustine:
+      amount: 1
+  products:
+    TheCuteCaptain: 3
+
+- type: reaction
+  id: AxelsAle
+  reactants:
+    Ale:
+      amount: 1
+    Rum:
+      amount: 1
+    Pomelustine:
+      amount: 1
+  products:
+    AxelsAle: 3
+
+- type: reaction
+  id: JennTonic
+  reactants:
+    Ice:
+      amount: 1
+    Whiskey:
+      amount: 1
+    TonicWater:
+      amount: 1
+  products:
+    JennTonic: 3
+
+- type: reaction
+  id: Hallelujah 
+  reactants:
+    Wine:
+      amount: 2
+    Water:
+      amount: 3
+    LotophagoiOil:
+      amount: 1
+  products:
+    Hallelujah : 6
+