Skip to content

Commit

Permalink
Craftable muskets + Flintlocks (#1008)
Browse files Browse the repository at this point in the history
* Musket + parts

* Graphs for Musket and Parts

* Recipes for Musket + Sprites

* Fix 1

* Fix two

* Flintlock

* Fixes

* Fix 3.0

* null is nulled

* forgor graph

* fireRate isn't all lowercase..

* actually make ammo craftable

* Craftable Flintlock Fix

* Update improvised.yml

* Update musket.yml

* I gib up

* Make firerate 1 shot every 8 seconds and it doesn't reset when you switch hands.

* why.

* Forgor

* forgor

* Update Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/meta.json

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Signed-off-by: Tryded <139474617+Tryded@users.noreply.github.com>

---------

Signed-off-by: Tryded <139474617+Tryded@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
  • Loading branch information
Tryded and Colin-Tel authored May 26, 2024
1 parent fb62f23 commit 9618366
Show file tree
Hide file tree
Showing 24 changed files with 437 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
- type: entity
parent: BaseItem
id: ModularBreech
name: modular breech
description: Loads the projectile and propellent into the chamber of the gun. Used in the creation of flintlock muskets.
components:
- type: Item
size: Small
- type: Sprite
sprite: DeltaV/Objects/Misc/modular_breech.rsi
state: base
- type: Construction
graph: ModularBreechGraph
node: modularbreech
- type: Tag
tags:
- Metal
- ModularBreech

- type: entity
parent: BaseItem
id: ModularTrigger
name: modular trigger
description: Makes gun go pew when activated. Used in the creation of guns.
components:
- type: Item
size: Small
- type: Sprite
sprite: DeltaV/Objects/Misc/modular_trigger.rsi
state: base
- type: Construction
graph: ModularTriggerGraph
node: modulartrigger
- type: Tag
tags:
- Metal
- ModularTrigger

- type: entity
parent: BaseItem
id: Bayonet
name: bayonet
description: Often placed on guns to go stabby stabby.
components:
- type: Item
size: Small
- type: Sprite
sprite: DeltaV/Objects/Misc/bayonet.rsi
state: base
- type: Construction
graph: BayonetGraph
node: bayonet
- type: Tag
tags:
- Metal
- Bayonet
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: entity
parent: BaseCartridge
id: CartridgeMusket
name: cartridge (musket)
description: A paper musket cartridge used to load a musket.
components:
- type: Tag
tags:
- Cartridge
- CartridgeMusket
- type: CartridgeAmmo
proto: BulletMusket
deleteOnSpawn: true
- type: Sprite
sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Casings/musket_casing.rsi
state: base
- type: Construction
graph: CartridgeMusketGraph
node: musketcartridge
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
id: BulletMusket
name: bullet (musket)
parent: BaseBullet
noSpawn: true
components:
- type: Projectile
damage:
types:
Piercing: 30 #4 shot kill for a musket
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,27 @@
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot

- type: entity
name: flintlock
suffix: "craftable"
parent: WeaponPistolFlintlock
id: WeaponPistolFlintlockCrafted
description: An old flintlock, feels like 1800s gang warfare. Uses musket cartridges.
components:
- type: BallisticAmmoProvider
whitelist:
tags:
- CartridgeMusket
capacity: 1
proto: CartridgeMusket
- type: Gun #Smoothbore
minAngle: 0
maxAngle: 30
fireRate: .125 #slow firerate
resetOnHandSelected: false #Dual Wielding Muskets
- type: Construction
graph: WeaponPistolFlintlockCraftedGraph
node: flintlock
- type: UseDelay
delay: 0 #Straight up doesn't work for guns
Original file line number Diff line number Diff line change
Expand Up @@ -178,3 +178,31 @@
sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi
- type: Clothing
sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi

- type: entity
name: musket
id: WeaponRifleMusket
parent: Musket
suffix: "craftable"
description: An old flintlock musket. Uses musket cartridges.
components:
- type: BallisticAmmoProvider
whitelist:
tags:
- CartridgeMusket
capacity: 1
proto: CartridgeMusket
- type: Gun #Smoothbore
fireRate: .125
resetOnHandSelected: false
minAngle: 20
maxAngle: 43
- type: Wieldable
- type: GunWieldBonus
minAngle: -20
maxAngle: -40
- type: Construction
graph: WeaponRifleMusketGraph
node: musket
- type: UseDelay
delay: 0 #Straight up doesn't work for guns
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#In its own file and not musket.yml in case anyone ever wants to add more guns that use it.
- type: constructionGraph
id: BayonetGraph
start: start
graph:
- node: start
edges:
- to: bayonet
steps:
- material: Steel
amount: 1
doAfter: 4
- node: bayonet
entity: Bayonet
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#In its own file and not musket.yml in case anyone ever wants to add more guns that use it.
- type: constructionGraph
id: ModularBreechGraph
start: start
graph:
- node: start
edges:
- to: modularbreech
steps:
- material: Steel
amount: 3
doAfter: 8
- node: modularbreech
entity: ModularBreech
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#In its own file and not musket.yml in case anyone ever wants to add more guns that use it.
- type: constructionGraph
id: ModularTriggerGraph
start: start
graph:
- node: start
edges:
- to: modulartrigger
steps:
- material: Steel
amount: 2
doAfter: 4
- node: modulartrigger
entity: ModularTrigger
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
- type: constructionGraph
id: WeaponRifleMusketGraph
start: start
graph:
- node: start
edges:
- to: musket
steps:
- tag: Pipe
icon:
sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeStraight
name: pipe
- tag: ModularBreech
icon:
sprite: DeltaV/Objects/Misc/modular_breech.rsi
state: base
name: modular breech
- tag: ModularTrigger
icon:
sprite: DeltaV/Objects/Misc/modular_trigger.rsi
state: base
name: modular trigger
- tag: RifleStock
icon:
sprite: Objects/Misc/rifle_stock.rsi
state: icon
name: rifle stock
- tag: Bayonet
icon:
sprite: DeltaV/Objects/Misc/bayonet.rsi
state: base
name: bayonet
- material: WoodPlank
amount: 3
doAfter: 10
- node: musket
entity: WeaponRifleMusket

- type: constructionGraph
id: WeaponPistolFlintlockCraftedGraph
start: start
graph:
- node: start
edges:
- to: flintlock
steps:
- tag: GasPipeHalf
icon:
sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeHalf
name: half pipe
- tag: ModularBreech
icon:
sprite: DeltaV/Objects/Misc/modular_breech.rsi
state: base
name: modular breech
- tag: ModularTrigger
icon:
sprite: DeltaV/Objects/Misc/modular_trigger.rsi
state: base
name: modular trigger
- tag: RifleStock
icon:
sprite: Objects/Misc/rifle_stock.rsi
state: icon
name: rifle stock
- tag: Bayonet
icon:
sprite: DeltaV/Objects/Misc/bayonet.rsi
state: base
name: bayonet
- material: WoodPlank
amount: 2
doAfter: 10
- node: flintlock
entity: WeaponPistolFlintlockCrafted
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
- type: constructionGraph
id: CartridgeMusketGraph
start: start
graph:
- node: start
edges:
- to: musketcartridge
steps:
- tag: Paper
icon:
sprite: Objects/Misc/bureaucracy.rsi
state: paper
name: paper
- material: Gunpowder
amount: 1
- material: Steel
amount: 1
doAfter: 1
- node: musketcartridge
entity: CartridgeMusket
77 changes: 77 additions & 0 deletions Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
- type: construction
name: musket
id: WeaponRifleMusket
graph: WeaponRifleMusketGraph
startNode: start
targetNode: musket
category: construction-category-weapons
objectType: Item
description: An old flintlock musket. Uses musket cartidges.
icon:
sprite: Objects/Weapons/Guns/Snipers/musket.rsi
state: base

- type: construction
name: modular breech
id: ModularBreech
graph: ModularBreechGraph
startNode: start
targetNode: modularbreech
category: construction-category-weapons
objectType: Item
description: Loads the projectile and propellent into the chamber of the gun. Used in the creation of flintlock muskets.
icon:
sprite: DeltaV/Objects/Misc/modular_breech.rsi
state: base

- type: construction
name: modular trigger
id: ModularTrigger
graph: ModularTriggerGraph
startNode: start
targetNode: modulartrigger
category: construction-category-weapons
objectType: Item
description: Makes gun go pew when activated. Used in the creation of guns.
icon:
sprite: DeltaV/Objects/Misc/modular_trigger.rsi
state: base

- type: construction
name: bayonet
id: Bayonet
graph: BayonetGraph
startNode: start
targetNode: bayonet
category: construction-category-weapons
objectType: Item
description: Often placed on guns to go stabby stabby.
icon:
sprite: DeltaV/Objects/Misc/bayonet.rsi
state: base

- type: construction
name: cartridge (musket)
id: CartridgeMusket
graph: CartridgeMusketGraph
startNode: start
targetNode: musketcartridge
category: construction-category-weapons
objectType: Item
description: A paper musket cartridge used to load a musket.
icon:
sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Casings/musket_casing.rsi
state: base

- type: construction
name: flintlock
id: WeaponPistolFlintlockCrafted
graph: WeaponPistolFlintlockCraftedGraph
startNode: start
targetNode: flintlock
category: construction-category-weapons
objectType: Item
description: An old flintlock, feels like 1800s gang warfare. Uses musket cartidges.
icon:
sprite: Objects/Weapons/Guns/Snipers/musket.rsi
state: base
Loading

0 comments on commit 9618366

Please sign in to comment.