From: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com>
Date: Sun, 24 Sep 2023 19:46:16 +0000 (+0300)
Subject: Solutions on thrown spears/shot arrows (#20416)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1a67c5583a2de07efd5b40b19d776af9d0e50eff;p=space-station-14.git

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)
---

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 0000000000..fec362ac72
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/spear1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
index 0800614b81..383ea777d2 100644
--- a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/reinforced_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/reinforced_spear.rsi/spear1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/spear1.png
new file mode 100644
index 0000000000..fec362ac72
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/spear1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
index 777736b486..49209bf2dc 100644
--- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/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/spear.rsi/spear1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/spear1.png
new file mode 100644
index 0000000000..fec362ac72
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/spear1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
index 0800614b81..383ea777d2 100644
--- a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/uranium_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/uranium_spear.rsi/spear1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/spear1.png
new file mode 100644
index 0000000000..fec362ac72
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/spear1.png differ