new guns PR 1: chinese pistol and some fixes

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/10mm.yml

@@ -8,4 +8,4 @@
   - type: Tag
     tags:
       - Cartridge
-      - N14CartridgePistol10
+      - N14CartridgePistol10

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12.7.yml

@@ -8,4 +8,4 @@
   - type: Tag
     tags:
       - Cartridge
-      - N14CartridgePistol12.7
+      - N14CartridgePistol12.7

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/22lr.yml

@@ -8,4 +8,4 @@
   - type: Tag
     tags:
       - Cartridge
-      - N14CartridgePistol22
+      - N14CartridgePistol22

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/308.yml

@@ -8,4 +8,4 @@
   - type: Tag
     tags:
       - Cartridge
-      - N14Cartridge308Rifle
+      - N14Cartridge308Rifle

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/44.yml

@@ -8,4 +8,4 @@
   - type: Tag
     tags:
       - Cartridge
-      - N14Cartridge44Magnum
+      - N14Cartridge44Magnum

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/45..yml

@@ -8,4 +8,4 @@
   - type: Tag
     tags:
       - Cartridge
-      - N14CartridgePistol45
+      - N14CartridgePistol45

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/5.56.yml

@@ -8,4 +8,4 @@
   - type: Tag
     tags:
       - Cartridge
-      - N14Cartridge5.56Rifle
+      - N14Cartridge5.56Rifle

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/7.62.yml

@@ -8,4 +8,4 @@
   - type: Tag
     tags:
       - Cartridge
-      - N14Cartridge7.62Rifle
+      - N14Cartridge7.62Rifle

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/9mm.yml

@@ -8,4 +8,4 @@
   - type: Tag
     tags:
       - Cartridge
-      - N14CartridgePistol9
+      - N14CartridgePistol9

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/5.56.yml

@@ -48,7 +48,6 @@
   components:
   - type: Tag
     tags:
-      - Magazine5.56Rifle
       - LongMagazine5.56Rifle
   - type: BallisticAmmoProvider
     proto: N14Cartridge5.56Rifle

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -32,6 +32,10 @@
         whitelist:
           tags:
             - N14CartridgePistol9
+  - type: Gun
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
 
 - type: entity
   name: 10mm Pistol
@@ -67,6 +71,10 @@
         whitelist:
           tags:
             - N14CartridgePistol10
+  - type: Gun
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
 
 - type: entity
   name: .45 handgun
@@ -109,6 +117,10 @@
     containers:
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
+  - type: Gun
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
 
 - type: entity
   name: 12.7mm handgun
@@ -151,6 +163,10 @@
     containers:
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
+  - type: Gun
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
 
 - type: entity
   name: 10mm pipe pistol
@@ -186,3 +202,79 @@
         whitelist:
           tags:
             - N14CartridgePistol10
+  - type: Gun
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+
+- type: entity
+  name: chinese pistol
+  parent: BaseWeaponPistol
+  id: N14WeaponPistolChinese
+  description: A elegant and long pistol with a internal magazine, chambered in 9 mm.
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    sprite: Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi
+  - type: Gun
+    fireRate: 5
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
+      gun_chamber:
+        name: Chamber
+        startingItem: N14CartridgePistol9
+        priority: 1
+        whitelist:
+          tags:
+            - N14CartridgePistol9
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+      - N14CartridgePistol9
+    capacity: 14
+    proto: N14CartridgePistol9
+  - type: Gun
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+
+- type: entity
+  name: the spy
+  parent: BaseWeaponPistol
+  id: N14WeaponPistolSpy
+  description: A totally modified chinese pistol. with a integrated silencer, fully automatic conversion and a extended magazine this pistol was designed for brutal silent murder, chambered in 9 mm.
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+  - type: Item
+    sprite: Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi
+  - type: Gun
+    fireRate: 6
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
+      gun_chamber:
+        name: Chamber
+        startingItem: N14CartridgePistol9
+        priority: 1
+        whitelist:
+          tags:
+            - N14CartridgePistol9
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+      - N14CartridgePistol9
+    capacity: 24
+    proto: N14CartridgePistol9
+  - type: Gun
+    selectedMode: Fullauto
+    availableModes:
+      - Fullauto

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml

@@ -20,3 +20,57 @@
         Piercing: 5
   - type: Item
     sprite: Nuclear14/Objects/Weapons/Melee/hatchet.rsi
+
+- type: entity
+  name: fireaxe
+  parent: N14BaseAxe
+  id: N14FireAxe
+  description: Truly, the weapon of a madman. Who would think to fight fire with an axe?
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Melee/fireaxe.rsi
+    state: icon
+  - type: Clothing
+    sprite: Nuclear14/Objects/Weapons/Melee/fireaxe.rsi
+    quickEquip: false
+    slots:
+    - back
+  - type: Tool
+    qualities:
+      - Prying
+  - type: TilePrying
+    advanced: true
+
+- type: entity
+  name: axe
+  parent: BaseItem
+  id: N14BaseAxe
+  description: A heavy wood axe, classic tool and weapon.
+  components:
+  - type: Tag
+    tags:
+    - FireAxe
+  - type: Sharp
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Melee/axe.rsi
+    state: icon
+  - type: MeleeWeapon
+    attackRate: 0.75
+    damage:
+      types:
+        # axes are kinda like sharp hammers, you know?
+        Blunt: 5
+        Slash: 5
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 2
+        Slash: 18
+  - type: Item
+    size: 150
+  - type: Clothing
+    sprite: Nuclear14/Objects/Weapons/Melee/axe.rsi
+    quickEquip: false
+    slots:
+    - back

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/hammer.yml

@@ -26,4 +26,23 @@
     qualities:
       - Crushing
     useSound:
-      path: /Audio/Items/eating_2.ogg # TODO: Crushing noise
+      path: /Audio/Items/eating_2.ogg # TODO: Crushing noise
+
+- type: entity
+  name: super sledge hammer
+  parent: N14SledgeHammer
+  id: N14SuperSledgeHammer
+  description: A bigger, heavier and more destructive sledge hammer, you really need some strong arms to swing it.
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Melee/supersledge.rsi
+    state: icon
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 5
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 35

Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml

@@ -10,3 +10,54 @@
   - type: Item
     size: 15
     sprite: Nuclear14/Objects/Weapons/Melee/machete.rsi
+
+- type: entity
+  name: tribal machete
+  parent: N14Machete
+  id: N14TribalMachete
+  description: A tribal machete, made from the materials giben by the nature, this long blade has the perfect balance between tool and weapon.
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Melee/tribal_machete.rsi
+    state: icon
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 16
+    soundHit:
+        path: /Audio/Weapons/bladeslice.ogg
+
+- type: entity
+  name: scrap machete
+  parent: N14Machete
+  id: N14ScrapMachete
+  description: A makeshift long blade machete, not the most sharp blade but it can still cut some meat.
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi
+    state: icon
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 16
+    soundHit:
+        path: /Audio/Weapons/bladeslice.ogg
+
+- type: entity
+  name: ripper
+  parent: N14Machete
+  id: N14ripper
+  description: A light one handed wield chainsaw, originally designed by the pre-war army sappers to clean selvatic and wooded paths, it also works well against meat.
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Melee/ripper.rsi
+    state: icon
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 25
+    soundHit:
+        path: /Audio/Weapons/chainsaw.ogg
+  - type: Item
+    size: 30
+    sprite: Nuclear14/Objects/Weapons/Melee/ripper.rsi

Resources/Prototypes/Nuclear14/tags.yml

@@ -87,4 +87,4 @@
   id: Bighorner
 
 - type: Tag
-  id: Radstag
+  id: Radstag

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/chinesepistol.rsi/meta.json

@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by PatoGrone for N14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/Nuclear14/Objects/Weapons/Guns/Pistols/thespy.rsi/meta.json

@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by PatoGrone for N14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}