summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/items/equipment/weapons/lightsaber.pngbin0 -> 514 bytes
-rw-r--r--graphics/items/equipment/weapons/redlightsaber.pngbin0 -> 504 bytes
-rw-r--r--graphics/sprites/equipment/weapons/weapon-staff-blue.pngbin0 -> 30051 bytes
-rw-r--r--graphics/sprites/equipment/weapons/weapon-staff-blue.xml7
-rw-r--r--graphics/sprites/equipment/weapons/weapon-staff-red.pngbin0 -> 29380 bytes
-rw-r--r--graphics/sprites/equipment/weapons/weapon-staff-red.xml7
-rw-r--r--graphics/sprites/equipment/weapons/weapon-staff.pngbin0 -> 9513 bytes
-rw-r--r--graphics/sprites/equipment/weapons/weapon-staff.xml87
-rw-r--r--items.xml30
9 files changed, 131 insertions, 0 deletions
diff --git a/graphics/items/equipment/weapons/lightsaber.png b/graphics/items/equipment/weapons/lightsaber.png
new file mode 100644
index 00000000..8783241f
--- /dev/null
+++ b/graphics/items/equipment/weapons/lightsaber.png
Binary files differ
diff --git a/graphics/items/equipment/weapons/redlightsaber.png b/graphics/items/equipment/weapons/redlightsaber.png
new file mode 100644
index 00000000..18146d6e
--- /dev/null
+++ b/graphics/items/equipment/weapons/redlightsaber.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/weapon-staff-blue.png b/graphics/sprites/equipment/weapons/weapon-staff-blue.png
new file mode 100644
index 00000000..c75cc316
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/weapon-staff-blue.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/weapon-staff-blue.xml b/graphics/sprites/equipment/weapons/weapon-staff-blue.xml
new file mode 100644
index 00000000..02cc6bb0
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/weapon-staff-blue.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="staff" src="graphics/sprites/weapon-staff-blue.png" width="128" height="128" />
+
+ <include file="weapon-staff.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/weapon-staff-red.png b/graphics/sprites/equipment/weapons/weapon-staff-red.png
new file mode 100644
index 00000000..0d8a916c
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/weapon-staff-red.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/weapon-staff-red.xml b/graphics/sprites/equipment/weapons/weapon-staff-red.xml
new file mode 100644
index 00000000..06accf0c
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/weapon-staff-red.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="staff" src="graphics/sprites/weapon-staff-red.png" width="128" height="128" />
+
+ <include file="weapon-staff.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/weapon-staff.png b/graphics/sprites/equipment/weapons/weapon-staff.png
new file mode 100644
index 00000000..fc2f0541
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/weapon-staff.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/weapon-staff.xml b/graphics/sprites/equipment/weapons/weapon-staff.xml
new file mode 100644
index 00000000..1b93e327
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/weapon-staff.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="staff" src="graphics/sprites/weapon-staff.png" width="128" height="128" />
+
+ <action name="default" imageset="staff">
+ </action>
+
+ <action name="stand" imageset="staff">
+ <animation direction="down">
+ <frame index="0" offsetX ="0" offsetY ="32" />
+ </animation>
+ <animation direction="left">
+ <frame index="16" offsetX ="0" offsetY ="32" />
+ </animation>
+ <animation direction="up">
+ <frame index="32" offsetX ="0" offsetY ="32" />
+ </animation>
+ <animation direction="right">
+ <frame index="48" offsetX ="0" offsetY ="32" />
+ </animation>
+ </action>
+
+ <action name="walk" imageset="staff">
+ <animation direction="down">
+ <sequence start="1" end="6" offsetX ="0" offsetY ="32" delay="75" />
+ </animation>
+ <animation direction="left">
+ <sequence start="17" end="22" offsetX ="0" offsetY ="32" delay="75" />
+ </animation>
+ <animation direction="up">
+ <sequence start="33" end="38" offsetX ="0" offsetY ="32" delay="75" />
+ </animation>
+ <animation direction="right">
+ <sequence start="49" end="54" offsetX ="0" offsetY ="32" delay="75" />
+ </animation>
+ </action>
+
+ <action name="sit" imageset="staff">
+ <animation direction="down">
+ <frame index="7" offsetX ="0" offsetY ="32" />
+ </animation>
+ <animation direction="left">
+ <frame index="23" offsetX ="0" offsetY ="32" />
+ </animation>
+ <animation direction="up">
+ <frame index="39" offsetX ="0" offsetY ="32" />
+ </animation>
+ <animation direction="right">
+ <frame index="55" offsetX ="0" offsetY ="32" />
+ </animation>
+ </action>
+
+ <action name="dead" imageset="staff">
+ <animation direction="down">
+ <frame index="12" offsetX ="0" offsetY ="32" />
+ </animation>
+ <animation direction="left">
+ <frame index="12" offsetX ="0" offsetY ="32" />
+ </animation>
+ <animation direction="up">
+ <frame index="12" offsetX ="0" offsetY ="32" />
+ </animation>
+ <animation direction="right">
+ <frame index="12" offsetX ="0" offsetY ="32" />
+ </animation>
+ </action>
+
+ <action name="attack" imageset="staff">
+ <animation direction="down">
+ <sequence start="8" end="11" offsetX ="0" offsetY ="32" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <sequence start="24" end="27" offsetX ="0" offsetY ="32" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <sequence start="40" end="43" offsetX ="0" offsetY ="32" delay="75" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <sequence start="56" end="59" offsetX ="0" offsetY ="32" delay="75" />
+ <end />
+ </animation>
+ </action>
+
+</sprite>
diff --git a/items.xml b/items.xml
index 478ffeb2..6e4fa3a3 100644
--- a/items.xml
+++ b/items.xml
@@ -6590,6 +6590,36 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
<sound event="hit">weapons/axe/hit.ogg</sound>
<sound event="miss">weapons/axe/miss.ogg</sound>
</item>
+ <item id="3536"
+ image="equipment/weapons/lightsaber.png"
+ name="Lightsaber"
+ description="Pyndragon always comes up with the craziest ideas."
+ effect="ATK Scales"
+ attack="240"
+ attack-range="1"
+ level="60"
+ type="equip-1hand"
+ attack-action="attack"
+ weight="360">
+ <sprite>equipment/weapons/weapon-staff-blue.xml</sprite>
+ <sound event="hit">weapons/axe/hit.ogg</sound>
+ <sound event="miss">weapons/axe/miss.ogg</sound>
+ </item>
+ <item id="3537"
+ image="equipment/weapons/redlightsaber.png"
+ name="Powerful Lightsaber"
+ description="Pyndragon always comes up with the craziest ideas."
+ effect="ATK Scales"
+ attack="300"
+ attack-range="2"
+ level="60"
+ type="equip-2hand"
+ attack-action="attack"
+ weight="380">
+ <sprite>equipment/weapons/weapon-staff-red.xml</sprite>
+ <sound event="hit">weapons/axe/hit.ogg</sound>
+ <sound event="miss">weapons/axe/miss.ogg</sound>
+ </item>
<!-- Fill new weapons HERE -->
<item id="3600"
image="equipment/weapons/savior.png"