diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-11-27 11:53:45 +0100 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-11-27 11:56:11 +0100 |
| commit | 6250327e657d9d95b839a56f851b862fa3076069 (patch) | |
| tree | 9adef94a587dbe461a163a8020e1e082fc609228 | |
| parent | 2bd90ceefad7a7b43505e6d725f5b36ee28851c0 (diff) | |
| download | clientdata-6250327e657d9d95b839a56f851b862fa3076069.tar.gz clientdata-6250327e657d9d95b839a56f851b862fa3076069.tar.bz2 clientdata-6250327e657d9d95b839a56f851b862fa3076069.tar.xz clientdata-6250327e657d9d95b839a56f851b862fa3076069.zip | |
Adding:
Knit Cap made by salmondine, xml from Dark Mage.
Elf Nightcap started by Lien, finished by Lizandra, xml from Ali-G.
Reservation for sunglasses.
music: two songs added, submodule pointer updated.
| -rw-r--r-- | graphics/items/equipment/head/elf-nightcap.png | bin | 0 -> 3079 bytes | |||
| -rw-r--r-- | graphics/items/equipment/head/knit-cap.png | bin | 0 -> 1088 bytes | |||
| -rw-r--r-- | graphics/sprites/equipment/head/elf-nightcap.png | bin | 0 -> 4600 bytes | |||
| -rw-r--r-- | graphics/sprites/equipment/head/elf-nightcap.xml | 124 | ||||
| -rw-r--r-- | graphics/sprites/equipment/head/knit-cap.png | bin | 0 -> 3783 bytes | |||
| -rw-r--r-- | graphics/sprites/equipment/head/knit-cap.xml | 142 | ||||
| -rw-r--r-- | items.xml | 35 | ||||
| m--------- | music | 0 |
8 files changed, 300 insertions, 1 deletions
diff --git a/graphics/items/equipment/head/elf-nightcap.png b/graphics/items/equipment/head/elf-nightcap.png Binary files differnew file mode 100644 index 00000000..8884a442 --- /dev/null +++ b/graphics/items/equipment/head/elf-nightcap.png diff --git a/graphics/items/equipment/head/knit-cap.png b/graphics/items/equipment/head/knit-cap.png Binary files differnew file mode 100644 index 00000000..f1a40e1e --- /dev/null +++ b/graphics/items/equipment/head/knit-cap.png diff --git a/graphics/sprites/equipment/head/elf-nightcap.png b/graphics/sprites/equipment/head/elf-nightcap.png Binary files differnew file mode 100644 index 00000000..3d7a0215 --- /dev/null +++ b/graphics/sprites/equipment/head/elf-nightcap.png diff --git a/graphics/sprites/equipment/head/elf-nightcap.xml b/graphics/sprites/equipment/head/elf-nightcap.xml new file mode 100644 index 00000000..78a40144 --- /dev/null +++ b/graphics/sprites/equipment/head/elf-nightcap.xml @@ -0,0 +1,124 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/equipment/head/elf-nightcap.png" width="40" height="31"/> + + <action name="stand" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="-1" offsetY ="-33"/> + </animation> + <animation direction="left"> + <frame index="1" offsetX="-2" offsetY ="-34"/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="-3" offsetY ="-34"/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-1" offsetY ="-32"/> + </animation> + </action> + + <action name="walk" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/> + <frame index="0" offsetX="-1" offsetY ="-33" delay="150"/> + <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/> + <frame index="0" offsetX="-1" offsetY ="-33" delay="150"/> + </animation> + <animation direction="left"> + <frame index="1" offsetX="-2" offsetY ="-34" delay="75"/> + <frame index="1" offsetX="-2" offsetY ="-33" delay="75"/> + <frame index="1" offsetX="-2" offsetY ="-34" delay="150"/> + <frame index="1" offsetX="-2" offsetY ="-33" delay="75"/> + <frame index="1" offsetX="-2" offsetY ="-34" delay="75"/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/> + <frame index="2" offsetX="-3" offsetY ="-35" delay="150"/> + <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/> + <frame index="2" offsetX="-3" offsetY ="-35" delay="150"/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-1" offsetY ="-32" delay="75"/> + <frame index="3" offsetX="-1" offsetY ="-31" delay="75"/> + <frame index="3" offsetX="-1" offsetY ="-32" delay="150"/> + <frame index="3" offsetX="-1" offsetY ="-31" delay="75"/> + <frame index="3" offsetX="-1" offsetY ="-32" delay="75"/> + </animation> + </action> + + <action name="attack" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="-1" offsetY ="-31" delay="75"/> + <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/> + <frame index="0" offsetX="-1" offsetY ="-29" delay="75"/> + <frame index="0" offsetX="-1" offsetY ="-28" delay="75"/> + <end /> + </animation> + <animation direction="left"> + <frame index="1" offsetX="2" offsetY ="-35" delay="75"/> + <frame index="1" offsetX="2" offsetY ="-36" delay="75"/> + <frame index="1" offsetX="-2" offsetY ="-33" delay="75"/> + <frame index="1" offsetX="-3" offsetY ="-32" delay="75"/> + <end /> + </animation> + <animation direction="up"> + <frame index="2" offsetX="-3" offsetY ="-34" delay="225"/> + <frame index="2" offsetX="-3" offsetY ="-32" delay="75"/> + <end /> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-5" offsetY ="-33" delay="75"/> + <frame index="3" offsetX="-5" offsetY ="-34" delay="75"/> + <frame index="3" offsetX="-2" offsetY ="-31" delay="75"/> + <frame index="3" offsetX="-1" offsetY ="-30" delay="75"/> + <end /> + </animation> + </action> + + <action name="attack_bow" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="-1" offsetY ="-32" delay="225"/> + <frame index="0" offsetX="-1" offsetY ="-31" delay="75"/> + <frame index="0" offsetX="-1" offsetY ="-32" delay="75"/> + <end /> + </animation> + <animation direction="left"> + <frame index="1" offsetX="1" offsetY ="-34" delay="225"/> + <frame index="1" offsetX="3" offsetY ="-35" delay="150"/> + <end /> + </animation> + <animation direction="up"> + <frame index="2" offsetX="-2" offsetY ="-34" delay="225"/> + <frame index="2" offsetX="-3" offsetY ="-33" delay="75"/> + <frame index="2" offsetX="-3" offsetY ="-34" delay="75"/> + <end /> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-5" offsetY ="-33" delay="225"/> + <frame index="3" offsetX="-7" offsetY ="-34" delay="150"/> + <end /> + </animation> + </action> + + <action name="sit" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="-1" offsetY ="-19"/> + </animation> + <animation direction="left"> + <frame index="1" offsetX="2" offsetY ="-23"/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="-2" offsetY ="-24"/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-8" offsetY ="-23"/> + </animation> + </action> + + <action name="dead" imageset="base"> + <animation direction="default"> + <frame index="4" offsetX="21" offsetY="-8"/> + </animation> + </action> + +</sprite> diff --git a/graphics/sprites/equipment/head/knit-cap.png b/graphics/sprites/equipment/head/knit-cap.png Binary files differnew file mode 100644 index 00000000..06ca0e4d --- /dev/null +++ b/graphics/sprites/equipment/head/knit-cap.png diff --git a/graphics/sprites/equipment/head/knit-cap.xml b/graphics/sprites/equipment/head/knit-cap.xml new file mode 100644 index 00000000..95d23802 --- /dev/null +++ b/graphics/sprites/equipment/head/knit-cap.xml @@ -0,0 +1,142 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/equipment/head/knit-cap.png" width="24" height="26" /> + + <action name="stand" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="0" offsetY ="-40" /> + </animation> + <animation direction="left"> + <frame index="1" offsetX="1" offsetY ="-40"/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="0" offsetY ="-41"/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-1" offsetY ="-40"/> + </animation> + </action> + + <action name="walk" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="0" offsetY ="-39" delay="75"/> + <frame index="0" offsetX="0" offsetY ="-40" delay="75" /> + <frame index="0" offsetX="0" offsetY ="-40" delay="75" /> + <frame index="0" offsetX="0" offsetY ="-39" delay="75" /> + <frame index="0" offsetX="0" offsetY ="-40" delay="75" /> + <frame index="0" offsetX="0" offsetY ="-40" delay="75" /> + </animation> + <animation direction="left"> + <frame index="1" offsetX="1" offsetY ="-40" delay="75"/> + <frame index="1" offsetX="1" offsetY ="-39" delay="75"/> + <frame index="1" offsetX="1" offsetY ="-40" delay="75"/> + <frame index="1" offsetX="1" offsetY ="-40" delay="75"/> + <frame index="1" offsetX="1" offsetY ="-39" delay="75"/> + <frame index="1" offsetX="1" offsetY ="-40" delay="75"/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="0" offsetY ="-41" delay="75"/> + <frame index="2" offsetX="0" offsetY ="-42" delay="75"/> + <frame index="2" offsetX="0" offsetY ="-42" delay="75"/> + <frame index="2" offsetX="0" offsetY ="-41" delay="75"/> + <frame index="2" offsetX="0" offsetY ="-42" delay="75"/> + <frame index="2" offsetX="0" offsetY ="-42" delay="75"/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-1" offsetY ="-40" delay="75"/> + <frame index="3" offsetX="-1" offsetY ="-39" delay="75"/> + <frame index="3" offsetX="-1" offsetY ="-40" delay="75"/> + <frame index="3" offsetX="-1" offsetY ="-40" delay="75"/> + <frame index="3" offsetX="-1" offsetY ="-39" delay="75"/> + <frame index="3" offsetX="-1" offsetY ="-40" delay="75"/> + </animation> + </action> + + <action name="attack" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="0" offsetY ="-38" delay="75" /> + <frame index="0" offsetX="0" offsetY ="-39" delay="75" /> + <frame index="0" offsetX="0" offsetY ="-36" delay="75" /> + <frame index="0" offsetX="0" offsetY ="-35" delay="75" /> + <end /> + </animation> + <animation direction="left"> + <frame index="1" offsetX="5" offsetY ="-41" delay="75" /> + <frame index="1" offsetX="5" offsetY ="-42" delay="75" /> + <frame index="1" offsetX="1" offsetY ="-39" delay="75" /> + <frame index="1" offsetX="0" offsetY ="-38" delay="75" /> + <end /> + </animation> + <animation direction="up"> + <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/> + <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/> + <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/> + <frame index="2" offsetX="-1" offsetY ="-39" delay="75"/> + <end /> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-4" offsetY ="-41" delay="75"/> + <frame index="3" offsetX="-4" offsetY ="-42" delay="75"/> + <frame index="3" offsetX="-1" offsetY ="-39" delay="75"/> + <frame index="3" offsetX="0" offsetY ="-38" delay="75"/> + <end /> + </animation> + </action> + + <action name="attack_bow" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="0" offsetY ="-39" delay="75" /> + <frame index="0" offsetX="0" offsetY ="-39" delay="75" /> + <frame index="0" offsetX="0" offsetY ="-39" delay="75" /> + <frame index="0" offsetX="0" offsetY ="-38" delay="75" /> + <frame index="0" offsetX="0" offsetY ="-39" delay="75" /> + <end /> + </animation> + <animation direction="left"> + <frame index="1" offsetX="4" offsetY ="-40" delay="75" /> + <frame index="1" offsetX="4" offsetY ="-40" delay="75" /> + <frame index="1" offsetX="4" offsetY ="-40" delay="75" /> + <frame index="1" offsetX="6" offsetY ="-41" delay="75" /> + <frame index="1" offsetX="6" offsetY ="-41" delay="75" /> + <end /> + </animation> + <animation direction="up"> + <frame index="2" offsetX="0" offsetY ="-41" delay="75"/> + <frame index="2" offsetX="0" offsetY ="-41" delay="75"/> + <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/> + <frame index="2" offsetX="-1" offsetY ="-40" delay="75"/> + <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/> + <end /> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-4" offsetY ="-40" delay="75"/> + <frame index="3" offsetX="-4" offsetY ="-40" delay="75"/> + <frame index="3" offsetX="-4" offsetY ="-40" delay="75"/> + <frame index="3" offsetX="-6" offsetY ="-41" delay="75"/> + <frame index="3" offsetX="-6" offsetY ="-41" delay="75"/> + <end /> + </animation> + </action> + + <action name="sit" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="0" offsetY ="-28" /> + </animation> + <animation direction="left"> + <frame index="1" offsetX="5" offsetY ="-31"/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="1" offsetY ="-33"/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-7" offsetY ="-31"/> + </animation> + </action> + + <action name="dead" imageset="base"> + <animation direction="default"> + <frame index="4" offsetX="33" offsetY="-13"/> + </animation> + </action> + +</sprite> @@ -2897,9 +2897,42 @@ <item id="853" image="generic/doll.png" name="Doll" - description="A cute red-haired doll with a blue dress. " + description="A cute red-haired doll with a blue dress." type="generic" weight="30"/> + <item id="854" + image="equipment/head/elf-nightcap.png" + name="Elf Nightcap" + description="A comfortable nightcap worn by Santa's helpers." + effect="M. Attack 5" + type="equip-head" + defense="3" + weight="50"> + <sprite>equipment/head/elf-nightcap.xml</sprite> + </item> +<!-- + <item id="855" + image="equipment/head/sunglasses.png" + name="Sunglasses" + description="Some stealthy sunglasses hiding your eyes from skeptical eyes." + effect="M. Attack 6" + type="equip-head" + defense="2" + weight="10"> + <sprite>equipment/head/sunglasses.xml</sprite> + </item> +--> + <item id="856" + image="equipment/head/knit-cap.png" + name="Knit Cap" + description="A knitted cap keeping your head warm in the crual cold." + effect="M. Attack 0" + type="equip-head" + defense="3" + weight="50"> + <sprite>equipment/head/knit-cap.xml</sprite> + </item> + <!-- HERE ARE SOME UNUSED ITEM IDS --> <item id="1198" diff --git a/music b/music -Subproject 318df683efb0636b91e61383552edca17fd197e +Subproject e2ca581edff93d666e8a0b2ee3b7162f811b188 |
