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)
This commit is contained in:
@@ -41,6 +41,24 @@
|
|||||||
damage:
|
damage:
|
||||||
types:
|
types:
|
||||||
Piercing: 25
|
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
|
- type: entity
|
||||||
parent: BaseArrow
|
parent: BaseArrow
|
||||||
@@ -55,6 +73,9 @@
|
|||||||
- state: rod
|
- state: rod
|
||||||
color: brown
|
color: brown
|
||||||
- state: tip
|
- state: tip
|
||||||
|
- state: solution1
|
||||||
|
map: ["enum.SolutionContainerLayers.Fill"]
|
||||||
|
visible: false
|
||||||
- type: Projectile
|
- type: Projectile
|
||||||
damage:
|
damage:
|
||||||
types:
|
types:
|
||||||
@@ -75,6 +96,9 @@
|
|||||||
color: darkgray
|
color: darkgray
|
||||||
- state: tip
|
- state: tip
|
||||||
color: lightblue
|
color: lightblue
|
||||||
|
- state: solution1
|
||||||
|
map: ["enum.SolutionContainerLayers.Fill"]
|
||||||
|
visible: false
|
||||||
- type: Projectile
|
- type: Projectile
|
||||||
damage:
|
damage:
|
||||||
types:
|
types:
|
||||||
|
|||||||
@@ -28,7 +28,11 @@
|
|||||||
- type: Sharp
|
- type: Sharp
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Objects/Weapons/Melee/spear.rsi
|
sprite: Objects/Weapons/Melee/spear.rsi
|
||||||
state: spear
|
layers:
|
||||||
|
- state: spear
|
||||||
|
- state: spear1
|
||||||
|
map: ["enum.SolutionContainerLayers.Fill"]
|
||||||
|
visible: false
|
||||||
- type: MeleeWeapon
|
- type: MeleeWeapon
|
||||||
damage:
|
damage:
|
||||||
types:
|
types:
|
||||||
@@ -61,6 +65,9 @@
|
|||||||
solution: melee
|
solution: melee
|
||||||
- type: InjectableSolution
|
- type: InjectableSolution
|
||||||
solution: melee
|
solution: melee
|
||||||
|
- type: SolutionInjectOnCollide
|
||||||
|
transferAmount: 5
|
||||||
|
blockSlots: NONE
|
||||||
- type: SolutionTransfer
|
- type: SolutionTransfer
|
||||||
maxTransferAmount: 5
|
maxTransferAmount: 5
|
||||||
- type: Wieldable
|
- type: Wieldable
|
||||||
@@ -96,6 +103,10 @@
|
|||||||
damage:
|
damage:
|
||||||
types:
|
types:
|
||||||
Blunt: 5
|
Blunt: 5
|
||||||
|
- type: Appearance
|
||||||
|
- type: SolutionContainerVisuals
|
||||||
|
maxFillLevels: 1
|
||||||
|
fillBaseName: spear
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: reinforced spear
|
name: reinforced spear
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
"name": "tip"
|
"name": "tip"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "solution"
|
"name": "solution1"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "inhand-left",
|
"name": "inhand-left",
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 257 B After Width: | Height: | Size: 257 B |
@@ -10,6 +10,9 @@
|
|||||||
{
|
{
|
||||||
"name": "spear"
|
"name": "spear"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "spear1"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "inhand-left",
|
"name": "inhand-left",
|
||||||
"directions": 4
|
"directions": 4
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
@@ -10,6 +10,9 @@
|
|||||||
{
|
{
|
||||||
"name": "spear"
|
"name": "spear"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "spear1"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "inhand-left",
|
"name": "inhand-left",
|
||||||
"directions": 4
|
"directions": 4
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
@@ -10,6 +10,9 @@
|
|||||||
{
|
{
|
||||||
"name": "spear"
|
"name": "spear"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "spear1"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "inhand-left",
|
"name": "inhand-left",
|
||||||
"directions": 4
|
"directions": 4
|
||||||
|
|||||||
BIN
Resources/Textures/Objects/Weapons/Melee/spear.rsi/spear1.png
Normal file
BIN
Resources/Textures/Objects/Weapons/Melee/spear.rsi/spear1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
@@ -10,6 +10,9 @@
|
|||||||
{
|
{
|
||||||
"name": "spear"
|
"name": "spear"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "spear1"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "inhand-left",
|
"name": "inhand-left",
|
||||||
"directions": 4
|
"directions": 4
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
Reference in New Issue
Block a user