From 1a67c5583a2de07efd5b40b19d776af9d0e50eff Mon Sep 17 00:00:00 2001 From: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:46:16 +0300 Subject: [PATCH] Solutions on thrown spears/shot arrows (#20416) * Solutions on thrown spears/shot arrows Spears inject their solution on thrown hit. Arrows now have 5u solution storage that is injected when it hits target. * Whoops, wrong arrow. Instead of base arrow, I accidentally modified the 'regular arrow' * spear and arrow solution graphics Spears and arrows now show what they are doped with when they are on ground. (just like beakers) --- .../Weapons/Guns/Projectiles/arrows.yml | 24 ++++++++++++++++++ .../Entities/Objects/Weapons/Melee/spear.yml | 13 +++++++++- .../Guns/Projectiles/arrows.rsi/meta.json | 2 +- .../{solution.png => solution1.png} | Bin .../Weapons/Melee/plasma_spear.rsi/meta.json | 3 +++ .../Weapons/Melee/plasma_spear.rsi/spear1.png | Bin 0 -> 1965 bytes .../Melee/reinforced_spear.rsi/meta.json | 3 +++ .../Melee/reinforced_spear.rsi/spear1.png | Bin 0 -> 1965 bytes .../Objects/Weapons/Melee/spear.rsi/meta.json | 3 +++ .../Weapons/Melee/spear.rsi/spear1.png | Bin 0 -> 1965 bytes .../Weapons/Melee/uranium_spear.rsi/meta.json | 3 +++ .../Melee/uranium_spear.rsi/spear1.png | Bin 0 -> 1965 bytes 12 files changed, 49 insertions(+), 2 deletions(-) rename Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/{solution.png => solution1.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/spear1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/spear1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/spear1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/spear1.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml index 7112d07f2f..201e328c75 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml @@ -41,6 +41,24 @@ damage: types: Piercing: 25 + - type: SolutionContainerManager + solutions: + ammo: + maxVol: 5 + - type: RefillableSolution + solution: ammo + - type: InjectableSolution + solution: ammo + - type: SolutionInjectOnCollide + transferAmount: 5 + blockSlots: NONE + - type: SolutionTransfer + maxTransferAmount: 5 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: solution + - type: entity parent: BaseArrow @@ -55,6 +73,9 @@ - state: rod color: brown - state: tip + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false - type: Projectile damage: types: @@ -75,6 +96,9 @@ color: darkgray - state: tip color: lightblue + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false - type: Projectile damage: types: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index c893829bea..ea25cf0db8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -28,7 +28,11 @@ - type: Sharp - type: Sprite sprite: Objects/Weapons/Melee/spear.rsi - state: spear + layers: + - state: spear + - state: spear1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false - type: MeleeWeapon damage: types: @@ -61,6 +65,9 @@ solution: melee - type: InjectableSolution solution: melee + - type: SolutionInjectOnCollide + transferAmount: 5 + blockSlots: NONE - type: SolutionTransfer maxTransferAmount: 5 - type: Wieldable @@ -96,6 +103,10 @@ damage: types: Blunt: 5 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: spear - type: entity name: reinforced spear diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json index b8313f7810..f5f474b960 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json @@ -17,7 +17,7 @@ "name": "tip" }, { - "name": "solution" + "name": "solution1" }, { "name": "inhand-left", diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/solution.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/solution1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/solution.png rename to Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/solution1.png diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json index 0800614b81..383ea777d2 100644 --- a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "spear" }, + { + "name": "spear1" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/spear1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/spear1.png new file mode 100644 index 0000000000000000000000000000000000000000..fec362ac7284b04db4492b77d3b1014516e64bd2 GIT binary patch literal 1965 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