Arsenal Expansion

Basically my Arsenal Expansion PR on oldrepo now on rebase. Balances some cargo prices, fixes a few item appearances and descriptions, adds new weapons, cleans sprites... yada yada.
DeltaV-Station · Oct 8, 2023 · 3e6c389 · 3e6c389
1 parent 930710c
commit 3e6c389
Show file tree

Hide file tree

Showing 94 changed files with 437 additions and 94 deletions.
diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/axiom.ogg b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/axiom.ogg
diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg
diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/universal.ogg b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/universal.ogg
diff --git a/Resources/Audio/DeltaV/license.txt b/Resources/Audio/DeltaV/license.txt
@@ -1 +1,4 @@
 typewriter.ogg is modified from https://www.freesoundslibrary.com/typewriter-sound/ which is licensed under the CC BY 4.0 License. This modified file follows the same license.
+axiom.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license.
+jackdaw.ogg is modified from atreides.ogg which was taken from https://gitlab.com/cmdevs/colonial-warfare/-/tree/32cb5892413243cc74bb2d11df8e3085f8ef1164/sound/weapons which is licensed under the CC-BY-SA 3.0 License. This modified file follows the same license.
+universal.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license.
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml
@@ -4,7 +4,7 @@
     sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi
     state: base
   product: CrateArmoryGrand
-  cost: 4000
+  cost: 5500
   category: Armory
   group: market
 
@@ -14,7 +14,7 @@
     sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi
     state: icon
   product: CrateArmoryUniversal
-  cost: 3500
+  cost: 6500
   category: Armory
   group: market
 
@@ -24,6 +24,6 @@
     sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi
     state: icon
   product: CrateArmoryAdjutant
-  cost: 9000
+  cost: 10000
   category: Armory
   group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -13,9 +13,9 @@
         amount: 1
       - id: WeaponPistolViperWood
         amount: 1
-#      - id: MagazinePistol # Ammo is too expensive nowadays (it causes test fails)
+#      - id: MagazinePistol # Ammo is too expensive nowadays (it causes test fails) || it does WHAT now???
 #        amount: 1
-#      - id: BaseBallBat # THIS BAT IS TOO DAMN BIG!
+#      - id: BaseBallBat # THIS BAT IS TOO DAMN BIG! || well shucks, guess I'll cry
 #        amount: 1
 
 - type: entity

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml
@@ -17,7 +17,7 @@
     contents:
       - id: WeaponPistolUniversal
         amount: 2
-      - id: MagazineUniversalCaselessRifle
+      - id: MagazineUniversalMagnum
         amount: 4
 
 - type: entity

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml
@@ -1,26 +1,26 @@
-#- type: entity
-#  parent: GunSafe
-#  id: GunSafePistolUniversal
-#  name: mk32 safe
-#  components:
-#  - type: StorageFill
-#    contents:
-#    - id: WeaponPistolUniversal
-#      amount: 2
-#    - id: MagazineUniversalCaselessRifle
-#      amount: 4
+- type: entity
+  parent: GunSafe
+  id: GunSafePistolUniversal
+  name: mk32 safe
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolUniversal
+      amount: 2
+    - id: MagazineUniversalMagnum
+      amount: 4
 
-#- type: entity
-#  parent: GunSafe
-#  id: GunSafeSniperGrand
-#  name: mark 1 rifle safe
-#  components:
-#  - type: StorageFill
-#    contents:
-#    - id: WeaponSniperGrand
-#      amount: 2
-#    - id: SpeedLoaderLightRifle
-#      amount: 4
+- type: entity
+  parent: GunSafe
+  id: GunSafeSniperGrand
+  name: mark 1 rifle safe
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSniperGrand
+      amount: 2
+    - id: SpeedLoaderLightRifle
+      amount: 4
 
 - type: entity
   parent: GunSafe

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -7,6 +7,47 @@
   components:
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistol
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazinePistol
+            - MagazinePistolHighCapacity
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistol
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgePistol
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+
+- type: entity
+  name: Pollock
+  parent: BaseWeaponPistol
+  id: WeaponPistolPollock
+  description: A compact and mass-produced combat pistol. Uses .35 auto ammo.
+  suffix: Mercenary
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi
+  - type: Gun
+    fireRate: 5
+    availableModes:
+    - SemiAuto
   - type: ItemSlots
     slots:
       gun_magazine:

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: vulcan
+  name: Vulcan
   parent: BaseWeaponRifle
   id: WeaponRifleVulcan
-  description: One of the first firearms modified for space usage, this rifle has been used to punch holes in Cargonian "combat mechs."
+  description: One of the first firearms modified for space usage, this rifle was purpose-designed to punch holes in Cargonian "combat mechs." Uses .30 rifle ammo.
   components:
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi
@@ -46,4 +46,130 @@
   - type: Appearance
   - type: Clothing
     sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi
-
+
+- type: entity
+  name: CAWS-25 Jackdaw
+  parent: BaseWeaponRifle
+  id: WeaponRifleJackdaw
+  description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo.
+  suffix: Deathsquad
+  components:
+  - type: Item
+    size: 30
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Gun
+    minAngle: 2
+    maxAngle: 6
+    angleIncrease: 2
+    angleDecay: 8
+    fireRate: 8
+    selectedMode: FullAuto
+    availableModes:
+    - SemiAuto
+    - FullAuto
+    soundGunshot:
+      path: /Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg
+  - type: ChamberMagazineAmmoProvider
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineCaselessRifle
+        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineCaselessRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeCaselessRifle
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeCaselessRifle
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi
+
+- type: entity
+  name: Tenebra
+  parent: BaseWeaponRifle
+  id: WeaponRifleTenebra
+  description: A mass-produced and minimalist rifle in bullpup design. Uses .20 rifle ammo.
+  suffix: Mercenary
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Gun
+    minAngle: 3
+    maxAngle: 12
+    angleIncrease: 3
+    angleDecay: 12
+    fireRate: 5
+    selectedMode: FullAuto
+    availableModes:
+    - SemiAuto
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
+  - type: ChamberMagazineAmmoProvider
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineRifle
+        insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeRifle
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeRifle
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi
+
+- type: entity
+  name: M-90
+  id: WeaponRifleM90
+  parent: WeaponRifleM90GrenadeLauncher
+  description: An older bullpup carbine model. Uses .20 rifle ammo.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -64,12 +64,11 @@
   name: viper
   parent: BaseWeaponPistol
   id: WeaponPistolViper
-  description: A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo.
+  description: A small, easily concealable, but somewhat underpowered gun, produced by a bulk arms manufacturer now defunct for over a century. Uses .35 auto ammo.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/viper.rsi
     availableModes:
-    - FullAuto
     - SemiAuto
   - type: ItemSlots
     slots:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -145,9 +145,10 @@
     secret: true
     litDamageBonus:
         types:
-            Slash: 7.5
-            Heat: 7.5
-            Blunt: -1
+            Slash: 17
+            Heat: 17
+            Structural: 8.5
+            Blunt: -6
     litDisarmMalus: 0.6
   - type: Sprite
     sprite: Objects/Weapons/Melee/e_cutlass.rsi
@@ -158,6 +159,13 @@
         visible: false
         shader: unshaded
         map: [ "blade" ]
+  - type: MeleeWeapon
+    attackRate: 0.75
+    soundHit:
+      path: /Audio/Weapons/eblade1.ogg
+    damage:
+      types:
+        Blunt: 6
   - type: Item
     size: 5
     sprite: Objects/Weapons/Melee/e_cutlass.rsi

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -848,7 +848,7 @@
   parent: PosterBase
   id: PosterLegitEnlist
   name: "Enlist"
-  description: "Enlist in the Nanotrasen Deathsquadron reserves today!"
+  description: "Enlist in the NanoTrasen ERT reserves today!"
   components:
   - type: Sprite
     state: poster29_legit