summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/images/ambient/spot.pngbin0 -> 134317 bytes
-rw-r--r--graphics/items/equipment/weapons/torch.pngbin0 -> 847 bytes
-rw-r--r--graphics/sprites/equipment/weapons/torch.pngbin0 -> 32359 bytes
-rw-r--r--graphics/sprites/equipment/weapons/torch.xml11
-rw-r--r--graphics/sprites/equipment/weapons/trainingwand.pngbin14046 -> 73352 bytes
-rw-r--r--items.xml22
-rw-r--r--maps/001-3-0.tmx1
-rw-r--r--maps/001-3-1.tmx1
-rw-r--r--maps/008-3-1.tmx3
9 files changed, 32 insertions, 6 deletions
diff --git a/graphics/images/ambient/spot.png b/graphics/images/ambient/spot.png
new file mode 100644
index 00000000..b9c51abd
--- /dev/null
+++ b/graphics/images/ambient/spot.png
Binary files differ
diff --git a/graphics/items/equipment/weapons/torch.png b/graphics/items/equipment/weapons/torch.png
new file mode 100644
index 00000000..638f2426
--- /dev/null
+++ b/graphics/items/equipment/weapons/torch.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/torch.png b/graphics/sprites/equipment/weapons/torch.png
new file mode 100644
index 00000000..16f430b7
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/torch.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/torch.xml b/graphics/sprites/equipment/weapons/torch.xml
new file mode 100644
index 00000000..8bdf853b
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/torch.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha, Reid
+Copyright (C) 2011-2018 Evol Online -->
+<sprite>
+ <imageset name="base"
+ src="graphics/sprites/equipment/weapons/torch.png|W"
+ width="64"
+ height="64"/>
+
+ <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/trainingwand.png b/graphics/sprites/equipment/weapons/trainingwand.png
index 190d4377..f41aedd1 100644
--- a/graphics/sprites/equipment/weapons/trainingwand.png
+++ b/graphics/sprites/equipment/weapons/trainingwand.png
Binary files differ
diff --git a/items.xml b/items.xml
index d444829e..8ec3a1c1 100644
--- a/items.xml
+++ b/items.xml
@@ -1610,7 +1610,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
image="equipment/weapons/woodensword.png"
name="Wooden Sword"
description="For sword training. Do not show-off with it."
- attack="40"
+ attack="75"
attack-range="1"
level="5"
type="equip-1hand"
@@ -1624,7 +1624,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
image="equipment/weapons/backsword.png"
name="Artis Backsword"
description="An engraved backsword with the symbole of Artis on its brass hilt."
- attack="800"
+ attack="500"
attack-range="1"
level="15"
type="equip-1hand"
@@ -1638,7 +1638,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
image="equipment/weapons/wand.png"
name="Training Wand"
description="A simple wand for your first steps in handling magic."
- attack="150"
+ attack="75"
attack-range="2"
level="10"
type="equip-1hand"
@@ -1650,7 +1650,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
image="equipment/weapons/wand.png|W:#ece96e"
name="Mana Torch"
description="A simple wand imbued with a fire spell, it can provide lighting and will never run out on you!"
- attack="200"
+ attack="100"
attack-range="2"
level="10"
type="equip-1hand"
@@ -1662,7 +1662,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
image="equipment/weapons/scythe.png"
name="Scythe"
description="A farmer's scythe, not new but still deadly."
- attack="1000"
+ attack="750"
attack-range="2"
level="15"
type="equip-2hand"
@@ -1712,6 +1712,18 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
weight="250">
<sprite>equipment/weapons/pickaxe.xml</sprite>
</item>
+ <item id="3511"
+ image="equipment/weapons/torch.png"
+ name="Torch"
+ description="A burning Torch. Handle with care."
+ attack="150"
+ attack-range="1"
+ level="15"
+ type="equip-2hand"
+ attack-action="attack"
+ weight="100">
+ <sprite>equipment/weapons/torch.xml</sprite>
+ </item>
<!-- Pets -->
diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx
index fd40aa25..7386f7c3 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-3-0.tmx
@@ -6,6 +6,7 @@
<property name="minimap" value=""/>
<property name="music" value=""/>
<property name="name" value="Sewer"/>
+ <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
</properties>
<tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
diff --git a/maps/001-3-1.tmx b/maps/001-3-1.tmx
index 0dfa6a9c..0dff6ca5 100644
--- a/maps/001-3-1.tmx
+++ b/maps/001-3-1.tmx
@@ -6,6 +6,7 @@
<property name="minimap" value=""/>
<property name="music" value=""/>
<property name="name" value="Rivercave"/>
+ <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
</properties>
<tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
diff --git a/maps/008-3-1.tmx b/maps/008-3-1.tmx
index 0232c925..e504f39e 100644
--- a/maps/008-3-1.tmx
+++ b/maps/008-3-1.tmx
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="80" height="80" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
+<map version="1.0" tiledversion="1.1.3" orientation="orthogonal" renderorder="right-down" width="80" height="80" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
<properties>
<property name="license" value="CC BY-SA 3.0"/>
<property name="manaplus version" value="2"/>
<property name="name" value="Bat Cave"/>
+ <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
</properties>
<tileset firstgid="1" name="hurns-cave" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/hurns-cave.png" width="512" height="512"/>