De-mangle the arsenal.yml

Resources/Prototypes/Research/arsenal.yml

@@ -15,27 +15,26 @@
   # These are roundstart but not replenishable for salvage
 
 - type: technology
-  id: BasicShuttleArmament
-  name: research-technology-basic-shuttle-armament
+  id: DraconicMunitions
+  name: research-technology-draconic-munitions
   icon:
-    sprite: Structures/Power/cage_recharger.rsi
-    state: full
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
+    state: incendiarydisplay
   discipline: Arsenal
-  tier: 1 #Delta-V moved to T1
-  cost: 10500
+  tier: 2 #Delta-V moved to t2
+  cost: 10000
   recipeUnlocks:
-  - PowerCageRechargerCircuitboard
-  - PowerCageSmall
-  - PowerCageMedium
-  - MagazineGrenadeEmpty
-  - GrenadeFlash
-  - GrenadeBlast 
-  - ShuttleGunSvalinnMachineGunCircuitboard
-  - ShuttleGunPerforatorCircuitboard
-  - ShuttleGunFriendshipCircuitboard
-  technologyPrerequisites:
-  - SalvageWeapons
-  - ExplosiveTechnology
+  - BoxShotgunIncendiary
+  - MagazineRifleIncendiary
+  - MagazinePistolIncendiary
+  - MagazineLightRifleIncendiary
+  - SpeedLoaderMagnumIncendiary
+  - MagazineShotgunIncendiary
+  - MagazineBoxPistolIncendiary
+  - MagazineBoxMagnumIncendiary
+  - MagazineBoxLightRifleIncendiary
+  - MagazineBoxRifleIncendiary
+  - MagazineBoxSpecialIncendiary # DeltaV
 
 - type: technology
   id: WeaponizedLaserManipulation
@@ -76,6 +75,29 @@
   - MagazineBoxSpecialRubber
   # End of modified code
 
+- type: technology
+  id: UraniumMunitions
+  name: research-technology-uranium-munitions
+  icon:
+    sprite: Objects/Materials/Sheets/other.rsi
+    state: uranium
+  discipline: Arsenal
+  tier: 2 #Delta-V moved to t2
+  cost: 7500
+  recipeUnlocks:
+  - MagazineRifleUranium
+  - MagazinePistolUranium
+  - MagazineLightRifleUranium
+  - SpeedLoaderMagnumUranium
+  - MagazineBoxPistolUranium
+  - MagazineBoxMagnumUranium
+  - MagazineBoxLightRifleUranium
+  - MagazineBoxRifleUranium
+  - BoxShotgunUranium
+  # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree
+  - SpeedLoaderSpecialUranium
+  - MagazineBoxSpecialUranium
+  # End of modified code
 
 - type: technology
   id: AdvancedRiotControl
@@ -135,69 +157,59 @@
     state: icon
   discipline: Arsenal
   tier: 2
-  cost: 12500 #DeltaV- Raised to 12500 from 10000 
+  cost: 12500 #Delta-V increased from 10000
   recipeUnlocks:
   - WeaponLaserCannon
-  - WeaponXrayCannon 
+  - WeaponXrayCannon
+
+#- type: technology Delta-V merged with concentrated laser weaponry
+ # 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: UraniumMunitions
-  name: research-technology-uranium-munitions
+  id: BasicShuttleArmament
+  name: research-technology-basic-shuttle-armament
   icon:
-    sprite: Objects/Materials/Sheets/other.rsi
-    state: uranium
+    sprite: Structures/Power/cage_recharger.rsi
+    state: full
   discipline: Arsenal
-  tier: 2 #Delta-V moved to t2
-  cost: 7500
+  tier: 1 #Delta-V moved to T1
+  cost: 10500
   recipeUnlocks:
-  - MagazineRifleUranium
-  - MagazinePistolUranium
-  - MagazineLightRifleUranium
-  - SpeedLoaderMagnumUranium
-  - MagazineBoxPistolUranium
-  - MagazineBoxMagnumUranium
-  - MagazineBoxLightRifleUranium
-  - MagazineBoxRifleUranium
-  - BoxShotgunUranium
-  # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree
-  - SpeedLoaderSpecialUranium
-  - MagazineBoxSpecialUranium
-  # End of modified code
+  - PowerCageRechargerCircuitboard
+  - PowerCageSmall
+  - PowerCageMedium
+  - MagazineGrenadeEmpty
+  - GrenadeFlash
+  - GrenadeBlast 
+  - ShuttleGunSvalinnMachineGunCircuitboard
+  - ShuttleGunPerforatorCircuitboard
+  - ShuttleGunFriendshipCircuitboard
+  technologyPrerequisites:
+  - SalvageWeapons
+  - ExplosiveTechnology
 
-#Delta-V merged with concentrated laser weaponry
-#- 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 
+# Tier 3
 
 - type: technology
-  id: DraconicMunitions
-  name: research-technology-draconic-munitions
+  id: PortableMicrofusionWeaponry
+  name: research-technology-portable-microfusion-weaponry
   icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
-    state: incendiarydisplay
+    sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi
+    state: icon
   discipline: Arsenal
-  tier: 2 #Delta-V moved to t2
-  cost: 10000
+  tier: 3
+  cost: 15000
   recipeUnlocks:
-  - BoxShotgunIncendiary
-  - MagazineRifleIncendiary
-  - MagazinePistolIncendiary
-  - MagazineLightRifleIncendiary
-  - SpeedLoaderMagnumIncendiary
-  - MagazineShotgunIncendiary
-  - MagazineBoxPistolIncendiary
-  - MagazineBoxMagnumIncendiary
-  - MagazineBoxLightRifleIncendiary
-  - MagazineBoxRifleIncendiary
-  - MagazineBoxSpecialIncendiary # DeltaV
+  - WeaponAdvancedLaser
 
 - type: technology
   id: ExperimentalBatteryAmmo
@@ -211,35 +223,18 @@
   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: 2
+  tier: 2 #Delta-V moved to t2
   cost: 15000
   recipeUnlocks:
   - GrenadeEMP
   - PowerCageHigh
   - ShuttleGunDusterCircuitboard
   technologyPrerequisites:
   - BasicShuttleArmament
-
-# Tier 3
-
-- type: technology
-  id: PortableMicrofusionWeaponry
-  name: research-technology-portable-microfusion-weaponry
-  icon:
-    sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi
-    state: icon
-  discipline: Arsenal
-  tier: 3
-  cost: 15000
-  recipeUnlocks:
-  - WeaponAdvancedLaser
-
-