diff options
author | Donald <donald.g.horn@gmail.com> | 2020-06-18 18:11:13 +0000 |
---|---|---|
committer | Donald <donald.g.horn@gmail.com> | 2020-06-18 18:11:13 +0000 |
commit | dd1d0051722f6e828c4e988de8a2ff66ee0998ee (patch) | |
tree | a9f25cad6abfbdf5bd15c137a004de20dd59cae6 | |
parent | 26d58e9485a7c493d2f24a02c7a8f3baf0094596 (diff) | |
parent | 522706bdae0fe28b3329ebaac666681c7d46a35b (diff) | |
download | clientdata-dd1d0051722f6e828c4e988de8a2ff66ee0998ee.tar.gz clientdata-dd1d0051722f6e828c4e988de8a2ff66ee0998ee.tar.bz2 clientdata-dd1d0051722f6e828c4e988de8a2ff66ee0998ee.tar.xz clientdata-dd1d0051722f6e828c4e988de8a2ff66ee0998ee.zip |
Merge branch 'Art_From_Kolchak' into 'master'
Art from kolchak
See merge request TMW2/clientdata!70
-rw-r--r-- | ART_LICENSE | 3 | ||||
-rw-r--r-- | LICENSE | 2 | ||||
-rw-r--r-- | graphics/items/equipment/weapons/legendwand.png | bin | 0 -> 279 bytes | |||
-rw-r--r-- | graphics/sprites/equipment/weapons/legend-wand.png | bin | 0 -> 9769 bytes | |||
-rw-r--r-- | graphics/sprites/equipment/weapons/legend-wand.xml | 7 | ||||
-rw-r--r-- | items.xml | 4 |
6 files changed, 12 insertions, 4 deletions
diff --git a/ART_LICENSE b/ART_LICENSE index cf36aef5..f5f73579 100644 --- a/ART_LICENSE +++ b/ART_LICENSE @@ -1,2 +1 @@ - path/to/the/licensed/work.something (Author) (License) (Contributors/Authors/Co-Authors/Sources/etc.) - + path/to/the/licensed/work.something (Author) (License) (Contributors/Authors/Co-Authors/Sources/etc.)
\ No newline at end of file @@ -502,6 +502,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/items/equipment/weapons/woodenstaff.png (?) (GPLv2) (tmw.org) graphics/items/equipment/weapons/woodensword.png (Len) (CC BY-SA 3.0) (Reid) graphics/items/equipment/weapons/zambacutou.png (?) (GPLv2) (tmw-br) + graphics/items/equipment/weapons/legendwand.png (Donald) (CC BY-SA 3.0) (-) graphics/items/equipment/weapons/placeholder_revolver.png (TODO: DELETE ME)(GPL 2.0) (basse/InfraRed/FreedroidRPG) graphics/items/equipment/weapons/placeholder_gatling.png (TODO: DELETE ME) (GPL 2.0) (basse/InfraRed/FreedroidRPG) @@ -1579,6 +1580,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors graphics/sprites/equipment/weapons/weapon-staff-red.png (?) (GPLv2) (TMW-BR) graphics/sprites/equipment/weapons/woodenbow.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/equipment/weapons/woodensword.png (Alige, Reid) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/weapons/legend-wand.png (Donald) (CC BY-SA 3.0) (-) ### Hairstyles graphics/sprites/hairstyles/hairstyle01.png (Reid) (CC BY-SA 3.0) (-) diff --git a/graphics/items/equipment/weapons/legendwand.png b/graphics/items/equipment/weapons/legendwand.png Binary files differnew file mode 100644 index 00000000..bd395647 --- /dev/null +++ b/graphics/items/equipment/weapons/legendwand.png diff --git a/graphics/sprites/equipment/weapons/legend-wand.png b/graphics/sprites/equipment/weapons/legend-wand.png Binary files differnew file mode 100644 index 00000000..69da512c --- /dev/null +++ b/graphics/sprites/equipment/weapons/legend-wand.png diff --git a/graphics/sprites/equipment/weapons/legend-wand.xml b/graphics/sprites/equipment/weapons/legend-wand.xml new file mode 100644 index 00000000..a0c22d19 --- /dev/null +++ b/graphics/sprites/equipment/weapons/legend-wand.xml @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="staff" src="graphics/sprites/equipment/weapons/weapon-staff.png" width="128" height="128" /> + + <include file="equipment/weapons/scorpionkinglance.xml"/> + +</sprite>
\ No newline at end of file @@ -7601,7 +7601,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml. <sprite>equipment/weapons/weapon-staff.xml</sprite> </item> <item id="7004" - image="equipment/weapons/woodenstaff.png" + image="equipment/weapons/legendwand.png" name="Legendary Wand" description="Only great mages dare to use this. It's damage is as high as its name." effect="Magic Attack +740, HP -25%" @@ -7610,7 +7610,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml. type="equip-2hand" attack-action="attack" weight="158"> - <sprite>equipment/weapons/weapon-staff.xml</sprite> + <sprite>equipment/weapons/legend-wand.xml</sprite> </item> <item id="7005" image="equipment/weapons/reinboowand.png" |