fix fluid colors and add few more items functionality from 781

src/const.h

@@ -122,6 +122,8 @@ enum FluidTypes_t : uint8_t
 	FLUID_MANAFLUID,
 	FLUID_LIFEFLUID,
 	FLUID_LEMONADE,
+	FLUID_RUM,
+	FLUID_COCONUTMILK,
 };
 
 enum FluidColor_t : uint8_t
@@ -130,10 +132,12 @@ enum FluidColor_t : uint8_t
 	FLUID_COLOR_BLUE = 1,
 	FLUID_COLOR_PURPLE = 2,
 	FLUID_COLOR_BROWN = 3,
-	FLUID_COLOR_RED = 4,
-	FLUID_COLOR_GREEN = 5,
-	FLUID_COLOR_YELLOW = 6,
-	FLUID_COLOR_WHITE = 7,
+	FLUID_COLOR_BROWN1 = 4,
+	FLUID_COLOR_RED = 5,
+	FLUID_COLOR_GREEN = 6,
+	FLUID_COLOR_BROWN2 = 7,
+	FLUID_COLOR_YELLOW = 8,
+	FLUID_COLOR_WHITE = 9,
 };
 
 enum SquareColor_t : uint8_t {

src/luascript.cpp

@@ -1407,6 +1407,7 @@ void LuaScriptInterface::registerFunctions()
 	registerEnum(FLUID_MANAFLUID)
 	registerEnum(FLUID_LIFEFLUID)
 	registerEnum(FLUID_LEMONADE)
+	registerEnum(FLUID_RUM)
 
 	registerEnum(TALKTYPE_SAY)
 	registerEnum(TALKTYPE_WHISPER)

src/tools.cpp

@@ -188,40 +188,42 @@ std::string transformToSHA1(const std::string& input)
 
 uint8_t getLiquidColor(uint8_t type)
 {
-	uint8_t result = 0;
+	uint8_t result = FLUID_COLOR_NONE;
 	switch (type)
 	{
-	case 1:
-		result = 1;
+	case FLUID_WATER:
+		result = FLUID_COLOR_BLUE;
 		break;
-	case 0:
-		result = 0;
+	case FLUID_NONE:
+		result = FLUID_COLOR_NONE;
 		break;
-	case 6:
-		result = 4;
+	case FLUID_SLIME:
+		result = FLUID_COLOR_GREEN;
 		break;
-	case 3:
-	case 4:
-	case 7:
-		result = 3;
+	case FLUID_BEER:
+	case FLUID_MUD:
+	case FLUID_OIL:
+	case FLUID_RUM:
+		result = FLUID_COLOR_BROWN;
 		break;
-	case 9:
-		result = 6;
+	case FLUID_MILK:
+	case FLUID_COCONUTMILK:
+		result = FLUID_COLOR_WHITE;
 		break;
-	case 2:
-	case 10:
-		result = 7;
+	case FLUID_WINE:
+	case FLUID_MANAFLUID:
+		result = FLUID_COLOR_PURPLE;
 		break;
-	case 5:
-	case 11:
-		result = 2;
+	case FLUID_BLOOD:
+	case FLUID_LIFEFLUID:
+		result = FLUID_COLOR_RED;
 		break;
-	case 8:
-	case 12:
-		result = 5;
+	case FLUID_URINE:
+	case FLUID_LEMONADE:
+		result = FLUID_COLOR_YELLOW;
 		break;
 	default:
-		result = 0;
+		result = FLUID_COLOR_NONE;
 		break;
 	}
 	return result;
@@ -717,7 +719,8 @@ FluidNames fluidNames[] = {
 	{"milk",			FLUID_MILK},
 	{"manafluid",		FLUID_MANAFLUID},
 	{"lifefluid",		FLUID_LIFEFLUID},
-	{"lemonade",		FLUID_LEMONADE}
+	{"lemonade",		FLUID_LEMONADE},
+	{"rum",				FLUID_RUM}
 };
 
 MagicEffectClasses getMagicEffect(const std::string& strValue)