From f9cff8fb05b9356a668c8cd9f41093f5f4243eac Mon Sep 17 00:00:00 2001 From: Alejandro Mujica Date: Tue, 5 Feb 2019 12:59:05 -0400 Subject: [PATCH] Update fluids Slime fluid using CipSoft condition system. Can only use fluids on players (need further confirmation on the behavior done on monsters and NPCs) --- data/actions/scripts/misc/fluids.lua | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/data/actions/scripts/misc/fluids.lua b/data/actions/scripts/misc/fluids.lua index 4bb92b4..3277f38 100644 --- a/data/actions/scripts/misc/fluids.lua +++ b/data/actions/scripts/misc/fluids.lua @@ -2,12 +2,7 @@ local drunk = Condition(CONDITION_DRUNK) drunk:setParameter(CONDITION_PARAM_TICKS, 60000) local poison = Condition(CONDITION_POISON) -poison:setParameter(CONDITION_PARAM_DELAYED, true) -poison:setParameter(CONDITION_PARAM_MINVALUE, -50) -poison:setParameter(CONDITION_PARAM_MAXVALUE, -120) -poison:setParameter(CONDITION_PARAM_STARTVALUE, -5) -poison:setParameter(CONDITION_PARAM_TICKINTERVAL, 5000) -poison:setParameter(CONDITION_PARAM_FORCEUPDATE, true) +poison:setTiming(100) local messages = { [FLUID_WATER] = "Gulp.", @@ -38,7 +33,7 @@ function onUse(player, item, fromPosition, target, toPosition) end end - if target:isCreature() then + if target:isCreature() and target:getPlayer() ~= nil then if item:getFluidType() == FLUID_NONE then player:sendCancelMessage("It is empty.") else