diff --git a/Resources/Locale/en-US/deltav/research/technologies.ftl b/Resources/Locale/en-US/deltav/research/technologies.ftl index b9a37b97454..25377b155f8 100644 --- 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 index 8542a78de2f..02b2ef0f5ca 100644 --- 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 index 17bcc254bc6..d604eb80568 100644 --- 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 new file mode 100644 index 00000000000..27402e01864 --- /dev/null +++ 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 index dda0b2a9c5e..30967c955fd 100644 --- 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 index 1bc89d160b9..1cd05a9c80e 100644 --- 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,22 +157,24 @@ 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 @@ -180,7 +182,7 @@ 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/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..26536db36fb Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/equipped-BACKPACK.png differ 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 new file mode 100644 index 00000000000..d665a4503ad Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-left.png new file mode 100644 index 00000000000..ec907b0f945 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-right.png new file mode 100644 index 00000000000..77258a43094 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/inhand-right.png differ 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 new file mode 100644 index 00000000000..f8637ed691f --- /dev/null +++ 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/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..700a5349f5f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..e40b87bff7b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/advanced_truncheon.rsi/wielded-inhand-right.png differ