Skip to content
This repository has been archived by the owner on May 20, 2023. It is now read-only.

[Compatibility/Enhancement] Rework on fluids colors and new monster race type (INK) #544

Merged
merged 8 commits into from
Apr 25, 2022
Merged

[Compatibility/Enhancement] Rework on fluids colors and new monster race type (INK) #544

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8fd3dec
Initial commit
marcosvf132 Apr 16, 2022
4929c7e
Merge branch 'opentibiabr:main' into sync-fluids-rework
marcosvf132 Apr 19, 2022
c9718e2
Few monsters and corpses tags
marcosvf132 Apr 19, 2022
9668d55
Merge branch 'sync-fluids-rework' of https://github.com/marcosvf132/o…
marcosvf132 Apr 19, 2022
35768a6
Rename fluids.lua strings
marcosvf132 Apr 20, 2022
bc3e6f5
Removing 'lava' tag
marcosvf132 Apr 21, 2022
9223ce7
Merge branch 'opentibiabr:main' into sync-fluids-rework
marcosvf132 Apr 23, 2022
8a01695
Fix NPC fluidcontainer ids
marcosvf132 Apr 25, 2022
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
151 changes: 76 additions & 75 deletions data/items/items.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<items>
<!-- Liquids -->
<item id="1" name="water" />
<item id="2" name="blood" />
<!-- 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="slime" />
<item id="5" name="lemonade" />
<item id="6" name="milk" />
<item id="7" name="manafluid" />
<item id="10" name="lifefluid" />
<item id="11" name="oil" />
<item id="13" name="urine" />
<item id="14" name="coconut milk" />
<item id="15" name="wine" />
<item id="19" name="mud" />
<item id="21" name="fruit juice" />
<item id="26" name="lava" />
<item id="27" name="rum" />
<item id="28" name="swamp" />
<item id="35" name="tea" />
<item id="43" name="mead" />
<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 -->

<item id="100" name="void"/>
<item id="101" name="earth"/>
Expand Down Expand Up @@ -644,7 +645,7 @@
</item>
<item id="391" article="a" name="lava hole">
<attribute key="description" value="It emits heat and light."/>
<attribute key="fluidsource" value="lava"/>
<attribute key="fluidsource" value="mud"/>
</item>
<item fromid="392" toid="393" name="stalagmites"/>
<item id="394" article="a" name="hole">
Expand Down Expand Up @@ -43777,26 +43778,26 @@
</item>
<item fromid="28573" toid="28574" name="unknown item"/>
<item id="28575" article="a" name="slain animated feather">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="60"/>
<attribute key="decayTo" value="0"/>
</item>
<item id="28576" article="a" name="slain animated feather">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28575"/>
<attribute key="containersize" value="10"/>
</item>
<item id="28577" article="a" name="slain animated feather">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28576"/>
<attribute key="containersize" value="20"/>
</item>
<item id="28578" article="a" name="slain animated feather">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="10"/>
<attribute key="decayTo" value="28577"/>
<attribute key="containersize" value="20"/>
Expand Down Expand Up @@ -43827,51 +43828,51 @@
<attribute key="containersize" value="20"/>
</item>
<item id="28583" article="a" name="slain flying book">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="60"/>
<attribute key="decayTo" value="0"/>
</item>
<item id="28584" article="a" name="slain flying book">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28583"/>
<attribute key="containersize" value="10"/>
</item>
<item id="28585" article="a" name="slain flying book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28584"/>
<attribute key="containersize" value="20"/>
</item>
<item id="28586" article="a" name="slain flying book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="10"/>
<attribute key="decayTo" value="28585"/>
<attribute key="containersize" value="20"/>
</item>
<item id="28587" article="a" name="slain cursed book">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="60"/>
<attribute key="decayTo" value="0"/>
</item>
<item id="28588" article="a" name="slain cursed book">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28587"/>
<attribute key="containersize" value="10"/>
</item>
<item id="28589" article="a" name="slain cursed book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28588"/>
<attribute key="containersize" value="20"/>
</item>
<item id="28590" article="a" name="slain cursed book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="10"/>
<attribute key="decayTo" value="28589"/>
<attribute key="containersize" value="20"/>
Expand Down Expand Up @@ -43903,26 +43904,26 @@
<attribute key="containersize" value="20"/>
</item>
<item id="28599" article="a" name="slain ink blob">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="60"/>
<attribute key="decayTo" value="0"/>
</item>
<item id="28600" article="a" name="slain ink blob">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28599"/>
<attribute key="containersize" value="10"/>
</item>
<item id="28601" article="a" name="slain ink blob">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28600"/>
<attribute key="containersize" value="20"/>
</item>
<item id="28602" article="a" name="slain ink blob">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="10"/>
<attribute key="decayTo" value="28601"/>
<attribute key="containersize" value="20"/>
Expand Down Expand Up @@ -43953,51 +43954,51 @@
<attribute key="containersize" value="20"/>
</item>
<item id="28607" article="a" name="slain biting book">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="60"/>
<attribute key="decayTo" value="0"/>
</item>
<item id="28608" article="a" name="slain biting book">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28607"/>
<attribute key="containersize" value="10"/>
</item>
<item id="28609" article="a" name="slain biting book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28608"/>
<attribute key="containersize" value="20"/>
</item>
<item id="28610" article="a" name="slain biting book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="10"/>
<attribute key="decayTo" value="28609"/>
<attribute key="containersize" value="20"/>
</item>
<item id="28611" article="a" name="slain librarian">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="60"/>
<attribute key="decayTo" value="0"/>
</item>
<item id="28612" article="a" name="slain librarian">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28611"/>
<attribute key="containersize" value="10"/>
</item>
<item id="28613" article="a" name="slain librarian">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28612"/>
<attribute key="containersize" value="20"/>
</item>
<item id="28614" article="a" name="slain librarian">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="10"/>
<attribute key="decayTo" value="28613"/>
<attribute key="containersize" value="20"/>
Expand Down Expand Up @@ -44687,27 +44688,27 @@
<attribute key="containersize" value="10"/>
</item>
<item id="28751" article="a" name="dead burning book">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="60"/>
<attribute key="decayTo" value="0"/>
</item>
<item id="28752" article="a" name="dead burning book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28751"/>
<attribute key="containersize" value="10"/>
</item>
<item id="28753" article="a" name="dead burning book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28752"/>
<attribute key="containersize" value="20"/>
</item>
<item id="28754" article="a" name="dead burning book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="10"/>
<attribute key="decayTo" value="28753"/>
<attribute key="containersize" value="20"/>
Expand Down Expand Up @@ -44740,52 +44741,52 @@
<attribute key="containersize" value="20"/>
</item>
<item id="28771" article="a" name="dead icecold book">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="60"/>
<attribute key="decayTo" value="0"/>
</item>
<item id="28772" article="a" name="dead icecold book">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28771"/>
<attribute key="containersize" value="10"/>
</item>
<item id="28773" article="a" name="dead icecold book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28772"/>
<attribute key="containersize" value="20"/>
</item>
<item id="28774" article="a" name="dead icecold book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="10"/>
<attribute key="decayTo" value="28773"/>
<attribute key="containersize" value="20"/>
</item>
<item id="28775" article="a" name="slain energetic book">
<attribute key="corpseType" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="duration" value="60"/>
<attribute key="decayTo" value="0"/>
</item>
<item id="28776" article="a" name="slain energetic book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28775"/>
<attribute key="containersize" value="10"/>
</item>
<item id="28777" article="a" name="slain energetic book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="300"/>
<attribute key="decayTo" value="28776"/>
<attribute key="containersize" value="20"/>
</item>
<item id="28778" article="a" name="slain energetic book">
<attribute key="corpseType" value="blood"/>
<attribute key="fluidsource" value="blood"/>
<attribute key="corpseType" value="ink"/>
<attribute key="fluidsource" value="ink"/>
<attribute key="duration" value="10"/>
<attribute key="decayTo" value="28777"/>
<attribute key="containersize" value="20"/>
Expand Down
2 changes: 1 addition & 1 deletion data/monster/constructs/biting_book.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ monster.Bestiary = {

monster.health = 6500
monster.maxHealth = 6500
monster.race = "undead"
monster.race = "ink"
monster.corpse = 28609
monster.speed = 480
monster.manaCost = 0
Expand Down
2 changes: 1 addition & 1 deletion data/monster/magicals/animated_feather.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ monster.Bestiary = {

monster.health = 13000
monster.maxHealth = 13000
monster.race = "undead"
monster.race = "ink"
monster.corpse = 28578
monster.speed = 420
monster.manaCost = 0
Expand Down
2 changes: 1 addition & 1 deletion data/monster/magicals/burning_book.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ monster.Bestiary = {

monster.health = 18000
monster.maxHealth = 18000
monster.race = "fire"
monster.race = "ink"
monster.corpse = 28754
monster.speed = 440
monster.manaCost = 0
Expand Down
2 changes: 1 addition & 1 deletion data/monster/magicals/cursed_book.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ monster.Bestiary = {

monster.health = 20000
monster.maxHealth = 20000
monster.race = "undead"
monster.race = "ink"
monster.corpse = 28590
monster.speed = 440
monster.manaCost = 0
Expand Down
2 changes: 1 addition & 1 deletion data/monster/magicals/energetic_book.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ monster.Bestiary = {

monster.health = 18500
monster.maxHealth = 18500
monster.race = "undead"
monster.race = "ink"
monster.corpse = 28778
monster.speed = 440
monster.manaCost = 0
Expand Down
Loading