Gestio burst-fire 20 rifle

Resources/Audio/Weapons/Guns/Gunshots/attributions.yml

@@ -26,4 +26,9 @@
 - files: ["ship_duster.ogg", "ship_friendship.ogg", "ship_svalinn.ogg", "ship_perforator.ogg"]
   license: "CC0-1.0"
   copyright: "Created by MIXnikita for Space Station 14"
-  source: "https://github.com/MIXnikita"
+  source: "https://github.com/MIXnikita"
+
+- files: ["rifle3.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Created by Michel Baradari apollo-music.de"
+  source: "https://opengameart.org/content/chaingun-pistol-rifle-shotgun-shots"

Resources/Prototypes/_NF/Catalog/Fills/Crates/armory.yml

@@ -1,9 +1,24 @@
+# Registered (legal) weapon crates
+- type: entity
+  id: CrateArmoryRifleGestio
+  parent: CrateWeaponSecure
+  name: gestio rifle crate
+  description: Contains two old prototype, burst-fire rifles with six low capacity mags. Requires Armory access to open.
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponRifleGestio
+        amount: 2
+      - id: MagazineRifleLowCapacity
+        amount: 6
+
 # Contraband (unregistered) weaponry crates for expeditions
 - type: entity
   id: CrateArmorySMGExpedition
   parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
   name: SMG crate
   description: Contains two high-powered, SMGs with four mags. Requires Armory access to open. Unregistered.
+  noSpawn: true
   components:
   - type: StorageFill
     contents:
@@ -17,6 +32,7 @@
   parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
   name: shotgun crate
   description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open. Unregistered.
+  noSpawn: true
   components:
   - type: StorageFill
     contents:
@@ -30,6 +46,7 @@
   parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
   name: lasers crate
   description: Contains three standard-issue laser carbines. Requires Armory access to open. Unregistered.
+  noSpawn: true
   components:
   - type: StorageFill
     contents:
@@ -41,6 +58,7 @@
   parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
   name: energy guns crate
   description: Contains three energy guns. Requires Armory access to open. Unregistered.
+  noSpawn: true
   components:
   - type: StorageFill
     contents:
@@ -52,10 +70,25 @@
   parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
   name: pistols crate
   description: Contains two standard NT pistols with four mags. Requires Armory access to open. Unregistered.
+  noSpawn: true
   components:
   - type: StorageFill
     contents:
     - id: WeaponPistolMk58Expedition
       amount: 2
     - id: MagazinePistol
       amount: 4
+
+- type: entity
+  id: CrateArmoryRifleGestioExpedition
+  parent: [ CrateWeaponSecure, UnregisteredFirearmBase ]
+  name: gestio rifle crate
+  description: Contains two old prototype, burst-fire rifles with six low capacity mags. Requires Armory access to open. Unregistered.
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponRifleGestioExpedition
+        amount: 2
+      - id: MagazineRifleLowCapacity
+        amount: 6

Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml

@@ -224,6 +224,19 @@
       amount: 2
 
 # Rifles
+- type: entity
+  parent: WeaponCaseLong
+  id: WeaponCaseLongGestioExpedition
+  suffix: Dungeon, Gestio
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleGestio
+      amount: 1
+    - id: MagazineRifleLowCapacity
+      amount: 3
+
 - type: entity
   parent: WeaponCaseLong
   id: WeaponCaseLongLecterExpedition

Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml

@@ -388,6 +388,7 @@
     prototypes:
     - CrateArmoryShotgunExpedition
     - CrateArmoryPistolsExpedition
+    - CrateArmoryRifleGestioExpedition
     chance: 0.55
     offset: 0.0
     rarePrototypes:

Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml

@@ -178,6 +178,7 @@
     - WeaponCaseShortCobra
     - WeaponCaseShortDeckardExpedition
     - WeaponCaseShortPython
+    - WeaponCaseLongGestioExpedition
     - WeaponCaseLongKammererExpedition
     - WeaponCaseLongEnergyGunExpedition
     - WeaponCaseLongRepeaterExpedition

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_lowcap.yml

@@ -0,0 +1,68 @@
+- type: entity
+  id: MagazineRifleLowCapacity
+  name: "magazine Low-Cap (.20 rifle)"
+  parent: BaseMagazineRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifle
+    capacity: 15
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi
+    layers:
+    - state: red
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineRifleLowCapacityPractice
+  name: "magazine Low-Cap (.20 rifle practice)"
+  parent: MagazineRifleLowCapacity
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRiflePractice
+    capacity: 15
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    layers:
+    - state: practice
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineRifleLowCapacityRubber
+  name: "magazine Low-Cap (.20 rifle rubber)"
+  parent: MagazineRifleLowCapacity
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleRubber
+    capacity: 15
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineRifleLowCapacityUranium
+  name: "magazine Low-Cap (.20 rifle uranium)"
+  parent: MagazineRifleLowCapacity
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleUranium
+    capacity: 15
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    layers:
+    - state: uranium
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/gestio.yml

@@ -0,0 +1,85 @@
+- type: entity
+  name: Gestio
+  parent: BaseWeaponRifle
+  id: WeaponRifleGestio
+  description: An old prototype burst-fire NanoTrasen marksman rifle. Manufactured by Silver Industries. It hasn't ever left the trials. Given it's antiquity it is considered a civilian grade weapon.   Uses .20 rifle ammo.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi
+  - type: Gun
+    fireRate: 3.75
+    projectileSpeed: 30
+    angleDecay: 4 #in testing 3 was more balanced
+    angleIncrease: 6
+    minAngle: 2 #generally meant to be 0 when used properly
+    maxAngle: 30 #generally meant to be 20 when used properly
+    selectedMode: Burst
+    availableModes:
+      - Burst
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/rifle3.ogg
+  - type: Wieldable
+  - type: GunWieldBonus
+    minAngle: -2
+    maxAngle: -10
+    angleDecay: 4 #in testing 3 was more balanced
+    angleIncrease: -3
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineRifleLowCapacity
+        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: entity
+  name: Gestio
+  parent: WeaponRifleGestio
+  id: WeaponRifleGestioRubber
+  suffix: Non-lethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineRifleLowCapacityRubber
+        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: CartridgeRifleRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeRifle

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml

@@ -45,6 +45,12 @@
   noSpawn: true
   id: WeaponShotgunKammererExpedition
 
+# Rifles
+- type: entity
+  parent: [ WeaponRifleGestio, UnregisteredFirearmBase ]
+  noSpawn: true
+  id: WeaponRifleGestioExpedition
+
 # SMGs
 - type: entity
   parent: [ WeaponSubMachineGunWt550, UnregisteredFirearmBase ]

Resources/Textures/_NF/Objects/Weapons/Gestio-Rifle.rsi/meta.json

@@ -0,0 +1,47 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Data_Redacted)",
+    "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
+        }
+    ]
+}

Resources/Textures/_NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Data_Redacted",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "red"
+        },
+        {
+            "name": "rubber"
+        },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "mag-1"
+        }
+    ]
+}