custom items + fix fluids.

vllworldbuilding · Oct 25, 2024 · 36e523b · 36e523b
1 parent 54c8e21
commit 36e523b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/data/items/items.xml b/data/items/items.xml
@@ -76355,7 +76355,7 @@ Granted by TibiaGoals.com"/>
 		<attribute key="decayTo" value="0"/>
 	</item>
 
-	<!--DAQUI PARA BAIXO SÃÂO TODOS ITENS CUSTOM REPENSAR OS NOMES DOS PEIXES	-->
+	<!--DAQUI PARA BAIXO SÃÂÃÂO TODOS ITENS CUSTOM REPENSAR OS NOMES DOS PEIXES	-->
 	<item id="49279" article="a" name="squid" plural="squids">
 		<attribute key="primarytype" value="food"/>
 		<attribute key="weight" value="1800"/>

diff --git a/src/items/functions/item/item_parse.hpp b/src/items/functions/item/item_parse.hpp
@@ -195,7 +195,7 @@ const phmap::flat_hash_map<std::string, TileFlags_t> TileStatesMap = {
 };
 
 const phmap::flat_hash_map<std::string, Fluids_t> FluidTypesMap = {
-	{ "water", FLUID_WATER },
+	{ "saltwater", FLUID_SALTWATER },
 	{ "blood", FLUID_BLOOD },
 	{ "beer", FLUID_BEER },
 	{ "slime", FLUID_SLIME },
@@ -215,6 +215,7 @@ const phmap::flat_hash_map<std::string, Fluids_t> FluidTypesMap = {
 	{ "ink", FLUID_INK },
 	{ "candyfluid", FLUID_CANDY },
 	{ "chocolate", FLUID_CHOCOLATE },
+	{ "freshwater", FLUID_FRESHWATER },
 };
 
 const phmap::flat_hash_map<std::string, WeaponType_t> WeaponTypesMap = {

diff --git a/src/utils/utils_definitions.hpp b/src/utils/utils_definitions.hpp
@@ -346,7 +346,7 @@ enum MessageClasses : uint8_t {
 
 enum Fluids_t : uint8_t {
 	FLUID_NONE = 0, /* Blue */
-	FLUID_WATER = 1, /* Blue */
+	FLUID_SALTWATER = 1, /* Blue */
 	FLUID_WINE = 2, /* Purple */
 	FLUID_BEER = 3, /* Orange */
 	FLUID_MUD = 4, /* Orange */
@@ -366,6 +366,7 @@ enum Fluids_t : uint8_t {
 	FLUID_INK = 18, /* Black */
 	FLUID_CANDY = 19, /* Red with white pieces */
 	FLUID_CHOCOLATE = 20, /* Brown */
+	FLUID_FRESHWATER = 21, /* Blue */
 	// 13.40 last fluid is 20, 21+ is a loop from 0 to 20 over and over again
 };