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 /graphics | |
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
Diffstat (limited to 'graphics')
18 files changed, 46 insertions, 1 deletions
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"/> |