Skip to content
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

feat: add new liquids 13.40 #2814

Merged
merged 7 commits into from
Aug 16, 2024
Merged

feat: add new liquids 13.40 #2814

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc9b86c
feat: add new liquids 13.40
phacUFPE Aug 14, 2024
0146582
feat: add new liquids to items.xml
phacUFPE Aug 15, 2024
fba6150
Merge branch 'main' into feat_new_liquids
phacUFPE Aug 15, 2024
b066195
fix: update unknown name to candyfluid
phacUFPE Aug 15, 2024
2bafb60
Merge branch 'feat_new_liquids' of https://github.com/opentibiabr/can…
phacUFPE Aug 15, 2024
8a3efa0
Merge branch 'main' into feat_new_liquids
phacUFPE Aug 16, 2024
66eae60
Merge branch 'main' into feat_new_liquids
majestyotbr Aug 16, 2024
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
42 changes: 22 additions & 20 deletions data/items/items.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<items>
<!-- Liquids -->
<!-- Fluid type 0 is same as water (id="1") -->
<item id="1" name="water"/>
<item id="2" name="wine"/>
<item id="3" name="beer"/>
<item id="4" name="mud"/>
<item id="5" name="blood"/>
<item id="6" name="slime"/>
<item id="7" name="oil"/>
<item id="8" name="urine"/>
<item id="9" name="milk"/>
<item id="10" name="manafluid"/>
<item id="11" name="lifefluid"/>
<item id="12" name="lemonade"/>
<item id="13" name="rum"/>
<item id="14" name="fruit juice"/>
<item id="15" name="coconut milk"/>
<item id="16" name="mead"/>
<item id="17" name="tea"/>
<item id="18" name="ink"/>
<!-- 12.85 last fluid is 18, 19+ is a loop from 0 to 18 over and over again -->
<!-- Fluid type 0 is same as water (id="1") -->
<item id="1" name="water"/>
<item id="2" name="wine"/>
<item id="3" name="beer"/>
<item id="4" name="mud"/>
<item id="5" name="blood"/>
<item id="6" name="slime"/>
<item id="7" name="oil"/>
<item id="8" name="urine"/>
<item id="9" name="milk"/>
<item id="10" name="manafluid"/>
<item id="11" name="lifefluid"/>
<item id="12" name="lemonade"/>
<item id="13" name="rum"/>
<item id="14" name="fruit juice"/>
<item id="15" name="coconut milk"/>
<item id="16" name="mead"/>
<item id="17" name="tea"/>
<item id="18" name="ink"/>
<item id="19" name="unknown"/>
<item id="20" name="chocolate"/>
<!-- 13.40 last fluid is 20, 21+ is a loop from 0 to 20 over and over again -->

<item id="100" name="void"/>
<item id="101" name="earth"/>
Expand Down
1 change: 1 addition & 0 deletions src/items/functions/item/item_parse.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ const phmap::flat_hash_map<std::string, Fluids_t> FluidTypesMap = {
{ "tea", FLUID_TEA },
{ "mead", FLUID_MEAD },
{ "ink", FLUID_INK },
{ "chocolate", FLUID_CHOCOLATE },
};

const phmap::flat_hash_map<std::string, WeaponType_t> WeaponTypesMap = {
Expand Down
18 changes: 10 additions & 8 deletions src/utils/utils_definitions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,23 +348,25 @@ enum Fluids_t : uint8_t {
FLUID_NONE = 0, /* Blue */
FLUID_WATER = 1, /* Blue */
FLUID_WINE = 2, /* Purple */
FLUID_BEER = 3, /* Brown */
FLUID_MUD = 4, /* Brown */
FLUID_BEER = 3, /* Orange */
FLUID_MUD = 4, /* Orange */
FLUID_BLOOD = 5, /* Red */
FLUID_SLIME = 6, /* Green */
FLUID_OIL = 7, /* Brown */
FLUID_OIL = 7, /* Orange */
FLUID_URINE = 8, /* Yellow */
FLUID_MILK = 9, /* White */
FLUID_MANA = 10, /* Purple */
FLUID_LIFE = 11, /* Red */
FLUID_LEMONADE = 12, /* Yellow */
FLUID_RUM = 13, /* Brown */
FLUID_RUM = 13, /* Orange */
FLUID_FRUITJUICE = 14, /* Yellow */
FLUID_COCONUTMILK = 15, /* White */
FLUID_MEAD = 16, /* Brown */
FLUID_TEA = 17, /* Brown */
FLUID_INK = 18 /* Black */
// 12.85 last fluid is 18, 19+ is a loop from 0 to 18 over and over again
FLUID_MEAD = 16, /* Orange */
FLUID_TEA = 17, /* Orange */
FLUID_INK = 18, /* Black */
FLUID_UNKNOWN = 19, /* Red with White pieces */
FLUID_CHOCOLATE = 20, /* Brown */
// 13.40 last fluid is 20, 21+ is a loop from 0 to 20 over and over again
};

enum SquareColor_t : uint8_t {
Expand Down
Loading