From c675b498f679de240fe046d6b17bc736e45101bf Mon Sep 17 00:00:00 2001 From: Micksha Date: Sat, 21 Jul 2018 20:12:41 +0200 Subject: add more --- graphics/items/equipment/chest/warlordplate.png | Bin 0 -> 1879 bytes graphics/items/equipment/feet/cottonboots.png | Bin 0 -> 348 bytes graphics/items/equipment/feet/warlordboots.png | Bin 0 -> 1014 bytes graphics/items/equipment/hands/cottongloves.png | Bin 0 -> 578 bytes graphics/items/equipment/hands/leathergloves.png | Bin 0 -> 692 bytes graphics/items/equipment/head/axehat.png | Bin 0 -> 694 bytes graphics/items/equipment/head/beaniecopter.png | Bin 0 -> 699 bytes graphics/items/equipment/head/bowlerhat.png | Bin 0 -> 643 bytes graphics/items/equipment/head/candlehelmet.png | Bin 0 -> 1436 bytes graphics/items/equipment/head/fairyhat.png | Bin 0 -> 559 bytes graphics/items/equipment/head/infantryhelmet.png | Bin 0 -> 1034 bytes graphics/items/equipment/head/pinkiehat.png | Bin 0 -> 339 bytes graphics/items/equipment/head/tophat.png | Bin 0 -> 667 bytes graphics/items/equipment/head/warlordhelmet.png | Bin 0 -> 1326 bytes graphics/items/equipment/legs/cottonskirt.png | Bin 0 -> 1361 bytes graphics/items/equipment/legs/jeanschaps.png | Bin 0 -> 1282 bytes graphics/items/equipment/legs/leathertrousers.png | Bin 0 -> 544 bytes graphics/items/equipment/legs/silkpants.png | Bin 0 -> 620 bytes graphics/items/equipment/shields/steelshield.png | Bin 0 -> 1715 bytes graphics/items/equipment/shields/woodenshield.png | Bin 0 -> 756 bytes graphics/items/equipment/weapons/dagger.png | Bin 0 -> 314 bytes graphics/items/equipment/weapons/setzer.png | Bin 0 -> 973 bytes graphics/items/equipment/weapons/shortbow.png | Bin 0 -> 233 bytes 23 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 graphics/items/equipment/chest/warlordplate.png create mode 100644 graphics/items/equipment/feet/cottonboots.png create mode 100644 graphics/items/equipment/feet/warlordboots.png create mode 100644 graphics/items/equipment/hands/cottongloves.png create mode 100644 graphics/items/equipment/hands/leathergloves.png create mode 100644 graphics/items/equipment/head/axehat.png create mode 100644 graphics/items/equipment/head/beaniecopter.png create mode 100644 graphics/items/equipment/head/bowlerhat.png create mode 100644 graphics/items/equipment/head/candlehelmet.png create mode 100644 graphics/items/equipment/head/fairyhat.png create mode 100644 graphics/items/equipment/head/infantryhelmet.png create mode 100644 graphics/items/equipment/head/pinkiehat.png create mode 100644 graphics/items/equipment/head/tophat.png create mode 100644 graphics/items/equipment/head/warlordhelmet.png create mode 100644 graphics/items/equipment/legs/cottonskirt.png create mode 100644 graphics/items/equipment/legs/jeanschaps.png create mode 100644 graphics/items/equipment/legs/leathertrousers.png create mode 100644 graphics/items/equipment/legs/silkpants.png create mode 100644 graphics/items/equipment/shields/steelshield.png create mode 100644 graphics/items/equipment/shields/woodenshield.png create mode 100644 graphics/items/equipment/weapons/dagger.png create mode 100644 graphics/items/equipment/weapons/setzer.png create mode 100644 graphics/items/equipment/weapons/shortbow.png (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/chest/warlordplate.png b/graphics/items/equipment/chest/warlordplate.png new file mode 100644 index 00000000..c8b46526 Binary files /dev/null and b/graphics/items/equipment/chest/warlordplate.png differ diff --git a/graphics/items/equipment/feet/cottonboots.png b/graphics/items/equipment/feet/cottonboots.png new file mode 100644 index 00000000..e2d6f8a9 Binary files /dev/null and b/graphics/items/equipment/feet/cottonboots.png differ diff --git a/graphics/items/equipment/feet/warlordboots.png b/graphics/items/equipment/feet/warlordboots.png new file mode 100644 index 00000000..41139b65 Binary files /dev/null and b/graphics/items/equipment/feet/warlordboots.png differ diff --git a/graphics/items/equipment/hands/cottongloves.png b/graphics/items/equipment/hands/cottongloves.png new file mode 100644 index 00000000..7a785530 Binary files /dev/null and b/graphics/items/equipment/hands/cottongloves.png differ diff --git a/graphics/items/equipment/hands/leathergloves.png b/graphics/items/equipment/hands/leathergloves.png new file mode 100644 index 00000000..3d44c4ae Binary files /dev/null and b/graphics/items/equipment/hands/leathergloves.png differ diff --git a/graphics/items/equipment/head/axehat.png b/graphics/items/equipment/head/axehat.png new file mode 100644 index 00000000..edb7a437 Binary files /dev/null and b/graphics/items/equipment/head/axehat.png differ diff --git a/graphics/items/equipment/head/beaniecopter.png b/graphics/items/equipment/head/beaniecopter.png new file mode 100644 index 00000000..135fc286 Binary files /dev/null and b/graphics/items/equipment/head/beaniecopter.png differ diff --git a/graphics/items/equipment/head/bowlerhat.png b/graphics/items/equipment/head/bowlerhat.png new file mode 100644 index 00000000..151e7765 Binary files /dev/null and b/graphics/items/equipment/head/bowlerhat.png differ diff --git a/graphics/items/equipment/head/candlehelmet.png b/graphics/items/equipment/head/candlehelmet.png new file mode 100644 index 00000000..dcde3f7c Binary files /dev/null and b/graphics/items/equipment/head/candlehelmet.png differ diff --git a/graphics/items/equipment/head/fairyhat.png b/graphics/items/equipment/head/fairyhat.png new file mode 100644 index 00000000..b2087bb8 Binary files /dev/null and b/graphics/items/equipment/head/fairyhat.png differ diff --git a/graphics/items/equipment/head/infantryhelmet.png b/graphics/items/equipment/head/infantryhelmet.png new file mode 100644 index 00000000..1fa1f476 Binary files /dev/null and b/graphics/items/equipment/head/infantryhelmet.png differ diff --git a/graphics/items/equipment/head/pinkiehat.png b/graphics/items/equipment/head/pinkiehat.png new file mode 100644 index 00000000..225a5a17 Binary files /dev/null and b/graphics/items/equipment/head/pinkiehat.png differ diff --git a/graphics/items/equipment/head/tophat.png b/graphics/items/equipment/head/tophat.png new file mode 100644 index 00000000..b8210866 Binary files /dev/null and b/graphics/items/equipment/head/tophat.png differ diff --git a/graphics/items/equipment/head/warlordhelmet.png b/graphics/items/equipment/head/warlordhelmet.png new file mode 100644 index 00000000..e0e01d18 Binary files /dev/null and b/graphics/items/equipment/head/warlordhelmet.png differ diff --git a/graphics/items/equipment/legs/cottonskirt.png b/graphics/items/equipment/legs/cottonskirt.png new file mode 100644 index 00000000..897d1b37 Binary files /dev/null and b/graphics/items/equipment/legs/cottonskirt.png differ diff --git a/graphics/items/equipment/legs/jeanschaps.png b/graphics/items/equipment/legs/jeanschaps.png new file mode 100644 index 00000000..71590e0f Binary files /dev/null and b/graphics/items/equipment/legs/jeanschaps.png differ diff --git a/graphics/items/equipment/legs/leathertrousers.png b/graphics/items/equipment/legs/leathertrousers.png new file mode 100644 index 00000000..2eaf29e8 Binary files /dev/null and b/graphics/items/equipment/legs/leathertrousers.png differ diff --git a/graphics/items/equipment/legs/silkpants.png b/graphics/items/equipment/legs/silkpants.png new file mode 100644 index 00000000..96e80660 Binary files /dev/null and b/graphics/items/equipment/legs/silkpants.png differ diff --git a/graphics/items/equipment/shields/steelshield.png b/graphics/items/equipment/shields/steelshield.png new file mode 100644 index 00000000..4fa7f6a8 Binary files /dev/null and b/graphics/items/equipment/shields/steelshield.png differ diff --git a/graphics/items/equipment/shields/woodenshield.png b/graphics/items/equipment/shields/woodenshield.png new file mode 100644 index 00000000..42df0184 Binary files /dev/null and b/graphics/items/equipment/shields/woodenshield.png differ diff --git a/graphics/items/equipment/weapons/dagger.png b/graphics/items/equipment/weapons/dagger.png new file mode 100644 index 00000000..fd697b66 Binary files /dev/null and b/graphics/items/equipment/weapons/dagger.png differ diff --git a/graphics/items/equipment/weapons/setzer.png b/graphics/items/equipment/weapons/setzer.png new file mode 100644 index 00000000..63c4c5cf Binary files /dev/null and b/graphics/items/equipment/weapons/setzer.png differ diff --git a/graphics/items/equipment/weapons/shortbow.png b/graphics/items/equipment/weapons/shortbow.png new file mode 100644 index 00000000..a87a8871 Binary files /dev/null and b/graphics/items/equipment/weapons/shortbow.png differ -- cgit v1.2.3-70-g09d2 From 739dc0d0b42f0fcefea59307fb76e96f7781661f Mon Sep 17 00:00:00 2001 From: Micksha Date: Tue, 31 Jul 2018 13:32:56 +0200 Subject: fix problems with items and their sprites --- graphics/items/equipment/weapons/shortbow.png | Bin 233 -> 0 bytes items.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 graphics/items/equipment/weapons/shortbow.png (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/weapons/shortbow.png b/graphics/items/equipment/weapons/shortbow.png deleted file mode 100644 index a87a8871..00000000 Binary files a/graphics/items/equipment/weapons/shortbow.png and /dev/null differ diff --git a/items.xml b/items.xml index 921a2c52..5681bd71 100644 --- a/items.xml +++ b/items.xml @@ -1030,7 +1030,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. colors="simple" maxFloorOffset="8"> equipment/feet/boots-male.xml - equipment/feet/cottonboots-female.xml + equipment/feet/boots-female.xml -- cgit v1.2.3-70-g09d2 From 918a7d969532a8f87899e92548e4de1a7964e98b Mon Sep 17 00:00:00 2001 From: Micksha Date: Tue, 31 Jul 2018 13:33:21 +0200 Subject: add bow icons and cotton trousers sprites --- graphics/items/equipment/weapons/forestbow.png | Bin 0 -> 1080 bytes graphics/items/equipment/weapons/trainingbow.png | Bin 0 -> 759 bytes .../sprites/equipment/legs/cottontrousers-female.png | Bin 0 -> 28183 bytes .../sprites/equipment/legs/cottontrousers-female.xml | 11 +++++++++++ graphics/sprites/equipment/legs/cottontrousers-male.png | Bin 0 -> 27685 bytes graphics/sprites/equipment/legs/cottontrousers-male.xml | 11 +++++++++++ 6 files changed, 22 insertions(+) create mode 100644 graphics/items/equipment/weapons/forestbow.png create mode 100644 graphics/items/equipment/weapons/trainingbow.png create mode 100644 graphics/sprites/equipment/legs/cottontrousers-female.png create mode 100644 graphics/sprites/equipment/legs/cottontrousers-female.xml create mode 100644 graphics/sprites/equipment/legs/cottontrousers-male.png create mode 100644 graphics/sprites/equipment/legs/cottontrousers-male.xml (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/weapons/forestbow.png b/graphics/items/equipment/weapons/forestbow.png new file mode 100644 index 00000000..85116bc1 Binary files /dev/null and b/graphics/items/equipment/weapons/forestbow.png differ diff --git a/graphics/items/equipment/weapons/trainingbow.png b/graphics/items/equipment/weapons/trainingbow.png new file mode 100644 index 00000000..977c0387 Binary files /dev/null and b/graphics/items/equipment/weapons/trainingbow.png differ diff --git a/graphics/sprites/equipment/legs/cottontrousers-female.png b/graphics/sprites/equipment/legs/cottontrousers-female.png new file mode 100644 index 00000000..42f60e96 Binary files /dev/null and b/graphics/sprites/equipment/legs/cottontrousers-female.png differ diff --git a/graphics/sprites/equipment/legs/cottontrousers-female.xml b/graphics/sprites/equipment/legs/cottontrousers-female.xml new file mode 100644 index 00000000..7d8b3f8f --- /dev/null +++ b/graphics/sprites/equipment/legs/cottontrousers-female.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/graphics/sprites/equipment/legs/cottontrousers-male.png b/graphics/sprites/equipment/legs/cottontrousers-male.png new file mode 100644 index 00000000..7c0cbacf Binary files /dev/null and b/graphics/sprites/equipment/legs/cottontrousers-male.png differ diff --git a/graphics/sprites/equipment/legs/cottontrousers-male.xml b/graphics/sprites/equipment/legs/cottontrousers-male.xml new file mode 100644 index 00000000..a8b9a64c --- /dev/null +++ b/graphics/sprites/equipment/legs/cottontrousers-male.xml @@ -0,0 +1,11 @@ + + + + + + + -- cgit v1.2.3-70-g09d2 From 1d7a087bbc92db23b19f502eb7a7ef701aa6b854 Mon Sep 17 00:00:00 2001 From: Micksha Date: Tue, 31 Jul 2018 13:46:19 +0200 Subject: improve pickaxe item, try fix fancy hat --- graphics/items/equipment/weapons/pickaxe.png | Bin 535 -> 487 bytes graphics/sprites/equipment/head/fancyhat.xml | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/weapons/pickaxe.png b/graphics/items/equipment/weapons/pickaxe.png index b197fa61..77e77f2e 100644 Binary files a/graphics/items/equipment/weapons/pickaxe.png and b/graphics/items/equipment/weapons/pickaxe.png differ diff --git a/graphics/sprites/equipment/head/fancyhat.xml b/graphics/sprites/equipment/head/fancyhat.xml index 1886b372..f9233b07 100644 --- a/graphics/sprites/equipment/head/fancyhat.xml +++ b/graphics/sprites/equipment/head/fancyhat.xml @@ -4,8 +4,8 @@ Copyright (C) 2018 TMW2 --> -- cgit v1.2.3-70-g09d2 From c3bbd2d538206382f09921929578d2a1bbf1811d Mon Sep 17 00:00:00 2001 From: Micksha Date: Wed, 1 Aug 2018 09:16:11 +0200 Subject: fix fancy hat, change bow naming --- graphics/items/equipment/weapons/shortbow.png | Bin 0 -> 759 bytes graphics/items/equipment/weapons/trainingbow.png | Bin 759 -> 0 bytes graphics/sprites/equipment/head/fancyhat.png | Bin 688 -> 1393 bytes items.xml | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 graphics/items/equipment/weapons/shortbow.png delete mode 100644 graphics/items/equipment/weapons/trainingbow.png (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/weapons/shortbow.png b/graphics/items/equipment/weapons/shortbow.png new file mode 100644 index 00000000..977c0387 Binary files /dev/null and b/graphics/items/equipment/weapons/shortbow.png differ diff --git a/graphics/items/equipment/weapons/trainingbow.png b/graphics/items/equipment/weapons/trainingbow.png deleted file mode 100644 index 977c0387..00000000 Binary files a/graphics/items/equipment/weapons/trainingbow.png and /dev/null differ diff --git a/graphics/sprites/equipment/head/fancyhat.png b/graphics/sprites/equipment/head/fancyhat.png index dd54672d..46d09cf4 100644 Binary files a/graphics/sprites/equipment/head/fancyhat.png and b/graphics/sprites/equipment/head/fancyhat.png differ diff --git a/items.xml b/items.xml index 5681bd71..2aae8bc1 100644 --- a/items.xml +++ b/items.xml @@ -1889,7 +1889,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. maxFloorOffset="15"/> Date: Sat, 21 Jul 2018 20:12:41 +0200 Subject: add more --- graphics/items/equipment/weapons/shortbow.png | Bin 759 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 graphics/items/equipment/weapons/shortbow.png (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/weapons/shortbow.png b/graphics/items/equipment/weapons/shortbow.png deleted file mode 100644 index 977c0387..00000000 Binary files a/graphics/items/equipment/weapons/shortbow.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 4304f6cd8510df63e9f58cfd407734f9a77236fb Mon Sep 17 00:00:00 2001 From: Micksha Date: Tue, 31 Jul 2018 13:33:21 +0200 Subject: add bow icons and cotton trousers sprites --- graphics/items/equipment/weapons/trainingbow.png | Bin 0 -> 759 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 graphics/items/equipment/weapons/trainingbow.png (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/weapons/trainingbow.png b/graphics/items/equipment/weapons/trainingbow.png new file mode 100644 index 00000000..977c0387 Binary files /dev/null and b/graphics/items/equipment/weapons/trainingbow.png differ -- cgit v1.2.3-70-g09d2 From 141994898ab979aa633b2632a299ab36b0c99840 Mon Sep 17 00:00:00 2001 From: Micksha Date: Wed, 1 Aug 2018 09:16:11 +0200 Subject: fix fancy hat, change bow naming --- graphics/items/equipment/weapons/shortbow.png | Bin 0 -> 759 bytes graphics/items/equipment/weapons/trainingbow.png | Bin 759 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 graphics/items/equipment/weapons/shortbow.png delete mode 100644 graphics/items/equipment/weapons/trainingbow.png (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/weapons/shortbow.png b/graphics/items/equipment/weapons/shortbow.png new file mode 100644 index 00000000..977c0387 Binary files /dev/null and b/graphics/items/equipment/weapons/shortbow.png differ diff --git a/graphics/items/equipment/weapons/trainingbow.png b/graphics/items/equipment/weapons/trainingbow.png deleted file mode 100644 index 977c0387..00000000 Binary files a/graphics/items/equipment/weapons/trainingbow.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 1f90ac3288c6bca7e1d743dab4d04659a7adc001 Mon Sep 17 00:00:00 2001 From: Micksha Date: Sun, 21 Oct 2018 20:04:19 +0200 Subject: Add items for Melinda: Fine dress, beer --- graphics/items/equipment/chest/finedress.png | Bin 0 -> 1775 bytes graphics/items/usable/beer.png | Bin 0 -> 557 bytes .../sprites/equipment/chest/finedress-female.png | Bin 0 -> 96049 bytes .../sprites/equipment/chest/finedress-female.xml | 11 +++++++++++ .../sprites/equipment/chest/finedress-male.png | Bin 0 -> 92252 bytes .../sprites/equipment/chest/finedress-male.xml | 11 +++++++++++ items.xml | 22 +++++++++++++++++++++ 7 files changed, 44 insertions(+) create mode 100644 graphics/items/equipment/chest/finedress.png create mode 100644 graphics/items/usable/beer.png create mode 100644 graphics/sprites/equipment/chest/finedress-female.png create mode 100644 graphics/sprites/equipment/chest/finedress-female.xml create mode 100644 graphics/sprites/equipment/chest/finedress-male.png create mode 100644 graphics/sprites/equipment/chest/finedress-male.xml (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/chest/finedress.png b/graphics/items/equipment/chest/finedress.png new file mode 100644 index 00000000..94277603 Binary files /dev/null and b/graphics/items/equipment/chest/finedress.png differ diff --git a/graphics/items/usable/beer.png b/graphics/items/usable/beer.png new file mode 100644 index 00000000..44387183 Binary files /dev/null and b/graphics/items/usable/beer.png differ diff --git a/graphics/sprites/equipment/chest/finedress-female.png b/graphics/sprites/equipment/chest/finedress-female.png new file mode 100644 index 00000000..86ad95ea Binary files /dev/null and b/graphics/sprites/equipment/chest/finedress-female.png differ diff --git a/graphics/sprites/equipment/chest/finedress-female.xml b/graphics/sprites/equipment/chest/finedress-female.xml new file mode 100644 index 00000000..1cc765d9 --- /dev/null +++ b/graphics/sprites/equipment/chest/finedress-female.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/graphics/sprites/equipment/chest/finedress-male.png b/graphics/sprites/equipment/chest/finedress-male.png new file mode 100644 index 00000000..8c385aa1 Binary files /dev/null and b/graphics/sprites/equipment/chest/finedress-male.png differ diff --git a/graphics/sprites/equipment/chest/finedress-male.xml b/graphics/sprites/equipment/chest/finedress-male.xml new file mode 100644 index 00000000..ac051dd9 --- /dev/null +++ b/graphics/sprites/equipment/chest/finedress-male.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/items.xml b/items.xml index a6b2b1c9..bf62e6c0 100644 --- a/items.xml +++ b/items.xml @@ -519,6 +519,15 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. type="usable" weight="25" maxFloorOffset="6"/> + equipment/chest/silkrobe-female.xml + equipment/chest/finedress-male.xml|#606060,aaaaaa,dddddd,fcfcfc + equipment/chest/finedress-female.xml||#606060,aaaaaa,dddddd,fcfcfc + + Date: Mon, 22 Oct 2018 11:45:20 +0200 Subject: remove skills from wrong branch, update items and NPCs (add Melinda), fix finedress for dying --- graphics/items/equipment/chest/finedress.png | Bin 1775 -> 1328 bytes graphics/skills/aura.png | Bin 2320 -> 0 bytes graphics/skills/axe.png | Bin 2182 -> 0 bytes graphics/skills/bash.png | Bin 2160 -> 0 bytes graphics/skills/dagger.png | Bin 2366 -> 0 bytes graphics/skills/doubledagger.png | Bin 2481 -> 0 bytes graphics/skills/emote.png | Bin 1508 -> 0 bytes graphics/skills/swordslash.png | Bin 2463 -> 0 bytes .../sprites/equipment/chest/finedress-female.png | Bin 96049 -> 58304 bytes .../sprites/equipment/chest/finedress-male.png | Bin 92252 -> 56999 bytes items.xml | 18 ++++++-- npcs.xml | 10 +++++ skills.xml | 48 --------------------- 13 files changed, 25 insertions(+), 51 deletions(-) delete mode 100644 graphics/skills/aura.png delete mode 100644 graphics/skills/axe.png delete mode 100644 graphics/skills/bash.png delete mode 100644 graphics/skills/dagger.png delete mode 100644 graphics/skills/doubledagger.png delete mode 100644 graphics/skills/emote.png delete mode 100644 graphics/skills/swordslash.png (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/chest/finedress.png b/graphics/items/equipment/chest/finedress.png index 94277603..af928f11 100644 Binary files a/graphics/items/equipment/chest/finedress.png and b/graphics/items/equipment/chest/finedress.png differ diff --git a/graphics/skills/aura.png b/graphics/skills/aura.png deleted file mode 100644 index 28d95708..00000000 Binary files a/graphics/skills/aura.png and /dev/null differ diff --git a/graphics/skills/axe.png b/graphics/skills/axe.png deleted file mode 100644 index 53aafbc7..00000000 Binary files a/graphics/skills/axe.png and /dev/null differ diff --git a/graphics/skills/bash.png b/graphics/skills/bash.png deleted file mode 100644 index 7c7d3115..00000000 Binary files a/graphics/skills/bash.png and /dev/null differ diff --git a/graphics/skills/dagger.png b/graphics/skills/dagger.png deleted file mode 100644 index 41960c58..00000000 Binary files a/graphics/skills/dagger.png and /dev/null differ diff --git a/graphics/skills/doubledagger.png b/graphics/skills/doubledagger.png deleted file mode 100644 index a66b9a4b..00000000 Binary files a/graphics/skills/doubledagger.png and /dev/null differ diff --git a/graphics/skills/emote.png b/graphics/skills/emote.png deleted file mode 100644 index 7de5e244..00000000 Binary files a/graphics/skills/emote.png and /dev/null differ diff --git a/graphics/skills/swordslash.png b/graphics/skills/swordslash.png deleted file mode 100644 index 3d1b4e8b..00000000 Binary files a/graphics/skills/swordslash.png and /dev/null differ diff --git a/graphics/sprites/equipment/chest/finedress-female.png b/graphics/sprites/equipment/chest/finedress-female.png index 86ad95ea..6a55302b 100644 Binary files a/graphics/sprites/equipment/chest/finedress-female.png and b/graphics/sprites/equipment/chest/finedress-female.png differ diff --git a/graphics/sprites/equipment/chest/finedress-male.png b/graphics/sprites/equipment/chest/finedress-male.png index 8c385aa1..1b598246 100644 Binary files a/graphics/sprites/equipment/chest/finedress-male.png and b/graphics/sprites/equipment/chest/finedress-male.png differ diff --git a/items.xml b/items.xml index bf62e6c0..d93c645b 100644 --- a/items.xml +++ b/items.xml @@ -1013,9 +1013,10 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. type="equip-torso" weight="240" colors="simple" + iconColors="simple" maxFloorOffset="10"> - equipment/chest/finedress-male.xml|#606060,aaaaaa,dddddd,fcfcfc - equipment/chest/finedress-female.xml||#606060,aaaaaa,dddddd,fcfcfc + equipment/chest/finedress-male.xml + equipment/chest/finedress-female.xml npcs/xml/mona.xml + + + races/elven-female.xml + equipment/feet/boots-female.xml|#594d36,b49b6c,f4d293 + equipment/chest/finedress-female.xml|#620e48,bf1b8b,e32bcf,ffb6f7 + equipment/hands/armbands-female.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b + equipment/neck/copper-necklace.xml|#315a67,a4a4ae,dce5d6,ffffff + hairstyles/hairstyle22.xml|#16211f,162e29,195145,1d7a62,29a27a,51de9c,c9f7bc + + diff --git a/skills.xml b/skills.xml index e94d4197..af72a714 100644 --- a/skills.xml +++ b/skills.xml @@ -66,54 +66,6 @@ Copyright (C) 2010-2013 Evol Online --> dstEffectId="34" /> - - - - - - - - Date: Wed, 19 Apr 2017 14:44:28 -0400 Subject: data for Hurnscald --- .../equipment/weapons/__LEGACY__forestbow.png | Bin 0 -> 758 bytes graphics/items/generic/__LEGACY__rawlog.png | Bin 0 -> 598 bytes items.xml | 28 +- quests.xml | 282 +++++++++++++++++++++ 4 files changed, 309 insertions(+), 1 deletion(-) create mode 100644 graphics/items/equipment/weapons/__LEGACY__forestbow.png create mode 100644 graphics/items/generic/__LEGACY__rawlog.png (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/weapons/__LEGACY__forestbow.png b/graphics/items/equipment/weapons/__LEGACY__forestbow.png new file mode 100644 index 00000000..fb3580b8 Binary files /dev/null and b/graphics/items/equipment/weapons/__LEGACY__forestbow.png differ diff --git a/graphics/items/generic/__LEGACY__rawlog.png b/graphics/items/generic/__LEGACY__rawlog.png new file mode 100644 index 00000000..3e790620 Binary files /dev/null and b/graphics/items/generic/__LEGACY__rawlog.png differ diff --git a/items.xml b/items.xml index d93c645b..b191937c 100644 --- a/items.xml +++ b/items.xml @@ -1,7 +1,8 @@ +Copyright (C) 2010-2015 Evol Online +Copyright (C) 2016-2017 The Mana World --> + + + + + + equipment/weapons/woodenbow.xml + + diff --git a/quests.xml b/quests.xml index baedff9e..fa22bfc0 100644 --- a/quests.xml +++ b/quests.xml @@ -751,6 +751,288 @@ Copyright (C) 2012-2013 Evol Online --> + + + + + Farmer's Scythe + Hinnak wants you to kill 10 pinkies and bring back their antennae. + + Pinkies killed: {@@var2}/10. + + Hinnak + + {@@1}. + + + Farmer's Scythe + You helped Hinnak. + + Hinnak + + {@@1}. + + + + + + Maggot slime soup + Bernard wants a {@@1}. + + Bernard + + Unknown. + + + Maggot slime soup + You gave Bernard a {@@1}. + + Bernard + + 100 EXP, 5 {@@1}. + + + Maggot slime soup + Bernard wants 3 {@@1}. + + Bernard + + Unknown. + + + Maggot slime soup + You gave Bernard 3 {@@1}. + + Bernard + + 100 EXP, 3 {@@1}. + + + A slimy situation + Mikhail wants 5 {@@1}. + + Mikhail + + Unknown. + + + A slimy situation + You gave Mikhail 5 {@@1}. + + Mikhail + + 100 EXP. + + + + + + Robberies in Hurnscald + The inspector tasked you with finding clues about the recent robberies. + You should question everyone in town. + + Inspector + + Unknown. + + + Robberies in Hurnscald + An old woman said she saw something unusual, but she refuses to tell anyone but the Inspector himself. + Perhaps there is a way to convince her? + + Inspector + + Unknown. + + + Robberies in Hurnscald + The old woman said she saw someone wearing a theater mask sneaking around. + You should inform the Inspector about your findings. + + Inspector + + Unknown. + + + Robberies in Hurnscald + The inspector told you to go interrogate the leader of the traveling troupe in Tulimshar. + + Inspector + + Unknown. + + + Robberies in Hurnscald + The troupe leader said she saw an old man behaving oddly. + You should report to the Inspector. + + Inspector + + Unknown. + + + Robberies in Hurnscald + The inspector asked you to find and question the old man. + + Inspector + + Unknown. + + + Robberies in Hurnscald + The old man told you to ask his wife. + + Inspector + + Unknown. + + + Robberies in Hurnscald + The old woman confirmed the story of the old man. + You should report to the Inspector. + + Inspector + + Unknown. + + + Robberies in Hurnscald + The inspector told you to question everyone again. + + Inspector + + Unknown. + + + Robberies in Hurnscald + The old woman remembered something. + She saw someone with a large satchel heading north. + + Inspector + + Unknown. + + + Robberies in Hurnscald + Malek said he heard someone go down to the basement. + You should search the basement for clues. + + Inspector + + Unknown. + + + Robberies in Hurnscald + You found a {@@1} hidden in the basement. + You should report to the Inspector. + + Inspector + + Unknown. + + + Robberies in Hurnscald + The inspector is still deciphering the letter. + You should head back to the Troupe Leader meanwhile. + + Inspector + + Unknown. + + + Robberies in Hurnscald + You brought back the stolen {@@1}. + The troupe leader said you should keep it. + + Inspector + + 1500 EXP, {@@1}. + + + Robberies in Hurnscald + The inspector and his associates found all the stolen goods. + + Inspector + + 2500 EXP. + + + + + + Forest Bow + Jack the handsome lumberjack won't give any more wood to Alan. + Alan is desperate to get his wood. + + Alan + + a splendid {@@1}. + + + Forest Bow + Jack says the trees became alive and he won't cut them anymore. + You should tell Alan about this. + + Alan + + a splendid {@@1}. + + + Forest Bow + Alan needs wood badly. + Perhaps you could satisfy him yourself? + + Alan + + a splendid {@@1}. + + + Forest Bow + Alan says your wood is perfect. + He can make a beautiful {@@1} out of it but he needs 10000 E. + + Alan + + a splendid {@@1}. + + + Forest Bow + You gave your wood to Alan and he loved it so much he gave you a {@@1}. + + Alan + + a splendid {@@1}. + + + + + + Wooden Shield + Jack the handsome lumberjack has a proposal for you. + + Jack + + + + Wooden Shield + Jack can make you a sturdy shield but he needs 40 {@@1}. + He also wants 5000 E for his time. + + Jack + + {@@1} + + + Wooden Shield + Jack made you a shield. + + Jack + + 2500 EXP, {@@1} + + + + Testing quest name with var1={@@var1} -- cgit v1.2.3-70-g09d2 From ca33512c446526a418669c96289371793d09d0fd Mon Sep 17 00:00:00 2001 From: Micksha Date: Sun, 21 Oct 2018 20:04:19 +0200 Subject: Add items for Melinda: Fine dress, beer --- graphics/items/equipment/chest/finedress.png | Bin 1328 -> 0 bytes graphics/sprites/equipment/chest/finedress-female.png | Bin 61482 -> 0 bytes graphics/sprites/equipment/chest/finedress-male.png | Bin 59311 -> 0 bytes items.xml | 6 ++++++ 4 files changed, 6 insertions(+) delete mode 100644 graphics/items/equipment/chest/finedress.png delete mode 100644 graphics/sprites/equipment/chest/finedress-female.png delete mode 100644 graphics/sprites/equipment/chest/finedress-male.png (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/chest/finedress.png b/graphics/items/equipment/chest/finedress.png deleted file mode 100644 index af928f11..00000000 Binary files a/graphics/items/equipment/chest/finedress.png and /dev/null differ diff --git a/graphics/sprites/equipment/chest/finedress-female.png b/graphics/sprites/equipment/chest/finedress-female.png deleted file mode 100644 index a481f71a..00000000 Binary files a/graphics/sprites/equipment/chest/finedress-female.png and /dev/null differ diff --git a/graphics/sprites/equipment/chest/finedress-male.png b/graphics/sprites/equipment/chest/finedress-male.png deleted file mode 100644 index b2771257..00000000 Binary files a/graphics/sprites/equipment/chest/finedress-male.png and /dev/null differ diff --git a/items.xml b/items.xml index b191937c..3af70065 100644 --- a/items.xml +++ b/items.xml @@ -1014,10 +1014,16 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. type="equip-torso" weight="240" colors="simple" +<<<<<<< 9e0bdba0ea0f30537713a567ea39b05820b819d9 iconColors="simple" maxFloorOffset="10"> equipment/chest/finedress-male.xml equipment/chest/finedress-female.xml +======= + maxFloorOffset="10"> + equipment/chest/finedress-male.xml|#606060,aaaaaa,dddddd,fcfcfc + equipment/chest/finedress-female.xml||#606060,aaaaaa,dddddd,fcfcfc +>>>>>>> Add items for Melinda: Fine dress, beer Date: Mon, 22 Oct 2018 11:45:20 +0200 Subject: remove skills from wrong branch, update items and NPCs (add Melinda), fix finedress for dying --- graphics/items/equipment/chest/finedress.png | Bin 0 -> 1328 bytes graphics/skills/aura.png | Bin 2320 -> 0 bytes graphics/skills/axe.png | Bin 2182 -> 0 bytes graphics/skills/dagger.png | Bin 2366 -> 0 bytes graphics/skills/doubledagger.png | Bin 2481 -> 0 bytes graphics/skills/swordslash.png | Bin 2463 -> 0 bytes .../sprites/equipment/chest/finedress-female.png | Bin 0 -> 58304 bytes .../sprites/equipment/chest/finedress-male.png | Bin 0 -> 56999 bytes items.xml | 6 --- skills.xml | 48 --------------------- 10 files changed, 54 deletions(-) create mode 100644 graphics/items/equipment/chest/finedress.png delete mode 100644 graphics/skills/aura.png delete mode 100644 graphics/skills/axe.png delete mode 100644 graphics/skills/dagger.png delete mode 100644 graphics/skills/doubledagger.png delete mode 100644 graphics/skills/swordslash.png create mode 100644 graphics/sprites/equipment/chest/finedress-female.png create mode 100644 graphics/sprites/equipment/chest/finedress-male.png (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/chest/finedress.png b/graphics/items/equipment/chest/finedress.png new file mode 100644 index 00000000..af928f11 Binary files /dev/null and b/graphics/items/equipment/chest/finedress.png differ diff --git a/graphics/skills/aura.png b/graphics/skills/aura.png deleted file mode 100644 index 28d95708..00000000 Binary files a/graphics/skills/aura.png and /dev/null differ diff --git a/graphics/skills/axe.png b/graphics/skills/axe.png deleted file mode 100644 index 53aafbc7..00000000 Binary files a/graphics/skills/axe.png and /dev/null differ diff --git a/graphics/skills/dagger.png b/graphics/skills/dagger.png deleted file mode 100644 index 41960c58..00000000 Binary files a/graphics/skills/dagger.png and /dev/null differ diff --git a/graphics/skills/doubledagger.png b/graphics/skills/doubledagger.png deleted file mode 100644 index a66b9a4b..00000000 Binary files a/graphics/skills/doubledagger.png and /dev/null differ diff --git a/graphics/skills/swordslash.png b/graphics/skills/swordslash.png deleted file mode 100644 index 3d1b4e8b..00000000 Binary files a/graphics/skills/swordslash.png and /dev/null differ diff --git a/graphics/sprites/equipment/chest/finedress-female.png b/graphics/sprites/equipment/chest/finedress-female.png new file mode 100644 index 00000000..6a55302b Binary files /dev/null and b/graphics/sprites/equipment/chest/finedress-female.png differ diff --git a/graphics/sprites/equipment/chest/finedress-male.png b/graphics/sprites/equipment/chest/finedress-male.png new file mode 100644 index 00000000..1b598246 Binary files /dev/null and b/graphics/sprites/equipment/chest/finedress-male.png differ diff --git a/items.xml b/items.xml index 3af70065..b191937c 100644 --- a/items.xml +++ b/items.xml @@ -1014,16 +1014,10 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. type="equip-torso" weight="240" colors="simple" -<<<<<<< 9e0bdba0ea0f30537713a567ea39b05820b819d9 iconColors="simple" maxFloorOffset="10"> equipment/chest/finedress-male.xml equipment/chest/finedress-female.xml -======= - maxFloorOffset="10"> - equipment/chest/finedress-male.xml|#606060,aaaaaa,dddddd,fcfcfc - equipment/chest/finedress-female.xml||#606060,aaaaaa,dddddd,fcfcfc ->>>>>>> Add items for Melinda: Fine dress, beer dstEffectId="34" /> - - - - - - - - Date: Tue, 23 Oct 2018 09:54:50 +0200 Subject: Add a few missing items and the Noh Mask --- LICENSE | 6 +++++ graphics/items/equipment/head/nohmask.png | Bin 0 -> 1139 bytes graphics/items/generic/__LEGACY__rawlog.png | Bin 598 -> 0 bytes graphics/items/generic/mug-empty.png | Bin 1868 -> 1868 bytes graphics/items/usable/bottleofwater.png | Bin 0 -> 511 bytes graphics/items/usable/cherrycake.png | Bin 0 -> 345 bytes graphics/items/usable/roastedmaggot.png | Bin 0 -> 496 bytes graphics/sprites/equipment/head/nohmask.png | Bin 0 -> 2894 bytes graphics/sprites/equipment/head/nohmask.xml | 12 +++++++++ items.xml | 37 ++++++++++++++++++++++++++++ 10 files changed, 55 insertions(+) create mode 100644 graphics/items/equipment/head/nohmask.png delete mode 100644 graphics/items/generic/__LEGACY__rawlog.png create mode 100644 graphics/items/usable/bottleofwater.png create mode 100644 graphics/items/usable/cherrycake.png create mode 100644 graphics/items/usable/roastedmaggot.png create mode 100644 graphics/sprites/equipment/head/nohmask.png create mode 100644 graphics/sprites/equipment/head/nohmask.xml (limited to 'graphics/items/equipment') diff --git a/LICENSE b/LICENSE index 996b62bb..21e354d3 100644 --- a/LICENSE +++ b/LICENSE @@ -78,6 +78,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/equipment/head/fairyhat.png (Goku) (GPLv2) (-) graphics/items/equipment/head/fancyhat.png (Crush) (CC BY-SA 3.0) (-) graphics/items/equipment/head/infantryhelmet.png (Black Don) (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/tophat.png (QOAL) (GPLv2) (-) @@ -165,6 +166,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/usable/aquada.png (Reid) (CC BY-SA 3.0) (-) graphics/items/usable/atroposmixture.png (Reid) (CC BY-SA 3.0) (-) graphics/items/usable/beer.png (LEGACY) (CC BY-SA 3.0) (Micksha) + graphics/items/usable/bottleofwater.png (LEGACY) (CC BY-SA 3.0) (-) graphics/items/usable/blobime.png (Enchilado) (CC BY-SA 3.0) (-) graphics/items/usable/book-chorus.png (Hal9000) (CC BY-SA 3.0) (Reid) graphics/items/usable/book-comtheory.png (Hal9000) (CC BY-SA 3.0) (Reid) @@ -176,6 +178,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/usable/bread.png (Coolkid782) (CC BY-SA 3.0) (-) graphics/items/usable/carrot.png (Enchilado) (CC BY-SA 3.0) (Reid) graphics/items/usable/cheese.png (Reid) (CC BY-SA 3.0) (-) + graphics/items/usable/cherrycake.png (LEGACY) (CC BY-SA 3.0) (-) graphics/items/usable/curshroom.png (Reid) (CC BY-SA 3.0) (-) graphics/items/usable/clotholiquor.png (Reid) (CC BY-SA 3.0) (-) graphics/items/usable/croconut.png (Hal9000) (CC BY-SA 3.0) (-) @@ -192,6 +195,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/usable/gem3-polished.png (Micksha) (CC BY-SA 3.0) (-) graphics/items/usable/gem-crude.png (LEGACY) (CC BY-SA 3.0) (Micksha) graphics/items/usable/honey.png (LEGACY) (CC BY-SA 3.0) (Micksha) + graphics/items/usable/maggotslime.png (LEGACY) (CC BY-SA 3.0) (Micksha) graphics/items/usable/manana.png (Reid) (CC BY-SA 3.0) (IvanMorve) graphics/items/usable/lachesisbrew.png (Reid) (CC BY-SA 3.0) (-) graphics/items/usable/lettuceleaf.png (Reid) (CC BY-SA 3.0) (-) @@ -202,6 +206,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/usable/plushroom.png (Reid) (CC BY-SA 3.0) (-) graphics/items/usable/pumpkinjuice.png (Enchilado) (CC BY-SA 3.0) (Reid) graphics/items/usable/pumpkinseeds.png (Enchilado) (CC BY-SA 3.0) (-) + graphics/items/usable/roastedmaggot.png (LEGACY) (CC BY-SA 3.0) (Micksha) graphics/items/usable/sandwich-carp.png (Micksha) (CC BY-SA 3.0) (-) graphics/items/usable/sandwich-pioulegs.png (Micksha) (CC BY-SA 3.0) (-) graphics/items/usable/sandwich-manana.png (Micksha) (CC BY-SA 3.0) (-) @@ -358,6 +363,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/sprites/equipment/head/fancyhat.png (Crush) (CC BY-SA 3.0) (-) graphics/sprites/equipment/head/headmodel-male.png (Saulc) (GPLv2) (-) graphics/sprites/equipment/head/infantryhelmet.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) (-) diff --git a/graphics/items/equipment/head/nohmask.png b/graphics/items/equipment/head/nohmask.png new file mode 100644 index 00000000..43d43fb3 Binary files /dev/null and b/graphics/items/equipment/head/nohmask.png differ diff --git a/graphics/items/generic/__LEGACY__rawlog.png b/graphics/items/generic/__LEGACY__rawlog.png deleted file mode 100644 index 3e790620..00000000 Binary files a/graphics/items/generic/__LEGACY__rawlog.png and /dev/null differ diff --git a/graphics/items/generic/mug-empty.png b/graphics/items/generic/mug-empty.png index 11297640..347b4244 100644 Binary files a/graphics/items/generic/mug-empty.png and b/graphics/items/generic/mug-empty.png differ diff --git a/graphics/items/usable/bottleofwater.png b/graphics/items/usable/bottleofwater.png new file mode 100644 index 00000000..d1c04adc Binary files /dev/null and b/graphics/items/usable/bottleofwater.png differ diff --git a/graphics/items/usable/cherrycake.png b/graphics/items/usable/cherrycake.png new file mode 100644 index 00000000..4005b804 Binary files /dev/null and b/graphics/items/usable/cherrycake.png differ diff --git a/graphics/items/usable/roastedmaggot.png b/graphics/items/usable/roastedmaggot.png new file mode 100644 index 00000000..80e51c72 Binary files /dev/null and b/graphics/items/usable/roastedmaggot.png differ diff --git a/graphics/sprites/equipment/head/nohmask.png b/graphics/sprites/equipment/head/nohmask.png new file mode 100644 index 00000000..f6f58b95 Binary files /dev/null and b/graphics/sprites/equipment/head/nohmask.png differ diff --git a/graphics/sprites/equipment/head/nohmask.xml b/graphics/sprites/equipment/head/nohmask.xml new file mode 100644 index 00000000..9dd928bc --- /dev/null +++ b/graphics/sprites/equipment/head/nohmask.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/items.xml b/items.xml index 0fd05f2b..9d2d615d 100644 --- a/items.xml +++ b/items.xml @@ -529,6 +529,33 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. type="usable" weight="50" maxFloorOffset="6"/> + + + + + + equipment/head/nohmask.xml -- cgit v1.2.3-70-g09d2 From ebbf80ef9b73aec3266aa5262cad41ebf16fd773 Mon Sep 17 00:00:00 2001 From: Micksha Date: Tue, 23 Oct 2018 10:10:51 +0200 Subject: fix lumberjack.xml, delete Legacy raw log and Legacy forest bow --- graphics/items/equipment/weapons/__LEGACY__forestbow.png | Bin 758 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 graphics/items/equipment/weapons/__LEGACY__forestbow.png (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/weapons/__LEGACY__forestbow.png b/graphics/items/equipment/weapons/__LEGACY__forestbow.png deleted file mode 100644 index fb3580b8..00000000 Binary files a/graphics/items/equipment/weapons/__LEGACY__forestbow.png and /dev/null differ -- cgit v1.2.3-70-g09d2 From 8201f92e7838145383536ea65defd5cd75d57048 Mon Sep 17 00:00:00 2001 From: Micksha Date: Sun, 28 Oct 2018 10:13:05 +0100 Subject: Add the torch, add the spotlight overlay, improve Wand --- graphics/images/ambient/spot.png | Bin 0 -> 134317 bytes graphics/items/equipment/weapons/torch.png | Bin 0 -> 847 bytes graphics/sprites/equipment/weapons/torch.png | Bin 0 -> 32359 bytes graphics/sprites/equipment/weapons/torch.xml | 11 +++++++++++ .../sprites/equipment/weapons/trainingwand.png | Bin 14046 -> 73352 bytes items.xml | 22 ++++++++++++++++----- maps/001-3-0.tmx | 1 + maps/001-3-1.tmx | 1 + maps/008-3-1.tmx | 3 ++- 9 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 graphics/images/ambient/spot.png create mode 100644 graphics/items/equipment/weapons/torch.png create mode 100644 graphics/sprites/equipment/weapons/torch.png create mode 100644 graphics/sprites/equipment/weapons/torch.xml (limited to 'graphics/items/equipment') diff --git a/graphics/images/ambient/spot.png b/graphics/images/ambient/spot.png new file mode 100644 index 00000000..b9c51abd Binary files /dev/null and b/graphics/images/ambient/spot.png differ diff --git a/graphics/items/equipment/weapons/torch.png b/graphics/items/equipment/weapons/torch.png new file mode 100644 index 00000000..638f2426 Binary files /dev/null and b/graphics/items/equipment/weapons/torch.png differ diff --git a/graphics/sprites/equipment/weapons/torch.png b/graphics/sprites/equipment/weapons/torch.png new file mode 100644 index 00000000..16f430b7 Binary files /dev/null and b/graphics/sprites/equipment/weapons/torch.png differ diff --git a/graphics/sprites/equipment/weapons/torch.xml b/graphics/sprites/equipment/weapons/torch.xml new file mode 100644 index 00000000..8bdf853b --- /dev/null +++ b/graphics/sprites/equipment/weapons/torch.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/graphics/sprites/equipment/weapons/trainingwand.png b/graphics/sprites/equipment/weapons/trainingwand.png index 190d4377..f41aedd1 100644 Binary files a/graphics/sprites/equipment/weapons/trainingwand.png and b/graphics/sprites/equipment/weapons/trainingwand.png differ diff --git a/items.xml b/items.xml index d444829e..8ec3a1c1 100644 --- a/items.xml +++ b/items.xml @@ -1610,7 +1610,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. image="equipment/weapons/woodensword.png" name="Wooden Sword" description="For sword training. Do not show-off with it." - attack="40" + attack="75" attack-range="1" level="5" type="equip-1hand" @@ -1624,7 +1624,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. image="equipment/weapons/backsword.png" name="Artis Backsword" description="An engraved backsword with the symbole of Artis on its brass hilt." - attack="800" + attack="500" attack-range="1" level="15" type="equip-1hand" @@ -1638,7 +1638,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. image="equipment/weapons/wand.png" name="Training Wand" description="A simple wand for your first steps in handling magic." - attack="150" + attack="75" attack-range="2" level="10" type="equip-1hand" @@ -1650,7 +1650,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. image="equipment/weapons/wand.png|W:#ece96e" name="Mana Torch" description="A simple wand imbued with a fire spell, it can provide lighting and will never run out on you!" - attack="200" + attack="100" attack-range="2" level="10" type="equip-1hand" @@ -1662,7 +1662,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. image="equipment/weapons/scythe.png" name="Scythe" description="A farmer's scythe, not new but still deadly." - attack="1000" + attack="750" attack-range="2" level="15" type="equip-2hand" @@ -1712,6 +1712,18 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. weight="250"> equipment/weapons/pickaxe.xml + + equipment/weapons/torch.xml + diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx index fd40aa25..7386f7c3 100644 --- a/maps/001-3-0.tmx +++ b/maps/001-3-0.tmx @@ -6,6 +6,7 @@ + diff --git a/maps/001-3-1.tmx b/maps/001-3-1.tmx index 0dfa6a9c..0dff6ca5 100644 --- a/maps/001-3-1.tmx +++ b/maps/001-3-1.tmx @@ -6,6 +6,7 @@ + diff --git a/maps/008-3-1.tmx b/maps/008-3-1.tmx index 0232c925..e504f39e 100644 --- a/maps/008-3-1.tmx +++ b/maps/008-3-1.tmx @@ -1,9 +1,10 @@ - + + -- cgit v1.2.3-70-g09d2 From 69db7d94aab42358e0ba28cfbe31dd2013ed220f Mon Sep 17 00:00:00 2001 From: Micksha Date: Tue, 30 Oct 2018 10:43:45 +0100 Subject: bugfix a lot of .png, improve scythe-attack, few map fixes --- graphics/items/equipment/legs/silkpants.png | Bin 620 -> 674 bytes .../equipment/hands/cottongloves-female.png | Bin 9626 -> 9987 bytes .../sprites/equipment/hands/cottongloves-male.png | Bin 9774 -> 9987 bytes graphics/sprites/equipment/head/bowlerhat.png | Bin 1601 -> 1585 bytes graphics/sprites/equipment/head/candlehelmet.xml | 168 ++++++++++----------- graphics/sprites/equipment/head/headmodel-male.xml | 2 +- graphics/sprites/equipment/head/infantryhelmet.png | Bin 4894 -> 4855 bytes .../sprites/equipment/legs/cottonskirt-female.png | Bin 28268 -> 28778 bytes .../sprites/equipment/legs/cottonskirt-female.xml | 2 +- .../sprites/equipment/legs/cottonskirt-male.png | Bin 28914 -> 28914 bytes .../sprites/equipment/legs/cottonskirt-male.xml | 2 +- .../sprites/equipment/legs/silkpants-female.png | Bin 16658 -> 17949 bytes .../sprites/equipment/legs/silkpants-female.xml | 2 +- graphics/sprites/equipment/legs/silkpants-male.png | Bin 16229 -> 17226 bytes graphics/sprites/equipment/weapons/knife.xml | 26 ++-- graphics/sprites/equipment/weapons/scythe.png | Bin 21887 -> 25878 bytes .../sprites/equipment/weapons/trainingwand.png | Bin 26955 -> 26817 bytes items.xml | 15 +- maps/008-1.tmx | 4 +- maps/008-2-2.tmx | 6 +- 20 files changed, 122 insertions(+), 105 deletions(-) (limited to 'graphics/items/equipment') diff --git a/graphics/items/equipment/legs/silkpants.png b/graphics/items/equipment/legs/silkpants.png index 96e80660..9eae0200 100644 Binary files a/graphics/items/equipment/legs/silkpants.png and b/graphics/items/equipment/legs/silkpants.png differ diff --git a/graphics/sprites/equipment/hands/cottongloves-female.png b/graphics/sprites/equipment/hands/cottongloves-female.png index af222a0e..50c3d4f6 100644 Binary files a/graphics/sprites/equipment/hands/cottongloves-female.png and b/graphics/sprites/equipment/hands/cottongloves-female.png differ diff --git a/graphics/sprites/equipment/hands/cottongloves-male.png b/graphics/sprites/equipment/hands/cottongloves-male.png index 3dc86098..a1556682 100644 Binary files a/graphics/sprites/equipment/hands/cottongloves-male.png and b/graphics/sprites/equipment/hands/cottongloves-male.png differ diff --git a/graphics/sprites/equipment/head/bowlerhat.png b/graphics/sprites/equipment/head/bowlerhat.png index bd8b47eb..1891e2f1 100644 Binary files a/graphics/sprites/equipment/head/bowlerhat.png and b/graphics/sprites/equipment/head/bowlerhat.png differ diff --git a/graphics/sprites/equipment/head/candlehelmet.xml b/graphics/sprites/equipment/head/candlehelmet.xml index 9d676b03..15694b7b 100644 --- a/graphics/sprites/equipment/head/candlehelmet.xml +++ b/graphics/sprites/equipment/head/candlehelmet.xml @@ -4,133 +4,133 @@ - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + diff --git a/graphics/sprites/equipment/head/headmodel-male.xml b/graphics/sprites/equipment/head/headmodel-male.xml index dbb6bb76..b9a9a5a1 100644 --- a/graphics/sprites/equipment/head/headmodel-male.xml +++ b/graphics/sprites/equipment/head/headmodel-male.xml @@ -108,7 +108,7 @@ Copyright (C) 2018 TMW2 --> - + diff --git a/graphics/sprites/equipment/head/infantryhelmet.png b/graphics/sprites/equipment/head/infantryhelmet.png index ea45233b..39d390d9 100644 Binary files a/graphics/sprites/equipment/head/infantryhelmet.png and b/graphics/sprites/equipment/head/infantryhelmet.png differ diff --git a/graphics/sprites/equipment/legs/cottonskirt-female.png b/graphics/sprites/equipment/legs/cottonskirt-female.png index dca8bde3..799897a8 100644 Binary files a/graphics/sprites/equipment/legs/cottonskirt-female.png and b/graphics/sprites/equipment/legs/cottonskirt-female.png differ diff --git a/graphics/sprites/equipment/legs/cottonskirt-female.xml b/graphics/sprites/equipment/legs/cottonskirt-female.xml index 60a1e5f7..2e97e772 100644 --- a/graphics/sprites/equipment/legs/cottonskirt-female.xml +++ b/graphics/sprites/equipment/legs/cottonskirt-female.xml @@ -3,7 +3,7 @@ Copyright (C) 2018 TMW2 --> diff --git a/graphics/sprites/equipment/legs/cottonskirt-male.png b/graphics/sprites/equipment/legs/cottonskirt-male.png index 3053aa0d..e85f0241 100644 Binary files a/graphics/sprites/equipment/legs/cottonskirt-male.png and b/graphics/sprites/equipment/legs/cottonskirt-male.png differ diff --git a/graphics/sprites/equipment/legs/cottonskirt-male.xml b/graphics/sprites/equipment/legs/cottonskirt-male.xml index 627970d7..4eba770b 100644 --- a/graphics/sprites/equipment/legs/cottonskirt-male.xml +++ b/graphics/sprites/equipment/legs/cottonskirt-male.xml @@ -3,7 +3,7 @@ Copyright (C) 2014 Evol Online --> diff --git a/graphics/sprites/equipment/legs/silkpants-female.png b/graphics/sprites/equipment/legs/silkpants-female.png index fede06a9..ac26bc61 100644 Binary files a/graphics/sprites/equipment/legs/silkpants-female.png and b/graphics/sprites/equipment/legs/silkpants-female.png differ diff --git a/graphics/sprites/equipment/legs/silkpants-female.xml b/graphics/sprites/equipment/legs/silkpants-female.xml index 0e8b1465..fb653ca1 100644 --- a/graphics/sprites/equipment/legs/silkpants-female.xml +++ b/graphics/sprites/equipment/legs/silkpants-female.xml @@ -3,7 +3,7 @@ Copyright (C) 2018 TMW2 --> diff --git a/graphics/sprites/equipment/legs/silkpants-male.png b/graphics/sprites/equipment/legs/silkpants-male.png index a9e67807..3d944714 100644 Binary files a/graphics/sprites/equipment/legs/silkpants-male.png and b/graphics/sprites/equipment/legs/silkpants-male.png differ diff --git a/graphics/sprites/equipment/weapons/knife.xml b/graphics/sprites/equipment/weapons/knife.xml index 9c2beb1e..0d7f023d 100644 --- a/graphics/sprites/equipment/weapons/knife.xml +++ b/graphics/sprites/equipment/weapons/knife.xml @@ -101,38 +101,46 @@ Copyright (C) 2012-2013 Evol Online --> - - - + - + + + + + + + - - - + - + + + + + + - + + diff --git a/graphics/sprites/equipment/weapons/scythe.png b/graphics/sprites/equipment/weapons/scythe.png index cca3223b..ba39bb30 100644 Binary files a/graphics/sprites/equipment/weapons/scythe.png and b/graphics/sprites/equipment/weapons/scythe.png differ diff --git a/graphics/sprites/equipment/weapons/trainingwand.png b/graphics/sprites/equipment/weapons/trainingwand.png index c37efc91..dd58ad42 100644 Binary files a/graphics/sprites/equipment/weapons/trainingwand.png and b/graphics/sprites/equipment/weapons/trainingwand.png differ diff --git a/items.xml b/items.xml index 8ec3a1c1..c020ba44 100644 --- a/items.xml +++ b/items.xml @@ -1446,9 +1446,18 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. weight="400"> equipment/head/infantryhelmet.xml - - - + + + + + + + + + + + +