diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-04-25 11:31:30 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-04-25 11:31:30 -0300 |
| commit | 1556f5c3f3dc4b7d34e8a3ccdada3de120ff784d (patch) | |
| tree | 4eb3825545d8a369b58c314b554ff9289417518d | |
| parent | bccea5feaf7bcb96afe5e8c21f3aeda2a4f2cc11 (diff) | |
| parent | 1e48865ad0dad8c063dd29abdf8a3ab7c8fb4f23 (diff) | |
| download | clientdata-1556f5c3f3dc4b7d34e8a3ccdada3de120ff784d.tar.gz clientdata-1556f5c3f3dc4b7d34e8a3ccdada3de120ff784d.tar.bz2 clientdata-1556f5c3f3dc4b7d34e8a3ccdada3de120ff784d.tar.xz clientdata-1556f5c3f3dc4b7d34e8a3ccdada3de120ff784d.zip | |
Merge branch 'jesusalva/spots' into HEAD
25 files changed, 134 insertions, 1 deletions
@@ -625,14 +625,22 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/sprites/races/elven-male.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy) graphics/sprites/races/human-female.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy) graphics/sprites/races/human-male.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy) + graphics/sprites/races/human-female-dark.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Micksha, Reid, Saphy) + graphics/sprites/races/human-male-dark.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Micksha, Reid, Saphy) + graphics/sprites/races/human-female-medium.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Micksha, Reid, Saphy) + graphics/sprites/races/human-male-medium.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Micksha, Reid, Saphy) graphics/sprites/races/orc-female.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy) graphics/sprites/races/orc-male.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy) graphics/sprites/races/raijin-female.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy) graphics/sprites/races/raijin-male.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy) graphics/sprites/races/tritan-female.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy) graphics/sprites/races/tritan-male.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy) + graphics/sprites/races/tritan-female-purple.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Micksha, Reid, Saphy) + graphics/sprites/races/tritan-male-purple.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Micksha, Reid, Saphy) graphics/sprites/races/ukar-female.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy) graphics/sprites/races/ukar-male.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Arikel, Reid, Saphy) + graphics/sprites/races/ukar-female-pink.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Micksha, Reid, Saphy) + graphics/sprites/races/ukar-male-pink.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Arikel, Micksha, Reid, Saphy) ### Heads graphics/sprites/heads/demon-female-default.png (Reid) (CC BY-SA 3.0) (Modanung, Talaroc) graphics/sprites/heads/demon-male-default.png (Reid) (CC BY-SA 3.0) (Modanung, Talaroc) diff --git a/charcreation.xml b/charcreation.xml index de63cd7e..5b4de358 100644 --- a/charcreation.xml +++ b/charcreation.xml @@ -6,7 +6,7 @@ Copyright (C) 2011-2012 ManaPlus --> <haircolor min="0" max="20"/> <hairstyle min="1" max="28"/> <look min="0" max="2"/> - <race min="0" max="6"/> + <race min="0" max="10"/> <stat min="1" max="9" sum="30"/> <item id="1300"/> <item id="2200"/> diff --git a/graphics/sprites/races/human-female-dark.png b/graphics/sprites/races/human-female-dark.png Binary files differnew file mode 100644 index 00000000..b20d1949 --- /dev/null +++ b/graphics/sprites/races/human-female-dark.png diff --git a/graphics/sprites/races/human-female-dark.xml b/graphics/sprites/races/human-female-dark.xml new file mode 100644 index 00000000..00538da4 --- /dev/null +++ b/graphics/sprites/races/human-female-dark.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Micksha, Reid +Copyright (C) 2012 - 2019 Evol Online --> +<sprite> + <imageset name="base" + src="graphics/sprites/races/human-female-dark.png" + width="64" + height="64"/> + + <include file="races/human-male.xml"/> +</sprite> diff --git a/graphics/sprites/races/human-female-medium.png b/graphics/sprites/races/human-female-medium.png Binary files differnew file mode 100644 index 00000000..c4fe8d85 --- /dev/null +++ b/graphics/sprites/races/human-female-medium.png diff --git a/graphics/sprites/races/human-female-medium.xml b/graphics/sprites/races/human-female-medium.xml new file mode 100644 index 00000000..44e22eaf --- /dev/null +++ b/graphics/sprites/races/human-female-medium.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Micksha, Reid +Copyright (C) 2012 - 2019 Evol Online --> +<sprite> + <imageset name="base" + src="graphics/sprites/races/human-female-medium.png" + width="64" + height="64"/> + + <include file="races/human-male.xml"/> +</sprite> diff --git a/graphics/sprites/races/human-male-dark.png b/graphics/sprites/races/human-male-dark.png Binary files differnew file mode 100644 index 00000000..e57ac51f --- /dev/null +++ b/graphics/sprites/races/human-male-dark.png diff --git a/graphics/sprites/races/human-male-dark.xml b/graphics/sprites/races/human-male-dark.xml new file mode 100644 index 00000000..30cb5f49 --- /dev/null +++ b/graphics/sprites/races/human-male-dark.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Micksha, Reid +Copyright (C) 2012 - 2019 Evol Online --> +<sprite> + <imageset name="base" + src="graphics/sprites/races/human-male-dark.png" + width="64" + height="64"/> + + <include file="races/human-male.xml"/> +</sprite> diff --git a/graphics/sprites/races/human-male-medium.png b/graphics/sprites/races/human-male-medium.png Binary files differnew file mode 100644 index 00000000..53deffc3 --- /dev/null +++ b/graphics/sprites/races/human-male-medium.png diff --git a/graphics/sprites/races/human-male-medium.xml b/graphics/sprites/races/human-male-medium.xml new file mode 100644 index 00000000..88c4c822 --- /dev/null +++ b/graphics/sprites/races/human-male-medium.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Micksha, Reid +Copyright (C) 2012 - 2019 Evol Online --> +<sprite> + <imageset name="base" + src="graphics/sprites/races/human-male-medium.png" + width="64" + height="64"/> + + <include file="races/human-male.xml"/> +</sprite> diff --git a/graphics/sprites/races/tritan-female-purple.png b/graphics/sprites/races/tritan-female-purple.png Binary files differnew file mode 100644 index 00000000..293cdbc4 --- /dev/null +++ b/graphics/sprites/races/tritan-female-purple.png diff --git a/graphics/sprites/races/tritan-female-purple.xml b/graphics/sprites/races/tritan-female-purple.xml new file mode 100644 index 00000000..b27ee22f --- /dev/null +++ b/graphics/sprites/races/tritan-female-purple.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Micksha, Reid +Copyright (C) 2012 - 2019 Evol Online --> +<sprite> + <imageset name="base" + src="graphics/sprites/races/tritan-female-purple.png" + width="64" + height="64"/> + + <include file="races/human-male.xml"/> +</sprite> diff --git a/graphics/sprites/races/tritan-male-purple.png b/graphics/sprites/races/tritan-male-purple.png Binary files differnew file mode 100644 index 00000000..31f81852 --- /dev/null +++ b/graphics/sprites/races/tritan-male-purple.png diff --git a/graphics/sprites/races/tritan-male-purple.xml b/graphics/sprites/races/tritan-male-purple.xml new file mode 100644 index 00000000..e713c7cf --- /dev/null +++ b/graphics/sprites/races/tritan-male-purple.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Micksha, Reid +Copyright (C) 2012 - 2019 Evol Online --> +<sprite> + <imageset name="base" + src="graphics/sprites/races/tritan-male-purple.png" + width="64" + height="64"/> + + <include file="races/human-male.xml"/> +</sprite> diff --git a/graphics/sprites/races/ukar-female-pink.png b/graphics/sprites/races/ukar-female-pink.png Binary files differnew file mode 100644 index 00000000..aa268330 --- /dev/null +++ b/graphics/sprites/races/ukar-female-pink.png diff --git a/graphics/sprites/races/ukar-female-pink.xml b/graphics/sprites/races/ukar-female-pink.xml new file mode 100644 index 00000000..b5973ce1 --- /dev/null +++ b/graphics/sprites/races/ukar-female-pink.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Micksha, Reid +Copyright (C) 2012 - 2019 Evol Online --> +<sprite> + <imageset name="base" + src="graphics/sprites/races/ukar-female-pink.png" + width="64" + height="64"/> + + <include file="races/human-male.xml"/> +</sprite> diff --git a/graphics/sprites/races/ukar-male-pink.png b/graphics/sprites/races/ukar-male-pink.png Binary files differnew file mode 100644 index 00000000..77d95bee --- /dev/null +++ b/graphics/sprites/races/ukar-male-pink.png diff --git a/graphics/sprites/races/ukar-male-pink.xml b/graphics/sprites/races/ukar-male-pink.xml new file mode 100644 index 00000000..5e8f5a6b --- /dev/null +++ b/graphics/sprites/races/ukar-male-pink.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Micksha, Reid +Copyright (C) 2012 - 2019 Evol Online --> +<sprite> + <imageset name="base" + src="graphics/sprites/races/ukar-male-pink.png" + width="64" + height="64"/> + + <include file="races/human-male.xml"/> +</sprite> @@ -158,6 +158,30 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. <sound event="hit">weapons/barehands/hit1.ogg</sound> <sound event="miss">weapons/barehands/miss1.ogg</sound> </item> + <item id="-107" type="racesprite" name="Medium Human"> + <sprite gender="unisex">races/human-male-medium.xml</sprite> + <sprite gender="female">races/human-female-medium.xml</sprite> + <sound event="hit">weapons/barehands/hit1.ogg</sound> + <sound event="miss">weapons/barehands/miss1.ogg</sound> + </item> + <item id="-108" type="racesprite" name="Dark Human"> + <sprite gender="unisex">races/human-male-dark.xml</sprite> + <sprite gender="female">races/human-female-dark.xml</sprite> + <sound event="hit">weapons/barehands/hit1.ogg</sound> + <sound event="miss">weapons/barehands/miss1.ogg</sound> + </item> + <item id="-109" type="racesprite" name="Purple Tritan"> + <sprite gender="unisex">races/tritan-male-purple.xml</sprite> + <sprite gender="female">races/tritan-female-purple.xml</sprite> + <sound event="hit">weapons/barehands/hit1.ogg</sound> + <sound event="miss">weapons/barehands/miss1.ogg</sound> + </item> + <item id="-110" type="racesprite" name="Pink Ukar"> + <sprite gender="unisex">races/ukar-male-pink.xml</sprite> + <sprite gender="female">races/ukar-female-pink.xml</sprite> + <sound event="hit">weapons/barehands/hit1.ogg</sound> + <sound event="miss">weapons/barehands/miss1.ogg</sound> + </item> <!-- Special Races --> <item id="-150" type="racesprite" name="Piou"> diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx index cf3ef655..5ca06eb1 100644 --- a/maps/001-3-0.tmx +++ b/maps/001-3-0.tmx @@ -1688,6 +1688,7 @@ <property name="dest_map" value="001-1"/> <property name="dest_x" value="197"/> <property name="dest_y" value="35"/> + <property name="spotlight" value="true"/> </properties> </object> <object id="2" name="to RivercaveEast" type="warp" x="5504" y="1312" width="32" height="32"> @@ -1695,6 +1696,7 @@ <property name="dest_map" value="001-3-1"/> <property name="dest_x" value="34"/> <property name="dest_y" value="58"/> + <property name="spotlight" value="true"/> </properties> </object> <object id="3" name="to RivercaveWest" type="warp" x="5184" y="1280" width="32" height="32"> @@ -1702,6 +1704,7 @@ <property name="dest_map" value="001-3-1"/> <property name="dest_x" value="23"/> <property name="dest_y" value="57"/> + <property name="spotlight" value="true"/> </properties> </object> <object id="4" name="to ArtisCoast" type="warp" x="6336" y="1920" width="32" height="32"> @@ -1709,6 +1712,7 @@ <property name="dest_map" value="001-1"/> <property name="dest_x" value="199"/> <property name="dest_y" value="61"/> + <property name="spotlight" value="true"/> </properties> </object> <object id="5" name="To ArtisCentral" type="warp" x="4864" y="1760" width="32" height="32"> @@ -1716,6 +1720,7 @@ <property name="dest_map" value="001-1"/> <property name="dest_x" value="152"/> <property name="dest_y" value="51"/> + <property name="spotlight" value="true"/> </properties> </object> <object id="6" name="to ArtisSouth" type="warp" x="2720" y="4160" width="32" height="32"> @@ -1723,6 +1728,7 @@ <property name="dest_map" value="001-1"/> <property name="dest_x" value="86"/> <property name="dest_y" value="130"/> + <property name="spotlight" value="true"/> </properties> </object> <object id="7" name="graphics/particles/sewer-pipe.xml" type="particle_effect" x="3520" y="1888" width="32" height="32"/> diff --git a/maps/001-3-1.tmx b/maps/001-3-1.tmx index 5c236bbc..71437ebf 100644 --- a/maps/001-3-1.tmx +++ b/maps/001-3-1.tmx @@ -546,6 +546,7 @@ <property name="dest_map" value="001-3-0"/> <property name="dest_x" value="162"/> <property name="dest_y" value="41"/> + <property name="spotlight" value="true"/> </properties> </object> <object id="9" name="to SewerEast" type="warp" x="1088" y="1888" width="64" height="32"> @@ -553,6 +554,7 @@ <property name="dest_map" value="001-3-0"/> <property name="dest_x" value="172"/> <property name="dest_y" value="42"/> + <property name="spotlight" value="true"/> </properties> </object> <object id="10" name="Green Slime" type="spawn" x="928" y="672" width="224" height="64"> @@ -608,6 +610,7 @@ <property name="dest_map" value="001-3-2"/> <property name="dest_x" value="30"/> <property name="dest_y" value="116"/> + <property name="spotlight" value="true"/> </properties> </object> </objectgroup> diff --git a/maps/001-3-2.tmx b/maps/001-3-2.tmx index bf397457..67f84dcc 100644 --- a/maps/001-3-2.tmx +++ b/maps/001-3-2.tmx @@ -1383,6 +1383,7 @@ <property name="dest_map" value="001-3-1"/> <property name="dest_x" value="30"/> <property name="dest_y" value="20"/> + <property name="spotlight" value="true"/> </properties> </object> <object id="2" name="graphics/particles/sewer-pipe.xml" type="particle_effect" x="1024" y="3168" width="32" height="32"/> diff --git a/maps/008-3-0.tmx b/maps/008-3-0.tmx index c1e6cf83..fd5c5aa7 100644 --- a/maps/008-3-0.tmx +++ b/maps/008-3-0.tmx @@ -2226,6 +2226,7 @@ <property name="dest_map" value="008-1-1"/> <property name="dest_x" value="202"/> <property name="dest_y" value="48"/> + <property name="spotlight" value="true"/> </properties> </object> <object id="31" name="Ruby Vein" type="spawn" x="2656" y="5312" width="32" height="32"> diff --git a/maps/008-3-1.tmx b/maps/008-3-1.tmx index 61cd882b..9e8f1998 100644 --- a/maps/008-3-1.tmx +++ b/maps/008-3-1.tmx @@ -714,6 +714,7 @@ <property name="dest_map" value="008-1"/> <property name="dest_x" value="128"/> <property name="dest_y" value="139"/> + <property name="spotlight" value="true"/> </properties> </object> <object id="2" name="Crafty" type="spawn" x="1120" y="960" width="512" height="384"> diff --git a/maps/008-4-1.tmx b/maps/008-4-1.tmx index be19124c..243d8cd1 100644 --- a/maps/008-4-1.tmx +++ b/maps/008-4-1.tmx @@ -796,6 +796,7 @@ <property name="dest_map" value="008-1"/> <property name="dest_x" value="165"/> <property name="dest_y" value="170"/> + <property name="spotlight" value="true"/> </properties> </object> </objectgroup> |
