Harpy rework

Content.Omu.Common/Proficiencies/CommonProficiencySystem.cs

@@ -0,0 +1,7 @@
+
+
+namespace Content.Omu.Common.Proficiencies;
+
+public abstract class CommonProficiencySystem : EntitySystem
+{
+}

Content.Omu.Shared/Proficiencies/Components/ProficiencyComponent.cs

@@ -0,0 +1,22 @@
+using Robust.Shared.Prototypes;
+namespace Content.Omu.Shared.Proficiencies;
+
+[RegisterComponent]
+public sealed partial class ProficiencyComponent : Component
+{
+    [DataField]
+    public List<EntProtoId>? Items;
+
+    [DataField]
+    public float ProficiencyMultiplier { get; set; } = 1f;
+
+    [DataField]
+    public float SurgeryProficiency { get; set; } = 1f;
+
+    //the lower the reloadspeed modifier the faster it goes
+    [DataField]
+    public float ReloadSpeedProficiency { get; set; } = 1f;
+
+    [DataField]
+    public string? ProficiencyID;
+}

Content.Omu.Shared/Proficiencies/ProficiencyPrototype.cs

@@ -0,0 +1,28 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+
+
+namespace Content.Omu.Shared.Proficiencies;
+
+[Prototype("Proficiency")]
+[DataDefinition]
+public sealed partial class ProficiencyPrototype : IPrototype
+{
+
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    [DataField]
+    public List<EntProtoId>? Items;
+
+    [DataField]
+    public float proficiencyMultiplier { get; private set; } = 1f;
+
+    [DataField]
+    public float surgeryProficiency { get; private set; } = 1f;
+
+    //the lower the reloadspeed modifier the faster it goes
+    [DataField]
+    public float reloadSpeedProficiency { get; private set; } = 1f;
+}

Content.Omu.Shared/Proficiencies/Systems/ProficiencySystem.cs

@@ -0,0 +1,108 @@
+using Content.Shared._Shitmed.Medical.Surgery;
+using Content.Shared.GameTicking;
+using Content.Shared.Hands;
+using Content.Shared.Tools.Components;
+using Robust.Shared.Prototypes;
+using Content.Shared.Weapons.Ranged.Components;
+using Content.Omu.Common.Proficiencies;
+
+namespace Content.Omu.Shared.Proficiencies.Systems;
+
+public sealed class ProficiencySystem : CommonProficiencySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+
+
+    public override void Initialize(){
+        SubscribeLocalEvent<ProficiencyComponent, DidEquipHandEvent>(OnEquip);
+        SubscribeLocalEvent<ProficiencyComponent, DidUnequipHandEvent>(OnUnequip);
+        SubscribeLocalEvent<ProficiencyComponent, PlayerSpawnCompleteEvent>(OnPlayerSpawnComplete);
+    }
+
+
+    private void OnEquip(Entity<ProficiencyComponent> entity, ref DidEquipHandEvent args){
+        if(entity.Comp.Items != null)
+        {
+        bool handled = false;
+
+        if(TryComp<BallisticAmmoProviderComponent>(args.Equipped, out var ammoComp))
+        {
+            ammoComp.FillDelay *= entity.Comp.ReloadSpeedProficiency;
+        }
+
+        foreach (var Item in entity.Comp.Items){
+            if(TryComp<MetaDataComponent>(args.Equipped, out var data) && data.EntityPrototype != null)
+            {
+                if(data.EntityPrototype.ID == Item.Id){
+                    handled = true;
+
+                    if(TryComp<ToolComponent>(args.Equipped, out var toolComp)){
+                        toolComp.SpeedModifier *= entity.Comp.ProficiencyMultiplier;
+
+                        Dirty(args.Equipped, toolComp);
+                    }
+
+                }
+            }
+        }
+        // If it isnt in the list of items buffed, debuff it instead
+        if (!handled)
+        {
+                if(TryComp<ToolComponent>(args.Equipped, out var toolComp))
+                {
+                    toolComp.SpeedModifier *= MathF.Pow(entity.Comp.ProficiencyMultiplier, -1);
+
+                    Dirty(args.Equipped, toolComp);
+                }
+            }
+        }
+    }
+
+    private void OnUnequip(Entity<ProficiencyComponent> entity, ref DidUnequipHandEvent args)
+    {
+        if(entity.Comp != null && entity.Comp.Items != null)
+        {
+            if (TryComp<MetaDataComponent>(args.Unequipped, out var data) && data.EntityPrototype != null)
+            {
+                if (TryComp<ToolComponent>(args.Unequipped, out var toolComp))
+                {
+                    toolComp.SpeedModifier *= MathF.Pow(toolComp.SpeedModifier, -1);
+
+                    Dirty(args.Unequipped, toolComp);
+                }
+
+            }
+            if (TryComp<BallisticAmmoProviderComponent>(args.Unequipped, out var ammoComp))
+            {
+                ammoComp.FillDelay *= MathF.Pow(entity.Comp.ReloadSpeedProficiency, -1);
+            }
+        }
+    }
+
+    private void OnPlayerSpawnComplete(Entity<ProficiencyComponent> entity, ref PlayerSpawnCompleteEvent args)
+    {
+        entity.Comp.ProficiencyID = args.JobId;
+
+        if (entity.Comp.ProficiencyID == null)
+        {
+            return;
+        }
+
+        if (entity.Comp.ProficiencyID != null && args.JobId != null && _prototypeManager.TryIndex<ProficiencyPrototype>(args.JobId, out var proficiencyPrototype))
+        {
+            entity.Comp.Items = proficiencyPrototype.Items;
+            entity.Comp.ProficiencyMultiplier = proficiencyPrototype.proficiencyMultiplier;
+            entity.Comp.SurgeryProficiency = proficiencyPrototype.surgeryProficiency;
+            entity.Comp.ReloadSpeedProficiency = proficiencyPrototype.reloadSpeedProficiency;
+
+            if (entity.Comp.SurgeryProficiency != 1f)
+            {
+                var surgerySpeedComp = _entityManager.EnsureComponent<SurgerySpeedModifierComponent>(args.Mob);
+                surgerySpeedComp.SpeedModifier *= entity.Comp.SurgeryProficiency;
+
+                Dirty(args.Mob, surgerySpeedComp);
+            }
+        }
+    }
+}

Content.Shared/Tools/Components/ToolComponent.cs

@@ -42,11 +42,14 @@
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
+using Content.Omu.Common.Proficiencies;
 
 namespace Content.Shared.Tools.Components;
 
 [RegisterComponent, NetworkedComponent]
-[Access(typeof(SharedToolSystem))]
+
+//Omu edit, added proficiency modifiers to tool speed
+[Access(typeof(SharedToolSystem), typeof(CommonProficiencySystem))]
 public sealed partial class ToolComponent : Component
 {
     [DataField]

Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs

@@ -90,10 +90,12 @@
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-
+using Content.Omu.Common.Proficiencies;
 namespace Content.Shared.Weapons.Ranged.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), Access(typeof(SharedGunSystem))]
+//Omu edit, added proficiency modifiers to reload speed
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), Access(typeof(SharedGunSystem), typeof(CommonProficiencySystem))]
+
 public sealed partial class BallisticAmmoProviderComponent : Component
 {
     [DataField]

Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml

@@ -199,6 +199,7 @@
             sprite: _DV/Mobs/Species/Harpy/displacement.rsi
             state: jumpsuit
   - type: HarpyVisuals
+  - type: Proficiency
   - type: Tag
     tags:
     - CanPilot

Resources/Prototypes/_Omu/Proficiencies/BaseProficiencies.yml

@@ -0,0 +1,44 @@
+- type: Proficiency
+  id: BaseTools
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
+
+- type: Proficiency
+  id: advancedTools
+  items:
+    - WelderExperimental
+    - PowerDrill
+    - JawsOfLife
+
+- type: Proficiency
+  id: BaseSci
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
+  proficiencyMultiplier: 1.2
+  # give sci a minor surgery speed buff, robotics exists and needs surgery to function
+  surgeryProficiency: 1.1
+
+- type: Proficiency
+  id: BaseEngi
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - WelderIndustrial
+    - Multitool
+    - WelderExperimental
+    - PowerDrill
+    - JawsOfLife
+  proficiencyMultiplier: 1.2

Resources/Prototypes/_Omu/Proficiencies/Cargo.yml

@@ -0,0 +1,43 @@
+- type: Proficiency
+  id: CargoTechnician
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
+  proficiencyMultiplier: 1.1
+
+- type: Proficiency
+  id: ShaftMiner
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
+  proficiencyMultiplier: 1.2
+
+- type: Proficiency
+  id: SalvageSpecialist
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
+  proficiencyMultiplier: 1.2
+
+- type: Proficiency
+  id: Quartermaster
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
+  proficiencyMultiplier: 1.4

Resources/Prototypes/_Omu/Proficiencies/Engineering.yml

@@ -0,0 +1,45 @@
+- type: Proficiency
+  id: StationEngineer
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
+    - WelderExperimental
+    - PowerDrill
+    #- JawsOfLife
+  #so many buffs we can't have them ALL be fast
+  proficiencyMultiplier: 1.15
+
+- type: Proficiency
+  #basically just engi+
+  id: AtmosphericsTechnician
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
+    - WelderExperimental
+    - PowerDrill
+    #- JawsOfLife
+  proficiencyMultiplier: 1.25
+
+- type: Proficiency
+  #basically just engi+
+  id: ChiefEngineer
+  items:
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
+    - WelderExperimental
+    - PowerDrill
+    #- JawsOfLife
+  #same as RD
+  proficiencyMultiplier: 1.4

Resources/Prototypes/_Omu/Proficiencies/Medical.yml

@@ -0,0 +1,30 @@
+- type: Proficiency
+  id: MedicalDoctor
+  # specifying proficiency anyways to debuff tool use, go do your job and stop tiding
+  proficiencyMultiplier: 1.20
+  surgeryProficiency: 1.25
+
+- type: Proficiency
+  id: Chemist
+  # specifying proficiency anyways to debuff tool use, go do your job and stop tiding
+  proficiencyMultiplier: 1.20
+  surgeryProficiency: 1.25
+
+- type: Proficiency
+  id: Virologist
+  # specifying proficiency anyways to debuff tool use, go do your job and stop tiding
+  proficiencyMultiplier: 1.20
+
+- type: Proficiency
+  id: Paramedic
+  items:
+  # lets buff jaws for paramed, this could be huge and if it is feel free to come back and change it
+    - JawsOfLife
+  proficiencyMultiplier: 1.20
+  surgeryProficiency: 1.10
+
+- type: Proficiency
+  id: ChiefMedicalOfficer
+  # less tool speed malus because you may need them more than docs, more surgery buff
+  proficiencyMultiplier: 1.10
+  surgeryProficiency: 1.5