damage system refactor

Content.Client/Nyanotrasen/Lamiae/ClientLamiaVisuals.cs

@@ -1,4 +1,5 @@
 using Robust.Client.GameObjects;
+using System.Numerics;
 using Content.Shared.Nyanotrasen.Lamiae;
 
 namespace Content.Client.Nyanotrasen.Lamiae;
@@ -16,6 +17,11 @@ private void OnAppearanceChange(EntityUid uid, LamiaSegmentComponent component,
     {
         if (args.Sprite == null) return;
 
+        if (AppearanceSystem.TryGetData<float>(uid, ScaleVisuals.Scale, out var scale) && TryComp<SpriteComponent>(uid, out var sprite))
+        {
+            sprite.Scale = (new Vector2(scale, scale));
+        }
+
         if (AppearanceSystem.TryGetData<bool>(uid, LamiaSegmentVisualLayers.Armor, out var worn)
             && AppearanceSystem.TryGetData<string>(uid, LamiaSegmentVisualLayers.ArmorRsi, out var path))
         {

Content.Server/Nyanotrasen/Lamiae/LamiaSystem.cs

@@ -1,5 +1,6 @@
 using Robust.Shared.Physics;
 using Content.Shared.Damage;
+using Content.Shared.Explosion;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
@@ -8,7 +9,6 @@
 using Content.Shared.Tag;
 using Content.Shared.Standing;
 using Content.Shared.Storage.Components;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Systems;
@@ -58,9 +58,9 @@ public override void Update(float frameTime)
                     revoluteJoint.CollideConnected = false;
                 }
                 if (segment.segment.SegmentNumber < segment.segment.MaxSegments)
-                    Transform(segmentUid).Coordinates = Transform(attachedUid).Coordinates.Offset(new Vector2(0f, 0.15f));
+                    Transform(segmentUid).Coordinates = Transform(attachedUid).Coordinates.Offset(new Vector2(0, segment.segment.OffsetSwitching));
                 else
-                    Transform(segmentUid).Coordinates = Transform(attachedUid).Coordinates.Offset(new Vector2(0, 0.1f));
+                    Transform(segmentUid).Coordinates = Transform(attachedUid).Coordinates.Offset(new Vector2(0, segment.segment.OffsetSwitching));
 
                 var joint = _jointSystem.CreateDistanceJoint(attachedUid, segmentUid, id: ("Segment" + segment.segment.SegmentNumber + segment.segment.Lamia));
                 joint.CollideConnected = false;
@@ -84,6 +84,7 @@ public override void Initialize()
             SubscribeLocalEvent<LamiaComponent, DidUnequipEvent>(OnDidUnequipEvent);
             SubscribeLocalEvent<LamiaSegmentComponent, BeforeDamageChangedEvent>(OnHitSelf);
             SubscribeLocalEvent<LamiaSegmentComponent, StandAttemptEvent>(TailCantStand);
+            SubscribeLocalEvent<LamiaSegmentComponent, GetExplosionResistanceEvent>(OnSnekBoom);
         }
 
         /// <summary>
@@ -101,6 +102,9 @@ private void OnSegmentSpawned(EntityUid uid, LamiaSegmentComponent component, Se
 
             if (!TryComp<HumanoidAppearanceComponent>(uid, out var species)) return;
             if (!TryComp<HumanoidAppearanceComponent>(args.Lamia, out var humanoid)) return;
+            if (!TryComp<AppearanceComponent>(uid, out var appearance)) return;
+
+            _appearance.SetData(uid, ScaleVisuals.Scale, component.ScaleFactor, appearance);
 
             if (humanoid.MarkingSet.TryGetCategory(MarkingCategories.Tail, out var tailMarkings))
             {
@@ -116,6 +120,7 @@ private void OnSegmentSpawned(EntityUid uid, LamiaSegmentComponent component, Se
 
         private void OnInit(EntityUid uid, LamiaComponent component, ComponentInit args)
         {
+            component.DamageModifierConstant = Math.Clamp(component.DamageModifierConstant, 1, component.NumberOfSegments);
             SpawnSegments(uid, component);
         }
 
@@ -154,7 +159,7 @@ private void OnRemovedFromContainer(EntityUid uid, LamiaComponent component, Ent
 
         private void HandleSegmentDamage(EntityUid uid, LamiaSegmentComponent component, DamageModifyEvent args)
         {
-            args.Damage = args.Damage / component.DamageModifyFactor / 5;
+            args.Damage = args.Damage / component.DamageModifyFactor;
         }
         private void HandleDamageTransfer(EntityUid uid, LamiaSegmentComponent component, DamageChangedEvent args)
         {
@@ -190,18 +195,33 @@ private void SpawnSegments(EntityUid uid, LamiaComponent component)
         private EntityUid AddSegment(EntityUid uid, EntityUid lamia, LamiaComponent lamiaComponent, int segmentNumber)
         {
             LamiaSegmentComponent segmentComponent = new();
+            segmentComponent.Lamia = lamia;
             segmentComponent.AttachedToUid = uid;
             segmentComponent.MaxSegments = lamiaComponent.NumberOfSegments;
-            segmentComponent.DamageModifyFactor = lamiaComponent.NumberOfSegments;
+            float taperConstant = segmentComponent.MaxSegments / 2;
+            float damageModifyCoefficient = lamiaComponent.DamageModifierConstant / lamiaComponent.NumberOfSegments;
+            segmentComponent.DamageModifyFactor = lamiaComponent.DamageModifierConstant * damageModifyCoefficient;
+            segmentComponent.ExplosiveModifyFactor = 1 / segmentComponent.DamageModifyFactor / (segmentComponent.MaxSegments / 10);
+
             EntityUid segment;
             if (segmentNumber == 1)
                 segment = EntityManager.SpawnEntity("LamiaInitialSegment", Transform(uid).Coordinates);
             else
                 segment = EntityManager.SpawnEntity("LamiaSegment", Transform(uid).Coordinates);
+            if (segmentNumber >= taperConstant)
+            {
+                segmentComponent.OffsetSwitching = 0.15f * MathF.Pow(1.02f, segmentNumber);
+                segmentComponent.ScaleFactor = MathF.Pow(0.99f, segmentNumber);
+            }
+            if (segmentNumber % 2 != 0)
+            {
+                segmentComponent.OffsetSwitching *= -1;
+            }
 
             segmentComponent.Owner = segment;
             segmentComponent.SegmentNumber = segmentNumber;
             EntityManager.AddComponent(segment, segmentComponent, true);
+
             _segments.Enqueue((segmentComponent, lamia));
             lamiaComponent.Segments.Add(segmentComponent.Owner);
             return segment;
@@ -232,6 +252,11 @@ private void OnDidEquipEvent(EntityUid equipee, LamiaComponent component, DidEqu
             }
         }
 
+        private void OnSnekBoom(EntityUid uid, LamiaSegmentComponent component, ref GetExplosionResistanceEvent args)
+        {
+            args.DamageCoefficient = component.ExplosiveModifyFactor;
+        }
+
         private void OnDidUnequipEvent(EntityUid equipee, LamiaComponent component, DidUnequipEvent args)
         {
             if (args.Slot == "outerClothing" && _tagSystem.HasTag(args.Equipment, LamiaHardsuitTag))

Content.Shared/Nyanotrasen/Lamiae/LamiaComponent.cs

@@ -13,5 +13,12 @@ public sealed partial class LamiaComponent : Component
 
         [DataField("numberOfSegments")]
         public int NumberOfSegments = 30;
+
+        /// <summary>
+        /// Used to derive how much damage should transfer from segments to body. Higher = less damage transfered.
+        /// Clamped to NumberOfSegments as a maximum value
+        /// </summary>
+        [DataField("damageModifierConstant")]
+        public float DamageModifierConstant = 8f;
     }
 }

Content.Shared/Nyanotrasen/Lamiae/LamiaSegmentComponent.cs

@@ -10,8 +10,11 @@ namespace Content.Shared.Nyanotrasen.Lamiae
     public sealed partial class LamiaSegmentComponent : Component
     {
         public EntityUid AttachedToUid = default!;
-        public int DamageModifyFactor = default!;
-        public bool SexChanged = false;
+        public float DamageModifyFactor = default!;
+        public float OffsetSwitching = 0.15f;
+        public float ScaleFactor = 1f;
+        public float DamageModifierCoefficient = default!;
+        public float ExplosiveModifyFactor = default!;
         public EntityUid Lamia = default!;
         public int SegmentNumber = default!;
         public int MaxSegments = default!;

Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/lamia.yml

@@ -119,6 +119,19 @@
   - type: NoSlip
   - type: Internals
   - type: MobState
+  - type: DamageVisuals
+    thresholds: [ 60, 120, 200 ] #these values aren't final, adjust accordingly with thresholds above'
+    targetLayers:
+      - "enum.HumanoidVisualLayers.Chest"
+      - "enum.HumanoidVisualLayers.Head"
+      - "enum.HumanoidVisualLayers.LArm"
+      - "enum.HumanoidVisualLayers.RArm"
+    damageOverlayGroups:
+      Brute:
+        sprite: Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi
+        color: "#FF0000"
+      Burn:
+        sprite: Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi
   - type: MobThresholds
     thresholds:
       0: Alive
@@ -137,19 +150,6 @@
     - type: BuckleVisualizer
     - type: CreamPiedVisualizer
       state: creampie_human
-  - type: DamageVisuals
-    thresholds: [ 60, 120, 200 ] #these values aren't final, adjust accordingly with thresholds above'
-    targetLayers:
-      - "enum.HumanoidVisualLayers.Chest"
-      - "enum.HumanoidVisualLayers.Head"
-      - "enum.HumanoidVisualLayers.LArm"
-      - "enum.HumanoidVisualLayers.RArm"
-    damageOverlayGroups:
-      Brute:
-        sprite: Mobs/Effects/brute_damage.rsi
-        color: "#FF0000"
-      Burn:
-        sprite: Mobs/Effects/burn_damage.rsi
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Generic_mob_burning
@@ -202,6 +202,7 @@
         layer:
         - MobLayer
   - type: Lamia
+    damageModifierConstant: 12
   - type: Speech
     speechSounds: Alto
   - type: Vocal

Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+	"version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/blob/971ddef989f7f4f365a714ef3d4df5dea2d53d9a/icons/mob/dam_mob.dmi",
+	"size": {"x": 32, "y": 32},
+	"states": [
+		{"name": "Head_Brute_60", "directions": 4},
+		{"name": "LArm_Brute_60", "directions": 4},
+		{"name": "LLeg_Brute_60", "directions": 4},
+		{"name": "RArm_Brute_60", "directions": 4},
+		{"name": "RLeg_Brute_60", "directions": 4},
+		{"name": "Chest_Brute_60", "directions": 4},
+		{"name": "Head_Brute_120", "directions": 4},
+		{"name": "LArm_Brute_120", "directions": 4},
+		{"name": "LLeg_Brute_120", "directions": 4},
+		{"name": "RArm_Brute_120", "directions": 4},
+		{"name": "RLeg_Brute_120", "directions": 4},
+		{"name": "Chest_Brute_120", "directions": 4},
+		{"name": "Head_Brute_200", "directions": 4},
+		{"name": "LArm_Brute_200", "directions": 4},
+		{"name": "LLeg_Brute_200", "directions": 4},
+		{"name": "RArm_Brute_200", "directions": 4},
+		{"name": "RLeg_Brute_200", "directions": 4},
+		{"name": "Chest_Brute_200", "directions": 4}
+	]
+}

Resources/Textures/Nyanotrasen/Mobs/Effects/Lamia/burn_damage.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+	"version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/blob/971ddef989f7f4f365a714ef3d4df5dea2d53d9a/icons/mob/dam_mob.dmi",
+	"size": {"x": 32, "y": 32},
+	"states": [
+		{"name": "Head_Burn_60", "directions": 4},
+		{"name": "LArm_Burn_60", "directions": 4},
+		{"name": "LLeg_Burn_60", "directions": 4},
+		{"name": "RArm_Burn_60", "directions": 4},
+		{"name": "RLeg_Burn_60", "directions": 4},
+		{"name": "Chest_Burn_60", "directions": 4},
+		{"name": "Head_Burn_120", "directions": 4},
+		{"name": "LArm_Burn_120", "directions": 4},
+		{"name": "LLeg_Burn_120", "directions": 4},
+		{"name": "RArm_Burn_120", "directions": 4},
+		{"name": "RLeg_Burn_120", "directions": 4},
+		{"name": "Chest_Burn_120", "directions": 4},
+		{"name": "Head_Burn_200", "directions": 4},
+		{"name": "LArm_Burn_200", "directions": 4},
+		{"name": "LLeg_Burn_200", "directions": 4},
+		{"name": "RArm_Burn_200", "directions": 4},
+		{"name": "RLeg_Burn_200", "directions": 4},
+		{"name": "Chest_Burn_200", "directions": 4}
+	]
+}