[Merge] RatKing Tweaks and Changes

Content.Server/SS220/StationEvents/Components/RegalRatRuleComponent.cs

@@ -0,0 +1,15 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+using Content.Server.SS220.StationEvents.Events;
+using Content.Shared.Storage;
+
+namespace Content.Server.SS220.StationEvents.Components;
+
+[RegisterComponent, Access(typeof(RegalRatRule))]
+public sealed partial class RegalRatRuleComponent : Component
+{
+    [DataField("entries")]
+    public List<EntitySpawnEntry> Entries = new();
+
+    [DataField("specialEntries")]
+    public List<EntitySpawnEntry> SpecialEntries = new();
+}

Content.Server/SS220/StationEvents/Components/RegalRatSpawnLocationComponent.cs

@@ -0,0 +1,8 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+namespace Content.Server.SS220.StationEvents.Components;
+
+[RegisterComponent]
+public sealed partial class RegalRatSpawnLocationComponent : Component
+{
+
+}

Content.Server/SS220/StationEvents/Events/RegalRatRule.cs

@@ -0,0 +1,71 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+using Content.Server.Station.Components;
+using Content.Server.SS220.StationEvents.Components;
+using Content.Server.StationEvents.Components;
+using Content.Server.StationEvents.Events;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Station.Components;
+using Content.Shared.Storage;
+using Robust.Shared.Map;
+using Robust.Shared.Random;
+
+namespace Content.Server.SS220.StationEvents.Events;
+
+public sealed class RegalRatRule : StationEventSystem<RegalRatRuleComponent>
+{
+    protected override void Started(EntityUid uid, RegalRatRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    {
+        base.Started(uid, component, gameRule, args);
+
+        if (!TryGetRandomStation(out var station))
+        {
+            return;
+        }
+
+        var mouseLocations = EntityQueryEnumerator<VentCritterSpawnLocationComponent, TransformComponent>();
+        var mouseVaidLocations = new List<EntityCoordinates>();
+
+        while (mouseLocations.MoveNext(out _, out _, out var transform))
+        {
+            if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station == station &&
+                HasComp<BecomesStationComponent>(transform.GridUid))
+            {
+                mouseVaidLocations.Add(transform.Coordinates);
+                foreach (var spawn in EntitySpawnCollection.GetSpawns(component.Entries, RobustRandom))
+                {
+                    Spawn(spawn, transform.Coordinates);
+                }
+            }
+        }
+
+        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 &&
+                HasComp<BecomesStationComponent>(transform.GridUid))
+            {
+                kingRatValidLocations.Add(transform.Coordinates);
+            }
+        }
+
+        if (component.SpecialEntries.Count == 0 || kingRatValidLocations.Count == 0)
+        {
+            return;
+        }
+
+        // guaranteed spawn
+        var specialEntry = RobustRandom.Pick(component.SpecialEntries);
+        var specialSpawn = RobustRandom.Pick(kingRatValidLocations);
+        Spawn(specialEntry.PrototypeId, specialSpawn);
+
+        foreach (var location in kingRatValidLocations)
+        {
+            foreach (var spawn in EntitySpawnCollection.GetSpawns(component.SpecialEntries, RobustRandom))
+            {
+                Spawn(spawn, location);
+            }
+        }
+    }
+}

Content.Shared/RatKing/RatKingComponent.cs

@@ -99,6 +99,14 @@ public sealed partial class RatKingComponent : Component
         { RatKingOrderType.CheeseEm, "RatKingCommandCheeseEm" },
         { RatKingOrderType.Loose, "RatKingCommandLoose" }
     };
+
+    // SS220 RatKing Tweaks and Changes begin
+    [ViewVariables]
+    public EntityUid? ActionRummageEntity;
+
+    [DataField("actionRummage")]
+    public EntProtoId ActionRummage = "ActionRatKingRummage";
+    // SS220 RatKing Tweaks and Changes end
 }
 
 [Serializable, NetSerializable]

Content.Shared/RatKing/SharedRatKingSystem.cs

@@ -12,6 +12,10 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
+//SS220 RatKing Tweaks and Changes start
+using Content.Shared.Popups;
+using Content.Shared.SS220.RatKing;
+//SS220 RatKing Tweaks and Changes end
 
 namespace Content.Shared.RatKing;
 
@@ -24,6 +28,7 @@ public abstract class SharedRatKingSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly TagSystem _tagSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!; //SS220 RatKing tweaks and changes
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -37,6 +42,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<RatKingRummageableComponent, GetVerbsEvent<AlternativeVerb>>(OnGetVerb);
         SubscribeLocalEvent<RatKingRummageableComponent, RatKingRummageDoAfterEvent>(OnDoAfterComplete);
+        SubscribeLocalEvent<RatKingComponent, RatKingRummageActionEvent>(OnRummageAction); //SS220 RatKing Tweaks and Changes
     }
 
     private void OnStartup(EntityUid uid, RatKingComponent component, ComponentStartup args)
@@ -50,6 +56,7 @@ private void OnStartup(EntityUid uid, RatKingComponent component, ComponentStart
         _action.AddAction(uid, ref component.ActionOrderFollowEntity, component.ActionOrderFollow, component: comp);
         _action.AddAction(uid, ref component.ActionOrderCheeseEmEntity, component.ActionOrderCheeseEm, component: comp);
         _action.AddAction(uid, ref component.ActionOrderLooseEntity, component.ActionOrderLoose, component: comp);
+        _action.AddAction(uid, ref component.ActionRummageEntity, component.ActionRummage, component: comp); //SS220 RatKing Tweaks and Changes
 
         UpdateActions(uid, component);
     }
@@ -71,6 +78,7 @@ private void OnShutdown(EntityUid uid, RatKingComponent component, ComponentShut
         _action.RemoveAction(uid, component.ActionOrderFollowEntity, comp);
         _action.RemoveAction(uid, component.ActionOrderCheeseEmEntity, comp);
         _action.RemoveAction(uid, component.ActionOrderLooseEntity, comp);
+        _action.RemoveAction(uid, component.ActionRummageEntity, comp); //SS220 RatKing Tweaks and Changes
     }
 
     private void OnOrderAction(EntityUid uid, RatKingComponent component, RatKingOrderActionEvent args)
@@ -143,6 +151,35 @@ private void OnGetVerb(EntityUid uid, RatKingRummageableComponent component, Get
         });
     }
 
+    //SS220 RatKing Tweaks and Changes start
+    private void OnRummageAction(Entity<RatKingComponent> entity, ref RatKingRummageActionEvent args)
+    {
+        if (args.Handled || !TryComp<RatKingRummageableComponent>(args.Target, out var rumComp))
+        {
+            _popup.PopupPredicted(Loc.GetString("ratking-rummage-failure"), args.Target, entity, PopupType.Small);
+            return;
+        }
+
+        if (rumComp.Looted)
+        {
+            _popup.PopupPredicted(Loc.GetString("ratking-rummage-looted-failure"), args.Target, entity, PopupType.Small);
+            return;
+        }
+
+        var doAfter = new DoAfterArgs(EntityManager, entity, rumComp.RummageDuration,
+            new RatKingRummageDoAfterEvent(), args.Target, args.Target)
+        {
+            BlockDuplicate = true,
+            BreakOnDamage = true,
+            BreakOnMove = true,
+            DistanceThreshold = 2f
+        };
+        _popup.PopupPredicted(Loc.GetString("ratking-rummage-success"), args.Target, entity, PopupType.Small);
+        _doAfter.TryStartDoAfter(doAfter);
+        args.Handled = true;
+    }
+    //SS220 RatKing Tweaks and Changes end
+
     private void OnDoAfterComplete(EntityUid uid, RatKingRummageableComponent component, RatKingRummageDoAfterEvent args)
     {
         if (args.Cancelled || component.Looted)

Content.Shared/SS220/RatKing/RatKingActions.cs

@@ -0,0 +1,7 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+using Content.Shared.Actions;
+
+namespace Content.Shared.SS220.RatKing;
+public sealed partial class RatKingRummageActionEvent : EntityTargetActionEvent
+{
+}

Resources/Locale/ru-RU/ss220/prototypes/entities/mobs/npcs/regalrat.ftl

@@ -0,0 +1,8 @@
+ent-ActionRatKingRummage = Перерыть мусор
+    .desc = Покопайтесь в мусоре. Вдруг найдёте сыр!
+
+ratking-rummage-failure = Здесь нет мусора!
+
+ratking-rummage-looted-failure = Вы уже пробовали искать здесь!
+
+ratking-rummage-success = Вы копаетесь в мусоре!

Resources/Prototypes/Catalog/Fills/Boxes/general.yml

@@ -17,6 +17,25 @@
   - type: Tag
     tags:
     - BoxCardboard
+    #SS220 RatKing damageable foodboxes tweaks and Changes start
+  - type: Damageable
+    damageContainer: StructuralInorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 15
+      behaviors:
+      - !type:EmptyAllContainersBehaviour
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    #SS220 RatKing damageable foodboxes tweaks and Changes end
 
 - type: entity
   name: mousetrap box

Resources/Prototypes/Catalog/Fills/Crates/service.yml

@@ -279,6 +279,11 @@
   suffix: Filled
   parent: CrateTrashCart
   components:
+    #SS220 RatKing tweaks and changes start here
+    - type: RatKingRummageable
+      rummageLoot: RatKingLootTrashCans
+    - type: RegalRatSpawnLocation
+    #SS220 Ratking tweaks and changes end here
     - type: StorageFill
       contents:
           # Creatures

Resources/Prototypes/Entities/Clothing/Head/misc.yml

@@ -165,9 +165,9 @@
   description: It smells like dead rat. Lets you speak like one!
   components:
   - type: Sprite
-    sprite: Clothing/Head/Misc/fancycrown.rsi
+    sprite: SS220/Clothing/Head/Misc/fancycrown.rsi #SS220 resprited
   - type: Clothing
-    sprite: Clothing/Head/Misc/fancycrown.rsi
+    sprite: SS220/Clothing/Head/Misc/fancycrown.rsi #SS220 resprited
   - type: MobPrice
     price: 3000
   - type: AddAccentClothing

Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml

@@ -9,6 +9,17 @@
     baseWalkSpeed : 3.00
     baseSprintSpeed : 5.00
   - type: InputMover
+    #SS220 RatKing tweaks and changes update start
+  - type: Puller
+    needsHands: false
+  - type: KeenHearing
+    visionRadius: 14
+    highSensitiveVisionRadius: 0
+    state: half
+  - type: RandomInsulation
+    list:
+      - 0.5
+    #SS220 RatKing tweaks and changes update end
   - type: MobMover
   - type: HTN
     rootTask:
@@ -208,6 +219,7 @@
       shader: unshaded
   - type: Bloodstream
     bloodMaxVolume: 40 #SS220 RatBlood fix
+  - type: Insulated #SS220 RatKing Tweaks and changes 
 
   - type: SpriteMovement
     movementLayers:
@@ -305,9 +317,16 @@
 - type: weightedRandomEntity
   id: RatKingLoot
   weights:
-    RandomSpawner100: 66 #garbage
-    FoodCheese: 28 #food
-    IngotGold1: 5 #loot
+  # SS220 RatKing tweaks and changes rummage weight changes start
+    RandomSpawner100: 40
+    FoodCheeseSlice: 40
+    FoodCheese: 15
+    FoodCakeCheese: 5
+  # Official weights
+    #RandomSpawner100: 66 #garbage
+    #FoodCheese: 28 #food
+    #IngotGold1: 5 #loot
+  # SS220 RatKing tweaks and changes rummage weight changes end
 
 - type: entity
   id: ActionRatKingRaiseArmy
@@ -317,7 +336,7 @@
   - type: InstantAction
     useDelay: 4
     icon:
-      sprite: Interface/Actions/actions_rat_king.rsi
+      sprite: SS220/Interface/Actions/actions_rat_king.rsi #SS220 resprited
       state: ratKingArmy
     event: !type:RatKingRaiseArmyActionEvent
 
@@ -329,7 +348,7 @@
   - type: InstantAction
     useDelay: 6
     icon:
-      sprite: Interface/Actions/actions_rat_king.rsi
+      sprite: SS220/Interface/Actions/actions_rat_king.rsi #SS220 resprited
       state: ratKingDomain
     event: !type:RatKingDomainActionEvent