summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE3
-rw-r--r--graphics/items/usable/timeflask.pngbin0 -> 1909 bytes
-rw-r--r--items.xml8
-rw-r--r--monsters.xml2
4 files changed, 11 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 8861a74b..064dc285 100644
--- a/LICENSE
+++ b/LICENSE
@@ -272,9 +272,10 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/items/usable/pumpkinjuice.png (Enchilado) (CC BY-SA 3.0) (Reid)
graphics/items/usable/pumpkinseeds.png (Enchilado) (CC BY-SA 3.0) (-)
graphics/items/usable/shovel.png (Alige, Reid) (CC BY-SA 3.0) (-)
+ graphics/items/timeflask.png (Ozthokk) (Unknown. BY-SA maybe?) (Pydsigner/LoF)
graphics/items/usable/urchinmeat.png (Alige) (CC BY-SA 3.0) (Reid)
graphics/items/usable/wine.png (Jak1) (CC BY-SA 3.0) (Reid)
-
+
#### Food
graphics/items/usable/food/applecocktail.png (Saulc FIX IT)
graphics/items/usable/food/cactuscocktail.png (Saulc FIX IT)
diff --git a/graphics/items/usable/timeflask.png b/graphics/items/usable/timeflask.png
new file mode 100644
index 00000000..26ec45f7
--- /dev/null
+++ b/graphics/items/usable/timeflask.png
Binary files differ
diff --git a/items.xml b/items.xml
index c5e43bf3..e2a375e1 100644
--- a/items.xml
+++ b/items.xml
@@ -1026,6 +1026,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
effect="Heal 100-250 HP"
type="usable"
weight="4"/>
+ <item id="614"
+ image="usable/timeflask.png"
+ name="Time Flask"
+ description="Contains Ozthokk's time-space technology."
+ useButton="Teleport"
+ effect="Teleport"
+ type="usable"
+ weight="40"/>
<!-- Generic Items -->
<item id="700"
image="generic/smalltentacles.png"
diff --git a/monsters.xml b/monsters.xml
index 1224a48b..d6f5f1ba 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -854,7 +854,7 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or spawn.
<sound event="die">monsters/fairy/fada-die2.ogg</sound>
</monster>
<monster id="1186" name="Poison Fairy">
- <sprite>monsters/fairy.xml</sprite>
+ <sprite>monsters/fairy.xml|#00ff00</sprite>
<sound event="hit">monsters/firegoblin/firegoblinhit.ogg</sound>
<sound event="miss">monsters/flower/miss.ogg</sound>
<sound event="die">monsters/fairy/fada-die1.ogg</sound>