lavahotfixes

Author: Zekins3366

Content.Server/_Wega/Lavaland/Systems/Artefacts/DragonBloodSystem.cs

@@ -1,7 +1,7 @@
 using Content.Server.Polymorph.Systems;
 using Content.Shared.Actions;
 using Content.Shared.DoAfter;
-using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
 using Content.Shared.Lavaland.Artefacts.Components;
 using Content.Shared.Lavaland.Components;
 using Content.Shared.Lavaland.Events;
@@ -23,14 +23,14 @@ public sealed class DragonBloodSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<DragonBloodComponent, InteractUsingEvent>(OnInteract);
+        SubscribeLocalEvent<DragonBloodComponent, UseInHandEvent>(OnUseInHand);
         SubscribeLocalEvent<DragonBloodComponent, DragonBloodDoAfterEvent>(OnDoAfter);
 
         SubscribeLocalEvent<BecomeToDrakeActionEvent>(OnBecomeToDrake);
         SubscribeLocalEvent<DrakeReturnBackActionEvent>(OnReturnBack);
     }
 
-    private void OnInteract(Entity<DragonBloodComponent> ent, ref InteractUsingEvent args)
+    private void OnUseInHand(Entity<DragonBloodComponent> ent, ref UseInHandEvent args)
     {
         var ev = new DragonBloodDoAfterEvent();
         _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, TimeSpan.FromSeconds(5), ev, ent)

Content.Server/_Wega/Lavaland/Systems/LavalandSystem.cs

@@ -912,7 +912,7 @@ private void PreloadAvanpostArea(EntityUid mapUid, EntityUid avanpostUid, BiomeC
         var localBounds = avanpostGrid.LocalAABB;
 
         var center = worldPos + localBounds.Center;
-        var radius = Math.Max(localBounds.Width, localBounds.Height) / 2f + 12f;
+        var radius = Math.Max(localBounds.Width, localBounds.Height) / 2f + 6f;
 
         _biome.ReserveTilesInCircle(mapUid, center, radius, biome, grid);
     }

Content.Shared/_Wega/Weapons/Misc/Upgrades/CrusherUpgradeEffectsSystem.cs

@@ -17,6 +17,7 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Weapons.Misc.Upgrades;
@@ -26,6 +27,7 @@ public sealed class CrusherUpgradeEffectsSystem : EntitySystem
     [Dependency] private readonly DamageableSystem _damage = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MobThresholdSystem _threshold = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly TagSystem _tag = default!;
@@ -255,16 +257,26 @@ private void OnAshDrakeSpikeAfterMarker(Entity<CrusherAshDrakeSpikeUpgradeCompon
     {
         var user = args.User;
         var target = args.Target;
-        var ents = _lookup.GetEntitiesInRange<DamageableComponent>(Transform(entity).Coordinates, entity.Comp.DamageRadius)
-            .Where(e => e.Owner != target && e.Owner != user);
+        if (!Exists(target))
+            return;
+
+        var ents = _lookup.GetEntitiesInRange<DamageableComponent>(Transform(target).Coordinates, entity.Comp.DamageRadius)
+            .Where(e => e.Owner != target && e.Owner != user).ToList();
 
         foreach (var ent in ents)
         {
+            // Only for mobs.
+            if (!HasComp<MobStateComponent>(ent))
+                continue;
+
             _damage.TryChangeDamage(ent.Owner, args.Damage * entity.Comp.DamageMultiplier);
 
-            var entityPos = _transform.GetWorldPosition(entity);
+            var targetPos = _transform.GetWorldPosition(target);
             var entPos = _transform.GetWorldPosition(ent.Owner);
-            var direction = (entPos - entityPos).Normalized();
+            var direction = (entPos - targetPos).Normalized();
+
+            var randomAngle = new Angle(_random.NextFloat(-0.2f, 0.2f));
+            direction = randomAngle.RotateVec(direction);
 
             _throwing.TryThrow(ent, direction);
         }

Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/effects/lavaland.ftl

@@ -13,7 +13,7 @@ ent-EffectHierophantSquare = Магия Иерофанта
     .desc = Плазма никогда не была так опасна.
 ent-EffectBubblegumHand = лапа Бубльгума
     .desc = БЕРЕГИСЬ!
-ent-EffectBubblegumHand = спавн лапы Бубльгума
+ent-BaseEffectBubblegumHandSpawn = спавн лапы Бубльгума
     .desc = БЕРЕГИСЬ!
 ent-EffectBubblegumDashTrail = "..."
     .desc = "..."

Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/structures/decoration/statues.ftl

@@ -1,4 +1,4 @@
 StatueAshDrake = статуя дракона
     .desc = Это статуя дракона. Возвышающаяся базальтовая скульптура гордого и царственного дракона. Его глаза - это шесть светящихся драгоценных камней.
-StatueAshDrake = разбитая статуя дракона
+StatueAshDrakeFalling = разбитая статуя дракона
     .desc = Это статуя дракона. Огромная базальтовая скульптура дракона. По ее поверхности идут трещины, и некоторые части ее отвалились.

Resources/Prototypes/_Wega/Entities/Mobs/NPCs/lavaland_fauna.yml

@@ -8,6 +8,23 @@
   suffix: AI
   abstract: true
   components:
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Radiation
+        damage: 15
+      behaviors:
+      - !type:PopupBehavior
+        popup: mouth-taste-metal
+        popupType: LargeCaution
+        targetOnly: true
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Radiation
+        damage: 40
+      behaviors:
+      - !type:VomitBehavior
   - type: Reactive
     groups:
       Flammable: [Touch]

Resources/Prototypes/_Wega/Maps/lavalandbuildings.yml

@@ -209,6 +209,7 @@
 - type: lavalandBuilding
   id: LavaRiver
   gridPath: /Maps/Lavaland/lava_river.yml
+  preloading: false
 
 - type: lavalandBuilding
   id: MimingDrill

Resources/Prototypes/_Wega/Polymorphs/polymorph.yml

@@ -56,6 +56,9 @@
     entity: MobSkeletonPerson
     forced: true
     transferName: true
+    inventory: Transfer
+    revertOnCrit: false
+    revertOnDeath: false
 
 - type: polymorph
   id: LowerAshDrakePolymorph