From d0a6cbbe6405415d8f2d8d448112d72cdd7a7ec6 Mon Sep 17 00:00:00 2001 From: cynical Date: Sat, 24 Aug 2024 15:47:00 -0400 Subject: [PATCH] changing names to follow nikko's convention --- ...nt.cs => ProductiveCumProducerComponent.cs} | 2 +- .../FloofStation/Traits/LewdTraitSystem.cs | 18 +++++++++--------- Resources/Locale/en-US/Floof/traits/traits.ftl | 4 ++-- Resources/Prototypes/Floof/Traits/lewd.yml | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) rename Content.Server/FloofStation/Traits/Components/{ProductivePenisComponent.cs => ProductiveCumProducerComponent.cs} (93%) diff --git a/Content.Server/FloofStation/Traits/Components/ProductivePenisComponent.cs b/Content.Server/FloofStation/Traits/Components/ProductiveCumProducerComponent.cs similarity index 93% rename from Content.Server/FloofStation/Traits/Components/ProductivePenisComponent.cs rename to Content.Server/FloofStation/Traits/Components/ProductiveCumProducerComponent.cs index 23b640df25e..5cb249ecff3 100644 --- a/Content.Server/FloofStation/Traits/Components/ProductivePenisComponent.cs +++ b/Content.Server/FloofStation/Traits/Components/ProductiveCumProducerComponent.cs @@ -10,7 +10,7 @@ namespace Content.Server.FloofStation.Traits; [RegisterComponent, Access(typeof(LewdTraitSystem))] -public sealed partial class ProductivePenisComponent : Component +public sealed partial class ProductiveCumProducerComponent : Component { [DataField("solutionname")] public string SolutionName = "productivePenis"; diff --git a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs index d84761178d4..c8e23cc2006 100644 --- a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs +++ b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs @@ -32,19 +32,19 @@ public override void Initialize() SubscribeLocalEvent(OnComponentInitCum); SubscribeLocalEvent(OnComponentInitMilk); SubscribeLocalEvent(OnComponentInitSquirt); - SubscribeLocalEvent(OnComponentInitProductiveCum); + SubscribeLocalEvent(OnComponentInitProductiveCum); //Verbs SubscribeLocalEvent>(AddCumVerb); SubscribeLocalEvent>(AddMilkVerb); SubscribeLocalEvent>(AddSquirtVerb); - SubscribeLocalEvent>(AddProductiveCumVerb); + SubscribeLocalEvent>(AddProductiveCumVerb); //Events SubscribeLocalEvent(OnDoAfterCum); SubscribeLocalEvent(OnDoAfterMilk); SubscribeLocalEvent(OnDoAfterSquirt); - SubscribeLocalEvent(OnDoAfterProductiveCum); + SubscribeLocalEvent(OnDoAfterProductiveCum); } #region event handling @@ -56,7 +56,7 @@ private void OnComponentInitCum(Entity entity, ref Compone solutionCum.AddReagent(entity.Comp.ReagentId, entity.Comp.MaxVolume - solutionCum.Volume); } - private void OnComponentInitProductiveCum(Entity entity, ref ComponentStartup args) + private void OnComponentInitProductiveCum(Entity entity, ref ComponentStartup args) { var solutionProdCum = _solutionContainer.EnsureSolution(entity.Owner, entity.Comp.SolutionName); solutionProdCum.MaxVolume = entity.Comp.MaxVolume; @@ -102,7 +102,7 @@ public void AddCumVerb(Entity entity, ref GetVerbsEvent entity, ref GetVerbsEvent args) + public void AddProductiveCumVerb(Entity entity, ref GetVerbsEvent args) { if (args.Using == null || !args.CanInteract || @@ -194,7 +194,7 @@ private void OnDoAfterCum(Entity entity, ref CummingDoAfte _popupSystem.PopupEntity(Loc.GetString("cum-verb-success", ("amount", quantity), ("target", Identity.Entity(args.Args.Used.Value, EntityManager))), entity.Owner, args.Args.User, PopupType.Medium); } - private void OnDoAfterProductiveCum(Entity entity, ref ProductiveCummingDoAfterEvent args) + private void OnDoAfterProductiveCum(Entity entity, ref ProductiveCummingDoAfterEvent args) { if (args.Cancelled || args.Handled || args.Args.Used == null) return; @@ -293,9 +293,9 @@ private void AttemptCum(Entity lewd, EntityUid userUid, En _doAfterSystem.TryStartDoAfter(doargs); } - private void AttemptProductiveCum(Entity lewd, EntityUid userUid, EntityUid containerUid) + private void AttemptProductiveCum(Entity lewd, EntityUid userUid, EntityUid containerUid) { - if (!HasComp(userUid)) + if (!HasComp(userUid)) return; var doargs = new DoAfterArgs(EntityManager, userUid, 5, new ProductiveCummingDoAfterEvent(), lewd, lewd, used: containerUid) @@ -347,7 +347,7 @@ public override void Update(float frameTime) var queryCum = EntityQueryEnumerator(); var queryMilk = EntityQueryEnumerator(); var querySquirt = EntityQueryEnumerator(); - var queryProductiveCum = EntityQueryEnumerator(); + var queryProductiveCum = EntityQueryEnumerator(); var now = _timing.CurTime; while (queryCum.MoveNext(out var uid, out var containerCum)) diff --git a/Resources/Locale/en-US/Floof/traits/traits.ftl b/Resources/Locale/en-US/Floof/traits/traits.ftl index fe1cb2e516f..a5e26cfd001 100644 --- a/Resources/Locale/en-US/Floof/traits/traits.ftl +++ b/Resources/Locale/en-US/Floof/traits/traits.ftl @@ -10,5 +10,5 @@ trait-description-MilkProducer = You have a pair of large mammaries. trait-name-SquirtProducer = Pussy trait-description-SquirtProducer = You have a slit between your legs. -trait-name-ProductivePenis = Productive Cock -trait-description-ProductivePenis = Whether through a healthy diet, genetic modification, or evolution, your cock seems to produce a much larger quantity of semen, while also regenerating it twice as fast. +trait-name-ProductiveCumProducer = Productive Cock +trait-description-ProductiveCumProducer = Through a blend of optimized nutrition, advanced genetic enhancements, or the next stage in evolution, your body now produces an exceptional volume of semen, regenerating it at double the usual speed. diff --git a/Resources/Prototypes/Floof/Traits/lewd.yml b/Resources/Prototypes/Floof/Traits/lewd.yml index 6ae36bcd426..d7593dd8224 100644 --- a/Resources/Prototypes/Floof/Traits/lewd.yml +++ b/Resources/Prototypes/Floof/Traits/lewd.yml @@ -10,7 +10,7 @@ - !type:CharacterTraitRequirement inverted: true traits: - - ProductivePenis + - ProductiveCumProducer components: - type: CumProducer solutionname: "penis" @@ -63,7 +63,7 @@ Quantity: 25 - type: trait - id: ProductivePenis + id: ProductiveCumProducer category: Physical points: -2 requirements: @@ -77,11 +77,11 @@ traits: - CumProducer components: - - type: ProductivePenis + - type: ProductiveCumProducer solutionname: "productivePenis" - type: SolutionContainerManager solutions: - productivepenis: + productivePenis: MaxVol: 50 reagents: - ReagentId: Cum