[FEATURE] Реворк работы утилизаторов.

Resources/Prototypes/Damage/modifier_sets.yml

@@ -40,14 +40,29 @@
 - type: damageModifierSet
   id: Rock
   coefficients:
-    Structural: 4
+    Structural: 5
     Blunt: 0.5
     Slash: 0.25
-    Piercing: 0.75
-    Heat: 0.9
+    Piercing: 0.5
+    Heat: 0.75
   flatReductions:
     Blunt: 5
 
+- type: damageModifierSet
+  id: RockStrong
+  coefficients:
+    Structural: 5
+    Blunt: 0.25
+    Slash: 0.1
+    Piercing: 0.25
+    Heat: 0.5
+  flatReduction:
+    Blunt: 10
+    Slash: 10
+    Piercing: 10
+    Heat: 10
+    Structural: 10
+
 - type: damageModifierSet
   id: PerforatedMetallic
   coefficients:

Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml

@@ -1,25 +1,25 @@
+# WD edit. Changed behavior to getting Structural damage, so it's now StructuralInorganic
+# Was Inorganic and gatherable by pickaxe (removed).
+# OreChance increased from 0.33 to 0.5 and from 0.2 to 0.25
+
 - type: entity
-  id: AsteroidAltRock #It's 1994
+  id: AsteroidAltRock #It was 1994. Now it's 2024.
   parent: BaseStructure
   name: asteroid rock
   suffix: Low Ore Yield
   description: A rocky asteroid.
   components:
-  - type: Gatherable
-    whitelist:
-      tags:
-        - Pickaxe
   - type: Sprite
     sprite: DeltaV/Structures/Walls/asteroid_rock.rsi
     state: full
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: RockStrong
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 150
+        damage: 100
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
@@ -40,7 +40,7 @@
     key: walls
     base: rock_
   - type: OreVein
-    oreChance: 0.2
+    oreChance: 0.25
     oreRarityPrototypeId: RandomOreDistributionStandard
 
 - type: entity
@@ -57,35 +57,24 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 300
+        damage: 200
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: OreVein
-    oreChance: 0.20
+    oreChance: 0.25
     oreRarityPrototypeId: RandomOreDistributionHigh
 
 - type: entity
   id: MountainRock
   parent: BaseStructure
   name: mountain rock
-  suffix: Un-mineable
+  suffix: Un-destructible
   description: A craggy mountain wall. It is too hard to mine.
   components:
   - type: Sprite
     sprite: DeltaV/Structures/Walls/mountain_rock.rsi
     state: full
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 1500
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
   - type: Occluder
   - type: Airtight
   - type: Fixtures
@@ -110,12 +99,8 @@
   suffix: Higher Ore Yield
   description: A rocky asteroid.
   components:
-  - type: Gatherable
-    whitelist:
-      tags:
-        - Pickaxe
   - type: OreVein
-    oreChance: 0.33
+    oreChance: 0.5
     oreRarityPrototypeId: RandomOreDistributionStandard
 
 - type: entity
@@ -126,5 +111,5 @@
   description: A rocky asteroid.
   components:
   - type: OreVein
-    oreChance: 0.33
+    oreChance: 0.5
     oreRarityPrototypeId: OreCrab

Resources/Prototypes/Entities/Objects/Weapons/Guns/Material/plasma_guns.yml

@@ -0,0 +1,73 @@
+- type: entity
+  id: BaseWeaponBattery
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Sprite
+  - type: Item
+    size: Huge
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: AmmoCounter
+  - type: Gun
+    fireRate: 2
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    fireOnDropChance: 0.15
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+    doRecoil: false
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: false
+  - type: Appearance
+  - type: StaticPrice
+    price: 500
+  - type: MeleeWeapon # WD EDIT
+    attackRate: 0.7
+    damage:
+      types:
+        Blunt: 10
+    soundHit:
+      collection: GenericHit
+
+- type: entity
+  id: BasePlasmaGun
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Sprite
+  - type: Item
+    size: Huge
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: AmmoCounter
+  - type: Gun
+    fireRate: 2
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    fireOnDropChance: 0.15
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+    doRecoil: false
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: false
+  - type: Appearance
+  - type: StaticPrice
+    price: 500

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

@@ -138,3 +138,37 @@
   impactFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: impact_beam_heavy2
+
+- type: hitscan
+  id: PlasmaLaser
+  maxLength: 4
+  damage:
+    types:
+      Heat: 10
+      Structural: 30
+  muzzleFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: muzzle_beam_heavy
+  travelFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: beam
+  impactFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: impact_beam_heavy
+
+- type: hitscan
+  id: LongPlasmaLaser
+  maxLength: 7
+  damage:
+    types:
+      Heat: 10
+      Structural: 30
+  muzzleFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: muzzle_beam_heavy
+  travelFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: beam
+  impactFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: impact_beam_heavy

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

@@ -415,10 +415,10 @@
     damage:
       types:
         Blunt: 25
-        Structural: 30
+        Structural: 20
   # Short lifespan
   - type: TimedDespawn
-    lifetime: 0.4
+    lifetime: 0.2 # WD EDIT / Actually short bullet, ~4 tiles.
 
 - type: entity
   id: BulletKineticShuttle

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

@@ -43,7 +43,7 @@
     capacity: 1
     count: 1
   - type: MeleeWeapon
-    attackRate: 0.75
+    attackRate: 0.5
     range: 1.75
     wideAnimationRotation: -135
     damage:
@@ -61,7 +61,7 @@
       types:
         Blunt: 2.5
         Slash: 2.5
-        Structural: 30
+        Structural: 20
   - type: GunRequiresWield
   - type: Item
     size: Ginormous
@@ -106,8 +106,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/crusher_glaive.rsi
-  - type: UseDelay
-    delay: 1.9
   - type: LeechOnMarker
     leech:
       groups:

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

@@ -30,7 +30,7 @@
     damage:
       types:
         Blunt: 5
-        Structural: 30
+        Structural: 20
   - type: Item
     size: Normal
     shape:
@@ -59,18 +59,16 @@
     wideAnimationRotation: -90
     soundHit:
       path: "/Audio/Items/drill_hit.ogg"
-    attackRate: 0.5
-    range: 1.4
+    attackRate: 1
+    range: 1
     damage:
       types:
         Blunt: 9
         Slash: 3
-        Structural: 12
-    bluntStaminaDamageFactor: 4.0
+        Structural: 20
     heavyRateModifier: 1
     heavyRangeModifier: 2
     heavyDamageBaseModifier: 1
-    heavyStaminaCost: 10
     maxTargets: 3
     angle: 20
 

Resources/Prototypes/Entities/Structures/Walls/asteroid.yml

@@ -36,7 +36,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 120
+        damage: 100
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
@@ -374,13 +374,9 @@
     - type: Transform
       noRot: true
     - type: SoundOnGather
-    - type: Gatherable
-      whitelist:
-        tags:
-          - Pickaxe
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: RockStrong
     - type: Destructible
       thresholds:
         - trigger: