diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Crossbow/crossbow.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Crossbow/crossbow.yml index 7868326ed2e..2990c4cb900 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Crossbow/crossbow.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Crossbow/crossbow.yml @@ -71,6 +71,9 @@ - sprite: _NF/Objects/Weapons/Guns/Projectiles/crossbow_bolts.rsi state: icon-bolt-stake map: [ stake ] + - sprite: _NF/Objects/Weapons/Guns/Projectiles/crossbow_bolts.rsi + state: icon-bolt-shell + map: [ shrapnel ] visible: false - type: Item size: Normal @@ -110,6 +113,7 @@ - CrossbowBoltExplosive - CrossbowBoltEMP - CrossbowBoltIncendiary + - CrossbowBoltShrapnel - Plunger - Bread - MailCapsule @@ -136,6 +140,7 @@ - bread - mail - stake + - shrapnel mapLayers: bolt: whitelist: @@ -193,6 +198,10 @@ whitelist: tags: - WeaponMeleeStake + shrapnel: + whitelist: + tags: + - CrossbowBoltShrapnel - type: entity id: BaseCrossbowWieldable diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/crossbow_bolts.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/crossbow_bolts.yml index 73e746aa529..3efbf452162 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/crossbow_bolts.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/crossbow_bolts.yml @@ -527,6 +527,46 @@ types: Blunt: 30 # Should prevent re-using +- type: Tag + id: CrossbowBoltShrapnel + +- type: entity + parent: BaseCrossbowBoltTrigger + id: CrossbowBoltShrapnel + name: shrapnel bolt + description: A bolt with a buckshot shotgun shell attached to it. + components: + - type: Tag + tags: + - CrossbowBoltShrapnel + - type: Sprite + layers: + - state: tail + color: "#9b0048" + - state: rod + color: "#767676" + - state: charge + color: "#801000" + - state: tip + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Projectile + damage: + types: + Blunt: 5 + - type: ClusterGrenade + fillPrototype: PelletShotgun + maxGrenadesCount: 6 + grenadeType: enum.GrenadeType.Shoot + - type: Construction + graph: CraftCrossbowBoltShrapnel + node: CraftCrossbowBoltShrapnel + - type: DamageOnLand + damage: + types: + Blunt: 30 # Should prevent re-using + # Blood cult - type: entity parent: diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/improvised_bolt.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/improvised_bolt.yml index 4bfd32c4575..9cbbf1e199f 100644 --- a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/improvised_bolt.yml +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/weapons/improvised_bolt.yml @@ -127,6 +127,12 @@ sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi state: base doAfter: 1 + - component: Explosive + name: Firebomb + icon: + sprite: Objects/Weapons/Bombs/ied.rsi + state: base + doAfter: 1 - node: CraftCrossbowBoltExplosive entity: CrossbowBoltExplosive @@ -140,16 +146,25 @@ steps: - material: MetalRod amount: 1 - doAfter: 0.5 + doAfter: 0.4 - material: Cloth amount: 1 - doAfter: 0.5 - - tag: PowerCellSmall - name: Small power cell + doAfter: 0.4 + - material: Cable + amount: 5 + doAfter: 0.4 + - component: PowerCell + name: Power cell icon: sprite: Objects/Power/power_cells.rsi - state: small - doAfter: 1 + state: high + doAfter: 0.4 + - component: LogicGate + name: Logic gate + icon: + sprite: Objects/Devices/gates.rsi + state: base + doAfter: 0.4 - node: CraftCrossbowBoltEMP entity: CrossbowBoltEMP @@ -175,3 +190,26 @@ doAfter: 1 - node: CraftCrossbowBoltIncendiary entity: CrossbowBoltIncendiary + +- type: constructionGraph + id: CraftCrossbowBoltShrapnel + start: start + graph: + - node: start + edges: + - to: CraftCrossbowBoltShrapnel + steps: + - material: MetalRod + amount: 1 + doAfter: 0.5 + - material: Cloth + amount: 1 + doAfter: 0.5 + - tag: ShellShotgun + name: Shotgun shell + icon: + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: base + doAfter: 1 + - node: CraftCrossbowBoltShrapnel + entity: CrossbowBoltShrapnel diff --git a/Resources/Prototypes/_NF/Recipes/Construction/weapons.yml b/Resources/Prototypes/_NF/Recipes/Construction/weapons.yml index 2035e13fcc9..fc5c4da1eb2 100644 --- a/Resources/Prototypes/_NF/Recipes/Construction/weapons.yml +++ b/Resources/Prototypes/_NF/Recipes/Construction/weapons.yml @@ -66,7 +66,6 @@ - type: construction name: explosive bolt - hide: true # Fix later id: CraftCrossbowBoltExplosive graph: CraftCrossbowBoltExplosive startNode: start @@ -78,7 +77,6 @@ - type: construction name: EMP bolt - hide: true # Fix later id: CraftCrossbowBoltEMP graph: CraftCrossbowBoltEMP startNode: start @@ -99,6 +97,17 @@ icon: { sprite: _NF/Objects/Weapons/Guns/Projectiles/crossbow_bolts.rsi, state: icon-bolt-incendiary } objectType: Item +- type: construction + name: shrapnel bolt + id: CraftCrossbowBoltShrapnel + graph: CraftCrossbowBoltShrapnel + startNode: start + targetNode: CraftCrossbowBoltShrapnel + category: construction-category-weapons + description: A bolt with a buckshot shotgun shell attached to it. + icon: { sprite: _NF/Objects/Weapons/Guns/Projectiles/crossbow_bolts.rsi, state: icon-bolt-shell } + objectType: Item + - type: construction name: wooden stake id: RecipeWoodenStake diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/crossbow_bolts.rsi/icon-bolt-shell.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/crossbow_bolts.rsi/icon-bolt-shell.png new file mode 100644 index 00000000000..064b65a5083 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/crossbow_bolts.rsi/icon-bolt-shell.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/crossbow_bolts.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/crossbow_bolts.rsi/meta.json index 17581961b7a..fdd489afc4d 100644 --- a/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/crossbow_bolts.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Projectiles/crossbow_bolts.rsi/meta.json @@ -43,6 +43,9 @@ { "name": "icon-bolt-plunger" }, + { + "name": "icon-bolt-shell" + }, { "name": "icon-bolt-baguette" },