Add SVT Mid-tier Weapon (#1417)

* add a new weapon to the game svt new gun * update update * small updates small updates * so i can fix it so i can fix it * fix fix * some updates pratice is more of an outlier now to look more like the tip of the bullet * Update weapon_cases_shuttle_guns.yml SOOOOOOOO * rifle IM NOT GOOD AT ENGLISHER * In the wrong place Mags where in the wrong place * Update Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml Co-authored-by: whatston3 <[email protected]> * Update Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml Co-authored-by: whatston3 <[email protected]> * updates upated. recentering the PNG files, changes to the IDs * updates again # changes * Shuttle update Shuttle update * ammo ammo * aaa updates to the yml again * Delete snipers.yml moves stuff around * Update snipers.yml * Resolve merge conflicts (for real this time) * aaa aaaa oogabogaa * Update dungeon_items_weapons.yml YEET * Update weapon_cases_expedition.yml this should work? * GADDAMNIT WHATSONE AAAAAAAAAAAAAA * ADSFGAFGA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA --------- Co-authored-by: whatston3 <[email protected]> Co-authored-by: Whatstone <[email protected]>
new-frontiers-14 · Jul 8, 2024 · 0c93099 · 0c93099
1 parent c57f6cf
commit 0c93099
Show file tree

Hide file tree

Showing 26 changed files with 278 additions and 0 deletions.
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -934,6 +934,8 @@
         - SpeedLoaderMagnumEmpty
         - SpeedLoaderRifleHeavy # Frontier
         - SpeedLoaderRifleHeavyEmpty # Frontier
+        - 10roundmagazine #frontier by VividPups
+        - 10roundmagazineempty #frontier by VividPups
     - type: MaterialStorage
       whitelist:
         tags:

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
@@ -276,6 +276,21 @@
     - id: MagazineRifle
       amount: 2
 
+- type: entity #made By VividPups added in with PR 1417
+  parent: WeaponCaseLong
+  id: WeaponCaseLongSVTExpedition
+  suffix: Dungeon, SVT
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSVT
+      amount: 1
+    - id: 10roundmagazine
+      amount: 2 
+
+
+
 # Energy
 - type: entity
   parent: WeaponCaseShort

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
@@ -167,6 +167,29 @@
       - id: WeaponShotgunSawnNonlethal
       - id: BoxBeanbag
 
+# WeaponSVT
+- type: entity  #made By VividPups added in with PR 1770
+  parent: WeaponCaseLongShuttle
+  id: ShuttleWeaponSVT
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponSVT
+      - id: 10roundmagazine
+
+# WeaponSVTNonlethal # Frontier - TODO: Restore this later
+# - type: entity
+  # parent: WeaponCaseLongShuttle
+  # id: ShuttleWeaponSVTNonlethal
+  # noSpawn: true
+  # components:
+  # - type: StorageFill
+    # contents:
+      # - id: WeaponSVTNonlethal
+      # - id: MagazineSVTRubber
+
+
 # T3:
 # WeaponEnergyGun
 - type: entity

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
@@ -118,6 +118,12 @@
     - id: ShuttleKardashev-MosinNonlethal
       orGroup: T1-2
       prob: 0.1
+    - id: ShuttleWeaponSVT
+      orGroup: T1-2
+      prob: 0.1
+#    - id: ShuttleWeaponSVTNonlethal # Frontier - TODO: Restore rubber
+#      orGroup: T1-2
+#      prob: 0.1
     # T2-1
     - id: ShuttleWeaponPistolMk58
       orGroup: T2-1
@@ -143,6 +149,12 @@
     - id: ShuttleWeaponShotgunSawnNonlethal
       orGroup: T2-1
       prob: 0.1
+    - id: ShuttleWeaponSVT
+      orGroup: T2-1
+      prob: 0.1
+#    - id: ShuttleWeaponSVTNonlethal # Frontier - TODO: Restore rubber
+#      orGroup: T2-1
+#      prob: 0.1
     # T2 Melee
     - id: SpearReinforced
       orGroup: Melee

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
@@ -182,6 +182,7 @@
     - WeaponCaseLongKammererExpedition
     - WeaponCaseLongEnergyGunExpedition
     - WeaponCaseLongRepeaterExpedition
+    - WeaponCaseLongSVTExpedition
     chance: 1.0
     offset: 0.0
     rarePrototypes:

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -11,3 +11,78 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity #made By VividPups added in with PR 1470
+  id: 10roundmagazine
+  name: "10 round magazine (.30 rifle)"
+  parent: BaseMagazineLightRifle
+  components:
+  - type: Tag
+    tags:
+      - MagazineLightRifle
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifle
+    capacity: 10
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi
+
+- type: entity
+  id: 10roundmagazineempty
+  name: "10 round magazine (.30 rifle any)"
+  suffix: empty
+  parent: 10roundmagazine
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+
+- type: entity
+  id: 10roundmagazineUranium
+  name: "10 round magazine (.30 rifle uranium)"
+  parent: 10roundmagazine
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleUranium
+  - type: Sprite
+    layers:
+    - state: uranium
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+# type: entity  to be added back when Rubber rounds are added. 
+ # id: 10roundmagazineRubber
+  #name: "10 round magazine(.30 rifle rubber)"
+  #parent: 10roundmagazine
+  #components:
+  # type: BallisticAmmoProvider
+  # proto: CartridgeLightRifleRubber
+  #type: Sprite
+   #layers:
+    # state: rubber
+     #map: ["enum.GunVisualLayers.Base"]
+    #state: mag-1
+    #map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: 10roundmagazinePractice
+  name: "10 round magazine (.30 rifle practice)"
+  parent: 10roundmagazine
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRiflePractice
+  - type: Sprite
+    layers:
+    - state: practice
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: 10roundmagazineIncendiary 
+  name: "10 round magazine (.30 rifle incendiary)"
+  parent: 10roundmagazine
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleIncendiary
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -26,3 +26,60 @@
       - CartridgeMagnum
     capacity: 7
     proto: CartridgeMagnum
+
+- type: entity #made By VividPups added in with PR 1417
+  id: WeaponSVT
+  name: SVT-40
+  parent: BaseWeaponRifle
+  description: Once a weapon used in war, now a civilian hunting rifle brought to you by S.E.S.W.C, Retreating is Consider Treason is etch into the side 
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: Gun
+    fireRate: 4
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
+  - type: ChamberMagazineAmmoProvider
+    soundRack:
+      path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: 10roundmagazine
+        insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineLightRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeLightRifle
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeLightRifle
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml b/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
@@ -0,0 +1,17 @@
+# these were added By VividPups for the AMMOfab for; added in with PR 1770
+
+- type: latheRecipe
+  id: 10roundmagazine
+  result: 10roundmagazine
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: 10roundmagazineempty
+  result: 10roundmagazineempty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 20
diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "red"
+        },
+        {
+            "name": "rubber"
+        },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "mag-1"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/base.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/bolt-open.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-BACKPACK.png
diff --git a/...ces/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-SUITSTORAGE.png b/...ces/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/icon.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-right.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/mag-0.png
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "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
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}
diff --git a/...rces/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/wielded-inhand-left.png b/...rces/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/wielded-inhand-left.png
diff --git a/...ces/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/wielded-inhand-right.png b/...ces/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/wielded-inhand-right.png