diff options
author | Micksha <ms-shaman@gmx.de> | 2019-04-13 19:57:08 +0000 |
---|---|---|
committer | Micksha <ms-shaman@gmx.de> | 2019-04-13 19:57:08 +0000 |
commit | db9ca1050dc11eba71665e075b4bededf3268cd1 (patch) | |
tree | a68a2b25af95b941b68ba4a2f538406c67184f1a | |
parent | 7084b260764944a098af738f051669c58c8c6915 (diff) | |
parent | c6ce30724bb7e7aa0bbc0e5572694454c036902b (diff) | |
download | clientdata-db9ca1050dc11eba71665e075b4bededf3268cd1.tar.gz clientdata-db9ca1050dc11eba71665e075b4bededf3268cd1.tar.bz2 clientdata-db9ca1050dc11eba71665e075b4bededf3268cd1.tar.xz clientdata-db9ca1050dc11eba71665e075b4bededf3268cd1.zip |
Merge branch 'bandit' into 'master'
Bandit MR
See merge request evol/clientdata!114
22 files changed, 163 insertions, 8 deletions
@@ -50,7 +50,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/equipment/chest/cottonshirt.png (VxD) (CC BY-SA 3.0) (Reid) graphics/items/equipment/chest/forestarmor.png (Goku) (CC BY-SA 3.0) (Micksha) graphics/items/equipment/chest/finedress.png (LEGACY) (CC BY-SA 3.0) (Micksha) - graphics/items/equipment/chest/forestarmor.png (LEGACY) (CC BY-SA 3.0) (Micksha) + graphics/items/equipment/chest/forestarmor.png (Goku) (GPLv2, CC BY-SA 3.0) (Micksha, Saphy) graphics/items/equipment/chest/sailorshirt.png (VxD) (CC BY-SA 3.0) (Reid) graphics/items/equipment/chest/silkrobe.png (LEGACY) (CC BY-SA 3.0) (Micksha) graphics/items/equipment/chest/tanktop.png (VxD) (CC BY-SA 3.0) (Reid) @@ -58,11 +58,13 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/equipment/chest/vneckjumper.png (VxD) (CC BY-SA 3.0) (Reid) graphics/items/equipment/chest/warlordplate.png (LEGACY) (GPLv2) (-) ### Feet + graphics/items/equipment/feet/banditboots.png (Micksha) (CC BY-SA 3.0) (-) graphics/items/equipment/feet/boots.png (Enchilado) (CC BY-SA 3.0) (Reid) graphics/items/equipment/feet/cottonboots.png (LEGACY) (GPLv2) (-) graphics/items/equipment/feet/warlordboots.png (Lizandra) (GPLv2) (-) - graphics/items/equipment/feet/furboots.png (LEGACY) (GPLv2) (-) + graphics/items/equipment/feet/furboots.png (Black Don) (GPLv2) (-) ### Hands + graphics/items/equipment/hands/banditgloves.png (Micksha) (CC BY-SA 3.0) (-) graphics/items/equipment/hands/armbands.png (Enchilado) (CC BY-SA 3.0) (-) graphics/items/equipment/hands/copperarmbands.png (Enchilado) (CC BY-SA 3.0) (-) graphics/items/equipment/hands/cottongloves.png (LEGACY) (GPLv2) (-) @@ -71,6 +73,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE ### Head graphics/items/equipment/head/axehat.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/bandana.png (Modanung) (CC BY-SA 3.0) (-) + 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/brimmedfeatherhat.png (Reid) (CC BY-SA 3.0) (-) @@ -83,10 +86,11 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE 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 (LEGACY) (GPLv2) (Micksha) + graphics/items/equipment/head/rosehat.png (Nami, skipy) (GPLv2) (Alige, Micksha) graphics/items/equipment/head/tophat.png (QOAL) (GPLv2) (-) graphics/items/equipment/head/warlordhelmet.png (Black Don) (GPLv2) (-) ### Legs + graphics/items/equipment/legs/bandittrousers.png (Micksha) (CC-BY-SA 3.0) (-) graphics/items/equipment/legs/cottonskirt.png (LEGACY) (GPLv2) (-) graphics/items/equipment/legs/jeanschaps.png (Black Don) (GPLv2) (-) graphics/items/equipment/legs/leathertrousers.png (Enchilado) (CC BY-SA 3.0) (-) @@ -94,6 +98,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/equipment/legs/shorts.png (VxD) (CC BY-SA 3.0) (Reid) graphics/items/equipment/legs/silkpants.png (LuH) (GPLv2) (-) ### Neck + 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) (-) ### Shields @@ -129,6 +134,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/generic/bugleg.png (:grey_question:, Enchilado) (GPLv2) (Micksha) graphics/items/generic/carp.png (Reid) (CC BY-SA 3.0) (-) graphics/items/generic/coal.png (Enchilado, Meway) (GPLv2,CC BY-SA 3.0) (Micksha) + graphics/items/generic/coinbag.png (LEGACY) (CC BY-SA 3.0) (Micksha) graphics/items/generic/coral.png (Reid) (CC BY-SA 3.0) (Enchilado) graphics/items/generic/crocclaw.png (Reid) (CC BY-SA 3.0) (Enchilado) graphics/items/generic/dish-poisoned.png (Hal9000) (CC BY-SA 3.0) (Alige) @@ -415,6 +421,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/sprites/equipment/head/axehat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/bandana-female.png (Modanung) (CC BY-SA 3.0) (Alige, Reid) graphics/sprites/equipment/head/bandana-male.png (Modanung) (CC BY-SA 3.0) (Alige) + 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/brimmedfeatherhat.png (Reid) (CC BY-SA 3.0) (-) @@ -433,6 +440,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/sprites/equipment/head/tophat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/warlordhelmet.png (LEGACY) (GPLv2) (-) ### Legs + graphics/sprites/equipment/legs/bandittrousers-male.png (Mickhsa) (CC-BY-SA 3.0) (-) + graphics/sprites/equipment/legs/bandittrousers-female.png (Mickhsa) (CC-BY-SA 3.0) (-) graphics/sprites/equipment/legs/cottonskirt-female.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/legs/cottonskirt-male.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/legs/cottontrousers-male.png (Modanung, Reid)(CC BY-SA 3.0) (Micksha) @@ -446,6 +455,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/sprites/equipment/legs/trousers-female.png (Modanung, Reid) (CC BY-SA 3.0) (-) 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) (-) ### Shields diff --git a/graphics/items/equipment/chest/forestarmor.png b/graphics/items/equipment/chest/forestarmor.png Binary files differindex 4b9f281d..7e56864d 100644 --- a/graphics/items/equipment/chest/forestarmor.png +++ b/graphics/items/equipment/chest/forestarmor.png diff --git a/graphics/items/equipment/feet/banditboots.png b/graphics/items/equipment/feet/banditboots.png Binary files differnew file mode 100644 index 00000000..a43e24b6 --- /dev/null +++ b/graphics/items/equipment/feet/banditboots.png diff --git a/graphics/items/equipment/hands/banditgloves.png b/graphics/items/equipment/hands/banditgloves.png Binary files differnew file mode 100644 index 00000000..ceecfbe6 --- /dev/null +++ b/graphics/items/equipment/hands/banditgloves.png diff --git a/graphics/items/equipment/head/bandithood.png b/graphics/items/equipment/head/bandithood.png Binary files differnew file mode 100644 index 00000000..5608d957 --- /dev/null +++ b/graphics/items/equipment/head/bandithood.png diff --git a/graphics/items/equipment/legs/bandittrousers.png b/graphics/items/equipment/legs/bandittrousers.png Binary files differnew file mode 100644 index 00000000..a242245b --- /dev/null +++ b/graphics/items/equipment/legs/bandittrousers.png diff --git a/graphics/items/equipment/neck/banditshawl.png b/graphics/items/equipment/neck/banditshawl.png Binary files differnew file mode 100644 index 00000000..c55e8702 --- /dev/null +++ b/graphics/items/equipment/neck/banditshawl.png diff --git a/graphics/items/generic/coinbag.png b/graphics/items/generic/coinbag.png Binary files differnew file mode 100644 index 00000000..25a6ad12 --- /dev/null +++ b/graphics/items/generic/coinbag.png diff --git a/graphics/sprites/equipment/chest/forestarmor-female.png b/graphics/sprites/equipment/chest/forestarmor-female.png Binary files differindex e87c4ecd..08411e99 100644 --- a/graphics/sprites/equipment/chest/forestarmor-female.png +++ b/graphics/sprites/equipment/chest/forestarmor-female.png diff --git a/graphics/sprites/equipment/chest/forestarmor-male.png b/graphics/sprites/equipment/chest/forestarmor-male.png Binary files differindex 8a988c84..b4a1d7bd 100644 --- a/graphics/sprites/equipment/chest/forestarmor-male.png +++ b/graphics/sprites/equipment/chest/forestarmor-male.png diff --git a/graphics/sprites/equipment/head/bandithood.png b/graphics/sprites/equipment/head/bandithood.png Binary files differnew file mode 100644 index 00000000..9d6d10c0 --- /dev/null +++ b/graphics/sprites/equipment/head/bandithood.png diff --git a/graphics/sprites/equipment/head/bandithood.xml b/graphics/sprites/equipment/head/bandithood.xml new file mode 100644 index 00000000..a4887af4 --- /dev/null +++ b/graphics/sprites/equipment/head/bandithood.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/bandithood.png" + width="32" + height="64" + /> + + <include file="equipment/head/headmodel-male.xml"/> +</sprite> diff --git a/graphics/sprites/equipment/legs/bandittrousers-female.png b/graphics/sprites/equipment/legs/bandittrousers-female.png Binary files differnew file mode 100644 index 00000000..915134cb --- /dev/null +++ b/graphics/sprites/equipment/legs/bandittrousers-female.png diff --git a/graphics/sprites/equipment/legs/bandittrousers-female.xml b/graphics/sprites/equipment/legs/bandittrousers-female.xml new file mode 100644 index 00000000..e4a972cd --- /dev/null +++ b/graphics/sprites/equipment/legs/bandittrousers-female.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Micksha, Reid +Copyright (C) 2014-2019 Evol Online --> +<sprite> + <imageset name="base" + src="graphics/sprites/equipment/legs/bandittrousers-female.png" + width="64" + height="64"/> + + <include file="races/human-male.xml"/> +</sprite> diff --git a/graphics/sprites/equipment/legs/bandittrousers-male.png b/graphics/sprites/equipment/legs/bandittrousers-male.png Binary files differnew file mode 100644 index 00000000..2700dcd9 --- /dev/null +++ b/graphics/sprites/equipment/legs/bandittrousers-male.png diff --git a/graphics/sprites/equipment/legs/bandittrousers-male.xml b/graphics/sprites/equipment/legs/bandittrousers-male.xml new file mode 100644 index 00000000..5c13a551 --- /dev/null +++ b/graphics/sprites/equipment/legs/bandittrousers-male.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Micksha, Reid +Copyright (C) 2014-2019 Evol Online --> +<sprite> + <imageset name="base" + src="graphics/sprites/equipment/legs/bandittrousers-male.png" + width="64" + height="64"/> + + <include file="races/human-male.xml"/> +</sprite> diff --git a/graphics/sprites/equipment/neck/banditshawl.png b/graphics/sprites/equipment/neck/banditshawl.png Binary files differnew file mode 100644 index 00000000..0e4da653 --- /dev/null +++ b/graphics/sprites/equipment/neck/banditshawl.png diff --git a/graphics/sprites/equipment/neck/banditshawl.xml b/graphics/sprites/equipment/neck/banditshawl.xml new file mode 100644 index 00000000..ed12972b --- /dev/null +++ b/graphics/sprites/equipment/neck/banditshawl.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Micksha, Reid +Copyright (C) 2016-2019 Evol Online --> +<sprite> + <imageset name="base" + src="graphics/sprites/equipment/neck/banditshawl.png" + width="20" + height="21"/> + + <include file="equipment/neck/shemagh.xml"/> +</sprite> diff --git a/graphics/sprites/npcs/xml/unanimated-legacy-tall.xml b/graphics/sprites/npcs/xml/unanimated-legacy-tall.xml index a37eaef1..ca0fc270 100644 --- a/graphics/sprites/npcs/xml/unanimated-legacy-tall.xml +++ b/graphics/sprites/npcs/xml/unanimated-legacy-tall.xml @@ -4,7 +4,7 @@ Copyright (C) 2015-2018 Evol Online --> <sprite variants="6" variant_offset="1"> <imageset name="npc" - src="graphics/sprites/npcs/sprite/unanimated-legacy-tall.png|S" + src="graphics/sprites/npcs/sprite/unanimated-legacy-tall.png" width="64" height="96"/> @@ -1033,6 +1033,13 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. type="generic" weight="10" maxFloorOffset="4"/> + <item id="756" + image="generic/coinbag.png" + name="Coin Bag" + description="A bag full of coins. They were most probably stolen from someone." + type="generic" + weight="250" + maxFloorOffset="4"/> <item id="800" image="generic/gem-shard.png|W:#315a67,a4a4ae,dce5d6,ffffff" @@ -1248,6 +1255,18 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. <sprite gender="unisex">equipment/feet/furboots-male.xml</sprite> <sprite gender="female">equipment/feet/furboots-female.xml</sprite> </item> + <item id="1803" + image="equipment/feet/banditboots.png" + name="Fur Boots" + description="A pair of light, sneaky boots. Good to sneak without being noisy." + defense="27" + level="20" + type="equip-feet" + weight="60" + maxFloorOffset="8"> + <sprite gender="unisex">equipment/feet/boots-male.xml|#222222,343434,3d3d3d,545454,606060,6c6c6c</sprite> + <sprite gender="female">equipment/feet/boots-female.xml|#222222,343434,3d3d3d,545454,606060,6c6c6c</sprite> + </item> <!-- Gloves --> <item id="2000" @@ -1311,6 +1330,18 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. <sprite gender="unisex">equipment/hands/cottongloves-male.xml|#4e2e18,c8752f</sprite> <sprite gender="female">equipment/hands/cottongloves-female.xml|#4e2e18,c8752f</sprite> </item> + <item id="2005" + image="equipment/hands/banditgloves.png" + name="Bandit Gloves" + description="Gloves made soft leather, perfect for stealing or backstabbing." + defense="15" + level="25" + type="equip-arms" + weight="85" + maxFloorOffset="16"> + <sprite gender="unisex">equipment/hands/cottongloves-male.xml|#4d3e21,624f2a,766033,8a703b,9e8043</sprite> + <sprite gender="female">equipment/hands/cottongloves-female.xml|#4d3e21,624f2a,766033,8a703b,9e8043</sprite> + </item> <!-- Pants --> <item id="2200" @@ -1341,7 +1372,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. image="equipment/legs/jeanschaps.png" name="Jeans Chaps" description="Jeans with snake skin chaps." - defense="240" + defense="130" level="12" type="equip-legs" weight="360" @@ -1353,7 +1384,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. image="equipment/legs/silkpants.png|W" name="%Color% Cashmere Pants" description="A very light fancy pair of %Color% cashmere trousers." - defense="80" + defense="75" level="17" type="equip-legs" weight="20" @@ -1380,7 +1411,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. image="equipment/legs/leathertrousers.png" name="Leather Trousers" description="A common pair of pants made from leather." - defense="160" + defense="145" level="15" type="equip-legs" weight="280" @@ -1388,6 +1419,18 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. <sprite gender="unisex">equipment/legs/cottontrousers-male.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite> <sprite gender="female">equipment/legs/cottontrousers-female.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite> </item> + <item id="2206" + image="equipment/legs/bandittrousers.png" + name="Bandit Trousers" + description="Not really odoriferous trousers, formerly worn by some stinky bandit." + defense="105" + level="25" + type="equip-legs" + weight="110" + maxFloorOffset="8"> + <sprite gender="unisex">equipment/legs/bandittrousers-male.xml</sprite> + <sprite gender="female">equipment/legs/bandittrousers-female.xml</sprite> + </item> <!-- Wings <item id="2500" @@ -1669,6 +1712,16 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. weight="50"> <sprite>equipment/head/rosehat.xml</sprite> </item> + <item id="2916" + image="equipment/head/bandithood.png" + name="Bandit Hood" + description="A woolen hood, very useful to hide your face from too curious constables, for example." + defense="15" + level="20" + type="equip-head" + weight="30"> + <sprite>equipment/head/bandithood.xml</sprite> + </item> <!-- Neck Armors --> <item id="3200" @@ -1683,6 +1736,18 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. <sprite gender="unisex">equipment/neck/shemagh.xml</sprite> <sprite gender="female">equipment/neck/shemagh.xml</sprite> </item> + <item id="3201" + image="equipment/neck/banditshawl.png" + name="Bandit Shawl" + description="A shawl, more for hiding you face than for keeping you warm." + defense="75" + level="30" + type="equip-neck" + weight="45" + drawAfter="torso"> + <sprite gender="unisex">equipment/neck/banditshawl.xml</sprite> + <sprite gender="female">equipment/neck/banditshawl.xml</sprite> + </item> <!-- Weapons --> <item id="3500" diff --git a/monsters.xml b/monsters.xml index 1b467855..1a8c2488 100644 --- a/monsters.xml +++ b/monsters.xml @@ -332,6 +332,41 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or <sound event="hit">monsters/flower/hit2.ogg</sound> <sound event="miss">monsters/flower/miss1.ogg</sound> </monster> + <monster id="1063" name="Bandit"> + <sprite>races/orc-male.xml</sprite> + <sprite>equipment/legs/bandittrousers-male.xml</sprite> + <sprite>equipment/feet/boots-male.xml|#222222,343434,3d3d3d,545454,606060,6c6c6c</sprite> + <sprite>equipment/hands/cottongloves-male.xml|#4d3e21,624f2a,766033,8a703b,9e8043</sprite> + <sprite>equipment/head/bandithood.xml</sprite> + <sprite>equipment/weapons/knife.xml</sprite> + <sprite>equipment/chest/forestarmor-male.xml</sprite> + <sound event="hit">weapons/piouslayer/hit1.ogg</sound> + <sound event="miss">weapons/piouslayer/miss1.ogg</sound> + </monster> + <monster id="1064" name="Robin Bandit"> + <sprite>races/orc-male.xml</sprite> + <sprite>equipment/legs/bandittrousers-male.xml</sprite> + <sprite>equipment/feet/boots-male.xml|#222222,343434,3d3d3d,545454,606060,6c6c6c</sprite> + <sprite>equipment/hands/cottongloves-male.xml|#4d3e21,624f2a,766033,8a703b,9e8043</sprite> + <sprite>equipment/head/bandithood.xml</sprite> + <sprite>equipment/weapons/woodenbow.xml</sprite> + <sprite>equipment/chest/forestarmor-male.xml</sprite> + <sound event="hit">weapons/piouslayer/hit1.ogg</sound> + <sound event="miss">weapons/piouslayer/miss1.ogg</sound> + <attack id="1" missile-particle="graphics/particles/training-arrow.xml" action="attack"/> + </monster> + <monster id="1065" name="Bandit Lord"> + <sprite>races/orc-male.xml</sprite> + <sprite>equipment/legs/bandittrousers-female.xml</sprite> + <sprite>equipment/feet/boots-female.xml|#222222,343434,3d3d3d,545454,606060,6c6c6c</sprite> + <sprite>equipment/hands/cottongloves-female.xml|#4d3e21,624f2a,766033,8a703b,9e8043</sprite> + <sprite>equipment/head/bandithood.xml</sprite> + <sprite>equipment/weapons/woodenbow.xml</sprite> + <sprite>equipment/chest/forestarmor-female.xml</sprite> + <sprite>equipment/neck/banditshawl.xml</sprite> + <sound event="hit">weapons/piouslayer/hit1.ogg</sound> + <sound event="miss">weapons/piouslayer/miss1.ogg</sound> + </monster> <monster id="1100" name="Poison Skull" walkType="fly" targetCursor="small"> <sprite>monsters/skull-poison.xml</sprite> </monster> @@ -450,7 +450,7 @@ IDs 900-999 = Special </npc> <npc id="187"> <!-- Simon, Wyaras Apprentice. --> - <sprite variant="6">npcs/xml/unanimated-legacy-tall.xml</sprite> + <sprite variant="5">npcs/xml/unanimated-legacy-tall.xml</sprite> <menu name="Talk" command="talk 'NAME'"/> </npc> |