Vampire Hotfix (#587)

* hotfix * biger mutations menu * upd * fix missing using * fix * fix hypnotise * fix * fix event * upd
space-sunrise · Oct 31, 2024 · 60ddf2e · 60ddf2e
1 parent 1b816d5
commit 60ddf2e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/Content.Client/Vampire/VampireMutationMenu.xaml b/Content.Client/Vampire/VampireMutationMenu.xaml
@@ -1,7 +1,7 @@
 <DefaultWindow xmlns="https://spacestation14.io"
                Title="{Loc 'vampire-mutation-menu-ui-window-name'}"
-               MinSize="250 300"
-               SetSize="250 300">
+               MinSize="300 300"
+               SetSize="300 300">
     <BoxContainer Orientation="Vertical">
         <ScrollContainer VerticalExpand="True">
             <GridContainer Name="Grid" Columns="3" Margin="0 5" >

diff --git a/Content.Server/GameTicking/Rules/VampireRuleSystem.cs b/Content.Server/GameTicking/Rules/VampireRuleSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Antag;
+using Content.Server.Atmos.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
 using Content.Server.Objectives;
@@ -10,6 +11,9 @@
 using Content.Shared.Roles;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Rotting;
+using Content.Shared.Nutrition.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -82,13 +86,19 @@ public bool MakeVampire(EntityUid target, VampireRuleComponent rule)
 
         if (HasComp<UserInterfaceComponent>(target))
             _uiSystem.SetUiState(target, VampireMutationUiKey.Key, new VampireMutationBoundUserInterfaceState(vampireComponent.VampireMutations, vampireComponent.CurrentMutation));
+
+        var vampire = new Entity<VampireComponent>(target, vampireComponent);
+
+        RemComp<PerishableComponent>(vampire);
+        RemComp<BarotraumaComponent>(vampire);
+        RemComp<ThirstComponent>(vampire);
 
         vampireComponent.Balance = new() { { VampireComponent.CurrencyProto, 0 } };
 
         rule.VampireMinds.Add(mindId);
 
-        if (HasComp<VampireComponent>(target))
-            _vampire.AddStartingAbilities(target);
+        _vampire.AddStartingAbilities(vampire);
+        _vampire.MakeVulnerableToHoly(vampire);
 
         Random random = new Random();
 

diff --git a/Content.Server/Vampire/VampireSystem.Transform.cs b/Content.Server/Vampire/VampireSystem.Transform.cs
@@ -50,7 +50,7 @@ private void MakeVampire(EntityUid vampireUid)
     /// <summary>
     /// Add vulnerability to holy water when ingested or slashed, and take damage from the bible
     /// </summary>
-    private void MakeVulnerableToHoly(Entity<VampireComponent> vampire)
+    public void MakeVulnerableToHoly(Entity<VampireComponent> vampire)
     {
         //React to being beaten with the bible
         EnsureComp<UnholyComponent>(vampire);
@@ -101,16 +101,21 @@ public void AddStartingAbilities(EntityUid vampire)
             if (!action.HasValue)
                 return;
 
-            if (!TryComp<InstantActionComponent>(action, out var instantActionComponent))
-                return;
-
-            var actionEvent = instantActionComponent.Event as VampireSelfPowerEvent;
-
-            if (actionEvent == null)
-                return;
+            if (TryComp<InstantActionComponent>(action, out var instantActionComponent))
+            {
+                if (instantActionComponent.Event is VampireSelfPowerEvent instantActionEvent)
+                {
+                    comp.UnlockedPowers.Add(instantActionEvent.DefinitionName, action);
+                }
+            }
 
-            comp.UnlockedPowers.Add(actionEvent.DefinitionName, action);
-
+            if (TryComp<EntityTargetActionComponent>(action, out var entityActionComponent))
+            {
+                if (entityActionComponent.Event is VampireTargetedPowerEvent entityActionEvent)
+                {
+                    comp.UnlockedPowers.Add(entityActionEvent.DefinitionName, action);
+                }
+            }
         }
 
         UpdateBloodDisplay(vampire);