Skip to content

fix: fluids descriptions #3559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
majestyotbr merged 3 commits into from
Jul 12, 2025
Merged

fix: fluids descriptions #3559

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b5865f
fix fluids
vllsystems May 30, 2025
98dfdc6
Update fluids.lua
vllsystems May 30, 2025
36f0c02
Update fluids.lua
vllsystems May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 23 additions & 20 deletions data-otservbr-global/scripts/actions/other/fluids.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,27 @@ poison:setParameter(CONDITION_PARAM_TICKINTERVAL, 4000)
poison:setParameter(CONDITION_PARAM_FORCEUPDATE, true)

local fluidMessage = {
[FLUID_NONE] = "Gulp.", -- water
[FLUID_WATER] = "Aah...", -- wine
[FLUID_WINE] = "Aah...", -- beer
[FLUID_BEER] = "Gulp.", -- mud
[FLUID_MUD] = "Gulp.", -- blood
[FLUID_BLOOD] = "Urgh!", -- slime
[FLUID_SLIME] = "Gulp.", -- oil
[FLUID_OIL] = "Urgh!", -- urine
[FLUID_URINE] = "Gulp.", -- milk
[FLUID_MILK] = "Aaaah...", -- manafluid
[FLUID_MANA] = "Aaaah...", -- lifefluid
[FLUID_LIFE] = "Mmmh.", -- lemonade
[FLUID_LEMONADE] = "Aah...", -- rum
[FLUID_RUM] = "Mmmh.", -- fruit juice
[FLUID_FRUITJUICE] = "Mmmh.", -- coconut milk
[FLUID_COCONUTMILK] = "Aah...", -- mead
[FLUID_MEAD] = "Gulp.", -- tea
[FLUID_TEA] = "Urgh!", -- ink
[FLUID_NONE] = "Gulp.", -- water 0
[FLUID_WATER] = "Gulp.", -- water 1
[FLUID_WINE] = "Aah...", -- wine 2
[FLUID_BEER] = "Aah...", -- beer 3
[FLUID_MUD] = "Gulp.", -- mud 4
[FLUID_BLOOD] = "Gulp.", -- blood 5
[FLUID_SLIME] = "Urgh!", -- slime 6
[FLUID_OIL] = "Gulp.", -- oil 7
[FLUID_URINE] = "Urgh!", -- urine 8
[FLUID_MILK] = "Gulp.", -- milk 9
[FLUID_MANA] = "Aaaah...", -- mana fluid 10
[FLUID_LIFE] = "Aaaah...", -- life fluid 11
[FLUID_LEMONADE] = "Mmmh.", -- lemonade 12
[FLUID_RUM] = "Aah...", -- rum 13
[FLUID_FRUITJUICE] = "Mmmh.", -- fruit juice 14
[FLUID_COCONUTMILK] = "Mmmh.", -- coconut milk 15
[FLUID_MEAD] = "Aah...", -- mead 16
[FLUID_TEA] = "Gulp.", -- tea 17
[FLUID_INK] = "Urgh!", -- ink 18
[FLUID_CANDY] = "Mmmh.", -- candy fluid 19
[FLUID_CHOCOLATE] = "Mmmh.", -- chocolate 20
}

local function graveStoneTeleport(cid, fromPosition, toPosition)
Expand Down Expand Up @@ -102,7 +105,7 @@ function fluid.onUse(player, item, fromPosition, target, toPosition, isHotkey)
if item.type == 0 then
player:sendTextMessage(MESSAGE_FAILURE, "It is empty.")
elseif item.type == 1 then
toPosition:sendMagicEffect(CONST_ME_WATER_SPLASH)
toPosition:sendMagicEffect(CONST_ME_WATERSPLASH)
target:transform(target.itemid + 1)
item:transform(item.itemid, 0)
else
Expand All @@ -115,7 +118,7 @@ function fluid.onUse(player, item, fromPosition, target, toPosition, isHotkey)
if item.type == 0 then
player:sendTextMessage(MESSAGE_FAILURE, "It is empty.")
elseif target.uid == player.uid then
if table.contains({ 2, 3, 16 }, item.type) then
if table.contains({ 2, 3, 13, 16 }, item.type) then
player:addCondition(drunk)
elseif item.type == 6 then
local town = player:getTown()
Expand Down