Merge pull request RonRonstation#215 from lemurian-ronstation/stop-nerfing-pkas

Revert "PKA Modkits + Rebalance (space-wizards#31247)"

Author: Merrokitsune

Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml

@@ -256,11 +256,11 @@
       children:
       - id: JetpackBlueFilled
       - id: JetpackBlackFilled
-    - !type:GroupSelector
-      children:
-      - id: PKAUpgradeDamage
-      - id: PKAUpgradeRange
-      - id: PKAUpgradeFireRate
+    # - !type:GroupSelector
+    #   children:
+    #   - id: PKAUpgradeDamage
+    #   - id: PKAUpgradeRange
+    #   - id: PKAUpgradeFireRate
 
 
 - type: entityTable

Resources/Prototypes/Entities/Objects/Tools/pka_upgrade.yml

@@ -1,80 +1,80 @@
-- type: entity
-  id: BasePKAUpgrade
-  parent: BaseItem
-  name: PKA modkit
-  description: A modkit for a proto-kinetic accelerator.
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: Objects/Tools/upgrade.rsi
-  - type: Item
-    size: Small
-  - type: GunUpgrade
-  - type: StaticPrice
-    price: 750
-  - type: Tag
-    tags:
-    - PKAUpgrade
+# - type: entity
+#   id: BasePKAUpgrade
+#   parent: BaseItem
+#   name: PKA modkit
+#   description: A modkit for a proto-kinetic accelerator.
+#   abstract: true
+#   components:
+#   - type: Sprite
+#     sprite: Objects/Tools/upgrade.rsi
+#   - type: Item
+#     size: Small
+#   - type: GunUpgrade
+#   - type: StaticPrice
+#     price: 750
+#   - type: Tag
+#     tags:
+#     - PKAUpgrade
 
-- type: entity
-  id: PKAUpgradeDamage
-  parent: BasePKAUpgrade
-  name: PKA modkit (damage)
-  components:
-  - type: Sprite
-    layers:
-    - state: base
-    - state: overlay-1
-      color: "#ec9b2d"
-    - state: overlay-2
-      color: "#a71010"
-    - state: overlay-3
-      color: "#eb4c13"
-  - type: GunUpgrade
-    tags: [ GunUpgradeDamage ]
-    examineText: gun-upgrade-examine-text-damage
-  - type: GunUpgradeDamage
-    damage:
-      types:
-        Blunt: 10
-        Structural: 15
+# - type: entity
+#   id: PKAUpgradeDamage
+#   parent: BasePKAUpgrade
+#   name: PKA modkit (damage)
+#   components:
+#   - type: Sprite
+#     layers:
+#     - state: base
+#     - state: overlay-1
+#       color: "#ec9b2d"
+#     - state: overlay-2
+#       color: "#a71010"
+#     - state: overlay-3
+#       color: "#eb4c13"
+#   - type: GunUpgrade
+#     tags: [ GunUpgradeDamage ]
+#     examineText: gun-upgrade-examine-text-damage
+#   - type: GunUpgradeDamage
+#     damage:
+#       types:
+#         Blunt: 10
+#         Structural: 15
 
-- type: entity
-  id: PKAUpgradeRange
-  parent: BasePKAUpgrade
-  name: PKA modkit (range)
-  components:
-  - type: Sprite
-    layers:
-    - state: base
-    - state: overlay-1
-      color: "#2decec"
-    - state: overlay-2
-      color: "#1012a7"
-    - state: overlay-3
-      color: "#1373eb"
-  - type: GunUpgrade
-    tags: [ GunUpgradeRange ]
-    examineText: gun-upgrade-examine-text-range
-  - type: GunUpgradeSpeed
-    coefficient: 1.5
+# - type: entity
+#   id: PKAUpgradeRange
+#   parent: BasePKAUpgrade
+#   name: PKA modkit (range)
+#   components:
+#   - type: Sprite
+#     layers:
+#     - state: base
+#     - state: overlay-1
+#       color: "#2decec"
+#     - state: overlay-2
+#       color: "#1012a7"
+#     - state: overlay-3
+#       color: "#1373eb"
+#   - type: GunUpgrade
+#     tags: [ GunUpgradeRange ]
+#     examineText: gun-upgrade-examine-text-range
+#   - type: GunUpgradeSpeed
+#     coefficient: 1.5
 
-- type: entity
-  id: PKAUpgradeFireRate
-  parent: BasePKAUpgrade
-  name: PKA modkit (fire rate)
-  components:
-  - type: Sprite
-    layers:
-    - state: base
-    - state: overlay-1
-      color: "#bbf134"
-    - state: overlay-2
-      color: "#07901b"
-    - state: overlay-3
-      color: "#9bf134"
-  - type: GunUpgrade
-    tags: [ GunUpgradeReloadSpeed ]
-    examineText: gun-upgrade-examine-text-reload
-  - type: GunUpgradeFireRate
-    coefficient: 1.5
+# - type: entity
+#   id: PKAUpgradeFireRate
+#   parent: BasePKAUpgrade
+#   name: PKA modkit (fire rate)
+#   components:
+#   - type: Sprite
+#     layers:
+#     - state: base
+#     - state: overlay-1
+#       color: "#bbf134"
+#     - state: overlay-2
+#       color: "#07901b"
+#     - state: overlay-3
+#       color: "#9bf134"
+#   - type: GunUpgrade
+#     tags: [ GunUpgradeReloadSpeed ]
+#     examineText: gun-upgrade-examine-text-reload
+#   - type: GunUpgradeFireRate
+#     coefficient: 1.5

Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml

@@ -7,9 +7,7 @@
     sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
-    size: Large
-    shape:
-    - 0,0,2,1
+    size: Normal
   - type: GunWieldBonus
     minAngle: -43
     maxAngle: -43

Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml

@@ -13,10 +13,10 @@
       map: [ "empty-icon" ]
   # todo: add itemcomponent with inhandVisuals states using unused texture and animation assets in kinetic_accelerator.rsi
   # todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi
-  - type: UpgradeableGun
-    whitelist:
-      tags:
-      - PKAUpgrade
-  - type: ContainerContainer
-    containers:
-      upgrades: !type:Container
+  # - type: UpgradeableGun
+  #   whitelist:
+  #     tags:
+  #     - PKAUpgrade
+  # - type: ContainerContainer
+  #   containers:
+  #     upgrades: !type:Container

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

@@ -461,7 +461,7 @@
         Structural: 30
   # Short lifespan
   - type: TimedDespawn
-    lifetime: 0.22 # roughly 5.5 tiles
+    lifetime: 4
   - type: GatheringProjectile
 
 - type: entity

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

@@ -399,7 +399,7 @@
     - SecurityWeaponsStatic
     dynamicPacks:
     - SalvageSecurityBoards
-    - SalvageSecurityWeapons
+    # - SalvageSecurityWeapons
     - SecurityEquipment
     - SecurityBoards
     - SecurityExplosives

Resources/Prototypes/Recipes/Lathes/Packs/science.yml

@@ -53,9 +53,9 @@
   - WeaponPistolCHIMP
   - WeaponForceGun
   - WeaponProtoKineticAccelerator
-  - PKAUpgradeDamage
-  - PKAUpgradeRange
-  - PKAUpgradeFireRate
+  # - PKAUpgradeDamage
+  # - PKAUpgradeRange
+  # - PKAUpgradeFireRate
   - WeaponTetherGun
   - WeaponGauntletGorilla
 

Resources/Prototypes/Recipes/Lathes/Packs/shared.yml

@@ -55,10 +55,10 @@
   recipes:
   - ShuttleGunKineticCircuitboard
 
-- type: latheRecipePack
-  id: SalvageSecurityWeapons
-  recipes:
-  - WeaponProtoKineticAccelerator
-  - PKAUpgradeDamage
-  - PKAUpgradeRange
-  - PKAUpgradeFireRate
+# - type: latheRecipePack
+#   id: SalvageSecurityWeapons
+#   recipes:
+#   - WeaponProtoKineticAccelerator
+#   - PKAUpgradeDamage
+#   - PKAUpgradeRange
+#   - PKAUpgradeFireRate

Resources/Prototypes/Recipes/Lathes/salvage.yml

@@ -69,36 +69,36 @@
     Silver: 200
     Diamond: 100
 
-- type: latheRecipe
-  id: PKAUpgradeDamage
-  result: PKAUpgradeDamage
-  categories:
-  - Weapons
-  completetime: 5
-  materials:
-    Steel: 1500
-    Gold: 500
-    Silver: 500
+# - type: latheRecipe
+#   id: PKAUpgradeDamage
+#   result: PKAUpgradeDamage
+#   categories:
+#   - Weapons
+#   completetime: 5
+#   materials:
+#     Steel: 1500
+#     Gold: 500
+#     Silver: 500
 
-- type: latheRecipe
-  id: PKAUpgradeRange
-  result: PKAUpgradeRange
-  categories:
-  - Weapons
-  completetime: 5
-  materials:
-    Steel: 1500
-    Gold: 500
-    Silver: 500
+# - type: latheRecipe
+#   id: PKAUpgradeRange
+#   result: PKAUpgradeRange
+#   categories:
+#   - Weapons
+#   completetime: 5
+#   materials:
+#     Steel: 1500
+#     Gold: 500
+#     Silver: 500
 
-- type: latheRecipe
-  id: PKAUpgradeFireRate
-  result: PKAUpgradeFireRate
-  categories:
-  - Weapons
-  completetime: 5
-  materials:
-    Steel: 1500
-    Gold: 500
-    Silver: 500
+# - type: latheRecipe
+#   id: PKAUpgradeFireRate
+#   result: PKAUpgradeFireRate
+#   categories:
+#   - Weapons
+#   completetime: 5
+#   materials:
+#     Steel: 1500
+#     Gold: 500
+#     Silver: 500
 

Resources/Prototypes/Research/arsenal.yml

@@ -155,19 +155,19 @@
   recipeUnlocks:
   - WeaponXrayCannon
 
-- type: technology
-  id: KineticModifications
-  name: research-technology-kinetic-modifications
-  icon:
-    sprite: Objects/Tools/upgrade.rsi
-    state: display
-  discipline: Arsenal
-  tier: 2
-  cost: 7500
-  recipeUnlocks:
-  - PKAUpgradeDamage
-  - PKAUpgradeRange
-  - PKAUpgradeFireRate
+# - type: technology
+#   id: KineticModifications
+#   name: research-technology-kinetic-modifications
+#   icon:
+#     sprite: Objects/Tools/upgrade.rsi
+#     state: display
+#   discipline: Arsenal
+#   tier: 2
+#   cost: 7500
+#   recipeUnlocks:
+#   - PKAUpgradeDamage
+#   - PKAUpgradeRange
+#   - PKAUpgradeFireRate
 
 - type: technology
   id: BasicShuttleArmament