Energy pilons WIP (#326)

* split partial magic system

* add debug sprited pilons

* some energy pilons interactions

* Update CP14MagicEnergySystem.Relay.cs

* spupers (#322)

* spupers

* meta

* aura nodes + aura scanners

* scanner sprites

* maid dress

* reverse pilon logic

* relay delete, code clean up

* delete content

* Update basic.yml

* Update shirt.yml

* Update crystal.yml

---------

Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com>

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml

@@ -4,7 +4,7 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: TimedDespawn
-    lifetime: 2.0
+    lifetime: 7.0
   - type: Sprite
     drawdepth: Effects
     layers:

Resources/Prototypes/_CP14/Entities/Clothing/Cloak/basic_cloak.yml

@@ -42,6 +42,19 @@
   - type: Clothing
     sprite: _CP14/Clothing/Cloak/blacksmith_apron.rsi
 
+- type: entity
+  parent: 
+  - CP14ClothingCloakBase
+  - ClothingSlotBase
+  id: CP14ClothingCloakMaidArpon
+  name: maid's apron
+  description: Cleanliness, orderliness and obedience are the main traits of a good maid.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/maid_apron.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/maid_apron.rsi
+
 - type: entity
   parent: CP14ClothingCloakBase
   id: CP14ClothingCloakFurcapeBlack

Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml

@@ -53,4 +53,15 @@
   - type: Sprite
     sprite: _CP14/Clothing/Pants/loincloth.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Pants/loincloth.rsi
+    sprite: _CP14/Clothing/Pants/loincloth.rsi
+
+- type: entity
+  parent: CP14ClothingPantsBase
+  id: CP14ClothingDressBlack
+  name: black dress
+  description: A roomy, feminine skirt
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Pants/Dress/black.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Pants/Dress/black.rsi

Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml

@@ -86,4 +86,4 @@
   - type: Sprite
     sprite: _CP14/Clothing/Shirt/steampunk.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Shirt/steampunk.rsi
+    sprite: _CP14/Clothing/Shirt/steampunk.rsi

Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml

@@ -20,4 +20,30 @@
     available:
       - random:
           dirt1: ""
-          dirt2: ""
+          dirt2: ""
+
+- type: entity
+  id: CP14MagicBeam1
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: /Textures/_CP14/Effects/Beams/magic.rsi
+    drawdepth: Effects
+    layers:
+    - state: magic1
+      shader: unshaded
+  - type: Physics
+    canCollide: false
+  - type: PointLight
+    enabled: true
+    color: "#4080FF"
+    radius: 3.5
+    softness: 1
+    autoRot: true
+    castShadows: false
+  - type: Beam
+  - type: TimedDespawn
+    lifetime: 3
+  - type: Tag
+    tags:
+      - HideContextMenu

Resources/Prototypes/_CP14/Entities/Markers/energyNodes.yml

@@ -0,0 +1,13 @@
+- type: entity
+  id: CP14AuraNodeBase
+  parent: MarkerBase
+  name: aura node
+  description: An energy node that affects the elemental energy in the surrounding space.
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: Mobs/Animals/mouse.rsi
+        state: icon-2 #TODO lol
+  - type: CP14AuraNode
+  - type: CP14RandomAuraNode

Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml

@@ -2,7 +2,7 @@
   id: CP14EnergyCrystalBase
   parent: BaseItem
   abstract: true
-  description: Processed quartz crystals are excellent repositories of magical energy. And special connectors allow you to conveniently insert them into magical devices, turning them into energy batteries.
+  description: Shards of one of the Khyber dragon, used to bind and control elemental energy.
   components:
   - type: CP14MagicEnergyCrystal
   - type: Item
@@ -11,13 +11,11 @@
     sprite: _CP14/Objects/Specific/Thaumaturgy/crystal.rsi
   - type: CP14MagicEnergyContainer
   - type: CP14MagicEnergyExaminable
-  - type: CP14MagicEnergyPointLightController
-
 
 - type: entity
   id: CP14EnergyCrystalSmall
   parent: CP14EnergyCrystalBase
-  name: small energy crystal
+  name: small Khyber shard
   suffix: Full
   components:
   - type: Sprite
@@ -48,7 +46,7 @@
 - type: entity
   id: CP14EnergyCrystalMedium
   parent: CP14EnergyCrystalBase
-  name: energy crystal
+  name: Khyber shard
   suffix: Full
   components:
   - type: PointLight

Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml

@@ -0,0 +1,19 @@
+- type: entity
+  id: CP14AuraScanner
+  parent: BaseItem
+  name: aura scanner
+  description: Scans the polarity of the elemental energy flows in this place.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Specific/Thaumaturgy/aura_scanner.rsi
+    state: icon
+  - type: Item
+    sprite: _CP14/Objects/Specific/Thaumaturgy/aura_scanner.rsi
+  - type: CP14AuraScanner
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/_CP14/Effects/aura_scanner.ogg
+      params:
+        variation: 0.03
+  - type: UseDelay
+    delay: 4

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Projectile/hitscan.yml

@@ -0,0 +1,14 @@
+- type: hitscan
+  id: CP14Magic
+  damage:
+    types:
+      Heat: 0
+  muzzleFlash:
+    sprite: _CP14/Effects/Beams/magic.rsi
+    state: muzzle_magic
+  travelFlash:
+    sprite: _CP14/Effects/Beams/magic.rsi
+    state: magic
+  impactFlash:
+    sprite: _CP14/Effects/Beams/magic.rsi
+    state: impact_magic

Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml

@@ -31,7 +31,7 @@
         hard: false
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.35,-0.4,0.35,0.4"
+          bounds: "-0.35,-0.35,0.35,0.35"
         density: 1000
         layer:
         - WallLayer
@@ -69,10 +69,6 @@
       #    CP14WoodLog:
       #      min: 1
       #      max: 3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14WoodenPlanks: 100
   - type: SpeedModifierContacts
     walkSpeedModifier: 0.5
     sprintSpeedModifier: 0.5

Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/normalizer.yml

@@ -1,6 +1,8 @@
 - type: entity
   id: CP14AlchemyNormalizer
-  parent: BaseStructureDynamic
+  parent: 
+  - BaseStructureDynamic
+  - CP14BaseCrystalSlot
   name: solution normalizer
   description: An alchemical device that removes fine precipitates from solutions, and stabilizes it for further work
   placement:
@@ -79,25 +81,4 @@
     fillBaseName: liq-
   - type: CP14MagicEnergyDraw
     energy: -0.2
-    delay: 1
-  - type: CP14MagicEnergyCrystalSlot
-    slotId: crystal_slot
-  - type: ContainerContainer
-    containers:
-      crystal_slot: !type:ContainerSlot
-  - type: ItemSlots
-    slots:
-      crystal_slot:
-        insertSound: 
-          path: /Audio/_CP14/Items/crystal_insert.ogg
-          params:
-            variation: 0.05
-        ejectSound: 
-          path: /Audio/_CP14/Items/crystal_eject.ogg
-          params:
-            variation: 0.05
-        ejectOnInteract: true
-        name: cp14-magic-energy-crystal-slot-name
-        whitelist:
-          components:
-          - CP14MagicEnergyCrystal
+    delay: 1

Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/elemental_reactor.yml

@@ -0,0 +1,27 @@
+- type: entity
+  id: CP14ElementalReactor
+  name: elemental reactor
+  description: A work of art created by the dwarves of Zilagro and House Lyrandar, controlling the fire elemental and allowing it to produce vast amounts of energy.
+  parent:
+  - BaseStructure
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Specific/Thaumaturgy/elemental_reactor.rsi #TODO resprite
+    state: base
+    drawdepth: Mobs
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.55,-0.85,0.55,0.85"
+        density: 1000
+        layer:
+        - WallLayer
+  - type: Physics
+    bodyType: Static
+  - type: CP14MagicEnergyContainer
+  - type: CP14MagicEnergyExaminable
+  - type: CP14MagicEnergyDraw
+    energy: 5
+    delay: 1

Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/pilon.yml

@@ -0,0 +1,25 @@
+- type: entity
+  id: CP14BaseCrystalSlot #TODO переструктуризовать объекты
+  abstract: true
+  components:
+  - type: CP14MagicEnergyCrystalSlot
+    slotId: crystal_slot
+  - type: ContainerContainer
+    containers:
+      crystal_slot: !type:ContainerSlot
+  - type: ItemSlots
+    slots:
+      crystal_slot:
+        insertSound: 
+          path: /Audio/_CP14/Items/crystal_insert.ogg
+          params:
+            variation: 0.05
+        ejectSound: 
+          path: /Audio/_CP14/Items/crystal_eject.ogg
+          params:
+            variation: 0.05
+        ejectOnInteract: true
+        name: cp14-magic-energy-crystal-slot-name
+        whitelist:
+          components:
+          - CP14MagicEnergyCrystal

Resources/Prototypes/_CP14/Loadouts/Jobs/basic.yml

@@ -7,6 +7,15 @@
   id: CP14ClothingCloakBlacksmithArpon
   equipment:
     cloak: CP14ClothingCloakBlacksmithArpon
+    
+- type: loadout
+  id: CP14ClothingCloakMaidArpon
+  equipment: CP14ClothingCloakMaidArpon
+
+- type: startingGear
+  id: CP14ClothingCloakMaidArpon
+  equipment:
+    cloak: CP14ClothingCloakMaidArpon
 
 
 - type: loadout
@@ -90,6 +99,7 @@
   equipment:
     head: CP14ClothingHeadMetalHeadband
 
+
 - type: loadout
   id: CP14ClothingHeadTriangularHat
   equipment: CP14ClothingHeadTriangularHat
@@ -99,6 +109,7 @@
   equipment:
     head: CP14ClothingHeadTriangularHat
 
+
 - type: loadout
   id: CP14ClothingHeadTriangularHatGolden
   equipment: CP14ClothingHeadTriangularHatGolden
@@ -108,6 +119,7 @@
   equipment:
     head: CP14ClothingHeadTriangularHatGolden
 
+
 - type: loadout
   id: CP14ClothingHeadRedBeret
   equipment: CP14ClothingHeadRedBeret
@@ -117,6 +129,7 @@
   equipment:
     head: CP14ClothingHeadRedBeret
 
+
 - type: loadout
   id: CP14ClothingHeadPurpleBeret
   equipment: CP14ClothingHeadPurpleBeret
@@ -126,6 +139,7 @@
   equipment:
     head: CP14ClothingHeadPurpleBeret
 
+
 - type: loadout
   id: CP14ClothingHeadYellowBeret
   equipment: CP14ClothingHeadYellowBeret
@@ -204,6 +218,16 @@
   id: CP14ClothingPantsLoincloth
   equipment:
     pants: CP14ClothingPantsLoincloth
+
+
+- type: loadout
+  id: CP14ClothingDressBlack
+  equipment: CP14ClothingDressBlack
+
+- type: startingGear
+  id: CP14ClothingDressBlack
+  equipment:
+    pants: CP14ClothingDressBlack
     
 # Shirt
 
@@ -216,7 +240,6 @@
   equipment:
     shirt: CP14ClothingShirtCottonBlue
 
-
 - type: loadout
   id: CP14ClothingShirtCottonBlack
   equipment: CP14ClothingShirtCottonBlack
@@ -226,7 +249,6 @@
   equipment:
     shirt: CP14ClothingShirtCottonBlack
 
-
 - type: loadout
   id: CP14ClothingShirtCottonPurple
   equipment: CP14ClothingShirtCottonPurple

Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml

@@ -10,6 +10,7 @@
   - CP14ClothingCloakBlacksmithArpon
   - CP14ClothingCloakFurcapeBlack
   - CP14ClothingCloakFurcapeBlue
+  - CP14ClothingCloakMaidArpon
 
 - type: loadoutGroup
   id: CP14BasicEyes
@@ -25,6 +26,7 @@
   minLimit: 0
   loadouts:
   - CP14Girdles
+
 - type: loadoutGroup
   id: CP14BasicMask
   name: cp14-loadout-basic-mask
@@ -54,6 +56,7 @@
   - CP14ClothingPantsTrouserDarkBlue
   - CP14ClothingPantsAristocratic
   - CP14ClothingPantsLoincloth
+  - CP14ClothingDressBlack
 
 - type: loadoutGroup
   id: CP14BasicShirt
@@ -86,4 +89,4 @@
   id: CP14CaptainCloak
   name: cp14-loadout-captain-cloak
   loadouts:
-  - CP14ClothingCloakCaptainJacket
+  - CP14ClothingCloakCaptainJacket