Consolidate Arsenal Research

Resources/Locale/en-US/research/technologies.ftl

@@ -23,20 +23,14 @@ research-technology-portable-fission = Portable Fission
 research-technology-space-scanning = Space Scanning
 research-technology-excavation = Mass Excavation
 
-research-technology-salvage-weapons = Salvage Weapons
+research-technology-basic-weapons = Basic Weapons
 research-technology-draconic-munitions = Draconic Munitions
 research-technology-uranium-munitions = Uranium Munitions
 research-technology-explosive-technology = Explosive Technology
-research-technology-weaponized-laser-manipulation = Weaponized Laser Manipulation
 research-technology-nonlethal-ammunition = Nonlethal Ammunition
 research-technology-practice-ammunition = Practice Ammunition
-research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry
-research-technology-wave-particle-harnessing = Wave Particle Harnessing
-research-technology-advanced-riot-control = Advanced Riot Control
-research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponry
-research-technology-experimental-battery-ammo = Experimental Battery Ammo
-research-technology-basic-shuttle-armament = Shuttle basic armament
-research-technology-advanced-shuttle-weapon = Advanced shuttle weapons
+research-technology-advanced-weapons = Advanced Weapons
+research-technology-prototype-weapons = Prototype Weapons
 
 research-technology-basic-robotics = Basic Robotics
 research-technology-basic-anomalous-research = Basic Anomalous Research

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

@@ -854,8 +854,12 @@
       - WeaponRifleGestio
       - MagazineMagnumLeverRifle # Goobstation
       - MagazineMagnumLeverRifleEmpty # Goobstation
-    dynamicRecipes:
+      - ClothingEyesGlassesSecurity
+      - TelescopicShield
+      - HoloprojectorSecurity
       - BolaEnergy
+    dynamicRecipes:
+      - Truncheon
       - BoxBeanbag
       - BoxShotgunIncendiary
       - BoxShotgunUranium
@@ -872,13 +876,11 @@
       - CartridgeMagnumRubber
       - CartridgePistolRubber
       - CartridgeRifleRubber
-      - ClothingEyesGlassesSecurity
       - ExplosivePayload
       - FlashPayload
       - GrenadeBlast
       - GrenadeEMP
       - GrenadeFlash
-      - HoloprojectorSecurity
       - MagazineBoxLightRifleIncendiary
       - MagazineBoxLightRifleUranium
       - MagazineBoxMagnumIncendiary
@@ -927,9 +929,7 @@
       - SpeedLoaderRifleHeavyRubber
       - SpeedLoaderRifleHeavyIncendiary
       - SpeedLoaderRifleHeavyUranium
-      - TelescopicShield
       - TimerTrigger
-      - Truncheon
       - VoiceTrigger
       - WeaponAdvancedLaser
       - WeaponDisabler

Resources/Prototypes/Nyanotrasen/Research/experimental.yml

@@ -12,8 +12,9 @@
   recipeUnlocks:
   - ClothingHeadHelmetInsulated
   - ClothingHeadCage
-  # - ShellSoulbreaker # DeltaV - Placing it under Exotic Ammunition because that's what it is.
-
+  - CartridgeSpecialHoly
+  - CartridgeSpecialMindbreaker
+  - ShellSoulbreaker
 
 # Tier 3
 

Resources/Prototypes/Research/arsenal.yml

@@ -1,18 +1,27 @@
 # Tier 1
 
+# STOP. STOP ADDING NEW WEAPONS AS A SINGLE RESEARCH ENTRY. ADD NEW WEAPONS HERE, NOT ON THEIR OWN.
+# DO NOT ADD ANOTHER TECH
 - type: technology
-  id: SalvageWeapons
-  name: research-technology-salvage-weapons
+  id: BasicWeapons
+  name: research-technology-basic-weapons
   icon:
-    sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
+    sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi
     state: icon
   discipline: Arsenal
   tier: 1
-  cost: 5000
+  cost: 10000
   recipeUnlocks:
   - WeaponProtoKineticAccelerator
   - ShuttleGunKineticCircuitboard
-  # These are roundstart but not replenishable for salvage
+  - WeaponLaserCarbine
+  - WeaponEnergyGun
+  - WeaponEnergyGunMini
+  - WeaponLaserSvalinn
+  - WeaponEnergyGunPistol
+  - WeaponDisablerSMG
+  - Truncheon
+  #- WeaponPistolMk58 #todo: Add a bunch of basic ballistic guns to the list and make lathe recipes for them.
 
 - type: technology
   id: DraconicMunitions
@@ -31,28 +40,14 @@
   - MagazineMagnumIncendiary
   - MagazineLightRifleIncendiary
   - SpeedLoaderMagnumIncendiary
-  - SpeedLoaderRifleHeavyIncendiary # Frontier
+  - SpeedLoaderRifleHeavyIncendiary
   - MagazineShotgunIncendiary
   - MagazineBoxPistolIncendiary
   - MagazineBoxMagnumIncendiary
   - MagazineBoxLightRifleIncendiary
   - MagazineBoxRifleIncendiary
-  # DeltaV - .38 special incendiary ammo - Add .38 special incendiary ammo to the research tree
   - CartridgeSpecialIncendiary
   - MagazineBoxSpecialIncendiary
-  # End of modified code
-
-- type: technology
-  id: WeaponizedLaserManipulation
-  name: research-technology-weaponized-laser-manipulation
-  icon:
-    sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi
-    state: icon
-  discipline: Arsenal
-  tier: 1
-  cost: 7500
-  recipeUnlocks:
-  - WeaponLaserCarbine
 
 - type: technology
   id: NonlethalAmmunition
@@ -115,25 +110,22 @@
   - CartridgeSpecialUranium
   - MagazineBoxSpecialUranium
 
-- type: technology
-  id: AdvancedRiotControl
-  name: research-technology-advanced-riot-control
-  icon:
-    sprite: Objects/Weapons/Melee/truncheon.rsi
-    state: icon
-  discipline: Arsenal
-  tier: 1
-  cost: 8000
-  recipeUnlocks:
-  - ClothingEyesGlassesSecurity
-  - Truncheon
-  - TelescopicShield
-  - HoloprojectorSecurity
-  - WeaponDisablerSMG
-  - BolaEnergy
-
 # Tier 2
 
+# TODO: Make lathe recipes for a variety of advanced tacsuits.
+# TODO: Also make the "Unpainted Gunmetal Grey" versions of the suits.
+# - type: technology
+#   id: AdvancedTacsuits
+#   name: research-technology-advanced-tacsuits
+#   icon:
+#     sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi
+#     state: icon
+#   discipline: Arsenal
+#   tier: 2
+#   cost: 15000
+#   recipeUnlocks:
+#   - ClothingOuterHardsuitCombatStandard
+
 - type: technology
   id: ExplosiveTechnology
   name: research-technology-explosive-technology
@@ -151,40 +143,17 @@
   - FlashPayload
   - ExplosivePayload
   - ChemicalPayload
+  # TODO: Add "Explosive Ammunition" to this tech to make it waaaay more interesting.
 
 - type: technology
-  id: ConcentratedLaserWeaponry
-  name: research-technology-concentrated-laser-weaponry
+  id: AdvancedWeapons
+  name: research-technology-advanced-weapons
   icon:
     sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
     state: icon
   discipline: Arsenal
   tier: 2
-  cost: 10000
-  recipeUnlocks:
-  - WeaponLaserCannon
-
-- type: technology
-  id: WaveParticleHarnessing
-  name: research-technology-wave-particle-harnessing
-  icon:
-    sprite: Objects/Weapons/Guns/Battery/xray.rsi
-    state: icon
-  discipline: Arsenal
-  tier: 2
-  cost: 10000
-  recipeUnlocks:
-  - WeaponXrayCannon
-
-- type: technology
-  id: BasicShuttleArmament
-  name: research-technology-basic-shuttle-armament
-  icon:
-    sprite: Structures/Power/cage_recharger.rsi
-    state: full
-  discipline: Arsenal
-  tier: 2
-  cost: 10500
+  cost: 15000
   recipeUnlocks:
   - PowerCageRechargerCircuitboard
   - PowerCageSmall
@@ -195,48 +164,42 @@
   - ShuttleGunSvalinnMachineGunCircuitboard
   - ShuttleGunPerforatorCircuitboard
   - ShuttleGunFriendshipCircuitboard
+  - WeaponXrayCannon
+  - WeaponLaserCannon
+  - WeaponGunLaserCarbineAutomatic
   technologyPrerequisites:
-  - SalvageWeapons
+  - BasicWeapons
 
 # Tier 3
 
+# TODO: Make lathe recipes for a variety of prototype tacsuits.
+# TODO: Also make the "Unpainted Gunmetal Grey" versions of the suits.
+# - type: technology
+#   id: PrototypeTacsuits
+#   name: research-technology-prototype-tacsuits
+#   icon:
+#     sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
+#     state: icon
+#   discipline: Arsenal
+#   tier: 3
+#   cost: 20000
+#   recipeUnlocks:
+#   - ClothingOuterHardsuitSyndieReverseEngineered
+
 - type: technology
-  id: PortableMicrofusionWeaponry
-  name: research-technology-portable-microfusion-weaponry
+  id: PrototypeWeapons
+  name: research-technology-prototype-weapons
   icon:
     sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi
     state: icon
   discipline: Arsenal
   tier: 3
-  cost: 15000
+  cost: 20000
   recipeUnlocks:
   - WeaponAdvancedLaser
   - PortableRecharger
-
-- type: technology
-  id: ExperimentalBatteryAmmo
-  name: research-technology-experimental-battery-ammo
-  icon:
-    sprite: Objects/Weapons/Guns/Battery/svalinn.rsi
-    state: icon
-  discipline: Arsenal
-  tier: 3
-  cost: 15000
-  recipeUnlocks:
-  - WeaponLaserSvalinn
-
-- type: technology
-  id: AdvancedShuttleWeapon
-  name: research-technology-advanced-shuttle-weapon
-  icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi
-    state: icon
-  discipline: Arsenal
-  tier: 3
-  cost: 15000
-  recipeUnlocks:
   - GrenadeEMP
   - PowerCageHigh
   - ShuttleGunDusterCircuitboard
-  technologyPrerequisites:
-  - BasicShuttleArmament
+  #- EnergySword # TODO: Add a bunch of stupidly exotic energy weapons to act as a reaaaaaally nice incentive for research to consider this.
+                 # Make the energy sword for instance include bananium and bluespace in its recipe. :)