Wizard NPCs Rework

Content.Shared/_NF/Weapons/Ranged/Components/WizardStaffRechargeableComponent.cs

@@ -0,0 +1,13 @@
+namespace Content.Shared.Weapons.Ranged.Components;
+
+[RegisterComponent]
+public sealed partial class WizardStaffRechargeableComponent : Component
+{
+
+}
+
+[RegisterComponent]
+public sealed partial class BloodCultStaffRechargeableComponent : Component
+{
+
+}

Resources/Prototypes/Entities/Structures/Power/chargers.yml

@@ -160,6 +160,9 @@
     slots:
       charger_slot:
         ejectOnInteract: true
+        blacklist: # Frontier
+          components: # Frontier
+          - WizardStaffRechargeable # Frontier
         whitelist:
           components:
           - HitscanBatteryAmmoProvider
@@ -191,6 +194,8 @@
         blacklist:
           tags:
           - PotatoBattery
+          components: # Frontier
+          - WizardStaffRechargeable # Frontier
 
 - type: entity
   parent: BaseItemRecharger
@@ -212,6 +217,9 @@
     slots:
       charger_slot:
         ejectOnInteract: true
+        blacklist: # Frontier
+          components: # Frontier
+          - WizardStaffRechargeable # Frontier
         whitelist:
           components:
           - HitscanBatteryAmmoProvider

Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_wizard.yml

@@ -0,0 +1,86 @@
+- type: entity
+  id: ClothingBeltWizardBlue
+  parent:
+  - ClothingBeltStorageBase
+  - RecyclableItemClothBasic
+  - ContrabandClothing
+  name: blue wizard sash
+  description: A webbing with pockets lined with waterproof (water, huh?) material.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Belt/wizard_sash.rsi
+    layers:
+      - state: icon-base-01
+        color: "#9595af"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base-01
+        color: "#9595af"
+      right:
+      - state: inhand-right-base-01
+        color: "#9595af"
+  - type: Clothing
+    sprite: _NF/Clothing/Belt/wizard_sash.rsi
+    clothingVisuals:
+      belt:
+      - state: equipped-belt-base-01
+        color: "#9595af"
+
+- type: entity
+  id: ClothingBeltWizardRed
+  parent:
+  - ClothingBeltStorageBase
+  - RecyclableItemClothBasic
+  - ContrabandClothing
+  name: blue wizard sash
+  description: A webbing with pockets lined with waterproof (water, huh?) material.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Belt/wizard_sash.rsi
+    layers:
+      - state: icon-base-01
+        color: "#d81919"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base-01
+        color: "#d81919"
+      right:
+      - state: inhand-right-base-01
+        color: "#d81919"
+  - type: Clothing
+    sprite: _NF/Clothing/Belt/wizard_sash.rsi
+    clothingVisuals:
+      belt:
+      - state: equipped-belt-base-01
+        color: "#d81919"
+
+- type: entity
+  id: ClothingBeltWizardPurple
+  parent:
+  - ClothingBeltStorageBase
+  - RecyclableItemClothBasic
+  - ContrabandClothing
+  name: purple wizard sash
+  description: A webbing with pockets lined with waterproof (water, huh?) material.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Belt/wizard_sash.rsi
+    layers:
+      - state: icon-base-01
+        color: "#3e2147"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base-01
+        color: "#3e2147"
+      right:
+      - state: inhand-right-base-01
+        color: "#3e2147"
+  - type: Clothing
+    sprite: _NF/Clothing/Belt/wizard_sash.rsi
+    clothingVisuals:
+      belt:
+      - state: equipped-belt-base-01
+        color: "#3e2147"

Resources/Prototypes/_NF/Entities/Clothing/Head/wizards_headwear.yml

@@ -0,0 +1,59 @@
+- type: entity
+  id: ClothingHeadHatHoodTacticalWizardBlue
+  parent:
+  - ClothingHeadBase
+  - ContrabandClothing
+  name: blue wizard tactical hood
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_blue.rsi
+  - type: HideLayerClothing
+    slots:
+    - Hair
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon
+
+- type: entity
+  id: ClothingHeadHatHoodTacticalWizardRed
+  parent: 
+  - ClothingHeadBase
+  - ContrabandClothing
+  name: red wizard tactical hood
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_red.rsi
+  - type: HideLayerClothing
+    slots:
+    - Hair
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon
+
+- type: entity
+  id: ClothingHeadHatHoodTacticalWizardPurple
+  parent: 
+  - ClothingHeadBase
+  - ContrabandClothing
+  name: purple wizard tactical hood
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hoods/Coat/wizard_robe_purple.rsi
+  - type: HideLayerClothing
+    slots:
+    - Hair
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon

Resources/Prototypes/_NF/Entities/Clothing/Masks/masks_wizard.yml

@@ -0,0 +1,86 @@
+- type: entity
+  id: ClothingMaskWizardBlue
+  parent:
+  - ClothingMaskGasExplorer
+  - RecyclableItemClothDevice
+  - ContrabandClothing
+  name: blue wizard gas mask
+  description: A close-fitting magical mask.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Mask/wizard.rsi
+    layers:
+      - state: icon-base-01
+        color: "#9595af"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base-01
+        color: "#9595af"
+      right:
+      - state: inhand-right-base-01
+        color: "#9595af"
+  - type: Clothing
+    sprite: _NF/Clothing/Mask/wizard.rsi
+    clothingVisuals:
+      mask:
+      - state: equipped-mask-base-01
+        color: "#9595af"
+
+- type: entity
+  id: ClothingMaskWizardRed
+  parent:
+  - ClothingMaskGasExplorer
+  - RecyclableItemClothDevice
+  - ContrabandClothing
+  name: red wizard gas mask
+  description: A close-fitting magical mask.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Mask/wizard.rsi
+    layers:
+      - state: icon-base-01
+        color: "#d81919"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base-01
+        color: "#d81919"
+      right:
+      - state: inhand-right-base-01
+        color: "#d81919"
+  - type: Clothing
+    sprite: _NF/Clothing/Mask/wizard.rsi
+    clothingVisuals:
+      mask:
+      - state: equipped-mask-base-01
+        color: "#d81919"
+
+- type: entity
+  id: ClothingMaskWizardPurple
+  parent:
+  - ClothingMaskGasExplorer
+  - RecyclableItemClothDevice
+  - ContrabandClothing
+  name: purple wizard gas mask
+  description: A close-fitting magical mask.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Mask/wizard.rsi
+    layers:
+      - state: icon-base-01
+        color: "#3e2147"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base-01
+        color: "#3e2147"
+      right:
+      - state: inhand-right-base-01
+        color: "#3e2147"
+  - type: Clothing
+    sprite: _NF/Clothing/Mask/wizard.rsi
+    clothingVisuals:
+      mask:
+      - state: equipped-mask-base-01
+        color: "#3e2147"

Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/wizard_robes.yml

@@ -0,0 +1,78 @@
+- type: entity
+  id: ClothingOuterRobeTacticalWizardBlue
+  parent:
+  - ClothingOuterStorageBase
+  - ClothingOuterBaseToggleable
+  - ContrabandClothing
+  - RecyclableItemClothArmor
+  name: blue wizard tactical robes
+  description: The perfect synthesis of tradition with modern materials and warfare practices.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_blue.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodTacticalWizardBlue
+  - type: Armor # placeholder stats, will be changed to something else
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.4
+        Heat: 0.9
+        Cold: 0.4
+  - type: ExplosionResistance
+    damageCoefficient: 0.40
+
+- type: entity
+  id: ClothingOuterRobeTacticalWizardRed
+  parent:
+  - ClothingOuterStorageBase
+  - ClothingOuterBaseToggleable
+  - ContrabandClothing
+  - RecyclableItemClothArmor
+  name: red wizard tactical robes
+  description: The perfect synthesis of tradition with modern materials and warfare practices.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_red.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodTacticalWizardRed
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.4
+        Heat: 0.4
+  - type: ExplosionResistance
+    damageCoefficient: 0.40
+
+- type: entity
+  id: ClothingOuterRobeTacticalWizardPurple
+  parent:
+  - ClothingOuterStorageBase
+  - ClothingOuterBaseToggleable
+  - ContrabandClothing
+  - RecyclableItemClothArmor
+  name: purple wizard tactical robes
+  description: The perfect synthesis of tradition with modern materials and warfare practices.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Coats/wizard_robe_purple.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodTacticalWizardPurple
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.4
+        Heat: 0.4
+  - type: ExplosionResistance
+    damageCoefficient: 0.40

Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_wizardfederation.yml

@@ -248,3 +248,28 @@
     lifetime: 30
   - type: Ammo
     muzzleFlash: null
+
+- type: entity
+  noSpawn: true
+  parent: WaterElementalConjured
+  id: WaterElementalConjuredStaff
+  components:
+  - type: NPCImprintingOnSpawnBehaviour
+    whitelist:
+      components:
+      - HumanoidAppearance
+  - type: HTN
+    rootTask:
+       task: KillerTomatoCompound
+    blackboard:
+      NavClimb: !type:Bool
+        false
+      NavInteract: !type:Bool
+        true
+      NavPry: !type:Bool
+        true
+  #- type: NpcFactionMember
+    #factions:
+    #- NanoTrasen
+  - type: TimedDespawn
+    lifetime: 180