diff --git a/config.lua b/config.lua
index e354f60..0383f6a 100644
--- a/config.lua
+++ b/config.lua
@@ -52,7 +52,7 @@ timeBetweenExActions = 1000
-- Map
-- NOTE: set mapName WITHOUT .otbm at the end
-mapName = "map"
+mapName = "mymap"
mapAuthor = "CipSoft"
-- MySQL
diff --git a/data/actions/scripts/misc/fluids.lua b/data/actions/scripts/misc/fluids.lua
index 4d8160f..c3ce9d6 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.",
@@ -48,7 +43,7 @@ function onUse(player, item, fromPosition, target, toPosition)
if self and item:getFluidType() == FLUID_BEER or item:getFluidType() == FLUID_WINE or item:getFluidType() == FLUID_RUM then
player:addCondition(drunk)
elseif self and item:getFluidType() == FLUID_SLIME then
- player:addCondition(slime)
+ player:addCondition(poison)
elseif item:getFluidType() == FLUID_MANAFLUID then
target:addMana(math.random(50, 100))
target:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
diff --git a/data/items/items.srv b/data/items/items.srv
index 41bc61b..2aa97e0 100644
--- a/data/items/items.srv
+++ b/data/items/items.srv
@@ -9303,7 +9303,7 @@ TypeID = 2121
Name = "poison gas"
Flags = {CollisionEvent,Unmove,Avoid,MagicField,Expire}
Attributes = {AvoidDamageTypes=POISON,Brightness=2,LightColor=104,ExpireTarget=0,TotalExpireTime=250}
-MagicField = {Type=POISON,Count=100}
+MagicField = {Type=POISON,Count=100,Damage=5}
TypeID = 2122
Name = "an energy field"
@@ -9338,7 +9338,7 @@ TypeID = 2127
Name = "poison gas"
Flags = {CollisionEvent,Unmove,Avoid,MagicField}
Attributes = {AvoidDamageTypes=POISON,Brightness=2,LightColor=104}
-MagicField = {Type=POISON,Count=100}
+MagicField = {Type=POISON,Count=100,Damage=5}
TypeID = 2128
Name = "a magic wall"
@@ -9376,7 +9376,7 @@ TypeID = 2134
Name = "poison gas"
Flags = {CollisionEvent,Unmove,Avoid,MagicField,Expire}
Attributes = {AvoidDamageTypes=POISON,Brightness=2,LightColor=214,ExpireTarget=0,TotalExpireTime=8}
-MagicField = {Type=POISON,Count=100}
+MagicField = {Type=POISON,Count=100,Damage=5}
TypeID = 2135
Name = "an energy field"
@@ -24442,32 +24442,32 @@ Attributes = {Brightness=7,LightColor=207}
TypeID = 5404
Name = "ocean floor"
-Flags = {Bank,Unmove}
+Flags = {Bank,Unmove,CollisionEvent}
Attributes = {Waypoints=500}
TypeID = 5405
Name = "ocean floor"
-Flags = {Bank,Unmove}
+Flags = {Bank,Unmove,CollisionEvent}
Attributes = {Waypoints=500}
TypeID = 5406
Name = "ocean floor"
-Flags = {Bank,Unmove}
+Flags = {Bank,Unmove,CollisionEvent}
Attributes = {Waypoints=500}
TypeID = 5407
Name = "ocean floor"
-Flags = {Bank,Unmove}
+Flags = {Bank,Unmove,CollisionEvent}
Attributes = {Waypoints=500}
TypeID = 5408
Name = "ocean floor"
-Flags = {Bank,Unmove}
+Flags = {Bank,Unmove,CollisionEvent}
Attributes = {Waypoints=500}
TypeID = 5409
Name = "ocean floor"
-Flags = {Bank,Unmove}
+Flags = {Bank,Unmove,CollisionEvent}
Attributes = {Waypoints=500}
TypeID = 5410
@@ -24674,7 +24674,7 @@ TypeID = 5460
Name = "a helmet of the deep"
Description = "Enables underwater exploration"
Flags = {Take,Armor}
-Attributes = {Weight=21000,SlotType=HEAD,ArmorValue=2} # TODO: Drown protection!
+Attributes = {Weight=21000,SlotType=HEAD,ArmorValue=2,AbsorbDrown=100}
TypeID = 5461
Name = "pirate boots"
@@ -25925,12 +25925,12 @@ Name = "" # this is nothing in client
TypeID = 5743
Name = "wooden floor"
-Flags = {Bank,Unmove}
+Flags = {Bank,Unmove,CollisionEvent}
Attributes = {Waypoints=500}
TypeID = 5744
Name = "wooden floor"
-Flags = {Bank,Unmove}
+Flags = {Bank,Unmove,CollisionEvent}
Attributes = {Waypoints=500}
TypeID = 5745
@@ -26017,7 +26017,7 @@ Attributes = {Waypoints=110}
TypeID = 5764
Name = "a ventilation grille"
-Flags = {Bank,Unmove}
+Flags = {Bank,Unmove,CollisionEvent}
Attributes = {Waypoints=500}
TypeID = 5765
@@ -26810,7 +26810,7 @@ Flags = {Take}
Attributes = {Weight=3200}
TypeID = 5929
-Name = "a goldfish bow"
+Name = "a goldfish bowl"
Flags = {Take}
Attributes = {Weight=3200}
diff --git a/data/monster/781/acolyte of the cult.xml b/data/monster/781/acolyte of the cult.xml
new file mode 100644
index 0000000..f446281
--- /dev/null
+++ b/data/monster/781/acolyte of the cult.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+