From 1d8afcf8f6a778f6431b43057d3b3ff1f9f70885 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sat, 7 Sep 2024 15:38:17 -0400 Subject: [PATCH 1/5] Adding drinks for a couple of cuties --- .../en-US/Floof/flavors/flavor-profiles.ftl | 2 + .../meta/consumable/drink/alcohol.ftl | 6 +++ .../Prototypes/Floof/Flavors/flavors.yml | 10 +++++ .../Reagents/Consumable/Drink/alcohol.yml | 40 +++++++++++++++++++ .../Floof/Recipes/Reactions/drinks.yml | 23 +++++++++++ 5 files changed, 81 insertions(+) diff --git a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl index 26b076a2348..ce04b1fdfad 100644 --- a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl @@ -63,3 +63,5 @@ 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 = tastes like moonlight +flavor-complex-axelsale = tastes like a long day on the frontier 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 index 8ac5d27f98f..63a79cb0b01 100644 --- 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,9 @@ 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 diff --git a/Resources/Prototypes/Floof/Flavors/flavors.yml b/Resources/Prototypes/Floof/Flavors/flavors.yml index 6b3cbffe141..634750809b3 100644 --- a/Resources/Prototypes/Floof/Flavors/flavors.yml +++ b/Resources/Prototypes/Floof/Flavors/flavors.yml @@ -322,3 +322,13 @@ 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 diff --git a/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml index e155c60ad41..833a3e228cd 100644 --- a/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml @@ -1395,3 +1395,43 @@ - !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" + 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" + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Pomelustine + amount: 0.5 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.03 + \ No newline at end of file diff --git a/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml index 7520efb3ff3..97d6fc9d708 100644 --- a/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml @@ -773,3 +773,26 @@ 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 + From c4897c27e102623e76fe0734b67f5674ac7a4f97 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sat, 7 Sep 2024 15:50:03 -0400 Subject: [PATCH 2/5] fixed sprites --- .../Floof/Reagents/Consumable/Drink/alcohol.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml index 833a3e228cd..24a57b3779b 100644 --- a/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml @@ -1404,6 +1404,11 @@ 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: @@ -1422,7 +1427,12 @@ physicalDesc: reagent-physical-desc-strong-smelling flavor: axelsale color: "#E43414" - metamorphicChangeColor: false + metamorphicSprite: + sprite: Floof/Objects/Consumable/Drinks/deadmansdraught.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metamorphicFillBaseName: fill- + metamorphicChangeColor: true metabolisms: Drink: effects: From bac431eb8373928c60af175388864ef3e40ef0e9 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sun, 8 Sep 2024 14:26:39 -0400 Subject: [PATCH 3/5] added Jenn in Tonic --- .../en-US/Floof/flavors/flavor-profiles.ftl | 1 + .../meta/consumable/drink/alcohol.ftl | 3 +++ .../Prototypes/Floof/Flavors/flavors.yml | 5 ++++ .../Reagents/Consumable/Drink/alcohol.yml | 23 +++++++++++++++++++ .../Floof/Recipes/Reactions/drinks.yml | 12 ++++++++++ 5 files changed, 44 insertions(+) diff --git a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl index ce04b1fdfad..6af697d44f2 100644 --- a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl @@ -65,3 +65,4 @@ flavor-complex-whitechocolatechip = like white chocolate chips flavor-complex-yeolhandy = like oranges and solitude flavor-complex-thecutecaptain = tastes like moonlight flavor-complex-axelsale = tastes like a long day on the frontier +flavor-complex-jenntonic = tasts sweet with a hidden bite \ No newline at end of file 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 index 63a79cb0b01..e6f59749505 100644 --- a/Resources/Locale/en-US/Floof/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/Floof/reagents/meta/consumable/drink/alcohol.ftl @@ -183,3 +183,6 @@ reagent-desc-the-cute-captain = Light blue liquid with a sweet floral scent and 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? diff --git a/Resources/Prototypes/Floof/Flavors/flavors.yml b/Resources/Prototypes/Floof/Flavors/flavors.yml index 634750809b3..0e2168dfcc8 100644 --- a/Resources/Prototypes/Floof/Flavors/flavors.yml +++ b/Resources/Prototypes/Floof/Flavors/flavors.yml @@ -332,3 +332,8 @@ id: axelsale flavorType: Complex description: flavor-complex-axelsale + +- type: flavor + id: jenntonic + flavorType: Complex + description: flavor-complex-jenntonic diff --git a/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml index 24a57b3779b..f8bd5ecee43 100644 --- a/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml @@ -1444,4 +1444,27 @@ - !type:AdjustReagent reagent: Ethanol amount: 0.03 + +- 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.05 \ No newline at end of file diff --git a/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml index 97d6fc9d708..698dae736bb 100644 --- a/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml @@ -796,3 +796,15 @@ products: AxelsAle: 3 +- type: reaction + id: JennTonic + reactants: + Ice: + amount: 1 + Whiskey: + amount: 1 + TonicWater: + amount: 1 + products: + JennTonic: 3 + From 91d77e0fb643b596e920696215e94228520fae06 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Sun, 8 Sep 2024 14:28:14 -0400 Subject: [PATCH 4/5] fixed "tastes tastes" inflavor description --- Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl index 6af697d44f2..47478482249 100644 --- a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl @@ -63,6 +63,6 @@ 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 = tastes like moonlight -flavor-complex-axelsale = tastes like a long day on the frontier -flavor-complex-jenntonic = tasts sweet with a hidden bite \ No newline at end of file +flavor-complex-thecutecaptain = like moonlight +flavor-complex-axelsale = like a long day on the frontier +flavor-complex-jenntonic = sweet with a hidden bite \ No newline at end of file From a9f1b2dc16094d1fec11f446e08510378fad51c5 Mon Sep 17 00:00:00 2001 From: neuPanda Date: Fri, 13 Sep 2024 20:37:56 -0400 Subject: [PATCH 5/5] adding hallelujah, hallelujah represents a player who is rare and hard to come by balanced some ethanol values --- .../en-US/Floof/flavors/flavor-profiles.ftl | 3 ++- .../meta/consumable/drink/alcohol.ftl | 3 +++ .../Prototypes/Floof/Flavors/flavors.yml | 5 ++++ .../Reagents/Consumable/Drink/alcohol.yml | 27 +++++++++++++++++-- .../Floof/Recipes/Reactions/drinks.yml | 12 +++++++++ 5 files changed, 47 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl index 47478482249..574c52a0bba 100644 --- a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl @@ -65,4 +65,5 @@ 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 \ No newline at end of file +flavor-complex-jenntonic = sweet with a hidden bite +flavor-complex-hallelujah = a moment of peace \ No newline at end of file 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 index e6f59749505..5f6a51ac9ec 100644 --- a/Resources/Locale/en-US/Floof/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/Floof/reagents/meta/consumable/drink/alcohol.ftl @@ -186,3 +186,6 @@ 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 index 0e2168dfcc8..35e1b1e2f9d 100644 --- a/Resources/Prototypes/Floof/Flavors/flavors.yml +++ b/Resources/Prototypes/Floof/Flavors/flavors.yml @@ -337,3 +337,8 @@ 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 index f8bd5ecee43..4db679788b4 100644 --- a/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml @@ -1443,7 +1443,7 @@ amount: 0.5 - !type:AdjustReagent reagent: Ethanol - amount: 0.03 + amount: 0.1 - type: reagent id: JennTonic @@ -1466,5 +1466,28 @@ factor: 2 - !type:AdjustReagent reagent: Ethanol - amount: 0.05 + 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 \ No newline at end of file diff --git a/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml index 698dae736bb..7dd8d0a797e 100644 --- a/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Floof/Recipes/Reactions/drinks.yml @@ -808,3 +808,15 @@ products: JennTonic: 3 +- type: reaction + id: Hallelujah + reactants: + Wine: + amount: 2 + Water: + amount: 3 + LotophagoiOil: + amount: 1 + products: + Hallelujah : 6 +