Merge branch 'master' into Vulpkanin-Update

Signed-off-by: FoxxoTrystan <[email protected]>
Simple-Station · Aug 14, 2024 · ee20123 · ee20123
2 parents d3eba80 + a9280bb
commit ee20123
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 5 deletions.
diff --git a/Content.Client/Flash/FlashSystem.cs b/Content.Client/Flash/FlashSystem.cs
@@ -38,8 +38,10 @@ private void OnFlashableHandleState(EntityUid uid, FlashableComponent component,
             // Few things here:
             // 1. If a shorter duration flash is applied then don't do anything
             // 2. If the client-side time is later than when the flash should've ended don't do anything
+            var calculatedStateDuration = state.Duration * state.DurationMultiplier;
+
             var currentTime = _gameTiming.CurTime.TotalSeconds;
-            var newEndTime = state.Time.TotalSeconds + state.Duration;
+            var newEndTime = state.Time.TotalSeconds + calculatedStateDuration;
             var currentEndTime = component.LastFlash.TotalSeconds + component.Duration;
 
             if (currentEndTime > newEndTime)
@@ -53,7 +55,7 @@ private void OnFlashableHandleState(EntityUid uid, FlashableComponent component,
             }
 
             component.LastFlash = state.Time;
-            component.Duration = state.Duration;
+            component.Duration = calculatedStateDuration;
 
             var overlay = _overlayManager.GetOverlay<FlashOverlay>();
             overlay.ReceiveFlash(component.Duration);

diff --git a/Content.Server/Atmos/Components/FlammableComponent.cs b/Content.Server/Atmos/Components/FlammableComponent.cs
@@ -61,5 +61,11 @@ public sealed partial class FlammableComponent : Component
         /// </summary>
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public float FirestackFade = -0.1f;
+
+        /// <summary>
+        ///     How stronger will firestack increases be?
+        /// </summary>
+        [DataField]
+        public float FireStackIncreaseMultiplier = 1f;
     }
 }
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -274,6 +274,9 @@ public void AdjustFireStacks(EntityUid uid, float relativeFireStacks, FlammableC
             if (!Resolve(uid, ref flammable))
                 return;
 
+            if (relativeFireStacks > 0)
+                relativeFireStacks *= flammable.FireStackIncreaseMultiplier;
+
             flammable.FireStacks = MathF.Min(MathF.Max(MinimumFireStacks, flammable.FireStacks + relativeFireStacks), MaximumFireStacks);
 
             if (flammable.OnFire && flammable.FireStacks <= 0)

diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
@@ -137,6 +137,8 @@ public void Flash(EntityUid target,
                     RaiseLocalEvent(used.Value, ref ev);
             }
 
+            flashDuration *= flashable.DurationMultiplier;
+
             flashable.LastFlash = _timing.CurTime;
             flashable.Duration = flashDuration / 1000f; // TODO: Make this sane...
             Dirty(target, flashable);

diff --git a/Content.Shared/Flash/FlashableComponent.cs b/Content.Shared/Flash/FlashableComponent.cs
@@ -21,6 +21,11 @@ public sealed partial class FlashableComponent : Component
         // </summary>
         [DataField]
         public int EyeDamage;
+
+        //   How much to modify the duration of flashes against this entity.
+        // </summary>
+        [DataField]
+        public float DurationMultiplier = 1f;
 
         [DataField]
         public CollisionGroup CollisionGroup = CollisionGroup.Opaque;
@@ -35,13 +40,15 @@ public sealed class FlashableComponentState : ComponentState
         public TimeSpan Time { get; }
         public float EyeDamageChance { get; }
         public int EyeDamage { get; }
+        public float DurationMultiplier { get; }
 
-        public FlashableComponentState(float duration, TimeSpan time, float eyeDamageChance, int eyeDamage)
+        public FlashableComponentState(float duration, TimeSpan time, float eyeDamageChance, int eyeDamage, float durationMultiplier)
         {
             Duration = duration;
             Time = time;
             EyeDamageChance = eyeDamageChance;
             EyeDamage = eyeDamage;
+            DurationMultiplier = durationMultiplier;
         }
     }
 

diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -13,7 +13,7 @@ public override void Initialize()
 
         private static void OnFlashableGetState(EntityUid uid, FlashableComponent component, ref ComponentGetState args)
         {
-            args.State = new FlashableComponentState(component.Duration, component.LastFlash, component.EyeDamageChance, component.EyeDamage);
+            args.State = new FlashableComponentState(component.Duration, component.LastFlash, component.EyeDamageChance, component.EyeDamage, component.DurationMultiplier);
         }
     }
 }
diff --git a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml
@@ -1,7 +1,8 @@
 - type: damageModifierSet
   id: Vulpkanin
   coefficients:
-    Heat: 1.15
+    Heat: 1.30
+    Cold: 0.70
 
 - type: damageModifierSet
   id: Harpy

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
@@ -8,6 +8,7 @@
   - type: HumanoidAppearance
     species: Vulpkanin
   - type: Hunger
+    baseDecayRate: 0.02083333332 # 25% more than default
   - type: Carriable # Carrying system from nyanotrasen.
   - type: Inventory # Allows vulps to wear properly shaped helmets
     speciesId: vulpkanin
@@ -109,6 +110,13 @@
     understands:
     - GalacticCommon
     - Canilunzt
+  - type: ConsumeDelayModifier
+    foodDelayMultiplier: 0.5
+    drinkDelayMultiplier: 0.5
+  - type: Flammable
+    fireStackIncreaseMultiplier: 1.25
+  - type: Flashable
+    durationMultiplier: 1.5
 
 - type: entity
   save: false

diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
@@ -115,6 +115,11 @@
     - type: ConsumeDelayModifier
       foodDelayMultiplier: 0.5
       drinkDelayMultiplier: 0.5
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      inverted: true
+      species:
+        - Vulpkanin
 
 - type: trait
   id: ParkourTraining