Diona Nymph runtime and Fruit Attack fixes

Fixes a runtime preventing Diona Nymphs from eating weeds and regaining
nutrition

Fixes fruit attacks checking for "hurt" when they should check for
"harm".
- You can now smack people with fruit on harm intent. If the plant has
TRAIT_STINGS, it will inject them with it's chemicals
- You can now crush a fruit in your hand on harm intent to destroy it
(will not leave trash like banana peels!). This will trigger the same
effects that throwing the fruit would have, except without needing to
throw it.
- Use this to activate that smoke-screen tobacco you spent all round
mutating, or to make a quick escape with your bluespace tomato!
This commit is contained in:
FalseIncarnate
2015-06-16 17:09:39 -04:00
parent 5ce71d8cd7
commit 3166200c5e
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -284,7 +284,7 @@
if(user == M)
return ..()
if(user.a_intent == "hurt")
if(user.a_intent == "harm")
// This is being copypasted here because reagent_containers (WHY DOES FOOD DESCEND FROM THAT) overrides it completely.
// TODO: refactor all food paths to be less horrible and difficult to work with in this respect. ~Z
@@ -349,7 +349,7 @@
if(istype(user.loc,/turf/space))
return
if(user.a_intent == "hurt")
if(user.a_intent == "harm")
user.visible_message("<span class='danger'>\The [user] squashes \the [src]!</span>")
seed.thrown_at(src,user)
sleep(-1)
@@ -146,7 +146,7 @@
if(!src || !target || target.weedlevel == 0) return //Sanity check.
src.reagents.add_reagent("nutriment", target.weedlevel)
src.nutrition += target.weedlevel * 15
target.weedlevel = 0
src.visible_message("\red [src] begins rooting through [target], ripping out weeds and eating them noisily.","\red You begin rooting through [target], ripping out weeds and eating them noisily.")