diff --git a/Content.Shared/Nutrition/Components/ExamineableHungerComponent.cs b/Content.Shared/Nutrition/Components/ExaminableHungerComponent.cs similarity index 54% rename from Content.Shared/Nutrition/Components/ExamineableHungerComponent.cs rename to Content.Shared/Nutrition/Components/ExaminableHungerComponent.cs index 00aba82e58..4431a5ef4a 100644 --- a/Content.Shared/Nutrition/Components/ExamineableHungerComponent.cs +++ b/Content.Shared/Nutrition/Components/ExaminableHungerComponent.cs @@ -7,8 +7,8 @@ namespace Content.Shared.Nutrition.Components; /// Adds text to the entity's description box based on its current hunger threshold. /// [RegisterComponent, NetworkedComponent] -[Access(typeof(ExamineableHungerSystem))] -public sealed partial class ExamineableHungerComponent : Component +[Access(typeof(ExaminableHungerSystem))] +public sealed partial class ExaminableHungerComponent : Component { /// /// Dictionary of hunger thresholds to LocIds of the messages to display. @@ -16,16 +16,16 @@ public sealed partial class ExamineableHungerComponent : Component [DataField] public Dictionary Descriptions = new() { - { HungerThreshold.Overfed, "examineable-hunger-component-examine-overfed"}, - { HungerThreshold.Okay, "examineable-hunger-component-examine-okay"}, - { HungerThreshold.Peckish, "examineable-hunger-component-examine-peckish"}, - { HungerThreshold.Starving, "examineable-hunger-component-examine-starving"}, - { HungerThreshold.Dead, "examineable-hunger-component-examine-starving"} + { HungerThreshold.Overfed, "examinable-hunger-component-examine-overfed"}, + { HungerThreshold.Okay, "examinable-hunger-component-examine-okay"}, + { HungerThreshold.Peckish, "examinable-hunger-component-examine-peckish"}, + { HungerThreshold.Starving, "examinable-hunger-component-examine-starving"}, + { HungerThreshold.Dead, "examinable-hunger-component-examine-starving"} }; /// /// LocId of a fallback message to display if the entity has no /// or does not have a value in for the current threshold. /// - public LocId NoHungerDescription = "examineable-hunger-component-examine-none"; + public LocId NoHungerDescription = "examinable-hunger-component-examine-none"; } diff --git a/Content.Shared/Nutrition/EntitySystems/ExamineableHungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/ExaminableHungerSystem.cs similarity index 79% rename from Content.Shared/Nutrition/EntitySystems/ExamineableHungerSystem.cs rename to Content.Shared/Nutrition/EntitySystems/ExaminableHungerSystem.cs index e0ac767bcf..1a1418b644 100644 --- a/Content.Shared/Nutrition/EntitySystems/ExamineableHungerSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/ExaminableHungerSystem.cs @@ -4,8 +4,8 @@ using Content.Shared.Nutrition.Components; namespace Content.Shared.Nutrition.EntitySystems; -/// -public sealed class ExamineableHungerSystem : EntitySystem +/// +public sealed class ExaminableHungerSystem : EntitySystem { [Dependency] private readonly HungerSystem _hunger = default!; private EntityQuery _hungerQuery; @@ -16,14 +16,14 @@ public sealed class ExamineableHungerSystem : EntitySystem _hungerQuery = GetEntityQuery(); - SubscribeLocalEvent(OnExamine); + SubscribeLocalEvent(OnExamine); } /// /// Defines the text provided on examine. /// Changes depending on the amount of hunger the target has. /// - private void OnExamine(Entity entity, ref ExaminedEvent args) + private void OnExamine(Entity entity, ref ExaminedEvent args) { var identity = Identity.Entity(entity, EntityManager); diff --git a/Resources/Locale/en-US/nutrition/components/examinable-hunger-component.ftl b/Resources/Locale/en-US/nutrition/components/examinable-hunger-component.ftl new file mode 100644 index 0000000000..c42b56ef88 --- /dev/null +++ b/Resources/Locale/en-US/nutrition/components/examinable-hunger-component.ftl @@ -0,0 +1,5 @@ +examinable-hunger-component-examine-overfed = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} stuffed! +examinable-hunger-component-examine-okay = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} content. +examinable-hunger-component-examine-peckish = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} hungry. +examinable-hunger-component-examine-starving = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} starved! +examinable-hunger-component-examine-none = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "seem", "seems")} not to get hungry. diff --git a/Resources/Locale/en-US/nutrition/components/examineable-hunger-component.ftl b/Resources/Locale/en-US/nutrition/components/examineable-hunger-component.ftl deleted file mode 100644 index d8d9963908..0000000000 --- a/Resources/Locale/en-US/nutrition/components/examineable-hunger-component.ftl +++ /dev/null @@ -1,5 +0,0 @@ -examineable-hunger-component-examine-overfed = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} stuffed! -examineable-hunger-component-examine-okay = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} content. -examineable-hunger-component-examine-peckish = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} hungry. -examineable-hunger-component-examine-starving = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} starved! -examineable-hunger-component-examine-none = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "seem", "seems")} not to get hungry. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 6dc055ea2a..aaca896175 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -229,7 +229,7 @@ - type: EggLayer eggSpawn: - id: FoodEgg - - type: ExamineableHunger + - type: ExaminableHunger - type: ReplacementAccent accent: chicken - type: SentienceTarget @@ -664,7 +664,7 @@ - type: EggLayer eggSpawn: - id: FoodEgg - - type: ExamineableHunger + - type: ExaminableHunger - type: ReplacementAccent accent: duck - type: SentienceTarget @@ -830,7 +830,7 @@ reagentId: Milk quantityPerUpdate: 25 growthDelay: 30 - - type: ExamineableHunger + - type: ExaminableHunger - type: Butcherable spawned: - id: FoodMeat @@ -987,7 +987,7 @@ reagentId: MilkGoat quantityPerUpdate: 25 growthDelay: 20 - - type: ExamineableHunger + - type: ExaminableHunger - type: Wooly - type: Food solution: wool