From 684a1bc50ad70501f26138b861a07ead8a2a53ed Mon Sep 17 00:00:00 2001 From: Micksha Date: Sat, 18 Jan 2020 01:34:45 +0000 Subject: Add compensation items when merging Legacy to rEvolt. Part 1 only. --- LICENSE | 54 ++- graphics/items/equipment/head/bowlerhat-brown.png | Bin 0 -> 675 bytes graphics/items/equipment/head/cashiershade.png | Bin 0 -> 247 bytes graphics/items/equipment/head/catears.png | Bin 0 -> 433 bytes graphics/items/equipment/head/funkyhat.png | Bin 0 -> 665 bytes graphics/items/equipment/head/moonshroomhat.png | Bin 0 -> 620 bytes graphics/items/equipment/head/santabeardhat.png | Bin 0 -> 1367 bytes graphics/items/equipment/head/santahat.png | Bin 0 -> 559 bytes graphics/items/equipment/neck/eyepatch.png | Bin 0 -> 391 bytes graphics/items/equipment/weapons/dagger.png | Bin 314 -> 556 bytes graphics/items/equipment/weapons/sharpknife.png | Bin 0 -> 605 bytes graphics/items/merge/blackpearl.png | Bin 0 -> 425 bytes graphics/items/merge/bloodstone.png | Bin 0 -> 516 bytes graphics/items/merge/bottle-sand.png | Bin 0 -> 619 bytes graphics/items/merge/brainstem.png | Bin 0 -> 291 bytes graphics/items/merge/christmasbox-closed.png | Bin 0 -> 432 bytes graphics/items/merge/christmasbox-open.png | Bin 0 -> 761 bytes graphics/items/merge/christmasbulb.png | Bin 0 -> 570 bytes graphics/items/merge/clover.png | Bin 0 -> 837 bytes graphics/items/merge/dark-petal.png | Bin 0 -> 349 bytes graphics/items/merge/doll.png | Bin 0 -> 951 bytes graphics/items/merge/easterbasket.png | Bin 0 -> 915 bytes graphics/items/merge/easteregg.png | Bin 0 -> 406 bytes graphics/items/merge/fakefangs.png | Bin 0 -> 212 bytes graphics/items/merge/flawed-lens.png | Bin 0 -> 443 bytes graphics/items/merge/flighttalisman.png | Bin 0 -> 626 bytes graphics/items/merge/jellybeans.png | Bin 0 -> 526 bytes graphics/items/merge/kidbook.png | Bin 0 -> 987 bytes graphics/items/merge/leatherball.png | Bin 0 -> 536 bytes graphics/items/merge/lollipop.png | Bin 0 -> 275 bytes graphics/items/merge/plushmouboo.png | Bin 0 -> 933 bytes graphics/items/merge/redstocking.png | Bin 0 -> 523 bytes graphics/items/merge/reinboo-stick.png | Bin 0 -> 510 bytes graphics/items/merge/rubberbat.png | Bin 0 -> 357 bytes graphics/items/merge/santacookie.png | Bin 0 -> 390 bytes graphics/items/merge/santaglobe.png | Bin 0 -> 791 bytes graphics/items/merge/scissors.png | Bin 0 -> 363 bytes graphics/items/merge/silverbell.png | Bin 0 -> 448 bytes graphics/items/merge/snowmanglobe.png | Bin 0 -> 724 bytes graphics/items/merge/strange-coin.png | Bin 0 -> 375 bytes graphics/items/merge/tongue.png | Bin 0 -> 323 bytes graphics/items/merge/wrapping-paper-dotted.png | Bin 0 -> 503 bytes graphics/items/merge/wrapping-paper-striped.png | Bin 0 -> 524 bytes .../sprites/equipment/head/bowlerhat-brown.png | Bin 0 -> 1567 bytes .../sprites/equipment/head/bowlerhat-brown.xml | 12 + graphics/sprites/equipment/head/cashiershade.png | Bin 0 -> 691 bytes graphics/sprites/equipment/head/cashiershade.xml | 12 + graphics/sprites/equipment/head/catears.png | Bin 0 -> 928 bytes graphics/sprites/equipment/head/catears.xml | 12 + graphics/sprites/equipment/head/funkyhat.png | Bin 0 -> 4202 bytes graphics/sprites/equipment/head/funkyhat.xml | 12 + graphics/sprites/equipment/head/moonshroomhat.png | Bin 0 -> 1031 bytes graphics/sprites/equipment/head/moonshroomhat.xml | 12 + graphics/sprites/equipment/head/santabeardhat.png | Bin 0 -> 2832 bytes graphics/sprites/equipment/head/santabeardhat.xml | 12 + graphics/sprites/equipment/head/santahat.png | Bin 0 -> 1654 bytes graphics/sprites/equipment/head/santahat.xml | 12 + .../sprites/equipment/neck/copperarmor-male.xml | 11 - graphics/sprites/equipment/neck/eyepatch.png | Bin 0 -> 762 bytes graphics/sprites/equipment/neck/eyepatch.xml | 12 + items.xml | 366 ++++++++++++++++++++- 61 files changed, 505 insertions(+), 22 deletions(-) create mode 100644 graphics/items/equipment/head/bowlerhat-brown.png create mode 100644 graphics/items/equipment/head/cashiershade.png create mode 100644 graphics/items/equipment/head/catears.png create mode 100644 graphics/items/equipment/head/funkyhat.png create mode 100644 graphics/items/equipment/head/moonshroomhat.png create mode 100644 graphics/items/equipment/head/santabeardhat.png create mode 100644 graphics/items/equipment/head/santahat.png create mode 100644 graphics/items/equipment/neck/eyepatch.png create mode 100644 graphics/items/equipment/weapons/sharpknife.png create mode 100644 graphics/items/merge/blackpearl.png create mode 100644 graphics/items/merge/bloodstone.png create mode 100644 graphics/items/merge/bottle-sand.png create mode 100644 graphics/items/merge/brainstem.png create mode 100644 graphics/items/merge/christmasbox-closed.png create mode 100644 graphics/items/merge/christmasbox-open.png create mode 100644 graphics/items/merge/christmasbulb.png create mode 100644 graphics/items/merge/clover.png create mode 100644 graphics/items/merge/dark-petal.png create mode 100644 graphics/items/merge/doll.png create mode 100644 graphics/items/merge/easterbasket.png create mode 100644 graphics/items/merge/easteregg.png create mode 100644 graphics/items/merge/fakefangs.png create mode 100644 graphics/items/merge/flawed-lens.png create mode 100644 graphics/items/merge/flighttalisman.png create mode 100644 graphics/items/merge/jellybeans.png create mode 100644 graphics/items/merge/kidbook.png create mode 100644 graphics/items/merge/leatherball.png create mode 100644 graphics/items/merge/lollipop.png create mode 100644 graphics/items/merge/plushmouboo.png create mode 100644 graphics/items/merge/redstocking.png create mode 100644 graphics/items/merge/reinboo-stick.png create mode 100644 graphics/items/merge/rubberbat.png create mode 100644 graphics/items/merge/santacookie.png create mode 100644 graphics/items/merge/santaglobe.png create mode 100644 graphics/items/merge/scissors.png create mode 100644 graphics/items/merge/silverbell.png create mode 100644 graphics/items/merge/snowmanglobe.png create mode 100644 graphics/items/merge/strange-coin.png create mode 100644 graphics/items/merge/tongue.png create mode 100644 graphics/items/merge/wrapping-paper-dotted.png create mode 100644 graphics/items/merge/wrapping-paper-striped.png create mode 100644 graphics/sprites/equipment/head/bowlerhat-brown.png create mode 100644 graphics/sprites/equipment/head/bowlerhat-brown.xml create mode 100644 graphics/sprites/equipment/head/cashiershade.png create mode 100644 graphics/sprites/equipment/head/cashiershade.xml create mode 100644 graphics/sprites/equipment/head/catears.png create mode 100644 graphics/sprites/equipment/head/catears.xml create mode 100644 graphics/sprites/equipment/head/funkyhat.png create mode 100644 graphics/sprites/equipment/head/funkyhat.xml create mode 100644 graphics/sprites/equipment/head/moonshroomhat.png create mode 100644 graphics/sprites/equipment/head/moonshroomhat.xml create mode 100644 graphics/sprites/equipment/head/santabeardhat.png create mode 100644 graphics/sprites/equipment/head/santabeardhat.xml create mode 100644 graphics/sprites/equipment/head/santahat.png create mode 100644 graphics/sprites/equipment/head/santahat.xml delete mode 100644 graphics/sprites/equipment/neck/copperarmor-male.xml create mode 100644 graphics/sprites/equipment/neck/eyepatch.png create mode 100644 graphics/sprites/equipment/neck/eyepatch.xml diff --git a/LICENSE b/LICENSE index 649ba8af..2a9603f3 100644 --- a/LICENSE +++ b/LICENSE @@ -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 new file mode 100644 index 00000000..c38c0362 Binary files /dev/null and b/graphics/items/equipment/head/bowlerhat-brown.png differ diff --git a/graphics/items/equipment/head/cashiershade.png b/graphics/items/equipment/head/cashiershade.png new file mode 100644 index 00000000..286a299c Binary files /dev/null and b/graphics/items/equipment/head/cashiershade.png differ diff --git a/graphics/items/equipment/head/catears.png b/graphics/items/equipment/head/catears.png new file mode 100644 index 00000000..32d3ff34 Binary files /dev/null and b/graphics/items/equipment/head/catears.png differ diff --git a/graphics/items/equipment/head/funkyhat.png b/graphics/items/equipment/head/funkyhat.png new file mode 100644 index 00000000..aef3105d Binary files /dev/null and b/graphics/items/equipment/head/funkyhat.png differ diff --git a/graphics/items/equipment/head/moonshroomhat.png b/graphics/items/equipment/head/moonshroomhat.png new file mode 100644 index 00000000..e29ad79d Binary files /dev/null and b/graphics/items/equipment/head/moonshroomhat.png differ diff --git a/graphics/items/equipment/head/santabeardhat.png b/graphics/items/equipment/head/santabeardhat.png new file mode 100644 index 00000000..679551fc Binary files /dev/null and b/graphics/items/equipment/head/santabeardhat.png differ diff --git a/graphics/items/equipment/head/santahat.png b/graphics/items/equipment/head/santahat.png new file mode 100644 index 00000000..d46f9e41 Binary files /dev/null and b/graphics/items/equipment/head/santahat.png differ diff --git a/graphics/items/equipment/neck/eyepatch.png b/graphics/items/equipment/neck/eyepatch.png new file mode 100644 index 00000000..4dcd88c9 Binary files /dev/null and b/graphics/items/equipment/neck/eyepatch.png differ diff --git a/graphics/items/equipment/weapons/dagger.png b/graphics/items/equipment/weapons/dagger.png index fd697b66..43a4ecd7 100644 Binary files a/graphics/items/equipment/weapons/dagger.png and b/graphics/items/equipment/weapons/dagger.png differ diff --git a/graphics/items/equipment/weapons/sharpknife.png b/graphics/items/equipment/weapons/sharpknife.png new file mode 100644 index 00000000..06aeccb1 Binary files /dev/null and b/graphics/items/equipment/weapons/sharpknife.png differ diff --git a/graphics/items/merge/blackpearl.png b/graphics/items/merge/blackpearl.png new file mode 100644 index 00000000..7253cd09 Binary files /dev/null and b/graphics/items/merge/blackpearl.png differ diff --git a/graphics/items/merge/bloodstone.png b/graphics/items/merge/bloodstone.png new file mode 100644 index 00000000..59b1aea2 Binary files /dev/null and b/graphics/items/merge/bloodstone.png differ diff --git a/graphics/items/merge/bottle-sand.png b/graphics/items/merge/bottle-sand.png new file mode 100644 index 00000000..1b568651 Binary files /dev/null and b/graphics/items/merge/bottle-sand.png differ diff --git a/graphics/items/merge/brainstem.png b/graphics/items/merge/brainstem.png new file mode 100644 index 00000000..30dd7ac7 Binary files /dev/null and b/graphics/items/merge/brainstem.png differ diff --git a/graphics/items/merge/christmasbox-closed.png b/graphics/items/merge/christmasbox-closed.png new file mode 100644 index 00000000..026f4a2a Binary files /dev/null and b/graphics/items/merge/christmasbox-closed.png differ diff --git a/graphics/items/merge/christmasbox-open.png b/graphics/items/merge/christmasbox-open.png new file mode 100644 index 00000000..8f88afac Binary files /dev/null and b/graphics/items/merge/christmasbox-open.png differ diff --git a/graphics/items/merge/christmasbulb.png b/graphics/items/merge/christmasbulb.png new file mode 100644 index 00000000..ce50e567 Binary files /dev/null and b/graphics/items/merge/christmasbulb.png differ diff --git a/graphics/items/merge/clover.png b/graphics/items/merge/clover.png new file mode 100644 index 00000000..8ed3ddfa Binary files /dev/null and b/graphics/items/merge/clover.png differ diff --git a/graphics/items/merge/dark-petal.png b/graphics/items/merge/dark-petal.png new file mode 100644 index 00000000..335a0315 Binary files /dev/null and b/graphics/items/merge/dark-petal.png differ diff --git a/graphics/items/merge/doll.png b/graphics/items/merge/doll.png new file mode 100644 index 00000000..7f64aae1 Binary files /dev/null and b/graphics/items/merge/doll.png differ diff --git a/graphics/items/merge/easterbasket.png b/graphics/items/merge/easterbasket.png new file mode 100644 index 00000000..2863189c Binary files /dev/null and b/graphics/items/merge/easterbasket.png differ diff --git a/graphics/items/merge/easteregg.png b/graphics/items/merge/easteregg.png new file mode 100644 index 00000000..ef7f7ba6 Binary files /dev/null and b/graphics/items/merge/easteregg.png differ diff --git a/graphics/items/merge/fakefangs.png b/graphics/items/merge/fakefangs.png new file mode 100644 index 00000000..37581b01 Binary files /dev/null and b/graphics/items/merge/fakefangs.png differ diff --git a/graphics/items/merge/flawed-lens.png b/graphics/items/merge/flawed-lens.png new file mode 100644 index 00000000..cb7f0c5a Binary files /dev/null and b/graphics/items/merge/flawed-lens.png differ diff --git a/graphics/items/merge/flighttalisman.png b/graphics/items/merge/flighttalisman.png new file mode 100644 index 00000000..0fcdffcd Binary files /dev/null and b/graphics/items/merge/flighttalisman.png differ diff --git a/graphics/items/merge/jellybeans.png b/graphics/items/merge/jellybeans.png new file mode 100644 index 00000000..5440c126 Binary files /dev/null and b/graphics/items/merge/jellybeans.png differ diff --git a/graphics/items/merge/kidbook.png b/graphics/items/merge/kidbook.png new file mode 100644 index 00000000..ecd1d9db Binary files /dev/null and b/graphics/items/merge/kidbook.png differ diff --git a/graphics/items/merge/leatherball.png b/graphics/items/merge/leatherball.png new file mode 100644 index 00000000..222b51ff Binary files /dev/null and b/graphics/items/merge/leatherball.png differ diff --git a/graphics/items/merge/lollipop.png b/graphics/items/merge/lollipop.png new file mode 100644 index 00000000..6953c8f1 Binary files /dev/null and b/graphics/items/merge/lollipop.png differ diff --git a/graphics/items/merge/plushmouboo.png b/graphics/items/merge/plushmouboo.png new file mode 100644 index 00000000..ae6bf137 Binary files /dev/null and b/graphics/items/merge/plushmouboo.png differ diff --git a/graphics/items/merge/redstocking.png b/graphics/items/merge/redstocking.png new file mode 100644 index 00000000..58bdabed Binary files /dev/null and b/graphics/items/merge/redstocking.png differ diff --git a/graphics/items/merge/reinboo-stick.png b/graphics/items/merge/reinboo-stick.png new file mode 100644 index 00000000..3650581b Binary files /dev/null and b/graphics/items/merge/reinboo-stick.png differ diff --git a/graphics/items/merge/rubberbat.png b/graphics/items/merge/rubberbat.png new file mode 100644 index 00000000..1f1ed22b Binary files /dev/null and b/graphics/items/merge/rubberbat.png differ diff --git a/graphics/items/merge/santacookie.png b/graphics/items/merge/santacookie.png new file mode 100644 index 00000000..1f1e0eef Binary files /dev/null and b/graphics/items/merge/santacookie.png differ diff --git a/graphics/items/merge/santaglobe.png b/graphics/items/merge/santaglobe.png new file mode 100644 index 00000000..70b9ed2d Binary files /dev/null and b/graphics/items/merge/santaglobe.png differ diff --git a/graphics/items/merge/scissors.png b/graphics/items/merge/scissors.png new file mode 100644 index 00000000..58fd2f14 Binary files /dev/null and b/graphics/items/merge/scissors.png differ diff --git a/graphics/items/merge/silverbell.png b/graphics/items/merge/silverbell.png new file mode 100644 index 00000000..be3928e0 Binary files /dev/null and b/graphics/items/merge/silverbell.png differ diff --git a/graphics/items/merge/snowmanglobe.png b/graphics/items/merge/snowmanglobe.png new file mode 100644 index 00000000..a83ac701 Binary files /dev/null and b/graphics/items/merge/snowmanglobe.png differ diff --git a/graphics/items/merge/strange-coin.png b/graphics/items/merge/strange-coin.png new file mode 100644 index 00000000..8cdffa6a Binary files /dev/null and b/graphics/items/merge/strange-coin.png differ diff --git a/graphics/items/merge/tongue.png b/graphics/items/merge/tongue.png new file mode 100644 index 00000000..6fe8d143 Binary files /dev/null and b/graphics/items/merge/tongue.png differ diff --git a/graphics/items/merge/wrapping-paper-dotted.png b/graphics/items/merge/wrapping-paper-dotted.png new file mode 100644 index 00000000..5b1c8296 Binary files /dev/null and b/graphics/items/merge/wrapping-paper-dotted.png differ diff --git a/graphics/items/merge/wrapping-paper-striped.png b/graphics/items/merge/wrapping-paper-striped.png new file mode 100644 index 00000000..b6f49ff4 Binary files /dev/null and b/graphics/items/merge/wrapping-paper-striped.png differ diff --git a/graphics/sprites/equipment/head/bowlerhat-brown.png b/graphics/sprites/equipment/head/bowlerhat-brown.png new file mode 100644 index 00000000..4731267e Binary files /dev/null and b/graphics/sprites/equipment/head/bowlerhat-brown.png differ 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 @@ + + + + + + + diff --git a/graphics/sprites/equipment/head/cashiershade.png b/graphics/sprites/equipment/head/cashiershade.png new file mode 100644 index 00000000..cc92640a Binary files /dev/null and b/graphics/sprites/equipment/head/cashiershade.png differ 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 @@ + + + + + + + diff --git a/graphics/sprites/equipment/head/catears.png b/graphics/sprites/equipment/head/catears.png new file mode 100644 index 00000000..34b580a8 Binary files /dev/null and b/graphics/sprites/equipment/head/catears.png differ 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 @@ + + + + + + + \ No newline at end of file diff --git a/graphics/sprites/equipment/head/funkyhat.png b/graphics/sprites/equipment/head/funkyhat.png new file mode 100644 index 00000000..5da27551 Binary files /dev/null and b/graphics/sprites/equipment/head/funkyhat.png differ 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 @@ + + + + + + + diff --git a/graphics/sprites/equipment/head/moonshroomhat.png b/graphics/sprites/equipment/head/moonshroomhat.png new file mode 100644 index 00000000..ea6aa0a7 Binary files /dev/null and b/graphics/sprites/equipment/head/moonshroomhat.png differ 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 @@ + + + + + + + diff --git a/graphics/sprites/equipment/head/santabeardhat.png b/graphics/sprites/equipment/head/santabeardhat.png new file mode 100644 index 00000000..72c3159c Binary files /dev/null and b/graphics/sprites/equipment/head/santabeardhat.png differ 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 @@ + + + + + + + diff --git a/graphics/sprites/equipment/head/santahat.png b/graphics/sprites/equipment/head/santahat.png new file mode 100644 index 00000000..e6016ef9 Binary files /dev/null and b/graphics/sprites/equipment/head/santahat.png differ 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 @@ + + + + + + + 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 @@ - - - - - - - diff --git a/graphics/sprites/equipment/neck/eyepatch.png b/graphics/sprites/equipment/neck/eyepatch.png new file mode 100644 index 00000000..8febbdea Binary files /dev/null and b/graphics/sprites/equipment/neck/eyepatch.png differ 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 @@ + + + + + + + diff --git a/items.xml b/items.xml index ce489dbe..83a7706d 100644 --- a/items.xml +++ b/items.xml @@ -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. equipment/chest/legionarmor-male.xml|#2f382e,48504f,5b6c6b,7d8d8a,929d9d,b6bac2,ced2d1;#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1 equipment/chest/legionarmor-female.xml|#2f382e,48504f,5b6c6b,7d8d8a,929d9d,b6bac2,ced2d1;#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1 + + equipment/chest/warlordplate-male.xml|#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1 + equipment/chest/warlordplate-female.xml|#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1 + equipment/head/tophat.xml - - - + + + equipment/head/bowlerhat.xml - - - + + + equipment/head/fairyhat.xml - - - + + + equipment/head/bandithood.xml + + equipment/head/bowlerhat-brown.xml + + + + + + + + equipment/head/catears.xml|#774444;#777777 + + + equipment/head/santahat.xml + + + equipment/head/moonshroomhat.xml + + + equipment/head/santabeardhat.xml + + + equipment/head/funkyhat.xml + + + + + + + + equipment/head/cashiershade.xml + equipment/neck/banditshawl.xml equipment/neck/banditshawl.xml + + equipment/neck/eyepatch.xml + equipment/neck/eyepatch.xml + equipment/weapons/halberd.xml + + equipment/weapons/knife.xml + weapons/knife/hit1.ogg + weapons/knife/miss1.ogg + @@ -2425,4 +2547,230 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. type="generic" weight="100"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2