Skip to content

Commit

Permalink
tweak(traits): rename Boozy Boost to Liquor Lifeline
Browse files Browse the repository at this point in the history
  • Loading branch information
angelofallars committed Aug 10, 2024
1 parent b2365b7 commit 76676f0
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Content.Server/Body/Components/MetabolizerComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public sealed partial class MetabolizerComponent : Component
/// List of metabolizer types that this organ is. ex. Human, Slime, Felinid, w/e.
/// </summary>
[DataField]
[Access(typeof(MetabolizerSystem), typeof(BoozyBoostSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
[Access(typeof(MetabolizerSystem), typeof(LiquorLifelineSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
public HashSet<ProtoId<MetabolizerTypePrototype>>? MetabolizerTypes = null;

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
namespace Content.Server.Traits.Assorted;

/// <summary>
/// This is used for the Boozy Boost trait.
/// This is used for the Liquor Lifeline trait.
/// </summary>
[RegisterComponent]
public sealed partial class BoozyBoostComponent : Component
public sealed partial class LiquorLifelineComponent : Component
{
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@

namespace Content.Server.Traits.Assorted;

public sealed class BoozyBoostSystem : EntitySystem
public sealed class LiquorLifelineSystem : EntitySystem
{
[Dependency] private readonly BodySystem _bodySystem = default!;

public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<BoozyBoostComponent, ComponentInit>(OnSpawn);
SubscribeLocalEvent<LiquorLifelineComponent, ComponentInit>(OnSpawn);
}

private void OnSpawn(Entity<BoozyBoostComponent> entity, ref ComponentInit args)
private void OnSpawn(Entity<LiquorLifelineComponent> entity, ref ComponentInit args)
{
if (!TryComp<BodyComponent>(entity, out var body))
return;
Expand All @@ -30,9 +30,9 @@ private void OnSpawn(Entity<BoozyBoostComponent> entity, ref ComponentInit args)

foreach (var metabolismGroup in metabolizer.MetabolismGroups)
{
// Add the BoozyBoost metabolizer type to the liver and equivalent organs.
// Add the LiquorLifeline metabolizer type to the liver and equivalent organs.
if (metabolismGroup.Id == "Alcohol")
metabolizer.MetabolizerTypes.Add("BoozyBoost");
metabolizer.MetabolizerTypes.Add("LiquorLifeline");
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/traits/traits.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ trait-name-HeavyweightDrunk = Alcohol Tolerance
trait-description-HeavyweightDrunk =
Alcohol is afraid of you.
trait-name-BoozyBoost = Boozy Boost
trait-description-BoozyBoost =
trait-name-LiquorLifeline = Liquor Lifeline
trait-description-LiquorLifeline =
Forget the doctor — just hit the bar for your "ethanol prescription"!
While drunk, you slowly heal [color=red]Brute[/color], [color=orange]Heat[/color], [color=orange]Shock[/color], and [color=orange]Cold[/color] damage, scaling with how drunk you are.
You also gain the benefits of [color=lightblue]Alcohol Tolerance[/color].
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Body/Organs/dwarf.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: entity
- type: entity
id: OrganDwarfHeart
parent: OrganHumanHeart
name: dwarf heart
Expand All @@ -12,7 +12,7 @@
name: dwarf liver
components:
- type: Metabolizer
metabolizerTypes: [Dwarf, BoozyBoost]
metabolizerTypes: [Dwarf, LiquorLifeline]

- type: entity
id: OrganDwarfStomach
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Chemistry/metabolizer_types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@
name: vampiric

- type: metabolizerType
id: BoozyBoost
name: boozyboost
id: LiquorLifeline
name: liquorlifeline
12 changes: 6 additions & 6 deletions Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,12 @@
- !type:HealthChange
conditions:
- !type:OrganType
type: BoozyBoost
type: LiquorLifeline
- !type:ReagentThreshold
reagent: Ethanol
min: 0.10
max: 0.49
damage: # NOTE: all damage sets for Boozy Boost are halved due to
damage: # NOTE: all damage sets for LiquorLifeline are halved due to
groups: # LightweightDrunkComponent making ethanol half as potent
Brute: -0.4
types:
Expand All @@ -196,7 +196,7 @@
- !type:HealthChange
conditions:
- !type:OrganType
type: BoozyBoost
type: LiquorLifeline
- !type:ReagentThreshold
reagent: Ethanol
min: 0.50
Expand All @@ -211,7 +211,7 @@
- !type:HealthChange
conditions:
- !type:OrganType
type: BoozyBoost
type: LiquorLifeline
- !type:ReagentThreshold
reagent: Ethanol
min: 7.00
Expand All @@ -226,7 +226,7 @@
- !type:HealthChange
conditions:
- !type:OrganType
type: BoozyBoost
type: LiquorLifeline
- !type:ReagentThreshold
reagent: Ethanol
min: 11
Expand All @@ -241,7 +241,7 @@
- !type:HealthChange
conditions:
- !type:OrganType
type: BoozyBoost
type: LiquorLifeline
- !type:ReagentThreshold
reagent: Ethanol
min: 15 # Overdose threshold
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Traits/inconveniences.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
inverted: true
traits:
- HeavyweightDrunk
- BoozyBoost
- LiquorLifeline
- !type:CharacterSpeciesRequirement
inverted: true
species:
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Traits/skills.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
inverted: true
traits:
- LightweightDrunk
- BoozyBoost
- LiquorLifeline
- !type:CharacterSpeciesRequirement
inverted: true
species:
Expand All @@ -57,7 +57,7 @@
boozeStrengthMultiplier: 0.5

- type: trait
id: BoozyBoost
id: LiquorLifeline
category: Physical
points: -3
requirements:
Expand All @@ -76,7 +76,7 @@
species:
- Dwarf
components:
- type: BoozyBoost
- type: LiquorLifeline
- type: LightweightDrunk
boozeStrengthMultiplier: 0.5

Expand Down

0 comments on commit 76676f0

Please sign in to comment.