Skip to content

Commit

Permalink
changing names to follow nikko's convention
Browse files Browse the repository at this point in the history
  • Loading branch information
cynical24 committed Aug 24, 2024
1 parent 80661ca commit d0a6cbb
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
18 changes: 9 additions & 9 deletions Content.Server/FloofStation/Traits/LewdTraitSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ public override void Initialize()
SubscribeLocalEvent<CumProducerComponent, ComponentStartup>(OnComponentInitCum);
SubscribeLocalEvent<MilkProducerComponent, ComponentStartup>(OnComponentInitMilk);
SubscribeLocalEvent<SquirtProducerComponent, ComponentStartup>(OnComponentInitSquirt);
SubscribeLocalEvent<ProductivePenisComponent, ComponentStartup>(OnComponentInitProductiveCum);
SubscribeLocalEvent<ProductiveCumProducerComponent, ComponentStartup>(OnComponentInitProductiveCum);

//Verbs
SubscribeLocalEvent<CumProducerComponent, GetVerbsEvent<InnateVerb>>(AddCumVerb);
SubscribeLocalEvent<MilkProducerComponent, GetVerbsEvent<InnateVerb>>(AddMilkVerb);
SubscribeLocalEvent<SquirtProducerComponent, GetVerbsEvent<InnateVerb>>(AddSquirtVerb);
SubscribeLocalEvent<ProductivePenisComponent, GetVerbsEvent<InnateVerb>>(AddProductiveCumVerb);
SubscribeLocalEvent<ProductiveCumProducerComponent, GetVerbsEvent<InnateVerb>>(AddProductiveCumVerb);

//Events
SubscribeLocalEvent<CumProducerComponent, CummingDoAfterEvent>(OnDoAfterCum);
SubscribeLocalEvent<MilkProducerComponent, MilkingDoAfterEvent>(OnDoAfterMilk);
SubscribeLocalEvent<SquirtProducerComponent, SquirtingDoAfterEvent>(OnDoAfterSquirt);
SubscribeLocalEvent<ProductivePenisComponent, ProductiveCummingDoAfterEvent>(OnDoAfterProductiveCum);
SubscribeLocalEvent<ProductiveCumProducerComponent, ProductiveCummingDoAfterEvent>(OnDoAfterProductiveCum);
}

#region event handling
Expand All @@ -56,7 +56,7 @@ private void OnComponentInitCum(Entity<CumProducerComponent> entity, ref Compone
solutionCum.AddReagent(entity.Comp.ReagentId, entity.Comp.MaxVolume - solutionCum.Volume);
}

private void OnComponentInitProductiveCum(Entity<ProductivePenisComponent> entity, ref ComponentStartup args)
private void OnComponentInitProductiveCum(Entity<ProductiveCumProducerComponent> entity, ref ComponentStartup args)
{
var solutionProdCum = _solutionContainer.EnsureSolution(entity.Owner, entity.Comp.SolutionName);
solutionProdCum.MaxVolume = entity.Comp.MaxVolume;
Expand Down Expand Up @@ -102,7 +102,7 @@ public void AddCumVerb(Entity<CumProducerComponent> entity, ref GetVerbsEvent<In
args.Verbs.Add(verbCum);
}

public void AddProductiveCumVerb(Entity<ProductivePenisComponent> entity, ref GetVerbsEvent<InnateVerb> args)
public void AddProductiveCumVerb(Entity<ProductiveCumProducerComponent> entity, ref GetVerbsEvent<InnateVerb> args)
{
if (args.Using == null ||
!args.CanInteract ||
Expand Down Expand Up @@ -194,7 +194,7 @@ private void OnDoAfterCum(Entity<CumProducerComponent> 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<ProductivePenisComponent> entity, ref ProductiveCummingDoAfterEvent args)
private void OnDoAfterProductiveCum(Entity<ProductiveCumProducerComponent> entity, ref ProductiveCummingDoAfterEvent args)
{
if (args.Cancelled || args.Handled || args.Args.Used == null)
return;
Expand Down Expand Up @@ -293,9 +293,9 @@ private void AttemptCum(Entity<CumProducerComponent> lewd, EntityUid userUid, En
_doAfterSystem.TryStartDoAfter(doargs);
}

private void AttemptProductiveCum(Entity<ProductivePenisComponent> lewd, EntityUid userUid, EntityUid containerUid)
private void AttemptProductiveCum(Entity<ProductiveCumProducerComponent> lewd, EntityUid userUid, EntityUid containerUid)
{
if (!HasComp<ProductivePenisComponent>(userUid))
if (!HasComp<ProductiveCumProducerComponent>(userUid))
return;

var doargs = new DoAfterArgs(EntityManager, userUid, 5, new ProductiveCummingDoAfterEvent(), lewd, lewd, used: containerUid)
Expand Down Expand Up @@ -347,7 +347,7 @@ public override void Update(float frameTime)
var queryCum = EntityQueryEnumerator<CumProducerComponent>();
var queryMilk = EntityQueryEnumerator<MilkProducerComponent>();
var querySquirt = EntityQueryEnumerator<SquirtProducerComponent>();
var queryProductiveCum = EntityQueryEnumerator<ProductivePenisComponent>();
var queryProductiveCum = EntityQueryEnumerator<ProductiveCumProducerComponent>();
var now = _timing.CurTime;

while (queryCum.MoveNext(out var uid, out var containerCum))
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/Floof/traits/traits.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
8 changes: 4 additions & 4 deletions Resources/Prototypes/Floof/Traits/lewd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- !type:CharacterTraitRequirement
inverted: true
traits:
- ProductivePenis
- ProductiveCumProducer
components:
- type: CumProducer
solutionname: "penis"
Expand Down Expand Up @@ -63,7 +63,7 @@
Quantity: 25

- type: trait
id: ProductivePenis
id: ProductiveCumProducer
category: Physical
points: -2
requirements:
Expand All @@ -77,11 +77,11 @@
traits:
- CumProducer
components:
- type: ProductivePenis
- type: ProductiveCumProducer
solutionname: "productivePenis"
- type: SolutionContainerManager
solutions:
productivepenis:
productivePenis:
MaxVol: 50
reagents:
- ReagentId: Cum
Expand Down

0 comments on commit d0a6cbb

Please sign in to comment.