diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-01-18 01:34:45 +0000 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-01-18 01:34:45 +0000 |
| commit | f846d5d38b81ea57150d012b270cc3506abcfb46 (patch) | |
| tree | 1e101a35e30f6e2f77ad17ff62d5dfad5d553381 | |
| parent | dcaffcfb9f3070c9120d958192bd3b6c3176ca2e (diff) | |
| parent | 684a1bc50ad70501f26138b861a07ead8a2a53ed (diff) | |
| download | clientdata-f846d5d38b81ea57150d012b270cc3506abcfb46.tar.gz clientdata-f846d5d38b81ea57150d012b270cc3506abcfb46.tar.bz2 clientdata-f846d5d38b81ea57150d012b270cc3506abcfb46.tar.xz clientdata-f846d5d38b81ea57150d012b270cc3506abcfb46.zip | |
Merge branch 'mergeitems' into 'master'
Mergeitems
See merge request evol/clientdata!135
61 files changed, 505 insertions, 22 deletions
@@ -79,17 +79,24 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/equipment/head/bandithood.png (Micksha) (CC-BY-SA 3.0) (-) graphics/items/equipment/head/beaniecopter.png (Alige, Black Don) (GPLv2) (Milla, Veryape) graphics/items/equipment/head/bowlerhat.png (ChefChelios) (CC BY-SA 3.0) (-) + graphics/items/equipment/head/bowlerhat-brown.png (ChefChelios) (CC BY-SA 3.0) (-) graphics/items/equipment/head/brimmedfeatherhat.png (Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/head/brimmedflowerhat.png (Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/head/brimmedhat.png (Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/head/candlehelmet.png (Skipy) (GPLv2) (-) + graphics/items/equipment/head/cashiershade.png (LEGACY) (GPLv2) (-) + graphics/items/equipment/head/catears.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/fairyhat.png (Goku) (GPLv2) (-) graphics/items/equipment/head/fancyhat.png (Crush) (CC BY-SA 3.0) (-) + graphics/items/equipment/head/funkyhat.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/infantryhelmet.png (Black Don) (GPLv2) (-) + graphics/items/equipment/head/moonshroomhat.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/nohmask.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/pinkiehat.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/pumpkinhat.png (Modanung) (CC BY-SA 3.0) (-) graphics/items/equipment/head/rosehat.png (Nami, skipy) (GPLv2) (Alige, Micksha) + graphics/items/equipment/head/santabeardhat.png (LEGACY) (GPLv2) (-) + graphics/items/equipment/head/santahat.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/tophat.png (QOAL) (GPLv2) (-) graphics/items/equipment/head/warlordhelmet.png (Black Don) (GPLv2) (-) ### Legs @@ -104,6 +111,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/equipment/neck/banditshawl.png (Micksha, Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/neck/shemagh.png (Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/neck/copper-necklace.png (Micksha) (CC BY-SA 3.0) (-) + graphics/items/equipment/neck/eyepatch.png (LEGACY) (CC BY-SA 3.0) (-) ### Shields graphics/items/equipment/shields/barrel.png (Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/shields/leather.png (Len) (CC BY-SA 3.0) (Reid) @@ -120,6 +128,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/equipment/weapons/piouslayer.png (Reid) (CC BY-SA 3.0) (Enchilado) graphics/items/equipment/weapons/scythe.png (Micksha) (CC BY-SA 3.0) (-) graphics/items/equipment/weapons/setzer.png (LEGACY) (GPLv2) (-) + graphics/items/equipment/weapons/sharpknife.png (EJlol) (CC BY-SA 3.0) (Reid, Micksha) graphics/items/equipment/weapons/shortbow.png (LEGACY) (CC BY-SA 3.0,GPLv2) (Micksha) graphics/items/equipment/weapons/traininggladius.png (Reid) (CC BY-SA 3.0) (-) graphics/items/equipment/weapons/wand.png (Micksha) (CC BY-SA 3.0) (-) @@ -128,7 +137,6 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/equipment/weapons/pickaxe.png (Micksha) (CC BY-SA 3.0) (-) graphics/items/equipment/weapons/torch.png (Micksha) (CC BY-SA 3.0) (-) graphics/items/equipment/weapons/wand.png (Micksha) (CC BY-SA 3.0) (-) - ## Generic graphics/items/generic/adventurersoul.png (Micksha) (CC BY-SA 3.0) (idea by TMW-BR?) graphics/items/generic/bottle-empty.png (FotherJ, Enchilado) (CC BY-SA 3.0,GPLv2) (Micksha) @@ -243,6 +251,40 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/usable/shovel.png (Alige, Reid) (CC BY-SA 3.0) (-) graphics/items/usable/urchinmeat.png (Alige) (CC BY-SA 3.0) (Reid) graphics/items/usable/wine.png (Jak1) (CC BY-SA 3.0) (Reid) +## Merge + graphics/items/merge/blackpearl.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/bloodstone.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/bottle-sand.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/brainstem.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/christmasbox-closed.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/christmasbox-open.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/christmasbulb.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/clover.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/dark-petal.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/doll.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/easterbasket.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/easteregg.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/fakefangs.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/flawed-lens.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/flighttalisman.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/jellybeans.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/kidbook.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/leatherball.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/lollipop.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/plushmouboo.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/redstocking.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/reinboo-stick.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/rubberbat.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/santacookie.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/santaglobe.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/scissors.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/silverbell.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/snowmanglobe.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/strange-coin.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/tongue.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/wrapping-paper-dotted.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/items/merge/wrapping-paper-striped.png (LEGACY) (CC BY-SA 3.0) (-) + # Minimaps graphics/minimaps/000-0.png (Reid) (CC BY-SA 3.0) (-) @@ -438,19 +480,26 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/sprites/equipment/head/bandithood.png (Micksha) (CC BY-SA 3.0) (-) graphics/sprites/equipment/head/beaniecopter.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/bowlerhat.png (LEGACY) (GPLv2) (-) + graphics/sprites/equipment/head/bowlerhat-brown.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/brimmedfeatherhat.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/equipment/head/brimmedflowerhat.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/equipment/head/brimmedhat.png (Reid) (CC BY-SA 3.0) (Reid) graphics/sprites/equipment/head/candlehelmet.png (LEGACY) (GPLv2) (-) + graphics/sprites/equipment/head/cashiershade.png (LEGACY) (GPLv2) (-) + graphics/sprites/equipment/head/catears.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/fairyhat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/fancyhat.png (Crush) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/head/funkyhat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/headmodel-male.png (Saulc) (GPLv2) (-) graphics/sprites/equipment/head/infantryhelmet.png (LEGACY) (GPLv2) (-) + graphics/sprites/equipment/head/moonshroomhat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/nohmask.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/pinkiehat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/pumpkinhat.png (Modanung) (CC BY-SA 3.0) (-) graphics/sprites/equipment/head/purplemodel.png (Saulc) (GPLv2) (-) graphics/sprites/equipment/head/rosehat.png (LEGACY) (GPLv2) (Micksha) + graphics/sprites/equipment/head/santabeardhat.png (LEGACY) (GPLv2) (-) + graphics/sprites/equipment/head/santahat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/tophat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/warlordhelmet.png (LEGACY) (GPLv2) (-) ### Legs @@ -470,8 +519,9 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/sprites/equipment/legs/trousers-male.png (Modanung, Reid) (CC BY-SA 3.0) (-) ### Neck graphics/sprites/equipment/neck/banditshawl.png (Reid) (CC BY-SA 3.0) (Micksha) - graphics/sprites/equipment/neck/shemagh.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/equipment/neck/copper-necklace.png (Micksha) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/neck/eyepatch.png (LEGACY) (CC BY-SA 3.0) (-) + graphics/sprites/equipment/neck/shemagh.png (Reid) (CC BY-SA 3.0) (-) ### Shields graphics/sprites/equipment/shields/barrel.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/equipment/shields/leathershield.png (Micksha) (CC BY-SA 3.0) (-) diff --git a/graphics/items/equipment/head/bowlerhat-brown.png b/graphics/items/equipment/head/bowlerhat-brown.png Binary files differnew file mode 100644 index 00000000..c38c0362 --- /dev/null +++ b/graphics/items/equipment/head/bowlerhat-brown.png diff --git a/graphics/items/equipment/head/cashiershade.png b/graphics/items/equipment/head/cashiershade.png Binary files differnew file mode 100644 index 00000000..286a299c --- /dev/null +++ b/graphics/items/equipment/head/cashiershade.png diff --git a/graphics/items/equipment/head/catears.png b/graphics/items/equipment/head/catears.png Binary files differnew file mode 100644 index 00000000..32d3ff34 --- /dev/null +++ b/graphics/items/equipment/head/catears.png diff --git a/graphics/items/equipment/head/funkyhat.png b/graphics/items/equipment/head/funkyhat.png Binary files differnew file mode 100644 index 00000000..aef3105d --- /dev/null +++ b/graphics/items/equipment/head/funkyhat.png diff --git a/graphics/items/equipment/head/moonshroomhat.png b/graphics/items/equipment/head/moonshroomhat.png Binary files differnew file mode 100644 index 00000000..e29ad79d --- /dev/null +++ b/graphics/items/equipment/head/moonshroomhat.png diff --git a/graphics/items/equipment/head/santabeardhat.png b/graphics/items/equipment/head/santabeardhat.png Binary files differnew file mode 100644 index 00000000..679551fc --- /dev/null +++ b/graphics/items/equipment/head/santabeardhat.png diff --git a/graphics/items/equipment/head/santahat.png b/graphics/items/equipment/head/santahat.png Binary files differnew file mode 100644 index 00000000..d46f9e41 --- /dev/null +++ b/graphics/items/equipment/head/santahat.png diff --git a/graphics/items/equipment/neck/eyepatch.png b/graphics/items/equipment/neck/eyepatch.png Binary files differnew file mode 100644 index 00000000..4dcd88c9 --- /dev/null +++ b/graphics/items/equipment/neck/eyepatch.png diff --git a/graphics/items/equipment/weapons/dagger.png b/graphics/items/equipment/weapons/dagger.png Binary files differindex fd697b66..43a4ecd7 100644 --- a/graphics/items/equipment/weapons/dagger.png +++ b/graphics/items/equipment/weapons/dagger.png diff --git a/graphics/items/equipment/weapons/sharpknife.png b/graphics/items/equipment/weapons/sharpknife.png Binary files differnew file mode 100644 index 00000000..06aeccb1 --- /dev/null +++ b/graphics/items/equipment/weapons/sharpknife.png diff --git a/graphics/items/merge/blackpearl.png b/graphics/items/merge/blackpearl.png Binary files differnew file mode 100644 index 00000000..7253cd09 --- /dev/null +++ b/graphics/items/merge/blackpearl.png diff --git a/graphics/items/merge/bloodstone.png b/graphics/items/merge/bloodstone.png Binary files differnew file mode 100644 index 00000000..59b1aea2 --- /dev/null +++ b/graphics/items/merge/bloodstone.png diff --git a/graphics/items/merge/bottle-sand.png b/graphics/items/merge/bottle-sand.png Binary files differnew file mode 100644 index 00000000..1b568651 --- /dev/null +++ b/graphics/items/merge/bottle-sand.png diff --git a/graphics/items/merge/brainstem.png b/graphics/items/merge/brainstem.png Binary files differnew file mode 100644 index 00000000..30dd7ac7 --- /dev/null +++ b/graphics/items/merge/brainstem.png diff --git a/graphics/items/merge/christmasbox-closed.png b/graphics/items/merge/christmasbox-closed.png Binary files differnew file mode 100644 index 00000000..026f4a2a --- /dev/null +++ b/graphics/items/merge/christmasbox-closed.png diff --git a/graphics/items/merge/christmasbox-open.png b/graphics/items/merge/christmasbox-open.png Binary files differnew file mode 100644 index 00000000..8f88afac --- /dev/null +++ b/graphics/items/merge/christmasbox-open.png diff --git a/graphics/items/merge/christmasbulb.png b/graphics/items/merge/christmasbulb.png Binary files differnew file mode 100644 index 00000000..ce50e567 --- /dev/null +++ b/graphics/items/merge/christmasbulb.png diff --git a/graphics/items/merge/clover.png b/graphics/items/merge/clover.png Binary files differnew file mode 100644 index 00000000..8ed3ddfa --- /dev/null +++ b/graphics/items/merge/clover.png diff --git a/graphics/items/merge/dark-petal.png b/graphics/items/merge/dark-petal.png Binary files differnew file mode 100644 index 00000000..335a0315 --- /dev/null +++ b/graphics/items/merge/dark-petal.png diff --git a/graphics/items/merge/doll.png b/graphics/items/merge/doll.png Binary files differnew file mode 100644 index 00000000..7f64aae1 --- /dev/null +++ b/graphics/items/merge/doll.png diff --git a/graphics/items/merge/easterbasket.png b/graphics/items/merge/easterbasket.png Binary files differnew file mode 100644 index 00000000..2863189c --- /dev/null +++ b/graphics/items/merge/easterbasket.png diff --git a/graphics/items/merge/easteregg.png b/graphics/items/merge/easteregg.png Binary files differnew file mode 100644 index 00000000..ef7f7ba6 --- /dev/null +++ b/graphics/items/merge/easteregg.png diff --git a/graphics/items/merge/fakefangs.png b/graphics/items/merge/fakefangs.png Binary files differnew file mode 100644 index 00000000..37581b01 --- /dev/null +++ b/graphics/items/merge/fakefangs.png diff --git a/graphics/items/merge/flawed-lens.png b/graphics/items/merge/flawed-lens.png Binary files differnew file mode 100644 index 00000000..cb7f0c5a --- /dev/null +++ b/graphics/items/merge/flawed-lens.png diff --git a/graphics/items/merge/flighttalisman.png b/graphics/items/merge/flighttalisman.png Binary files differnew file mode 100644 index 00000000..0fcdffcd --- /dev/null +++ b/graphics/items/merge/flighttalisman.png diff --git a/graphics/items/merge/jellybeans.png b/graphics/items/merge/jellybeans.png Binary files differnew file mode 100644 index 00000000..5440c126 --- /dev/null +++ b/graphics/items/merge/jellybeans.png diff --git a/graphics/items/merge/kidbook.png b/graphics/items/merge/kidbook.png Binary files differnew file mode 100644 index 00000000..ecd1d9db --- /dev/null +++ b/graphics/items/merge/kidbook.png diff --git a/graphics/items/merge/leatherball.png b/graphics/items/merge/leatherball.png Binary files differnew file mode 100644 index 00000000..222b51ff --- /dev/null +++ b/graphics/items/merge/leatherball.png diff --git a/graphics/items/merge/lollipop.png b/graphics/items/merge/lollipop.png Binary files differnew file mode 100644 index 00000000..6953c8f1 --- /dev/null +++ b/graphics/items/merge/lollipop.png diff --git a/graphics/items/merge/plushmouboo.png b/graphics/items/merge/plushmouboo.png Binary files differnew file mode 100644 index 00000000..ae6bf137 --- /dev/null +++ b/graphics/items/merge/plushmouboo.png diff --git a/graphics/items/merge/redstocking.png b/graphics/items/merge/redstocking.png Binary files differnew file mode 100644 index 00000000..58bdabed --- /dev/null +++ b/graphics/items/merge/redstocking.png diff --git a/graphics/items/merge/reinboo-stick.png b/graphics/items/merge/reinboo-stick.png Binary files differnew file mode 100644 index 00000000..3650581b --- /dev/null +++ b/graphics/items/merge/reinboo-stick.png diff --git a/graphics/items/merge/rubberbat.png b/graphics/items/merge/rubberbat.png Binary files differnew file mode 100644 index 00000000..1f1ed22b --- /dev/null +++ b/graphics/items/merge/rubberbat.png diff --git a/graphics/items/merge/santacookie.png b/graphics/items/merge/santacookie.png Binary files differnew file mode 100644 index 00000000..1f1e0eef --- /dev/null +++ b/graphics/items/merge/santacookie.png diff --git a/graphics/items/merge/santaglobe.png b/graphics/items/merge/santaglobe.png Binary files differnew file mode 100644 index 00000000..70b9ed2d --- /dev/null +++ b/graphics/items/merge/santaglobe.png diff --git a/graphics/items/merge/scissors.png b/graphics/items/merge/scissors.png Binary files differnew file mode 100644 index 00000000..58fd2f14 --- /dev/null +++ b/graphics/items/merge/scissors.png diff --git a/graphics/items/merge/silverbell.png b/graphics/items/merge/silverbell.png Binary files differnew file mode 100644 index 00000000..be3928e0 --- /dev/null +++ b/graphics/items/merge/silverbell.png diff --git a/graphics/items/merge/snowmanglobe.png b/graphics/items/merge/snowmanglobe.png Binary files differnew file mode 100644 index 00000000..a83ac701 --- /dev/null +++ b/graphics/items/merge/snowmanglobe.png diff --git a/graphics/items/merge/strange-coin.png b/graphics/items/merge/strange-coin.png Binary files differnew file mode 100644 index 00000000..8cdffa6a --- /dev/null +++ b/graphics/items/merge/strange-coin.png diff --git a/graphics/items/merge/tongue.png b/graphics/items/merge/tongue.png Binary files differnew file mode 100644 index 00000000..6fe8d143 --- /dev/null +++ b/graphics/items/merge/tongue.png diff --git a/graphics/items/merge/wrapping-paper-dotted.png b/graphics/items/merge/wrapping-paper-dotted.png Binary files differnew file mode 100644 index 00000000..5b1c8296 --- /dev/null +++ b/graphics/items/merge/wrapping-paper-dotted.png diff --git a/graphics/items/merge/wrapping-paper-striped.png b/graphics/items/merge/wrapping-paper-striped.png Binary files differnew file mode 100644 index 00000000..b6f49ff4 --- /dev/null +++ b/graphics/items/merge/wrapping-paper-striped.png diff --git a/graphics/sprites/equipment/head/bowlerhat-brown.png b/graphics/sprites/equipment/head/bowlerhat-brown.png Binary files differnew file mode 100644 index 00000000..4731267e --- /dev/null +++ b/graphics/sprites/equipment/head/bowlerhat-brown.png diff --git a/graphics/sprites/equipment/head/bowlerhat-brown.xml b/graphics/sprites/equipment/head/bowlerhat-brown.xml new file mode 100644 index 00000000..f073def4 --- /dev/null +++ b/graphics/sprites/equipment/head/bowlerhat-brown.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Saulc +Copyright (C) 2018 TMW2 --> +<sprite> + <imageset name="base" + src="graphics/sprites/equipment/head/bowlerhat-brown.png|W" + width="32" + height="64" + /> + + <include file="equipment/head/headmodel-male.xml"/> +</sprite> diff --git a/graphics/sprites/equipment/head/cashiershade.png b/graphics/sprites/equipment/head/cashiershade.png Binary files differnew file mode 100644 index 00000000..cc92640a --- /dev/null +++ b/graphics/sprites/equipment/head/cashiershade.png diff --git a/graphics/sprites/equipment/head/cashiershade.xml b/graphics/sprites/equipment/head/cashiershade.xml new file mode 100644 index 00000000..f2c0d122 --- /dev/null +++ b/graphics/sprites/equipment/head/cashiershade.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Saulc +Copyright (C) 2018 TMW2: Moubootaur Legends --> +<sprite> + <imageset name="base" + src="graphics/sprites/equipment/head/cashiershade.png" + width="32" + height="64" + offsetY="1"/> + + <include file="equipment/head/headmodel-male.xml"/> +</sprite> diff --git a/graphics/sprites/equipment/head/catears.png b/graphics/sprites/equipment/head/catears.png Binary files differnew file mode 100644 index 00000000..34b580a8 --- /dev/null +++ b/graphics/sprites/equipment/head/catears.png diff --git a/graphics/sprites/equipment/head/catears.xml b/graphics/sprites/equipment/head/catears.xml new file mode 100644 index 00000000..d1c73e4f --- /dev/null +++ b/graphics/sprites/equipment/head/catears.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Saulc +Copyright (C) 2018 TMW2: Moubootaur Legends --> +<sprite> + <imageset name="base" + src="graphics/sprites/equipment/head/catears.png|M;W" + width="32" + height="64" + offsetY="1"/> + + <include file="equipment/head/headmodel-male.xml"/> +</sprite>
\ No newline at end of file diff --git a/graphics/sprites/equipment/head/funkyhat.png b/graphics/sprites/equipment/head/funkyhat.png Binary files differnew file mode 100644 index 00000000..5da27551 --- /dev/null +++ b/graphics/sprites/equipment/head/funkyhat.png diff --git a/graphics/sprites/equipment/head/funkyhat.xml b/graphics/sprites/equipment/head/funkyhat.xml new file mode 100644 index 00000000..bc72b575 --- /dev/null +++ b/graphics/sprites/equipment/head/funkyhat.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Saulc +Copyright (C) 2018 TMW2 --> +<sprite> + <imageset name="base" + src="graphics/sprites/equipment/head/funkyhat.png|W" + width="32" + height="64" + offsetY="1"/> + + <include file="equipment/head/headmodel-male.xml"/> +</sprite> diff --git a/graphics/sprites/equipment/head/moonshroomhat.png b/graphics/sprites/equipment/head/moonshroomhat.png Binary files differnew file mode 100644 index 00000000..ea6aa0a7 --- /dev/null +++ b/graphics/sprites/equipment/head/moonshroomhat.png diff --git a/graphics/sprites/equipment/head/moonshroomhat.xml b/graphics/sprites/equipment/head/moonshroomhat.xml new file mode 100644 index 00000000..999c4f33 --- /dev/null +++ b/graphics/sprites/equipment/head/moonshroomhat.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Saulc +Copyright (C) 2018 TMW2: Moubootaur Legends --> +<sprite> + <imageset name="base" + src="graphics/sprites/equipment/head/moonshroomhat.png" + width="32" + height="64" + offsetY="1"/> + + <include file="equipment/head/headmodel-male.xml"/> +</sprite> diff --git a/graphics/sprites/equipment/head/santabeardhat.png b/graphics/sprites/equipment/head/santabeardhat.png Binary files differnew file mode 100644 index 00000000..72c3159c --- /dev/null +++ b/graphics/sprites/equipment/head/santabeardhat.png diff --git a/graphics/sprites/equipment/head/santabeardhat.xml b/graphics/sprites/equipment/head/santabeardhat.xml new file mode 100644 index 00000000..1cfbdbdb --- /dev/null +++ b/graphics/sprites/equipment/head/santabeardhat.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Saulc +Copyright (C) 2018 TMW2 --> +<sprite> + <imageset name="base" + src="graphics/sprites/equipment/head/santabeardhat.png" + width="32" + height="64" + offsetY="1"/> + + <include file="equipment/head/headmodel-male.xml"/> +</sprite> diff --git a/graphics/sprites/equipment/head/santahat.png b/graphics/sprites/equipment/head/santahat.png Binary files differnew file mode 100644 index 00000000..e6016ef9 --- /dev/null +++ b/graphics/sprites/equipment/head/santahat.png diff --git a/graphics/sprites/equipment/head/santahat.xml b/graphics/sprites/equipment/head/santahat.xml new file mode 100644 index 00000000..4a4b4284 --- /dev/null +++ b/graphics/sprites/equipment/head/santahat.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Saulc +Copyright (C) 2018 TMW2 --> +<sprite> + <imageset name="base" + src="graphics/sprites/equipment/head/santahat.png" + width="32" + height="64" + offsetY="1"/> + + <include file="equipment/head/headmodel-male.xml"/> +</sprite> diff --git a/graphics/sprites/equipment/neck/copperarmor-male.xml b/graphics/sprites/equipment/neck/copperarmor-male.xml deleted file mode 100644 index 719aeb07..00000000 --- a/graphics/sprites/equipment/neck/copperarmor-male.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Author: Reid -Copyright (C) 2015 Evol Online --> -<sprite> - <imageset name="base" - src="graphics/sprites/equipment/chest/copperarmor-male.png" - width="64" - height="64"/> - - <include file="races/human-male.xml"/> -</sprite> diff --git a/graphics/sprites/equipment/neck/eyepatch.png b/graphics/sprites/equipment/neck/eyepatch.png Binary files differnew file mode 100644 index 00000000..8febbdea --- /dev/null +++ b/graphics/sprites/equipment/neck/eyepatch.png diff --git a/graphics/sprites/equipment/neck/eyepatch.xml b/graphics/sprites/equipment/neck/eyepatch.xml new file mode 100644 index 00000000..28f8f82c --- /dev/null +++ b/graphics/sprites/equipment/neck/eyepatch.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Saulc +Copyright (C) 2018 TMW2 --> +<sprite> + <imageset name="base" + src="graphics/sprites/equipment/neck/eyepatch.png" + width="32" + height="64" + offsetY="1"/> + + <include file="equipment/head/headmodel-male.xml"/> +</sprite> @@ -25,6 +25,8 @@ New organization (04/12/11). 5000 5999 = Cards 6000 6999 = Bows 7000 7999 = Arrows +8000 8499 = LEGACY merge items, generic or usable + Colors for dyeable equipments or items are now set up by itemcolors.xml. --> @@ -1314,6 +1316,17 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. <sprite gender="unisex">equipment/chest/legionarmor-male.xml|#2f382e,48504f,5b6c6b,7d8d8a,929d9d,b6bac2,ced2d1;#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1</sprite> <sprite gender="female">equipment/chest/legionarmor-female.xml|#2f382e,48504f,5b6c6b,7d8d8a,929d9d,b6bac2,ced2d1;#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1</sprite> </item> + <item id="1311" + image="equipment/chest/warlordplate.png|W:#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1" + name="Golden Warlord Plate" + description="Strong and decorative armor, made of pure gold." + defense="650" + level="50" + type="equip-torso" + weight="2500"> + <sprite gender="unisex">equipment/chest/warlordplate-male.xml|#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1</sprite> + <sprite gender="female">equipment/chest/warlordplate-female.xml|#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1</sprite> + </item> <!-- Boots --> <item id="1800" image="equipment/feet/boots.png|S:#3c3c3c,40332d,4d4d4d,5e4a3d,686868,705740,919191,a1825d,b6b6b6,b59767,dfdfdf,dbbf88" @@ -1754,9 +1767,9 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. weight="40"> <sprite>equipment/head/tophat.xml</sprite> <replace sprite="hair"> - <item from="-5" to="-4"/> - <item from="-14" to="-9"/> - <item from="-15" to="-19"/> + <item from="-5" to="-4"/> + <item from="-14" to="-9"/> + <item from="-15" to="-19"/> </replace> </item> <item id="2912" @@ -1769,9 +1782,9 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. weight="30"> <sprite>equipment/head/bowlerhat.xml</sprite> <replace sprite="hair"> - <item from="-5" to="-4"/> - <item from="-14" to="-9"/> - <item from="-15" to="-19"/> + <item from="-5" to="-4"/> + <item from="-14" to="-9"/> + <item from="-15" to="-19"/> </replace> </item> <item id="2913" @@ -1784,9 +1797,9 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. weight="5"> <sprite>equipment/head/fairyhat.xml</sprite> <replace sprite="hair"> - <item from="-5" to="-4"/> - <item from="-14" to="-9"/> - <item from="-15" to="-19"/> + <item from="-5" to="-4"/> + <item from="-14" to="-9"/> + <item from="-15" to="-19"/> </replace> </item> <item id="2914" @@ -1819,6 +1832,89 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. weight="30"> <sprite>equipment/head/bandithood.xml</sprite> </item> + <item id="2917" + image="equipment/head/bowlerhat-brown.png" + name="Brown Bowler Hat" + description="A hat for those with a bit of class." + defense="40" + level="15" + type="equip-head" + weight="30"> + <sprite>equipment/head/bowlerhat-brown.xml</sprite> + <replace sprite="hair"> + <item from="-5" to="-4"/> + <item from="-14" to="-9"/> + <item from="-15" to="-19"/> + </replace> + </item> + <item id="2918" + image="equipment/head/catears.png|M:#774444;W:#777777" + name="Cat Ears" + description="Meow! A pair of plush cat ears. Meow!" + defense="25" + level="35" + type="equip-head" + weight="10"> + <sprite>equipment/head/catears.xml|#774444;#777777</sprite> + </item> + <item id="2919" + image="equipment/head/santahat.png" + name="Santa Hat" + description="The beard is missing, but at least you could pretend to be him. Or his fan." + defense="6" + level="14" + type="equip-head" + weight="28"> + <sprite>equipment/head/santahat.xml</sprite> + </item> + <item id="2920" + image="equipment/head/moonshroomhat.png" + name="Moonshroom Hat" + description="Do you feel this magic aura?" + defense="51" + level="70" + int="7" + type="equip-head" + weight="50"> + <sprite>equipment/head/moonshroomhat.xml</sprite> + </item> + <item id="2921" + image="equipment/head/santabeardhat.png" + name="Santa Beard Hat" + description="Hohoho! Gifts for the nice! Coal for the naughty!" + defense="9" + level="18" + type="equip-head" + weight="32"> + <sprite>equipment/head/santabeardhat.xml</sprite> + </item> + <item id="2922" + image="equipment/head/funkyhat.png|W" + name="%Color% Funky Hat" + description="Yawn." + defense="17" + level="30" + type="equip-head" + weight="50" + colors="simple" + maxFloorOffset="10"> + <sprite>equipment/head/funkyhat.xml</sprite> + <replace sprite="hair"> + <item from="-5" to="-4"/> + <item from="-14" to="-9"/> + <item from="-15" to="-19"/> + </replace> + </item> + <item id="2923" + image="equipment/head/cashiershade.png" + name="Cashier Shade" + description="Do you have something to hide? Or are you just sensitive against the sun?" + defense="12" + level="9" + type="equip-head" + weight="28"> + <sprite>equipment/head/cashiershade.xml</sprite> + </item> <!-- Neck Armors --> <item id="3200" @@ -1845,6 +1941,18 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. <sprite gender="unisex">equipment/neck/banditshawl.xml</sprite> <sprite gender="female">equipment/neck/banditshawl.xml</sprite> </item> + <item id="3202" + image="equipment/neck/eyepatch.png" + name="Eye Patch" + description="Arr! What's a pirate with two eyes? A not-pirate! Ar Arr!" + defense="3" + level="16" + type="equip-neck" + weight="8" + drawAfter="torso"> + <sprite gender="unisex">equipment/neck/eyepatch.xml</sprite> + <sprite gender="female">equipment/neck/eyepatch.xml</sprite> + </item> <!-- Weapons --> <item id="3500" @@ -2043,6 +2151,20 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. weight="1200"> <sprite>equipment/weapons/halberd.xml</sprite> </item> + <item id="3515" + image="equipment/weapons/sharpknife.png" + name="Sharp Knife" + description="A sharp knife, commonly used by chefs." + attack="120" + attack-range="1" + level="5" + type="equip-1hand" + attack-action="attack" + weight="15"> + <sprite>equipment/weapons/knife.xml</sprite> + <sound event="hit">weapons/knife/hit1.ogg</sound> + <sound event="miss">weapons/knife/miss1.ogg</sound> + </item> <!-- Pets --> @@ -2425,4 +2547,230 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. type="generic" weight="100"/> + <!-- LEGACY merge items, generic or usable --> + <item id="8000" + image="merge/blackpearl.png" + name="Black Pearl" + description="A shiny, black pearl. It must be old!" + type="generic" + weight="100"/> + <item id="8001" + image="merge/bloodstone.png" + name="Bloodstone" + description="A dark read, shimmering stone. It looks scary." + type="generic" + weight="100"/> + <item id="8002" + image="merge/bottle-sand.png" + name="Bottle of Sand" + description="A bottle filled with sand. Where this sand may originate?" + type="generic" + weight="200"/> + <item id="8003" + image="merge/brainstem.png" + name="Brainstem" + description="If only someone knew what kind of being exactly that comes from." + type="generic" + weight="50"/> + <item id="8004" + image="merge/christmasbox-closed.png" + name="Closed Christmas Box" + description="Surprise surprise, what might be inside?" + type="generic" + weight="100"/> + <item id="8005" + image="merge/christmasbox-open.png" + name="Open Christmas Box" + description="Surprise surprise, what might have been inside?" + type="generic" + weight="100"/> + <item id="8006" + image="merge/christmasbulb.png|W:#f00000" + name="Red Christmas Ornament" + description="An ornament from Santa's tree." + type="generic" + weight="20"/> + <item id="8007" + image="merge/christmasbulb.png|W:#f0e000" + name="Yellow Christmas Ornament" + description="An ornament from Santa's tree." + type="generic" + weight="20"/> + <item id="8008" + image="merge/christmasbulb.png|W:#00f000" + name="Green Christmas Ornament" + description="An ornament from Santa's tree." + type="generic" + weight="20"/> + <item id="8009" + image="merge/christmasbulb.png|W:#00f0ee" + name="Aqua Christmas Ornament" + description="An ornament from Santa's tree." + type="generic" + weight="20"/> + <item id="8010" + image="merge/christmasbulb.png|W:#0000d0" + name="Blue Christmas Ornament" + description="An ornament from Santa's tree." + type="generic" + weight="20"/> + <item id="8011" + image="merge/christmasbulb.png|W:#d000ef" + name="Purple Christmas Ornament" + description="An ornament from Santa's tree." + type="generic" + weight="20"/> + <item id="8012" + image="merge/doll.png" + name="Doll" + description="You see right. This doll is not broken." + type="generic" + weight="75"/> + <item id="8013" + image="merge/easterbasket.png" + name="Easter Basket" + description="A nice basket. Someone may hide it during easter and fill it with chocolate." + type="generic" + weight="200"/> + <item id="8014" + image="merge/easteregg.png" + name="Easteregg" + description="A chocolate egg, wrapped in silver paper." + type="generic" + weight="50"/> + <item id="8015" + image="merge/fakefangs.png" + name="Plastic Fangs" + description="You will look like a vampire with these!" + type="generic" + weight="25"/> + <item id="8016" + image="merge/flawed-lens.png" + name="Flawed Lens" + description="A failed attempt at making a lens with powerful properties. Perhaps, one day, you will be able to salvage the remains from this effort." + type="generic" + weight="50"/> + <item id="8017" + image="merge/dark-petal.png" + name="Dark Petal" + description="A single, dark, petal, oddly heavy. The edges of the petal are unusually hard, and have a slightly reflective shine to them. But looking into the gleam, you can only see fire..." + type="generic" + weight="250"/> + <item id="8018" + image="merge/flighttalisman.png" + name="Flight Talisman" + description="A talisman created using ancient magic to keep you safe during flights." + type="generic" + weight="500"/> + <item id="8019" + image="merge/jellybeans.png" + name="Jellybeans" + description="Colorful and tasty Jelly Beans." + type="generic" + weight="150"/> + <item id="8020" + image="merge/leatherball.png" + name="Leatherball" + description="A heavy ball made out of leather, used for playing soccer in the old days." + type="generic" + weight="750"/> + <item id="8021" + image="merge/lollipop.png|W:#2502d6" + name="Booberry Blue Lollipop" + description="A lollipop. Mmm." + type="usable" + effect="Heal 1500-2500 HP" + weight="150"/> + <item id="8022" + image="merge/lollipop.png|W:#00ba16" + name="Ghastly Green Lollipop" + description="A lollipop. Tasty." + type="usable" + effect="Heal 1500-2500 HP" + weight="150"/> + <item id="8023" + image="merge/lollipop.png|W:#e00418" + name="Blood Red Lollipop" + description="A lollipop. Yum." + type="usable" + effect="Heal 1500-2500 HP" + weight="150"/> + <item id="8024" + image="merge/plushmouboo.png" + name="Plush Mouboo" + description="A mouboo made of plush. How cute!" + type="generic" + weight="250"/> + <item id="8025" + image="merge/redstocking.png" + name="Red Stocking" + description="Eww, it's smelly!" + type="generic" + weight="100"/> + <item id="8026" + image="merge/reinboo-stick.png" + name="Stick Reinboo" + description="A stick reinboo. This is fun!" + type="generic" + weight="100"/> + <item id="8027" + image="merge/rubberbat.png" + name="Rubber Bat" + description="Squeaks when you squeeze it." + type="generic" + weight="30"/> + <item id="8028" + image="merge/santacookie.png" + name="Santa Cookie" + description="A cookie, given to you by the one and only Santa Claus!" + type="generic" + weight="25"/> + <item id="8029" + image="merge/santaglobe.png" + name="Santa Globe" + description="A snow globe featuring Santa." + type="generic" + weight="500"/> + <item id="8030" + image="merge/scissors.png" + name="Scissors" + description="A pair of awkward and unwieldy scissors." + type="generic" + weight="150"/> + <item id="8031" + image="merge/silverbell.png" + name="Silver Bell" + description="A tiny bell made of silver." + type="generic" + weight="250"/> + <item id="8032" + image="merge/snowmanglobe.png" + name="Snowman Globe" + description="A snow globe featuring Snowman." + type="generic" + weight="500"/> + <item id="8033" + image="merge/strange-coin.png" + name="Strange Coin" + description="A cheap looking yellow plastic coin. Seems to be rather useless." + type="generic" + weight="10"/> + <item id="8034" + image="merge/tongue.png" + name="Tongue" + description="A tongue. Ewww." + type="generic" + weight="100"/> + <item id="8035" + image="merge/wrapping-paper-dotted.png" + name="Dotted Wrapping Paper" + description="Nice dotted wrapping paper, to be used for wrapping presents." + type="generic" + weight="50"/> + <item id="8036" + image="merge/wrapping-paper-striped.png" + name="Dotted Wrapping Paper" + description="Nice striped wrapping paper, to be used for wrapping presents." + type="generic" + weight="50"/> </items> |
