Merge remote-tracking branch 'upstream/master'

Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs

@@ -64,7 +64,7 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf
             var offering = new OfferingWindowOption();
             offering.Title = Loc.GetString($"salvage-expedition-type");
 
-            var difficultyId = "Moderate";
+            var difficultyId = missionParams.Difficulty;
             var difficultyProto = _protoManager.Index<SalvageDifficultyPrototype>(difficultyId);
             // TODO: Selectable difficulty soon.
             var mission = salvage.GetMission(difficultyProto, missionParams.Seed);
@@ -80,7 +80,7 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf
 
             offering.AddContent(new Label
             {
-                Text = Loc.GetString("salvage-expedition-difficulty-Moderate"),
+                Text = Loc.GetString($"salvage-expedition-difficulty-{difficultyId}"),
                 FontColorOverride = difficultyColor,
                 HorizontalAlignment = Control.HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),

Content.Server/Salvage/SalvageSystem.Expeditions.cs

@@ -18,7 +18,9 @@ public sealed partial class SalvageSystem
      * Handles setup / teardown of salvage expeditions.
      */
 
-    private const int MissionLimit = 3;
+    private const int MissionLimit = 5;
+
+    private static readonly string[] Difficulties = {"Minimal", "Minor", "Moderate", "Hazardous", "Extreme"};
 
     private readonly JobQueue _salvageQueue = new();
     private readonly List<(SpawnSalvageMissionJob Job, CancellationTokenSource CancelToken)> _salvageJobs = new();
@@ -136,7 +138,7 @@ public sealed partial class SalvageSystem
             {
                 Index = component.NextIndex,
                 Seed = _random.Next(),
-                Difficulty = "Moderate",
+                Difficulty = Difficulties[i],
             };
 
             component.Missions[component.NextIndex++] = mission;

Content.Server/Salvage/SpawnSalvageMissionJob.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Numerics;
 using System.Threading;
 using System.Threading.Tasks;
+using Content.Server._White.Other;
 using Content.Server.Atmos;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
@@ -118,7 +119,7 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
 
         // Setup mission configs
         // As we go through the config the rating will deplete so we'll go for most important to least important.
-        var difficultyId = "Moderate";
+        var difficultyId = _missionParams.Difficulty;
         var difficultyProto = _prototypeManager.Index<SalvageDifficultyPrototype>(difficultyId);
 
         var mission = _entManager.System<SharedSalvageSystem>()
@@ -304,6 +305,8 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
                 }
 
                 var uid = _entManager.SpawnAtPosition(entry.Proto, grid.GridTileToLocal(tile));
+                if (_entManager.HasComponent<ExpeditionGhostRoleComponent>(uid))
+                    return;
                 _entManager.RemoveComponent<GhostRoleComponent>(uid);
                 _entManager.RemoveComponent<GhostTakeoverAvailableComponent>(uid);
                 return;

Content.Server/_White/Other/ExpeditionGhostRoleComponent.cs

@@ -0,0 +1,6 @@
+namespace Content.Server._White.Other;
+
+[RegisterComponent]
+public sealed partial class ExpeditionGhostRoleComponent : Component
+{
+}

Content.Shared/CCVar/CCVars.cs

@@ -1749,7 +1749,7 @@ namespace Content.Shared.CCVar
         /// Cooldown for missions.
         /// </summary>
         public static readonly CVarDef<float>
-            SalvageExpeditionCooldown = CVarDef.Create("salvage.expedition_cooldown", 780f, CVar.REPLICATED);
+            SalvageExpeditionCooldown = CVarDef.Create("salvage.expedition_cooldown", 300f, CVar.REPLICATED);
 
         /*
          * Flavor

Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs

@@ -85,7 +85,7 @@ public sealed record SalvageMissionParams
 
     [ViewVariables(VVAccess.ReadWrite)] public int Seed;
 
-    public string Difficulty = string.Empty;
+    public string Difficulty = "Moderate";
 }
 
 /// <summary>

Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Damage;
+using Content.Shared.Mobs.Systems;
 using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Audio;
@@ -15,6 +16,7 @@ public abstract class SharedDamageMarkerSystem : EntitySystem
     [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!; // WD
 
     public override void Initialize()
     {
@@ -32,7 +34,7 @@ public abstract class SharedDamageMarkerSystem : EntitySystem
         RemCompDeferred<DamageMarkerComponent>(uid);
         _audio.PlayPredicted(component.Sound, uid, args.User);
 
-        if (TryComp<LeechOnMarkerComponent>(args.Used, out var leech))
+        if (TryComp<LeechOnMarkerComponent>(args.Used, out var leech) && !_mobState.IsDead(uid)) // WD EDIT
         {
             _damageable.TryChangeDamage(args.User, leech.Leech, true, false, origin: args.Used);
         }

Resources/Changelog/ChangelogWhite.yml

@@ -4408,3 +4408,22 @@
   id: 306
   time: '2024-06-15T13:37:17.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/358
+- author: Aviu
+  changes:
+  - message: "\u0420\u0435\u0432\u043E\u0440\u043A \u044D\u043A\u0441\u043F\u0435\u0434\
+      \u0438\u0446\u0438\u0439."
+    type: Add
+  - message: "\u041D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u043C\u043E\u0431\
+      \u044B \u043F\u043E\u043B\u0443\u0447\u0438\u043B\u0438 \u043F\u0435\u0440\u0435\
+      \u043A\u043B\u044E\u0447\u0430\u0435\u043C\u043E\u0435 \u043D\u043E\u0447\u043D\
+      \u043E\u0435 \u0437\u0440\u0435\u043D\u0438\u0435."
+    type: Add
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043B\u0435\u0447\u0435\u043D\u0438\
+      \u0435 \u043E\u0442 \u043C\u0435\u0442\u043A\u0438 \u043A\u0440\u0443\u0448\u0438\
+      \u0442\u0435\u043B\u044F \u043D\u0435 \u0440\u0430\u0431\u043E\u0442\u0430\u0435\
+      \u0442 \u043D\u0430 \u043C\u0435\u0440\u0442\u0432\u044B\u0445 \u0446\u0435\u043B\
+      \u0435\u0439."
+    type: Fix
+  id: 307
+  time: '2024-06-16T15:33:26.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/360

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -144,10 +144,11 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.7
+        Blunt: 0.6
-        Slash: 0.7
+        Slash: 0.6
-        Piercing: 0.5
+        Piercing: 0.7
         Radiation: 0.3
+        Heat: 0.8
         Caustic: 0.7
   - type: ClothingSpeedModifier
     walkModifier: 0.85
@@ -180,6 +181,7 @@
         Piercing: 0.5
         Heat: 0.3
         Radiation: 0.1
+        Caustic: 0.5
   - type: ExplosionResistance
     damageCoefficient: 0.2
   - type: TemperatureProtection

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

@@ -61,9 +61,8 @@
       soundHit:
         path: /Audio/Effects/bite.ogg
       damage:
-        types:
+        groups:
-          Piercing: 5
+          Brute: 15
-          Slash: 10
     - type: TypingIndicator
       proto: alien
     - type: Tag
@@ -80,6 +79,9 @@
       interactFailureSound:
         path: /Audio/Effects/bite.ogg
     - type: Penetrated
+    - type: NightVision
+      toggleSound: null
+      color: "#404040"
 
 - type: entity
   parent: BaseMobCarp
@@ -98,6 +100,8 @@
         alive: Rainbow
       enum.DamageStateVisualLayers.BaseUnshaded:
         mouth: ""
+  - type: MovementSpeedModifier
+    baseSprintSpeed: 6
 
 - type: entity
   name: magicarp
@@ -178,13 +182,10 @@
     thresholds:
       0: Alive
       50: Dead
-  - type: SlowOnDamage
-    speedModifierThresholds:
-      25: 0.7
   - type: MeleeWeapon
     damage:
-      types:
+      groups:
-        Slash: 6
+        Brute: 7.5
 
 - type: entity
   name: sharkminnow
@@ -234,8 +235,9 @@
           amount: 4
     - type: MeleeWeapon
       damage:
+        groups:
+          Brute: 15
         types:
-          Slash: 12
           Bloodloss: 5
 
 - type: entity

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

@@ -118,6 +118,9 @@
   - type: Grammar
     attributes:
       gender: male
+  - type: NightVision
+    toggleSound: null
+    color: "#404040"
 
 - type: entity
   id: MobRatKingBuff

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

@@ -67,7 +67,7 @@
       50: Dead
   - type: SlowOnDamage
     speedModifierThresholds:
-      25: 0.5
+      40: 0.7
   - type: Stamina
     critThreshold: 200
   - type: Bloodstream
@@ -81,7 +81,7 @@
     animation: WeaponArcBite
     damage:
       groups:
-        Brute: 6
+        Brute: 10
   - type: DamageStateVisuals
     rotate: true
     states:
@@ -121,6 +121,9 @@
     molsPerSecondPerUnitMass: 0.0005
   - type: Speech
     speechVerb: LargeMob
+  - type: NightVision
+    toggleSound: null
+    color: "#404040"
 
 - type: entity
   name: Praetorian
@@ -137,12 +140,12 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      100: Dead
+      150: Dead
   - type: Stamina
     critThreshold: 300
   - type: SlowOnDamage
     speedModifierThresholds:
-      50: 0.7
+      130: 0.7
   - type: Fixtures
     fixtures:
       fix1:
@@ -154,6 +157,11 @@
         - MobMask
         layer:
         - MobLayer
+  - type: MeleeWeapon
+    animation: WeaponArcBite
+    damage:
+      groups:
+        Brute: 20
 
 - type: entity
   name: Drone
@@ -170,16 +178,17 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      80: Dead
+      150: Dead
   - type: SlowOnDamage
     speedModifierThresholds:
-      40: 0.7
+      130: 0.7
   - type: MeleeWeapon
     damage:
       groups:
-        Brute: 6
+        Brute: 15
   - type: MovementSpeedModifier
-    baseSprintSpeed: 4
+    baseWalkSpeed: 2.0
+    baseSprintSpeed: 2.5
   - type: Fixtures
     fixtures:
       fix1:
@@ -210,12 +219,12 @@
       300: Dead
   - type: SlowOnDamage
     speedModifierThresholds:
-      150: 0.7
+      270: 0.7
   - type: MovementSpeedModifier
   - type: MeleeWeapon
     damage:
      groups:
-       Brute: 12
+       Brute: 25
   - type: Fixtures
     fixtures:
       fix1:
@@ -230,6 +239,7 @@
   - type: Tag
     tags:
     - CannotSuicide
+  - type: ExpeditionGhostRole
 
 - type: entity
   name: Ravager
@@ -252,10 +262,10 @@
   - type: MeleeWeapon
     damage:
      groups:
-       Brute: 10
+       Brute: 20
   - type: SlowOnDamage
     speedModifierThresholds:
-      50: 0.7
+      80: 0.7
   - type: Fixtures
     fixtures:
       fix1:
@@ -285,7 +295,7 @@
   - type: MeleeWeapon
     damage:
      groups:
-       Brute: 5
+       Brute: 8
   - type: Fixtures
     fixtures:
       fix1:
@@ -331,7 +341,7 @@
       50: Dead
   - type: SlowOnDamage
     speedModifierThresholds:
-      25: 0.7
+      40: 0.7
   - type: HTN
     rootTask:
       task: SimpleRangedHostileCompound

Resources/Prototypes/Entities/Mobs/Player/dragon.yml

@@ -14,6 +14,9 @@
     makeSentient: true
     name: ghost-role-information-space-dragon-name
     description: ghost-role-information-space-dragon-description
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      270: 0.7
   - type: GhostTakeoverAvailable
   - type: HTN
     rootTask:
@@ -108,9 +111,8 @@
     soundHit:
       path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
     damage:
-      types:
+      groups:
-        Piercing: 15
+        Brute: 30
-        Slash: 15
   - type: Devourer
     foodPreference: Humanoid
     shouldStoreDevoured: true
@@ -126,6 +128,9 @@
     tags:
     - CannotSuicide
     - DoorBumpOpener
+  - type: NightVision
+    toggleSound: null
+    color: "#404040"
 
 - type: entity
   parent: BaseMobDragon
@@ -146,18 +151,16 @@
   components:
   - type: GhostRole
     description: ghost-role-information-space-dragon-dungeon-description
-  - type: SlowOnDamage
-    speedModifierThresholds:
-      100: 0.7
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      200: Dead
   # less meat spawned since it's a lot easier to kill
   - type: Butcherable
     spawned:
     - id: FoodMeatDragon
       amount: 1
+  - type: MeleeWeapon
+    damage:
+      groups:
+        Brute: 20
+  - type: ExpeditionGhostRole
 
 - type: entity
   id: ActionSpawnRift

Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml

@@ -43,7 +43,6 @@
     capacity: 1
     count: 1
   - type: MeleeWeapon
-    attackRate: 1.5
     wideAnimationRotation: -135
     damage:
       types:
@@ -55,8 +54,8 @@
   - type: IncreaseDamageOnWield
     damage:
       types:
-        Blunt: 2.5
+        Blunt: 5
-        Slash: 2.5
+        Slash: 5
         Structural: 30
   - type: GunRequiresWield
   - type: Item

Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml

@@ -327,6 +327,7 @@
     radius: 1.8
     energy: 1.6
     color: "#3db83b"
+  - type: CargoSellBlacklist
 
 - type: entity
   parent: VendingMachine

Resources/Prototypes/Procedural/salvage_difficulties.yml

@@ -1,11 +1,43 @@
+- type: salvageDifficulty
+  id: Minimal
+  lootBudget: 10
+  mobBudget: 10
+  modifierBudget: 1
+  color: "#9FED5896"
+  recommendedPlayers: 1
+
+- type: salvageDifficulty
+  id: Minor
+  lootBudget: 30
+  mobBudget: 30
+  modifierBudget: 1
+  color: "#EFB34196"
+  recommendedPlayers: 2
+
 - type: salvageDifficulty
   id: Moderate
-  lootBudget: 30
+  lootBudget: 50
-  mobBudget: 25
+  mobBudget: 50
   modifierBudget: 2
   color: "#52B4E996"
   recommendedPlayers: 2
 
+- type: salvageDifficulty
+  id: Hazardous
+  lootBudget: 70
+  mobBudget: 70
+  modifierBudget: 2
+  color: "#DE3A3A96"
+  recommendedPlayers: 3
+
+- type: salvageDifficulty
+  id: Extreme
+  lootBudget: 100
+  mobBudget: 100
+  modifierBudget: 3
+  color: "#D381C996"
+  recommendedPlayers: 4
+
     #9FED5896
     #EFB34196
     #DE3A3A96

Resources/Prototypes/Procedural/salvage_factions.yml

@@ -12,10 +12,13 @@
       prob: 0.02
     - proto: MobXenoRavager
       cost: 5
+    - proto: MobXenoRunner
+      cost: 2
     - proto: MobXenoRouny
       cost: 3
       prob: 0.02
     - proto: MobXenoSpitter
+      cost: 3
     - proto: WeaponTurretXeno
       prob: 0.1
   configs:
@@ -27,17 +30,20 @@
   entries:
     - proto: MobCarpDungeon
     # These do too much damage for salvage, need nerfs
-    #- proto: MobCarpHolo
+    - proto: MobCarpHolo
-    #  cost: 5
+      cost: 5
-    #  prob: 0.1
-    #- proto: MobCarpMagic
-    #  cost: 5
-    #  prob: 0.1
-    - proto: MobCarpRainbow # carp version of rouny...
-      cost: 3
       prob: 0.05
+    - proto: MobCarpMagic
+      cost: 4
+      prob: 0.1
+    - proto: MobCarpRainbow # carp version of rouny...
+      cost: 6
+      prob: 0.05
+    - proto: MobShark
+      cost: 8
+      prob: 0.035
     - proto: MobDragonDungeon
-      cost: 10
+      cost: 12
       prob: 0.02
   configs:
     DefenseStructure: CarpStatue

Resources/Prototypes/Procedural/salvage_loot.yml

@@ -105,6 +105,100 @@
         - proto: WeaponTeslaGun
           prob: 0.1
           cost: 2
+        - proto: EnergyBattleAxe
+          prob: 0.1
+          cost: 8
+        - proto: WeaponRifleAk
+          cost: 5
+        - proto: TimeBeacon
+          cost: 2
+          prob: 0.5
+        - proto: ClothingBackpackDuffelSyndicateFilledSMG
+          cost: 6
+          prob: 0.5
+        - proto: ClothingBackpackDuffelSyndicateFilledShotgun
+          cost: 8
+          prob: 0.5
+        - proto: BriefcaseSyndieSniperBundleFilled
+          cost: 10
+          prob: 0.5
+        - proto: ClothingBackpackDuffelSyndicateFilledLMG
+          cost: 12
+          prob: 0.5
+        - proto: WeaponRevolverMateba
+          cost: 5
+        - proto: WeaponRevolverDeckard
+          cost: 4
+        - proto: ExGrenade
+          cost: 3
+        - proto: SupermatterGrenade
+          cost: 5
+        - proto: WhiteholeGrenade
+          cost: 3
+        - proto: ClothingOuterHardsuitMaxim
+          cost: 5
+        - proto: GrenadeIncendiary
+          cost: 4
+        - proto: ExperimentalSyndicateTeleporter
+          cost: 8
+          prob: 0.5
+        - proto: ClothingHeadHelmetSwat
+          cost: 4
+        - proto: ClothingBeltMilitaryWebbing
+          cost: 2
+        - proto: ClothingOuterVestWeb
+          cost: 5
+        - proto: ClothingEyesNightVisionGoggles
+          cost: 5
+        - proto: ClothingHandsGlovesCombat
+          cost: 3
+        - proto: Katana
+          cost: 3
+        - proto: WeaponMakeshiftLaser
+          cost: 4
+        - proto: WeaponLaserGun
+          cost: 5
+        - proto: WeaponEgun
+          cost: 5
+        - proto: WeaponXrayCannon
+          cost: 6
+        - proto: WeaponLaserCannon
+          cost: 6
+        - proto: WeaponTempGun
+          cost: 4
+        - proto: WeaponAdvancedLaser
+          cost: 10
+          prob: 0.5
+        - proto: Stimpack
+          cost: 6
+        - proto: StimkitFilled
+          cost: 8
+          prob: 0.5
+        - proto: CrateSecurityRiot
+          cost: 5
+          prob: 0.5
+        - proto: CrateSecurityNonlethal
+          cost: 4
+          prob: 0.5
+        - proto: ClothingShoesBootsMagSyndie
+          cost: 5
+        - proto: JetpackBlackFilled
+          cost: 3
+        - proto: WeaponLauncherRocket
+          cost: 8
+        - proto: WeaponLauncherPirateCannon
+          cost: 5
+        - proto: LightModule
+          cost: 2
+        - proto: LaserModule
+          cost: 4
+        - proto: FlameHiderModule
+          cost: 2
+        - proto: SilencerModule
+          cost: 3
+        - proto: AcceleratorModule
+          cost: 5
+
 
 # Mob loot table
 

Resources/Prototypes/Procedural/salvage_mods.yml

@@ -60,60 +60,60 @@
   id: RoomTemp
   cost: 0
 
-- type: salvageTemperatureMod
+#- type: salvageTemperatureMod
-  id: Hot
+#  id: Hot
-  cost: 1
+#  cost: 1
-  temperature: 323.15 # 50C
+#  temperature: 323.15 # 50C
-  biomes:
+#  biomes:
-    - Caves
+#    - Caves
-    #- LowDesert
+#    #- LowDesert
-    - Grasslands
+#    - Grasslands
-    - Lava
+#    - Lava
-
+#
-- type: salvageTemperatureMod
+#- type: salvageTemperatureMod
-  id: Burning
+#  id: Burning
-  desc: High temperature
+#  desc: High temperature
-  cost: 2
+#  cost: 2
-  temperature: 423.15 # 200C
+#  temperature: 423.15 # 200C
-  biomes:
+#  biomes:
-    - Caves
+#    - Caves
-    #- LowDesert
+#    #- LowDesert
-    - Lava
+#    - Lava
-
+#
-- type: salvageTemperatureMod
+#- type: salvageTemperatureMod
-  id: Melting
+#  id: Melting
-  desc: Extreme heat
+#  desc: Extreme heat
-  cost: 4
+#  cost: 4
-  temperature: 1273.15 # 1000C hot hot hot
+#  temperature: 1273.15 # 1000C hot hot hot
-  biomes:
+#  biomes:
-    - Lava
+#    - Lava
-
+#
-- type: salvageTemperatureMod
+#- type: salvageTemperatureMod
-  id: Cold
+#  id: Cold
-  cost: 1
+#  cost: 1
-  temperature: 275.15 # 2C
+#  temperature: 275.15 # 2C
-  biomes:
+#  biomes:
-    - Caves
+#    - Caves
-    #- LowDesert
+#    #- LowDesert
-    - Grasslands
+#    - Grasslands
-    - Snow
+#    - Snow
-
+#
-- type: salvageTemperatureMod
+#- type: salvageTemperatureMod
-  id: Tundra
+#  id: Tundra
-  desc: Low temperature
+#  desc: Low temperature
-  cost: 2
+#  cost: 2
-  temperature: 263.15 # -40C
+#  temperature: 263.15 # -40C
-  biomes:
+#  biomes:
-    - Caves
+#    - Caves
-    - Snow
+#    - Snow
-
+#
-- type: salvageTemperatureMod
+#- type: salvageTemperatureMod
-  id: Frozen
+#  id: Frozen
-  desc: Extreme cold
+#  desc: Extreme cold
-  cost: 4
+#  cost: 4
-  temperature: 123.15 # -150C
+#  temperature: 123.15 # -150C
-  biomes:
+#  biomes:
-    - Snow
+#    - Snow
 
 # Air mixtures
 - type: salvageAirMod
@@ -242,7 +242,7 @@
   proto: SnowyLabs
   biomes:
     - Snow
-    
+
 - type: salvageDungeonMod
   id: Haunted
   proto: Haunted

Resources/Prototypes/_White/Catalog/Cargo/cargo.yml

@@ -1,4 +1,4 @@
-- type: cargoProduct
+- type: cargoProduct
   id: CratePaper
   icon:
     sprite: Objects/Materials/Sheets/other.rsi
@@ -273,6 +273,6 @@
     sprite: Clothing/Head/Hardsuits/security.rsi
     state: icon-flash
   product: CrateSecurityVoidsuit
-  cost: 4000
+  cost: 10000
   category: Security
   group: market