summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/sprites/equipment/weapons/weapon-staff-blue.xml2
-rw-r--r--graphics/sprites/equipment/weapons/weapon-staff-red.xml2
-rw-r--r--graphics/sprites/equipment/weapons/weapon-staff.xml82
-rw-r--r--quests.xml3
4 files changed, 6 insertions, 83 deletions
diff --git a/graphics/sprites/equipment/weapons/weapon-staff-blue.xml b/graphics/sprites/equipment/weapons/weapon-staff-blue.xml
index 02cc6bb0..6f90d57a 100644
--- a/graphics/sprites/equipment/weapons/weapon-staff-blue.xml
+++ b/graphics/sprites/equipment/weapons/weapon-staff-blue.xml
@@ -2,6 +2,6 @@
<sprite>
<imageset name="staff" src="graphics/sprites/weapon-staff-blue.png" width="128" height="128" />
- <include file="weapon-staff.xml"/>
+ <include file="scorpionkinglance.xml"/>
</sprite>
diff --git a/graphics/sprites/equipment/weapons/weapon-staff-red.xml b/graphics/sprites/equipment/weapons/weapon-staff-red.xml
index 06accf0c..ab14577f 100644
--- a/graphics/sprites/equipment/weapons/weapon-staff-red.xml
+++ b/graphics/sprites/equipment/weapons/weapon-staff-red.xml
@@ -2,6 +2,6 @@
<sprite>
<imageset name="staff" src="graphics/sprites/weapon-staff-red.png" width="128" height="128" />
- <include file="weapon-staff.xml"/>
+ <include file="scorpionkinglance.xml"/>
</sprite>
diff --git a/graphics/sprites/equipment/weapons/weapon-staff.xml b/graphics/sprites/equipment/weapons/weapon-staff.xml
index 1b93e327..ba86848f 100644
--- a/graphics/sprites/equipment/weapons/weapon-staff.xml
+++ b/graphics/sprites/equipment/weapons/weapon-staff.xml
@@ -2,86 +2,6 @@
<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>
+ <include file="scorpionkinglance.xml"/>
</sprite>
diff --git a/quests.xml b/quests.xml
index 876fa7f3..2b68a076 100644
--- a/quests.xml
+++ b/quests.xml
@@ -1599,6 +1599,9 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
<wiki>- About 26k Tonori Delight required for Elixir + Mylarin</wiki>
<wiki>- About 87k Tonori Delight required for Sunny Crystal</wiki>
<wiki></wiki>
+ <wiki>During summer, you can make more Tonori Delight than usual.</wiki>
+ <wiki>This quest is profitable, but slow.</wiki>
+ <wiki></wiki>
<questgiver>Ryan</questgiver>
<coordinates x="29" y="57">Halinarzo, Library.</coordinates>
<reward text1="[Chef Hat]">{@@1}</reward>