Arsenal tech overhaul (#2104)

* Merge the wizden stuff Signed-off-by: Stop-Signs <[email protected]> * Update the delta techs Signed-off-by: Stop-Signs <[email protected]> * Upload resprites Signed-off-by: Stop-Signs <[email protected]> * Adds the weapon prototype Signed-off-by: Stop-Signs <[email protected]> * adds the recipe in the seclathe Signed-off-by: Stop-Signs <[email protected]> * fully integrates the AT Signed-off-by: Stop-Signs <[email protected]> * fixeds the yaml error Signed-off-by: Stop-Signs <[email protected]> * Im dumb and dont know proper spacing Signed-off-by: Stop-Signs <[email protected]> * Im dumb and dont know proper spacing pt2 Signed-off-by: Stop-Signs <[email protected]> * im silly Signed-off-by: Stop-Signs <[email protected]> * im silly pt2 Signed-off-by: Stop-Signs <[email protected]> * Moves the texture file and renames it * Fixes more yml and sprites * Update advanced_truncheon.yml * added the .json * PLEASE FIX THE YML * suffering * punctuation matters * Update technologies.ftl Signed-off-by: Stop-Signs <[email protected]> * Update arsenal.yml Signed-off-by: Stop-Signs <[email protected]> * Update arsenal.yml Signed-off-by: Stop-Signs <[email protected]> * Update arsenal.yml Signed-off-by: Stop-Signs <[email protected]> * Update advanced_truncheon.yml Signed-off-by: Stop-Signs <[email protected]> * Update meta.json Signed-off-by: Stop-Signs <[email protected]> * Delete Resources/Textures/Objects/Weapons/Melee/meta.json Signed-off-by: Stop-Signs <[email protected]> * Should fix the ubuntu * Emagged protolathe and secfab recipes added fully (i hope :3) * De-mangle the arsenal.yml * make comments less evil Signed-off-by: deltanedas <[email protected]> * should fix conflicts * merge conflicts * hyphens * Update Resources/Prototypes/Research/arsenal.yml Co-authored-by: Milon <[email protected]> Signed-off-by: Stop-Signs <[email protected]> * space Signed-off-by: Stop-Signs <[email protected]> * line Signed-off-by: Stop-Signs <[email protected]> * milon pranked me Signed-off-by: Stop-Signs <[email protected]> * Update arsenal.yml Signed-off-by: Stop-Signs <[email protected]> * Update arsenal.yml Signed-off-by: Stop-Signs <[email protected]> --------- Signed-off-by: Stop-Signs <[email protected]> Signed-off-by: deltanedas <[email protected]> Signed-off-by: Milon <[email protected]> Co-authored-by: deltanedas <[email protected]> Co-authored-by: Milon <[email protected]> Co-authored-by: Milon <[email protected]>
DeltaV-Station · Nov 7, 2024 · 64078b8 · 64078b8
1 parent b1d1f8f
commit 64078b8
Show file tree

Hide file tree

Showing 13 changed files with 108 additions and 26 deletions.
diff --git a/Resources/Locale/en-US/deltav/research/technologies.ftl b/Resources/Locale/en-US/deltav/research/technologies.ftl
@@ -4,3 +4,4 @@ research-technology-exotic-ammunition = Exotic Ammunition
 research-technology-energy-gun = Energy Guns
 research-technology-energy-gun-advance = Advanced Energy Manipulation
 research-technology-advance-laser = Advanced Laser Manipulation
+research-technology-robust-melee = Robust Melee
diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
@@ -214,3 +214,13 @@
   parent: ClothingShoesBootsMagSci
   id: ClothingShoesBootsSecurityMagboots
   result: ClothingShoesBootsSecurityMagboots
+
+- type: latheRecipe
+  parent: BaseWeaponRecipe
+  id: AdvancedTruncheon
+  result: AdvancedTruncheon
+  completetime: 5
+  materials:
+    Steel: 1000
+    Plastic: 800
+
diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml
@@ -32,24 +32,23 @@
   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
     state: icon
   discipline: Arsenal
   tier: 2
-  cost: 7500
+  cost: 12500
   recipeUnlocks:
   - WeaponEnergyGunPistol
+  - WeaponGunLaserCarbineAutomatic
 
 - type: technology
-  id: Advanced Laser Manipulation
-  name: research-technology-advance-laser
+  id: RobustMelee
+  name: research-technology-robust-melee
   icon:
-    sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi
+    sprite: DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi
     state: icon
   discipline: Arsenal
-  tier: 2
+  tier: 3
   cost: 12500
   recipeUnlocks:
-  - WeaponGunLaserCarbineAutomatic
-
-
+  - AdvancedTruncheon
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/advanced_truncheon.yml
@@ -0,0 +1,33 @@
+- type: entity
+  parent: BaseItem
+  id: AdvancedTruncheon
+  name: Advanced Truncheon
+  description: If all else fails, BONK!
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi
+    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: DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi
+    quickEquip: false
+    slots:
+    - back
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -434,6 +434,7 @@
       - MagazineBoxSpecialUranium
       - MagazineBoxSpecialHoly
       - MagazineBoxSpecialMindbreaker
+      - AdvancedTruncheon
       # End DeltaV additions
 
 - type: entity
@@ -938,6 +939,7 @@
       - ClothingOuterHardsuitJuggernautReverseEngineered
       - ClothingOuterHardsuitSyndieReverseEngineered
       - ClothingShoesBootsSecurityMagboots
+      - AdvancedTruncheon
       # End DeltaV additions
   - type: MaterialStorage
     whitelist:

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -21,7 +21,7 @@
     sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
     state: incendiarydisplay
   discipline: Arsenal
-  tier: 1
+  tier: 2 # DeltaV moved to t2 from t1
   cost: 10000
   recipeUnlocks:
   - BoxShotgunIncendiary
@@ -82,7 +82,7 @@
     sprite: Objects/Materials/Sheets/other.rsi
     state: uranium
   discipline: Arsenal
-  tier: 1
+  tier: 2 # DeltaV moved to t2 from t1
   cost: 7500
   recipeUnlocks:
   - MagazineRifleUranium
@@ -157,30 +157,32 @@
     state: icon
   discipline: Arsenal
   tier: 2
-  cost: 10000
+  cost: 12500 # DeltaV: increased from 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
 
+# DeltaV: 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: BasicShuttleArmament
   name: research-technology-basic-shuttle-armament
   icon:
     sprite: Structures/Power/cage_recharger.rsi
     state: full
   discipline: Arsenal
-  tier: 2
+  tier: 1 # DeltaV: moved to T1 from t2
   cost: 10500
   recipeUnlocks:
   - PowerCageRechargerCircuitboard
@@ -194,6 +196,7 @@
   - ShuttleGunFriendshipCircuitboard
   technologyPrerequisites:
   - SalvageWeapons
+  - ExplosiveTechnology
 
 # Tier 3
 
@@ -216,7 +219,7 @@
     sprite: Objects/Weapons/Guns/Battery/svalinn.rsi
     state: icon
   discipline: Arsenal
-  tier: 3
+  tier: 2 # DeltaV: moved to t2 from t3
   cost: 15000
   recipeUnlocks:
   - WeaponLaserSvalinn
@@ -228,7 +231,7 @@
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi
     state: icon
   discipline: Arsenal
-  tier: 3
+  tier: 2 # DeltaV: moved to t2 from t3
   cost: 15000
   recipeUnlocks:
   - GrenadeEMP

diff --git a/...tures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/equipped-BACKPACK.png b/...tures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/icon.png
diff --git a/...es/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-left.png b/...es/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-left.png
diff --git a/...s/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-right.png b/...s/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-right.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/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
+    }
+  ]
+}
diff --git a/...res/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-left.png b/...res/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-left.png
diff --git a/...es/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-right.png b/...es/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-right.png