KeenHearing + looting trashbins and crates + spawn on trashbins and c…

…rates
SerbiaStrong-220 · Jan 25, 2025 · da9d521 · da9d521
1 parent 55beadb
commit da9d521
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 8 deletions.
diff --git a/Content.Server/SS220/StationEvents/Events/RegalRatRule.cs b/Content.Server/SS220/StationEvents/Events/RegalRatRule.cs
@@ -23,10 +23,7 @@ protected override void Started(EntityUid uid, RegalRatRuleComponent component,
             return;
         }
 
-        var kingRatLocations = EntityQueryEnumerator<RegalRatSpawnLocationComponent, TransformComponent>();
         var mouseLocations = EntityQueryEnumerator<VentCritterSpawnLocationComponent, TransformComponent>();
-
-        var kingRatValidLocations = new List<EntityCoordinates>();
         var mouseVaidLocations = new List<EntityCoordinates>();
 
         while (mouseLocations.MoveNext(out _, out _, out var transform))
@@ -42,6 +39,9 @@ protected override void Started(EntityUid uid, RegalRatRuleComponent component,
             }
         }
 
+        var kingRatValidLocations = new List<EntityCoordinates>();
+        var kingRatLocations = EntityQueryEnumerator<RegalRatSpawnLocationComponent, TransformComponent>();
+
         while (kingRatLocations.MoveNext(out _, out _, out var transform))
         {
             if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station == station &&
@@ -53,7 +53,7 @@ protected override void Started(EntityUid uid, RegalRatRuleComponent component,
 
         if (component.SpecialEntries.Count == 0 || kingRatValidLocations.Count == 0)
         {
-            return;
+            return; 
         }
 
         // guaranteed spawn

diff --git a/Content.Shared/RatKing/SharedRatKingSystem.cs b/Content.Shared/RatKing/SharedRatKingSystem.cs
@@ -151,7 +151,6 @@ private void OnGetVerb(EntityUid uid, RatKingRummageableComponent component, Get
     //SS220 RatKing Changes start here
     private void OnRummageAction(Entity<RatKingComponent> entity, ref RatKingRummageActionEvent args)
     {
-
         if (args.Handled || !TryComp<RatKingRummageableComponent>(args.Target, out var rumComp) || rumComp.Looted)
             return;
 
@@ -200,9 +199,10 @@ public virtual void DoCommandCallout(EntityUid uid, RatKingComponent component)
 
     }
 }
-
+//SS220
 [Serializable, NetSerializable]
 public sealed partial class RatKingRummageDoAfterEvent : SimpleDoAfterEvent
 {
 
 }
+//SS220 changes ending
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -280,6 +280,11 @@
   parent: CrateTrashCart
   components:
     - type: StorageFill
+    #SS220 RatKingUpdate
+    - type: RatKingRummageable
+      rummageLoot: RatKingLootTrashCans
+    - type: RegalRatSpawnLocation
+    #SS220 Ratking update End
       contents:
           # Creatures
         - id: MobCockroach

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -9,9 +9,13 @@
     baseWalkSpeed : 3.00
     baseSprintSpeed : 5.00
   - type: InputMover
-    #SS220 RatKing tail Pull
+    #SS220 RatKing additions
   - type: Puller
     needsHands: false
+  - type: KeenHearing
+    visionRadius: 14
+    highSensitiveVisionRadius: 0
+    state: half
     #SS220 changes end here
   - type: MobMover
   - type: HTN

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -711,6 +711,11 @@
       offset: "0.0,0.03125"
       map: ["enum.PaperLabelVisuals.Layer"]
   - type: Cart #SS220-Cart-system
+  #SS220 RatKing update
+  - type: RatKingRummageable
+    rummageLoot: RatKingLootTrashCans
+  - type: RegalRatSpawnLocation
+  #SS220 changes end here
 
 - type: entity
   parent: CrateBaseSecure

diff --git a/Resources/Prototypes/SS220/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/SS220/Entities/Mobs/NPCs/regalrat.yml
@@ -6,13 +6,20 @@
     FoodCheeseSlice: 20
     FoodCheese: 5
 
+- type: weightedRandomEntity
+  id: RatKingLootTrashCans
+  weights:
+    RandomSpawner100: 50
+    MobCockroach: 25
+    FoodTacoRat: 20
+    FoodCheese: 5
+
 - type: entity
   id: ActionRatKingRummage
   name: Rummage
   description: Rummage trash to find some cheesy-cheese.
   components:
   - type: EntityTargetAction
-    useDelay: 3
     icon:
       sprite: SS220/Interface/Actions/actions_rat_king.rsi
       state: rummage

diff --git a/Resources/Prototypes/SS220/Entities/Structures/Storage/trashcan.yml b/Resources/Prototypes/SS220/Entities/Structures/Storage/trashcan.yml
@@ -22,6 +22,9 @@
   - type: Construction
     graph: TrashCan
     node: TrashCan
+  - type: RatKingRummageable
+    rummageLoot: RatKingLootTrashCans
+  - type: RegalRatSpawnLocation
 
 - type: entity
   parent: TrashCan