RandomSpeak: revert back to Advertise

new-frontiers-14 · Mar 6, 2025 · 8507e68 · 8507e68
1 parent bb45d18
commit 8507e68
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 16 deletions.
diff --git a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs b/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Power.Components;
 using Content.Shared.VendingMachines;
+using Robust.Shared.Player; // Frontier
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
@@ -31,6 +32,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<ApcPowerReceiverComponent, AttemptAdvertiseEvent>(OnPowerReceiverAttemptAdvertiseEvent);
         SubscribeLocalEvent<VendingMachineComponent, AttemptAdvertiseEvent>(OnVendingAttemptAdvertiseEvent);
+        SubscribeLocalEvent<ActorComponent, AttemptAdvertiseEvent>(OnActorAttemptAdvertiseEvent); // Frontier: no player advertisements
 
         _nextCheckTime = TimeSpan.MinValue;
     }
@@ -97,6 +99,13 @@ private static void OnVendingAttemptAdvertiseEvent(EntityUid uid, VendingMachine
     {
         args.Cancelled |= machine.Broken;
     }
+
+    // Frontier: no player advertisements
+    private static void OnActorAttemptAdvertiseEvent(EntityUid uid, ActorComponent actor, ref AttemptAdvertiseEvent args)
+    {
+        args.Cancelled = true;
+    }
+    // End Frontier
 }
 
 [ByRefEvent]

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
@@ -404,11 +404,11 @@
   - type: MobPrice
     price: 1500
     deathPenalty: 0.5
-  - type: RandomSpeak
+  - type: Advertise
     pack: syndicatehumanoidchatter
     minimumWait: 120
     maximumWait: 240
-    nextRandomSpeakTime: 0
+    nextAdvertisementTime: 0
   - type: FTLKnockdownImmune
   - type: Respirator
     updateInterval: 99999 # Shouldn't run often, if ever.

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml
@@ -14,11 +14,11 @@
     rechargeCooldown: 1.5
     rechargeSound:
       path: /Audio/_NF/Effects/silence.ogg
-  - type: RandomSpeak
+  - type: Advertise
     pack: bloodcultisthumanoidchatter
     minimumWait: 30
     maximumWait: 120
-    nextRandomSpeakTime: 10
+    nextAdvertisementTime: 10
   - type: AutoWakeUp
   - type: TriggerOnBeingGibbed
   - type: GibOnTrigger

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_explorers.yml
@@ -45,11 +45,11 @@
         Structural: 30
     soundHit:
       collection: MetalThud
-  - type: RandomSpeak
+  - type: Advertise
     pack: mercenaryhumanoidchatter
     minimumWait: 30
     maximumWait: 120
-    nextRandomSpeakTime: 10
+    nextAdvertisementTime: 10
   - type: AutoWakeUp
   - type: PointLight
     enabled: true

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml
@@ -54,11 +54,11 @@
       path: /Audio/Weapons/bladeslice.ogg
       params:
         variation: 0.125
-  - type: RandomSpeak
+  - type: Advertise
     pack: mercenaryhumanoidchatter
     minimumWait: 30
     maximumWait: 120
-    nextRandomSpeakTime: 10
+    nextAdvertisementTime: 10
   - type: AutoWakeUp
   - type: MovementSpeedModifier
     baseWalkSpeed : 4.5

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_punkganger.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_punkganger.yml
@@ -48,11 +48,11 @@
       path: /Audio/Weapons/bladeslice.ogg
   - type: ReplacementAccent
     accent: streetpunk
-  - type: RandomSpeak
+  - type: Advertise
     pack: spacepunkhumanoidchatter
     minimumWait: 30
     maximumWait: 120
-    nextRandomSpeakTime: 10
+    nextAdvertisementTime: 10
   - type: AutoWakeUp
   - type: MovementSpeedModifier
     baseWalkSpeed : 4.5

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml
@@ -32,11 +32,11 @@
     rechargeCooldown: 1
     rechargeSound:
       path: /Audio/_NF/Effects/silence.ogg
-  - type: RandomSpeak
+  - type: Advertise
     pack: syndicatehumanoidchatter
     minimumWait: 30
     maximumWait: 120
-    nextRandomSpeakTime: 10
+    nextAdvertisementTime: 10
   - type: AutoWakeUp
   - type: TriggerOnBeingGibbed
   - type: GibOnTrigger
@@ -660,11 +660,11 @@
     - type: MovementSpeedModifier
       baseWalkSpeed: 4
       baseSprintSpeed: 6
-    - type: RandomSpeak
+    - type: Advertise
       pack: mimehumanoidchatter
       minimumWait: 120
       maximumWait: 240
-      nextRandomSpeakTime: 0
+      nextAdvertisementTime: 0
 
 # Syndicate Chemwarrior, shoots healthy mixes of chems
 # Look for chems here: /Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Projectiles/chem.yml

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml
@@ -35,11 +35,11 @@
     speedModifierThresholds:
       72: 0.7
       96: 0.5
-  - type: RandomSpeak
+  - type: Advertise
     pack: wizardhumanoidchatter
     minimumWait: 30
     maximumWait: 120
-    nextRandomSpeakTime: 10
+    nextAdvertisementTime: 10
   - type: AutoWakeUp
   - type: TriggerOnBeingGibbed
   - type: GibOnTrigger