Skip to content

Commit 3914010

Browse files
authored
fix: fluids descriptions (#3559)
1 parent 2e78830 commit 3914010

File tree

1 file changed

+23
-20
lines changed
  • data-otservbr-global/scripts/actions/other

1 file changed

+23
-20
lines changed

data-otservbr-global/scripts/actions/other/fluids.lua

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,27 @@ poison:setParameter(CONDITION_PARAM_TICKINTERVAL, 4000)
1010
poison:setParameter(CONDITION_PARAM_FORCEUPDATE, true)
1111

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

3336
local function graveStoneTeleport(cid, fromPosition, toPosition)
@@ -102,7 +105,7 @@ function fluid.onUse(player, item, fromPosition, target, toPosition, isHotkey)
102105
if item.type == 0 then
103106
player:sendTextMessage(MESSAGE_FAILURE, "It is empty.")
104107
elseif item.type == 1 then
105-
toPosition:sendMagicEffect(CONST_ME_WATER_SPLASH)
108+
toPosition:sendMagicEffect(CONST_ME_WATERSPLASH)
106109
target:transform(target.itemid + 1)
107110
item:transform(item.itemid, 0)
108111
else
@@ -115,7 +118,7 @@ function fluid.onUse(player, item, fromPosition, target, toPosition, isHotkey)
115118
if item.type == 0 then
116119
player:sendTextMessage(MESSAGE_FAILURE, "It is empty.")
117120
elseif target.uid == player.uid then
118-
if table.contains({ 2, 3, 16 }, item.type) then
121+
if table.contains({ 2, 3, 13, 16 }, item.type) then
119122
player:addCondition(drunk)
120123
elseif item.type == 6 then
121124
local town = player:getTown()

0 commit comments

Comments
 (0)