Arsenal tech overhaul

Resources/Prototypes/DeltaV/Research/arsenal.yml

@@ -32,24 +32,38 @@
   id: EnergyGunsAdvanced
   name: research-technology-energy-gun-advance
   icon:
-    sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi #changed sprite to ik-60
     state: icon
   discipline: Arsenal
   tier: 2
-  cost: 7500
+  cost: 12500
   recipeUnlocks:
   - WeaponEnergyGunPistol
+  - WeaponGunLaserCarbineAutomatic
 
-- type: technology
-  id: Advanced Laser Manipulation
-  name: research-technology-advance-laser
+- type:  technology
+  id: RobustMelee
+  name: research-technology-robust-melee
   icon:
-    sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi
+    sprite: Objects/Weapons/Melee/Advanced trunch
     state: icon
   discipline: Arsenal
-  tier: 2
-  cost: 12500
+  tier: 3
+  Cost: 12500
   recipeUnlocks:
-  - WeaponGunLaserCarbineAutomatic
+  - AdvancedTruncheon
+
+#Merged with EnergyGunsAdvanced
+#- type: technology
+#  id: Advanced Laser Manipulation
+#  name: research-technology-advance-laser
+#  icon:
+#    sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi
+#    state: icon
+#  discipline: Arsenal
+#  tier: 2
+ # cost: 12500
+#  recipeUnlocks:
+#  - WeaponGunLaserCarbineAutomatic
 
 

Resources/Prototypes/Entities/Objects/Weapons/Melee/Advanced Truncheon.yml

@@ -0,0 +1,33 @@
+- type: entity
+  name: Advanced Truncheon
+  parent: BaseItem
+  id: AdvancedTruncheon
+  description: If all else fails, BONK!
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/Advanced trunch
+    state: icon
+  - type: Item
+    size: Normal
+  - type: MeleeWeapon
+    attackRate: 0.75
+    range: 1.75
+    damage:
+      types:
+        Blunt: 16
+    soundHit:
+      path: /Audio/Nyanotrasen/Weapons/club.ogg
+    bluntStaminaDamageFactor: 1.60 # 25.6 stamina damage
+#  - type: MeleeStaminaCost
+#    swing: 10
+#    wieldCoefficient: 0.35 #if wielded you will only consume 3.5 stam its a weapon after all
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 14
+  - type: Clothing
+    sprite: Objects/Weapons/Melee/Advanced trunch
+    quickEquip: false
+    slots:
+    - back

Resources/Prototypes/Recipes/Lathes/security.yml

@@ -657,6 +657,16 @@
     Plastic: 100
     Glass: 20
 
+    - type: latheRecipe
+  parent: BaseWeaponRecipe
+  id: AdvancedTruncheon
+  result: AdvancedTruncheon
+  completetime: 5
+  Materials:
+    Steel: 1000
+    Plastic: 800
+
+
 # DeltaV: removed, idk why
 #- type: latheRecipe
 #  id: PortableRecharger

Resources/Prototypes/Research/arsenal.yml

@@ -15,26 +15,27 @@
   # These are roundstart but not replenishable for salvage
 
 - type: technology
-  id: DraconicMunitions
-  name: research-technology-draconic-munitions
+  id: BasicShuttleArmament
+  name: research-technology-basic-shuttle-armament
   icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
-    state: incendiarydisplay
+    sprite: Structures/Power/cage_recharger.rsi
+    state: full
   discipline: Arsenal
-  tier: 1
-  cost: 10000
+  tier: 1 #Delta-V moved to T1
+  cost: 10500
   recipeUnlocks:
-  - BoxShotgunIncendiary
-  - MagazineRifleIncendiary
-  - MagazinePistolIncendiary
-  - MagazineLightRifleIncendiary
-  - SpeedLoaderMagnumIncendiary
-  - MagazineShotgunIncendiary
-  - MagazineBoxPistolIncendiary
-  - MagazineBoxMagnumIncendiary
-  - MagazineBoxLightRifleIncendiary
-  - MagazineBoxRifleIncendiary
-  - MagazineBoxSpecialIncendiary # DeltaV
+  - PowerCageRechargerCircuitboard
+  - PowerCageSmall
+  - PowerCageMedium
+  - MagazineGrenadeEmpty
+  - GrenadeFlash
+  - GrenadeBlast 
+  - ShuttleGunSvalinnMachineGunCircuitboard
+  - ShuttleGunPerforatorCircuitboard
+  - ShuttleGunFriendshipCircuitboard
+  technologyPrerequisites:
+  - SalvageWeapons
+  - ExplosiveTechnology
 
 - type: technology
   id: WeaponizedLaserManipulation
@@ -75,29 +76,7 @@
   - 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: 1
-  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
@@ -157,57 +136,69 @@
     state: icon
   discipline: Arsenal
   tier: 2
-  cost: 10000
+  cost: 12500 #DeltaV- Raised to 12500 from 10000 
   recipeUnlocks:
   - WeaponLaserCannon
+  - WeaponXrayCannon 
 
-- 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
+  - type: technology
+  id: UraniumMunitions
+  name: research-technology-uranium-munitions
   icon:
-    sprite: Structures/Power/cage_recharger.rsi
-    state: full
+    sprite: Objects/Materials/Sheets/other.rsi
+    state: uranium
   discipline: Arsenal
-  tier: 2
-  cost: 10500
+  tier: 2 #Delta-V moved to t2
+  cost: 7500
   recipeUnlocks:
-  - PowerCageRechargerCircuitboard
-  - PowerCageSmall
-  - PowerCageMedium
-  - MagazineGrenadeEmpty
-  - GrenadeFlash
-  - GrenadeBlast 
-  - ShuttleGunSvalinnMachineGunCircuitboard
-  - ShuttleGunPerforatorCircuitboard
-  - ShuttleGunFriendshipCircuitboard
-  technologyPrerequisites:
-  - SalvageWeapons
+  - 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
 
-# Tier 3
+#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 
 
 - type: technology
-  id: PortableMicrofusionWeaponry
-  name: research-technology-portable-microfusion-weaponry
+  id: DraconicMunitions
+  name: research-technology-draconic-munitions
   icon:
-    sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi
-    state: icon
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
+    state: incendiarydisplay
   discipline: Arsenal
-  tier: 3
-  cost: 15000
+  tier: 2 #Delta-V moved to t2
+  cost: 10000
   recipeUnlocks:
-  - WeaponAdvancedLaser
+  - BoxShotgunIncendiary
+  - MagazineRifleIncendiary
+  - MagazinePistolIncendiary
+  - MagazineLightRifleIncendiary
+  - SpeedLoaderMagnumIncendiary
+  - MagazineShotgunIncendiary
+  - MagazineBoxPistolIncendiary
+  - MagazineBoxMagnumIncendiary
+  - MagazineBoxLightRifleIncendiary
+  - MagazineBoxRifleIncendiary
+  - MagazineBoxSpecialIncendiary # DeltaV
 
 - type: technology
   id: ExperimentalBatteryAmmo
@@ -216,23 +207,41 @@
     sprite: Objects/Weapons/Guns/Battery/svalinn.rsi
     state: icon
   discipline: Arsenal
-  tier: 3
+  tier: 2 #Delta-V moved to t2
   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
+  tier: 2
   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
+
+
+

Resources/Textures/Objects/Weapons/Melee/meta.json

@@ -0,0 +1,34 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Findorsal",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+	{
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+	{
+      "name": "wielded-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    }
+  ]
+}