OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-19 10:04:52 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

- Added scrollbar to item info dialog (thanks ctnbeh13)

Browse Source 
- Changed the color of the exp bar yet again (thanks Samuel)
- Update HP-bar graphics when player gets "Minor berserker rage" condition (thanks kabbie1882)
- Fixed walkable crosses near "Blackwater Border Patrol" (thanks ctnbeh13)
- Fixed walkable pile of armour near Waeges (thanks ctnbeh13)
- Fixed walkable chair near Harlenn's bodyguard (thanks ctnbeh13)
- Fixed walkable signs on west side of Prim (thanks ctnbeh13)
- Fixed walkable plant in Prim inn (thanks ctnbeh13)
- Changed sign into fence tile outside Elm mine near Prim (thanks ctnbeh13)
- Changed walkable grass tiles outside Elm mine near Prim (thanks ctnbeh13)
- Updated authors list

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@117 08aca716-68be-ccc6-4d58-36f5abd142ac
This commit is contained in:
oskar.wiksten
2011-06-28 20:04:51 +00:00
parent 1513337329
commit db7d65c355
14 changed files with 82 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndorsTrail/AndroidManifest.xml
View File

@@ -4,7 +4,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gpl.rpg.AndorsTrail"
android:versionCode="20"
android:versionName="0.6.9b1"
android:versionName="0.6.9b2"
android:installLocation="auto"
>
<uses-sdk

BIN
AndorsTrail/res/drawable/ui_yellow_foreground.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 251 B

After

Width:  |  Height:  |  Size: 255 B

95
AndorsTrail/res/layout/iteminfo.xml
View File

@@ -5,60 +5,67 @@
android:layout_height="fill_parent"
android:orientation="vertical"
>
<LinearLayout
<ScrollView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin"
android:layout_weight="1"
>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:orientation="vertical"
android:padding="@dimen/dialog_margin"
>
<ImageView
android:id="@+id/iteminfo_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/equip_weapon"
android:paddingRight="@dimen/dialog_iconpadding_right"
android:paddingBottom="@dimen/dialog_iconpadding_bottom"
/>
<TextView
android:id="@+id/iteminfo_title"
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="Item"
android:textSize="@dimen/titletext"
/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginBottom="@dimen/section_margin"
>
<TextView
android:text="@string/iteminfo_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/iteminfo_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</LinearLayout>
android:orientation="horizontal"
android:gravity="center_vertical"
>
<ImageView
android:id="@+id/iteminfo_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/equip_weapon"
android:paddingRight="@dimen/dialog_iconpadding_right"
android:paddingBottom="@dimen/dialog_iconpadding_bottom"
/>
<TextView
android:id="@+id/iteminfo_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="Item"
android:textSize="@dimen/titletext"
/>
</LinearLayout>
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
android:id="@+id/iteminfo_effects"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginBottom="@dimen/section_margin"
>
<TextView
android:text="@string/iteminfo_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/iteminfo_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</LinearLayout>
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
android:id="@+id/iteminfo_effects"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="fill_parent"

3
AndorsTrail/res/values/strings.xml
View File

@@ -219,6 +219,9 @@
French translation by LeSanglier and Misty Soul&lt;br /&gt;
German translation by Bomber and Samuel Plentz&lt;br /&gt;
English proofreading by taws34&lt;br /&gt;
Forum moderated by Tim Davis&lt;br /&gt;
Forum moderated by Josh Kloos&lt;br /&gt;
Forum moderated by Travis Miller&lt;br /&gt;
&lt;br /&gt;
&lt;a href="http://rltiles.sourceforge.net"&gt;Monster tileset graphics by rltiles.sourceforge.net&lt;/a&gt;&lt;br /&gt;
Part of (or All) the graphic tiles used in this program is the public domain roguelike tileset "RLTiles".

8
AndorsTrail/res/xml/blackwater_mountain11.tmx
View File

@@ -55,17 +55,17 @@
</layer>
<layer name="Objects" width="30" height="30">
<data encoding="base64" compression="zlib">
eJzVVr1OwzAQTnHCyzDSF6BCQmKp+JF4AE/AVJhgS8uCQIgFVcDAAAuqeARGEIWZBwhDBhiYmeCs5JTj8Dl204VPshw5zn3+7s+JIhntGfv6vLDu+ua/wWgM0eLySRO0W9Oxc6vC9i825N1NomgnsfN+K7u/jL+fYrs9X/+mwNkXeD+VbD8T1qX9S6X9HnDppJglvRKGYHsQFzPiBGxcwThN7N9sgH0dVzq1oJfazAVbFK49+A5noxXjy/Eu6Pc5Qx1SopfD6OUcWenbczjTRUBcLslejCvVi749JnzX8HzTUOOI8KYlJ8Z5UBNPl3/varSPmF5NtEr53Ekq/xp01d8z3Hvw4jeosy/wDoU67Ab2NeRFYHx7Qj5/lXszVquc1ye/kTdPqvi68pnO0wLG11a/h7PFkDCG8z8HjBdLPmuSzyHaeA/yBdfL8+poQrvSfp7Pdf1Z8oFZ31a/7whzVjNj3eE6vbts/Yrio6ZeDKd0F7rg6leoh84cm8C7NUEt8/vXxmHuy44Qrz3g3A/kddVvTs4Q2qd9kZL4jlXFF8Ljc99z8FrCfvAK44GMR0svkOLu4w/qa5rXB2BzAf4L5+B5pfw/TAnPWRzes2jfonpp3zJYA75VGOvsvxTf83uF3y+udS3oRW3LrUI75XuL7b6iNiTbdP0Hc+exmw==
eJzVVjtOw0AQdbDNZSjJBYiQkGgiPhIHcAVUgQo6JzQIhGhQBBQU0KCII1CCCNQcIBRpOUKYlT3yY9hZ7yZpeNJqrfV63r6Z2RlHkY7mgn19WVl3ffPfYDSGaHH5ZBY0G/Ox8xiH7V+dkfcwjaKD1M47ie3+Mv5+S+z2fP2bE2dX4f2OdfsjZV3bv1ba7xBXlhazpldDn2z3kmJmXJCNOxqXqf2bHbKfJZXOTNGLNseKLYRrD7/j2Wjl+EpMFP0+Z6hDDnoljF7JMSp9e01nugmIyy3s5biiXvbtOfDd0/PDjBoHwJuXnBznXk08Xf59qtE+EHoz0Krlcyut/GvQjv+e4dmDl79hnV2Ft6/cw3ZgXWNeBse3U5PPI3FXJa9PfjPvOK3i68pnnOcFjq/t/p4uFkPDkM7/HjA+LPmcQT6HaJM1yBdSr8yrsyntavtlPtfVZ80HZn0//t0jzFnNzPeO17F32eoVQqvPDMOp9UIXXPWK9eAssUu8e1PcZdl/bRymX7aUeB0R53Egr+v+juEMoXXaFznEdxhXfCE8Pv1eQt4lrgefNF5gvFpqgRZ3H3+grzGvT8jmCv0XLtHzRvl/mAPPVRJes7BuoV6sWwZbxLdJY1v8l/J72Vdkf3GtZ4pe1rbeKLQj31di9xXa0Gzj+g+81rHK
</data>
</layer>
<layer name="Above" width="30" height="30">
<data encoding="base64" compression="zlib">
eJzdVr1OAzEMvippXwXmiomxQgJ1RmLmEeAVYGhhBMQzVFUFIz9i6dQNBh4D6TrDUBzlrLNcOz93JyHxSVYuOec+23HsK4oa/X4hYmn9uIJxY+L6Ej5t2tpKWHMoK94n9n6p6LeBZFcTXSk+e73ttaGwhqDxTtHn8TmvbDgQ9ox6uj2lwKvph2zi+qin2eNwaL0cD/zcxUDSxz1zeL8GOSPx5vojNnfffoA9j6aO8Yn1gqAxoPpo09xsn4/k7z18c0Jse4c9H0aOsQTUR5sk3pi/XUDinVVzelYOF+DvJcv/Kby7ypBrE+dFYCxvgPM28d5pcGe2VuLMeScC177xMgvkLcep9Wem5RXnlTA2XpzuF8jC+HOJ+T4M8Gr3N4S36hsx30P+ts3nhdHHjYnHmeezBOlM0HdpLBN4EbQ27MDzLpk/w/NLhrxGeKcD3ce20OpVSj63RVf53AWvls+5/TSXV8vnUD/NrZU5+fxt6j7Ke3BqrUQ7c/OK9lHag3+YTQ6016f0fXcn7xrkNLXpyMo2Omj3CLnxrlNItaCJjRpvDnJrFq1bf4HUf7P/hl8KjK1Z
eJzdVr1KBDEQ3iW5exWtFyvLQ1CuFqx9BH0FLe60VPEZjuPQ0h9srrpC0MKnUGGvVYtzQnbYITeTn90FwQ+GbJJJvpnJJLNZVqPXy1jMtW0X0K5UWJ/Dm44bWzBjBmXFe+fMzwX9NuDsaqLLxWcrXx8rmDEEjXeMvhuf48qGHWbNIJftKRleSd9nk6uPepI9Brvayn7f9k0MOH1cM4X5JcgRiberP3D6Zu8bWHOr6hgfaCsIGgOqjzZN1fr5cP5ew54jYtsLrHlVfIw5oD7axPGG/O0CHO+k6uNZvVf9E/D31Mn/McydJci5CvMiMJYXwHkZee8kmDNbCnF2eUcM17ayMvHkrYtDbc9MyiuXl8NQWXkG+QSZKXsuId8LD690f314qvYI+e7zt20+z5TcrlQ4zpjPX564c2eCvnNtGcGLoG/DBnxvkv49fD8kyGOAd9yXfWwL6b2Kyee26Cqfu+CV8jm1nqbyuvn8EbibvhrPocjT8vlb1XXUrcGxbyXamZpXtI7SGvzj2GRAa31M3Td38qpBTlOb9jRvo4F0j5Ab7zoF9xY0sVHiTUHqm0Xfrb9A7L/Zf8Mv4dGtTQ==
</data>
</layer>
<layer name="Walkable" width="30" height="30">
<layer name="Walkable" width="30" height="30" visible="0">
<data encoding="base64" compression="zlib">
eJztk1EOwCAMQrmC97/s/htFutJ+SdLEaN1jigvAevWqqdDc7/gOQr+6d9d32xvXgb2HLOM055byP5NcgLMr+clwT+OsB8a9qYvLfLA5JzebrS7uzUdXrmJPRlVupRRup9y5cnPVM2R39oersjvzPMl1+WBchHVFqqcTd+otqefCPDq5Ds+V+59mT3E/5pUnQA==
eJztk1EKwCAMQ3OF3f+y+y8a0zUt+zBQEK2+oPEB8Ny61VRo7necg9Cv7l31nfbGdWDtIcvYzbn1Ny7AuZX8ZLi7cdYD457UxWU+2JyTm81VF/fkoytXsSejKrdSCrdT7ly5ueodsjf7wlXZnXme5Lp8MC7CuiLV04479ZfUe2EenVyH58r7T7OnuC+MZCdR
</data>
</layer>
<objectgroup name="Mapevents" width="30" height="30">

4
AndorsTrail/res/xml/blackwater_mountain12.tmx
View File

@@ -55,7 +55,7 @@
</layer>
<layer name="Objects" width="28" height="27">
<data encoding="base64" compression="zlib">
eJy9VkFOwzAQdKhjPsAL+gUqDjwBopYDF4SEKtFLBRwozQPa5i/wA3gHP4iSOwd6B4/sVTYrO7RVy0gr08Te3dnZdVBq/3hOlbq39uLXpbWF/70NTo/i7wbs3YLFwjpLmxwOAcmPr4eA5MdXCaoLajfoqF8IJ6k7E9NvuYN+8FdopT6Pm2c8zxA/0m/G4v303HptwrFu7fNLZmO/ZsbF5vn3TTtmiN9XL84Lud9YH6/W75u1K+N+AyOWH+LSHs5T8oM/+Bh5P5NEqbm13NZN+z14/m79fHhfD4Iv8aQ9tXb7Qv0Jn1SvO59vZuMNfQ7QC/FyHa8B50UI9SnVAf7A8UnkTfZowj4IxIt06uKHeFPjeHKdLpJ27uQjFLO071b+fc5i8buM+JG/oWnrdJ60c+eI9V3hNee9sk7a+7i/qWk0rVKn40y7v8mIVxWx7ySuM9A3TV3JgNrnk7HzC8GL1kpvfoeUkb5DvEI3MUm/Sje1Q641O1919DBhpcO9S7liHs+EzRnniXjW9d0CcJdV6f6+Hcj/yDR3hbz7ax3XBUAt6WzsXqzZXYR4k0AN5qKPcjZDgNS1EDMcO4sVPUpariP9qgM1JB+lr1GXzoS/5oHnL+sF0DxIfpznNvMgv+PSj8wnpvM24PUK+SGOY/Gd5LO3S+yazbL0kQldZJ03BeaP+y39vQHdC9Fj8v+GUuS1aa/8F34BOCC8Eg==
eJy9VkFOwzAQdKhjPsAL+gUqDjwBopYDF4SEKtFLBRwozQPa5i/wA3gHP4iSOwd6B4/ilTcrO7RVy0grq449u7O7tqvU/vGcKnVv7cWNS2sL93sbnB7Fvw3YtwXzhXGW+hgOAamPj4eA1MdHCcoLcjfoyF8IJ2mzJ1a/5Q71A1+hlfo89nM8zpA+qt+M+fvpNeO1Cfu6tfOXzMZuzEzjm8ffN22fIX1fvbguxH5jOV4t75u1K9P8BkYsPvilNVyn1Ac+cIwczyRRam4tt3nTbg3m3y3Ph+N6EHpJJ62pdbMu1J/gpHzduXgz62/oYkC94C/X8RxwXYRQn1IewAeNTyJuskcT5iCQLqpTlz74m5pGJ6/TRdKOnThCPkv7beW+58wXv8tIH/ENTbtO50k7do5Y3xWu5rxX1kl7HeebGl/TKm3qWKVtI11ynuw7idcZ6BufVzKgdvFkbP9C6KKx0pvfIWWk7+Cv0N4n1a/SPneItWb7q44eJqx0uHcpVpzHM2Fzpnki5rreLQB3WZXu7+1A/EfG3xXy7q91vC4Ackl7Y/dize4i+JsEcjAXfZSzMwTIuhbiDMf2YkSPUi3XkX7VgRwSR+ly1FVnwl/ngccv8wXQeZD6uM5tzoN8xyWPjCdW523A8xXiIY1j8U7ys7eL75qdZcmRibrIPG8KnD/OW7p7A3UvRI/J/w2liGvTXvkv/ALidbyE
</data>
</layer>
<layer name="Above" width="28" height="27">
@@ -65,7 +65,7 @@
</layer>
<layer name="Walkable" width="28" height="27">
<data encoding="base64" compression="zlib">
eJztk1EKwCAMQ3sF73/Z/Q6xaZ51sA8DhTm0SWocETFu3TpcsfiOQ70zvgynfCh/FW+lwwHlU9q7WPXq+lv1oP+VrmpN5qs41dqdz07mv3xjc983n6Ob6Mrg5GhnlpVuis6Md0HzRnNHdFAvzhn3rZEemT9yV86c3LNUH/FI/Kl9itPVQrLVyVPnHuf3E8b+P9QDPiohRg==
eJztU0EKwCAM6xf8/2d3HdKmSeNgBwOFObRJalwRsW7dOlyRfMeh3hVfhVM+kL+Ot9PBQOVD2l1kvVx/WQ/1P9LVrZX5Is5uzXBOMv/lG9v7vvkY3YquCkyOJrPsdKtwZjxFlbdJhhxtEy/MGfatKT0qf8pdMXNiz6r6FI+KP7QPcbJalGw5eXLucX8/Qez/Qz1lnyEk
</data>
</layer>
<objectgroup name="Mapevents" width="28" height="27">

4
AndorsTrail/res/xml/blackwater_mountain21.tmx
View File

@@ -63,9 +63,9 @@
eJxjYMAEq5kZGP4zY5EgEsD05jJT1zwYINa8lTjUkGseLkBP97GxQ2hWIP2VjXTztgHZu6ngvmQWVLH3RIbfbWaEO7C5Dxv4AfSnIDumeCZQXxYWveTGZSVQXxUWvcT6bSAAAEGyIKo=
</data>
</layer>
<layer name="Walkable" width="20" height="12">
<layer name="Walkable" width="20" height="12" visible="0">
<data encoding="base64" compression="zlib">
eJwTZGBgEByGmIFMPfgAuhp8enGZJ4hHDSHzCLmbWPOIDQd0Ni41xIQdPvOI0YcvTGhhHqlmEmsnpWkUHQMARFQJXg==
eJwTZGBgEByGmIFMPfgAuhp8enGZJ4hHDSHzCLmbWPOIDQd0Ni415IQfqfrwhQktzCPVTGLtpDSNomMAXUwJbw==
</data>
</layer>
<objectgroup name="Mapevents" width="20" height="12">

4
AndorsTrail/res/xml/blackwater_mountain43.tmx
View File

@@ -63,9 +63,9 @@
eJxjYBg48J+ZgYGVFcLezI7KZkNiY9MXDRSPYYfII7OR1cD46GaA5ESh5oPsgbElgLQYlM2KJI+sjxg/eQL1eAGxNxAH4NBPDJtUe4mRI9VeQWDYfWeD8H8AaU4sYYkMwki0i1L/+gLD1weI/ekYzplAnIVEU8NeIXbMsCXWbchy74lgkwKItZdSgG4WNe19BFWPXA7A2P+R5J4xI8LJCkgns1BmLz6ALz4I2dsJ5HchiYHY3VRwWzrQjAw8aXUlFjtWUzFMRqq9tAbUTLfEmv8fKS9JsBJWT017SVEPA+HsEIxPnhb2kgLItdcezV++SHx0ORhQxONfUFkJEzvLjr19RQ2Abs4VdkSaussO4eNTr4gnPnH5G5s5l9nx86kFaFmfkqIWPVwJhTO17KVEPSntG1LbQrQuPwcTAACbuHkL
</data>
</layer>
<layer name="Walkable" width="30" height="30" visible="0">
<layer name="Walkable" width="30" height="30">
<data encoding="base64" compression="zlib">
eJztk1EOgDAIQ7nC7n9Zf81CS2GyGF0T4nRhDzocZjZObAlLrOdvSCrXxHWmRq+2ndyOfpG6uZGfHdzoLOSJ4hfLU7jov6mw/8ad81dq9vbQe1XMn6e47C4Y1ztHqTnLfSIOF99ZN5fxVlXl3mfVe7I91efIn4qq3I5+53yUE81Kdq6Yvsp9q8+7pfTQFRfIBSNV
eJztk10OwCAIg7mC97/sXhdDy58Ys9mEzM2wDyoOERk3toQE1vM3JC9XnOtIjVptO7kd/SJ1cy0/O7jWv5AnHr9YnoeL7k2G/TfunF+pWdtD71kxf1Zx2VlE5p/dxQp3RVwuPrNuLuNVleW+Z1V7sj2vz5Y/GWW5Hf3O+SjHmpXoXDF9lXuqz7vl6aErHj6MI2Y=
</data>
</layer>
<objectgroup name="Mapevents" width="30" height="30">

4
AndorsTrail/res/xml/blackwater_mountain45.tmx
View File

@@ -63,9 +63,9 @@
eJxjYMAN/jPjkURSk8nOwGDBjuBvZkfQm9mxq4OJ5QKxB5IaEHiPZi9M3IMdU4yQW7GJg8Tq2BgYklnI00uJvcQAXHpFof5XRgtXEADxfzATtjcCqm8WG2Y4o/NxuWUVG37349NLLMCn9wo7fj6t7KUVAABiOSqu
</data>
</layer>
<layer name="Walkable" width="15" height="15" visible="0">
<layer name="Walkable" width="15" height="15">
<data encoding="base64" compression="zlib">
eJwTZGBgEMSBGfDIEcK01ouuBhtAF0fXi00NMXpxqSGkVxCPGC6/DCa9DDjE0AG+eBlovbjikBh/EWMvORgA610H+Q==
eJwTZGBgEMSBGfDIEcK01ouuBhtAF0fXi00NMXpxqSGkVxCPGC6/EONvYvRSYi82cXwAX7wMtF5ccUiMv4ixlxwMAArECAo=
</data>
</layer>
<objectgroup name="Mapevents" width="15" height="15">

8
AndorsTrail/res/xml/blackwater_mountain52.tmx
View File

@@ -63,12 +63,12 @@
eJxjYEAF/5kZCILBpAYk/x6qZjM7YTNYWSm3hxx5YuwgVw0fFn9T2y5cYYusBjls0dXD1BSzYKqFgS+MhN0DAh+onG7INQOXGvT4oGd+ITcMYfFCLAAAnV4kLw==
</data>
</layer>
<layer name="Walkable" width="9" height="30" visible="0">
<layer name="Walkable" width="9" height="30">
<data encoding="base64" compression="zlib">
eJwTZGBgEETCDGh8bHg4q8GnDh0QowZdHTnyhNQMhnCjNGyJDR9iw4hcs+hlBjl24QPUdjOhuAMAM9kLfg==
eJwTZGBgEETCDGh8bHg4q8GnDh0QowZdHTnyhNQMhnCjNGypGcakqCNVnlpmkGMXPkBtNxOKOwBnYQug
</data>
</layer>
<objectgroup name="Mapevents" width="9" height="30">
<objectgroup name="Mapevents" width="9" height="30" visible="0">
<object name="north" type="mapchange" x="128" y="0" width="32" height="32">
<properties>
<property name="map" value="blackwater_mountain44"/>
@@ -82,7 +82,7 @@
</properties>
</object>
</objectgroup>
<objectgroup name="Spawn" width="9" height="30">
<objectgroup name="Spawn" width="9" height="30" visible="0">
<object name="restless_dead_1" type="spawn" x="32" y="736" width="224" height="160"/>
<object name="blackwater_guard2" type="spawn" x="96" y="256" width="128" height="160">
<properties>

2
AndorsTrail/res/xml/wild2.tmx
View File

@@ -55,7 +55,7 @@
</layer>
<layer name="Objects" width="20" height="20">
<data encoding="base64" compression="zlib">
eJytVLENwjAQ/IQkPRIFLRX0IEBUVC4QFUUGQMAEMAC7MAIFI7BA9kCCHv4Vv2weOySYk6zYsf98f34b4B0qAshTgEkKXkz1PH2PiVk7cMTMkW8flf0qzp6YY36JZ6v8LpHzkph1NrcrzqePcNOcG+Qca73n5FODPfbpY43kiwTzV7VQ2Pv68v0Vvnx9oDoqHD4ybH2r7Dsfnz2B8/Sd+xr5ujX0Ksca1ss1OYoBFp6ziUR8XtMjpfmGsfmXYWwbW8fatw6u6MUM+Q6J4aTYg6hBHlNepJNysv0r9Dz5fHLUL+EufHjguJ+WZ6l0PxTsv4qq34wmoLdC/eF+Ebj2pL6m98NGIfSFcG0xdif8C30L8tTt3ws9rSdM
eJytVDFOAzEQ3Au+9EgUtKmSHhQiqlQuUKoU9wAUeAF5QLo8JE+gyBPygXsAP0BK+rDLeXXDxnucBCOdbJ+949nx2kQ/EQuiqiR6KMnFLM1Luwnt2gnEHELTzpnvrWj6XZwjM6f8Fuerpl0w5z6065A7F2f1IT4T54o5p0nve7jUgGPs78Olxo35h/xd31+B+0q+24wOxO6XeYTn68HhkDqqMz6iPsVymOdAb/XsBZqnd+7PzHfbUW+KmFmjerUm7wdET87ZFCa+6rHn976J727Q/hty7DV/N7BvH4j/j8y3Di2nxK7NuehY8hKdkhP6V6d58dmri6Px4cTjcdmcZUx9Dx89a039j0X+zbDatP5srWPtSD/+w/2SHLT2rL4Z3Df7JghQt70ztdHn3TUPmPsLx74a/7y3D5HTrKjKvH9f+z00Gg==
</data>
</layer>
<layer name="Above" width="20" height="20">

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
View File

@@ -20,7 +20,7 @@ public final class AndorsTrailApplication extends Application {
public static final boolean DEVELOPMENT_VALIDATEDATA = false;
public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
public static final int CURRENT_VERSION = 20;
public static final String CURRENT_VERSION_DISPLAY = "0.6.9b1";
public static final String CURRENT_VERSION_DISPLAY = "0.6.9b2";
public final WorldContext world = new WorldContext();
public final WorldSetup setup = new WorldSetup(world, this);

9
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
View File

@@ -133,11 +133,16 @@ public final class MainActivity extends Activity {
world.model.player.inventory.addItem(itemType);
itemType = world.itemTypes.getItemTypeByTag("shadow_slayer");
world.model.player.inventory.addItem(itemType);
itemType = world.itemTypes.getItemTypeByTag("pot_blind_rage");
world.model.player.inventory.addItem(itemType, 10);
itemType = world.itemTypes.getItemTypeByTag("clouded_rage");
world.model.player.inventory.addItem(itemType);
updateStatus();
Toast.makeText(MainActivity.this, "DEBUG: added items", Toast.LENGTH_SHORT).show();
}
})
,new DebugButton("bwm", new OnClickListener() {
})*/
/*,new DebugButton("bwm", new OnClickListener() {
@Override
public void onClick(View arg0) {
Player player = world.model.player;

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
View File

@@ -33,6 +33,8 @@ public final class RangeBar extends RelativeLayout {
}
public void update(final Range range) {
progressBar.setProgress(0); // http://stackoverflow.com/questions/4348032/android-progressbar-does-not-update-progress-view-drawable
progressBar.setMax(range.max);
progressBar.setProgress(Math.min(range.current, range.max));
progressBarText.setText(range.toString());