diff --git a/AndorsTrail/res/values/content_monsterlist.xml b/AndorsTrail/res/values/content_monsterlist.xml index e0240a8c1..a01e3fb13 100644 --- a/AndorsTrail/res/values/content_monsterlist.xml +++ b/AndorsTrail/res/values/content_monsterlist.xml @@ -438,7 +438,7 @@ {erumen_4|monsters_rltiles2:115|Strong Erumen Lizard|erumen_2|1x1|79|10|5|3|125|||2|9|80|4|erumen|||||||||}; {erumen_5|monsters_rltiles2:115|Vile Erumen Lizard|erumen_3|1x1|89|10|5|3|150|||2|9|80|4|erumen|||||||||}; {erumen_6|monsters_rltiles2:117|Tough Erumen Lizard|erumen_3|1x1|91|10|5|3|125|||2|9|90|8|erumen|||||||||}; -{erumen_7|monsters_rltiles2:117|Hardened Erumen Lizard|erumen_4|1x1|93|10|5|3|125|||2|9|90|12|erumen_b||||||{{bleeding_wound|3|3|50|}}|}; +{erumen_7|monsters_rltiles2:117|Hardened Erumen Lizard|erumen_4|1x1|93|10|5|3|125|||2|9|90|12|erumen_b||||||||{{bleeding_wound|3|3|50|}}|}; {plaguesp_1|monsters_rltiles2:61|Puny Plaguecrawler|plaguespider_1|1x1|55|10|5|3|80|60|3|1|6|140||plaguespider||1||||||{{contagion|1|5|70|}{blister|1|5|20|}}|}; {plaguesp_2|monsters_rltiles2:61|Plaguecrawler|plaguespider_1|1x1|57|10|5|3|80|60|3|1|6|140||plaguespider||1||||||{{contagion|1|5|70|}{blister|1|5|20|}}|}; @@ -489,6 +489,11 @@ {toszylae|monsters_liches:1|Toszylae|toszylae|1x1||10|5|5||||||||toszylae|toszylae||||||||}; {toszylae_guard|monsters_rltiles1:20|Radiant guardian|toszylae_guard|1x1||10|5|5||||||||toszylae_guard|toszylae_guard||||||||}; {thorin|monsters_rltiles1:66|Thorin|thorin|1x1||10|5|5|||||||||thorin||||||||}; + +{lonelyhouse_sp|monsters_rats:1|Basement rat|lonelyhouse_sp|1x1|79|10|5|3|125|||2|9|180|4|lonelyhouse_sp|||||||||}; +{galoduil|monsters_men:4|Galoduil|galoduil|1x1||10|5|5||||||||shop_galoduil|galoduil||||||||}; +{algangror|monsters_rltiles1:68|Algangror|algangror|1x1||10|5|5|||||||||algangror||||||||}; +{remgard_bridge|monsters_men2:4|Bridge lookuot|remgard_bridge|1x1||10|5|5|||||||||remgard_bridge||||||||}; diff --git a/AndorsTrail/res/xml/loneford2.tmx b/AndorsTrail/res/xml/loneford2.tmx index 15e07fcea..7c92e77a1 100644 --- a/AndorsTrail/res/xml/loneford2.tmx +++ b/AndorsTrail/res/xml/loneford2.tmx @@ -124,6 +124,12 @@ + + + + + + diff --git a/AndorsTrail/res/xml/lonelyhouse0.tmx b/AndorsTrail/res/xml/lonelyhouse0.tmx index 7f997731f..82ecb4f19 100644 --- a/AndorsTrail/res/xml/lonelyhouse0.tmx +++ b/AndorsTrail/res/xml/lonelyhouse0.tmx @@ -71,7 +71,7 @@ - + @@ -82,6 +82,12 @@ - + + + + + + + diff --git a/AndorsTrail/res/xml/lonelyhouse1.tmx b/AndorsTrail/res/xml/lonelyhouse1.tmx index 8ed4fbabc..7aba94282 100644 --- a/AndorsTrail/res/xml/lonelyhouse1.tmx +++ b/AndorsTrail/res/xml/lonelyhouse1.tmx @@ -76,6 +76,19 @@ - + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountaincave1.tmx b/AndorsTrail/res/xml/mountaincave1.tmx index ef849b05c..993960c28 100644 --- a/AndorsTrail/res/xml/mountaincave1.tmx +++ b/AndorsTrail/res/xml/mountaincave1.tmx @@ -55,7 +55,7 @@ - eJxjYMAPHJkYGAKZIGxBNgKKiQAg80KB2IWJPP3/mVH5wUBz3JDcqEymucgA3c+UmonNz8hm+jJj6kEGhPyMbKYEKwNDLFA9GyvpboSZ18FCml5C5sEALP3sAJrvDJRzIiFcYWEIAk5QvcjhCZJ3JcE8UBgGQdUHQcMzlAlhdhgW9yMDQukXZj4yDsGhB2Y3uXkCBkyYEHZjSx+UAEYW3JgUsIMF1Y2hSHEpApQTxWHeZ0ZMMVi+6EAyEzkukcPzC5J+bGaNAvIAADViHRM= + eJxjYMAPHJkYGAKZIGxBNgKKiQAg80KB2IWJPP3/mVH5wUBz3JDcqEymucgA3c+UmonNz8hm+jJj6kEGhPyMbKYEKwNDLFA9GyvpboSZ18FCml5C5sEALP3sAJrvDJRzIiFcYWEIAk5QvcjhCZJ3JcE8UBgGQdUHQcMzlAlhdhgW9yMDQukXZj4yDsGhB2Y3uXkCBkyYEHZjSx+kgitI+Z2RBTcmBexgQXVjKFJcigDlRHGY95kRUwyWLzqQzESOS+Tw/IKkH5tZo4A8AAAIIh3t @@ -87,8 +87,9 @@ + - + diff --git a/AndorsTrail/res/xml/mountaincave2.tmx b/AndorsTrail/res/xml/mountaincave2.tmx index 983e82b50..b5b6a649c 100644 --- a/AndorsTrail/res/xml/mountaincave2.tmx +++ b/AndorsTrail/res/xml/mountaincave2.tmx @@ -81,7 +81,11 @@ - + + + + + diff --git a/AndorsTrail/res/xml/mountainlake0.tmx b/AndorsTrail/res/xml/mountainlake0.tmx index f151c8693..564dbf9b2 100644 --- a/AndorsTrail/res/xml/mountainlake0.tmx +++ b/AndorsTrail/res/xml/mountainlake0.tmx @@ -48,7 +48,7 @@ - + eJzVlMERAiEMRQHtYGnCvukAO9AOLMFGdjMuMxDJ8v3iwcM77eZNSOAn71wCuW5cXMvN+PeusJyI7xyce/iWU8B61D75Hrfap29Zwsupe9Y+ZCaFJbz3LGexXCOfoHuOuw+dB4q4e7tgfUd3ZbZPyDuzfEy/37wrIVfnQF2W75P63vtj5mS54iRfecvsHtE9sGft+eqMmeGrM8bKAHSvOmNKJrJ7tXJl5ERdo6w6uiNsFrD596++9AMf40TuoFWXPZ+lbF1hBRxuC1g= @@ -63,7 +63,7 @@ eJztlcEKgCAQRI3yg+vP+rKCuhd7iELUmYEtPPROgTaj466GoHH04g+Avbu/56E8bxV80VwbXwQ9tGc1E0Zvir56hmmOEWujbJDf5cF4Gc8ayGmlKNkgrVZIa3arZMLg3aeeemr/faVlvJUb2wuMnmcdt36uHrnl1lW6nxg/lJm6XuYMPN8Dldr9/FPnBOXxL3s= - + eJzlkssJADAIQ13B/ZfttQhq/BWhAW/1NWqYiDhYt6K9L3kdLJQX+RNlSWV5GlfbPcpDPHveUZ/V+3o9GV5XvrIzoTv8ibfNm9SmObmZNeXP0gR3U36mcpT1qb2vsCxtyGClDvzpIGk= @@ -82,6 +82,39 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake1.tmx b/AndorsTrail/res/xml/mountainlake1.tmx index ea764d0ff..4312d682b 100644 --- a/AndorsTrail/res/xml/mountainlake1.tmx +++ b/AndorsTrail/res/xml/mountainlake1.tmx @@ -82,6 +82,49 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake10.tmx b/AndorsTrail/res/xml/mountainlake10.tmx index e6561a014..e6aff6556 100644 --- a/AndorsTrail/res/xml/mountainlake10.tmx +++ b/AndorsTrail/res/xml/mountainlake10.tmx @@ -84,10 +84,63 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/AndorsTrail/res/xml/mountainlake10a.tmx b/AndorsTrail/res/xml/mountainlake10a.tmx index eb9afbc02..6bae1437f 100644 --- a/AndorsTrail/res/xml/mountainlake10a.tmx +++ b/AndorsTrail/res/xml/mountainlake10a.tmx @@ -63,7 +63,7 @@ eJxjYKAcFLIyMBSxQtgwmpagiUI7nNH0w9yP7A9qgkIqm4nuXmzmU+IPfO7FZR+1zKcGwBUe1LKX1u7HZSc106YJI3HqjIDqNrKQZ4cLkXY4EamOEvCfmXZmW0DD5z2N7EAvr0bBKMAFABHHEAc= - + eJwTZGBgECQDowNyzCDFDlqYSQhQYr4gFhqXOmq4nRphR4meoa6eVD2kqCPHDkrSA7Xcj8seWsQDqXpIdQ817cCln1I3kQqo4W9kcUrMJ8cv5Jg/ivFjAK7OGbQ= @@ -82,6 +82,22 @@ - + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake11.tmx b/AndorsTrail/res/xml/mountainlake11.tmx index 0d7287381..cfabfea2e 100644 --- a/AndorsTrail/res/xml/mountainlake11.tmx +++ b/AndorsTrail/res/xml/mountainlake11.tmx @@ -63,7 +63,7 @@ eJxjYBgFtAAfmAfGzvd0tncg7ASB/1Syk9R4AtlbyMrAUMQK4SOzSbGT1DAj5N+NLJSbQYyeQjS/EuN3fPYqM2GKqTBRJ02B7CUmXAiBRlZUdhMeP8Pi9iAWe6nhFmzhBQLUyoP48gO63SY43EIOQE4j1AgncuylBJDqZmrZSyoYjPZuwiMnDgzXjWTqBQFq5At6pkdiwWB00yigHwAArcwmcg== - + eJztkkEOACEIA/sF//9ZT5sYI1qq4B4k4UYZSy0AyuvXh/qrbF4md1TZN76Rj6ptdezd2DlvThns3iu7czbDvsPyyXgBxnsUrmfHDnd2ZzYnK7Odeyt+PWzF84obWaf8thpW651l/rR3l8Jlcorgrni32BFcK+e/dwUalSXs @@ -82,6 +82,47 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake12.tmx b/AndorsTrail/res/xml/mountainlake12.tmx index a58c544d5..9ba4f1e6c 100644 --- a/AndorsTrail/res/xml/mountainlake12.tmx +++ b/AndorsTrail/res/xml/mountainlake12.tmx @@ -82,6 +82,24 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake13.tmx b/AndorsTrail/res/xml/mountainlake13.tmx index f7f3e0ed3..2b0fcb86c 100644 --- a/AndorsTrail/res/xml/mountainlake13.tmx +++ b/AndorsTrail/res/xml/mountainlake13.tmx @@ -82,6 +82,39 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake13a.tmx b/AndorsTrail/res/xml/mountainlake13a.tmx index 2a0547be3..03b86e097 100644 --- a/AndorsTrail/res/xml/mountainlake13a.tmx +++ b/AndorsTrail/res/xml/mountainlake13a.tmx @@ -55,7 +55,7 @@ - eJzVVMENwjAMtKpmIxZoSxFfCkU8kZgAEPzhxUh82YENYBAcaivXkKQ84SQrauNzksvFRETzjGjCMeN45vTGxhDtOXam+97yWPH8UvIQBfw7cd7ZuBF5NcciwG05So4xx1XWf8gY45Hsu5G9tzJfSq0UL1TDoslcDPH+GZWnlWqfykddLWpP+1iNInO5qrPV9mD69+d7Cr2Wm8+699zVD/kR7/4iuSOok/JyK2dZc/5UOCvTfdvw6yvmX+rhr4l81FT5RzPM9fdggfcbOmuMb4Fv4RffA3qyhPOmfKwIedLXPLYm6qi9Eu89xkfPqB9tr7vl/f4b4+Kc9kbdQ8wXL58fN+s= + eJzVVEEOwiAQ3DTwIz/Q1hqvttZ4NPEFavSuJ5/k1T/4g/oQF7uEKQL1qJNMamVngWEKEVGTEc2YC+ZT0RtbTXRg7nX/vuNnyeMrqUPk8N+Z6y7aPVFXMZcBbcssmFPmTebvVFpHsu5a1t7KeCG9UrpQD4M6cxzT/TNKzyvrfaoefTWoPO9jPfLM1VqfjbdHPTw/P1OYNaU/+z6U6x/KI579VWon0CeV5Vb2suH6uWjWun839PtbNF/64c+JevTU6k96XOuvwQDPN7TXmN4Av4Vf/B4wkwXsN5Vji1Amfc9jc6KP9q7Ec4/pMTM2j+auu6vh/RvT4lin3G+zhlguXgl7ODA= @@ -63,7 +63,7 @@ eJxjYMAEhaxYBIGgCIc4IZAM1NdEht5GMvWRCz4wk6/3/wjT+x5NrxsF8RRGxzgmBCKAbkmAYlwAJOcxiNxMCzAU8wJ6mqQX2MgyMPYSAgA63w/0 - + eJwTZGBgEIRiZCBIIiZXH7q95LqBGvrJcftI1UtKOGMDxKYZXICQfmxqyXE7OWFFCFBiBiVuGArpil56KQ0fcvQjq8PFpmaaAgAQ5BJ3 @@ -82,6 +82,17 @@ - + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake2.tmx b/AndorsTrail/res/xml/mountainlake2.tmx index 5f26d0d23..916eedd30 100644 --- a/AndorsTrail/res/xml/mountainlake2.tmx +++ b/AndorsTrail/res/xml/mountainlake2.tmx @@ -63,9 +63,9 @@ eJxjYBgFwxUUstLerI0s1LODEkBNv9ICYHMfethtYiZszkZm6vu1cQDC7jMj/e2kBwAAMEYGnA== - + - eJwTZGBgEByCGBkQqw6bWnQ5Quaiq8NnFzaAy35BLPL43EXIjejyxAJ85lHqV0L+wiWGzyxC5hFrBjnmkQqo6T5C6ZfSfEVKHiM1/1Fi3mDHABebDmo= + eJwTZGBgEByCGBkQqw6bWnQ5Quaiq8NnFzaAy35BLPL43EXIjejyxAJ85lHqV/QwxBU/pJiFL5xIMYNY91ECaO0+QumClHxFSh4jNf9RYt5gxwBtqw6M @@ -82,6 +82,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake3.tmx b/AndorsTrail/res/xml/mountainlake3.tmx index 48ca1f207..610fcc39f 100644 --- a/AndorsTrail/res/xml/mountainlake3.tmx +++ b/AndorsTrail/res/xml/mountainlake3.tmx @@ -63,7 +63,7 @@ eJxjYBh8oIh1oF1AOShkpa4/NrJQz6yhAJDDb6ikB5ibkd1eSEW3g8xKpnFYNALNL0ayg1Zh34hkbhMN7PjMiCn2BU3sAzP17UUH/2lkB7JfYHYoM5FuDrZwQgawMEL2Bzn24AP/sdhBTQDyw3sCdhCTzvH5G9lcZDZ6+JJrjwoTwg/odmAD1Mi374mID+TyDl+dR+36EJv5pLppFIw8AAATACTZ - + eJztk1EKACEIRL1C97/sfi0ssZPKjCHUgBCVPjUbZjaAvULnCvtqB0PN8dQ1NuoLWlfVoKgLxVByGDH/wYsV3YvWwtzN1hbhsDO+yqUqdheGqocnMViO5z+rgvHHyWhmrHhKZXuA/BUMJid2Ttm3v4btAXMOIok= @@ -82,6 +82,57 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake4.tmx b/AndorsTrail/res/xml/mountainlake4.tmx index 67f9ad70c..24f725f26 100644 --- a/AndorsTrail/res/xml/mountainlake4.tmx +++ b/AndorsTrail/res/xml/mountainlake4.tmx @@ -82,6 +82,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake5.tmx b/AndorsTrail/res/xml/mountainlake5.tmx index e9f4cbd34..4ac1c267d 100644 --- a/AndorsTrail/res/xml/mountainlake5.tmx +++ b/AndorsTrail/res/xml/mountainlake5.tmx @@ -63,7 +63,7 @@ eJxjYKAMFLEyMBSyEi9ODbCRhTbmIgNnKrs9FWheGg4zPzNS166hDj4wQ2hjJuL1XCExTcDsgIH3zJjipNiPDHDpe49ktgmSmv/MmGqxAUJpEt1eEzzuJ9ZOagJ0O8kNX1LAeyz+RLcXVE4V0aiswgaQy0V62IurfKYFIFSWgewFld+wMCcm7Mkp74mtfzYB04c4CyreSCBvUFpef0HTj2weSI6JjTLzRwH5AADkWx4y - + eJztklEKACAIQ72C979sX0GIxNRhBQ32pfbUVBFRwFNILsurTjAtX5y8E31Eaxl9IHmsvUSYDJ6dIfovnUy0psL0eJ1My3+Fibxh4xU+WufFdqrOmNk5qso9ZO6Dyfu+3wOD4R9Z @@ -82,6 +82,57 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake6.tmx b/AndorsTrail/res/xml/mountainlake6.tmx index e038c0f24..7f03ecdd0 100644 --- a/AndorsTrail/res/xml/mountainlake6.tmx +++ b/AndorsTrail/res/xml/mountainlake6.tmx @@ -63,7 +63,7 @@ eJxjYCAeFLIyMBSxQuhRgB/AwoqagBrmIcfdYHAfejiRm7bQ/UWLNEqu/6hhHin+2chCvFpKAa5wJ8cNzkOgXBnMbqRGvFOr3Bps5QwMYMtHpJrnTKc6EJafkGlCgFruolZ5Sqj8wycPAKvjFmc= - + eJy9klEOACAIQr1C979sv65lgLjc/MMXmCsiFuhcSMuyXM7py2XeapLV4Z1zXVblQ2WhPCwPVdZN5GJ8vXKp+698ufua0CkcNueUd+Wmf7LYDB1Wh4tqgqN6yzO3jI4v50+qbMp7js65qY53xHT27t662hsZlBqA @@ -82,6 +82,34 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake7.tmx b/AndorsTrail/res/xml/mountainlake7.tmx index 0168fb0d0..99ee7facd 100644 --- a/AndorsTrail/res/xml/mountainlake7.tmx +++ b/AndorsTrail/res/xml/mountainlake7.tmx @@ -63,7 +63,7 @@ eJxjYKAt+MBMmf7/VNJfyEqe/vck2g+yp4gVN5+QXhgA6UHnUwqoYQYhQG440wKA/OtMhnuo5QdqxRkpaQgGBjoeBtp+YgEAN7wM/Q== - + eJzdUrENADAI4gX/f7Z7gwiOmnQwgKBpAajDDwb+F8MTfVcqE+OwvsujMjq7KMzxUdmSW27zOzdz5zPepGW8xNvZIdG7/O0/uOL/AN3QEDU= @@ -82,6 +82,38 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake8.tmx b/AndorsTrail/res/xml/mountainlake8.tmx index 6fe3b3065..0f901a377 100644 --- a/AndorsTrail/res/xml/mountainlake8.tmx +++ b/AndorsTrail/res/xml/mountainlake8.tmx @@ -63,7 +63,7 @@ eJxjYMAEhawMDEWsWCSoDA6xQOgTQPoKlL2RBSGOCxTicdtGNL0HSTAL5Gd0swnppwY4QYYdMHci08TGGb7wA4FAoHwQHeIfF4C5D5s7YH5EjucOIsMPW/xiA+hpiBRAi3xDDTOJ9Tu5ZsMAcl4eSADLD9jyBaHyhRhAaZyQUoZRYhYIUKsMo0edQCrAFpfklKdDBeBL1+SARhzl62A0s4kVQQ8VAAD/kSKa - + eJzNkskRACAIxGiB/pv17zGCbFRm+EkMh5uZ2xheTCWLYhJ+Khbh97rnyNud3ywUf/bsm35ZZnSGO+bJ3czqol6ZugpvFRUe4Zetp1jRm1HsQ81W8Qhfon+CefMOft4/kQ2faSCL @@ -71,7 +71,7 @@ - + @@ -82,6 +82,59 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/mountainlake9.tmx b/AndorsTrail/res/xml/mountainlake9.tmx index 0317aaf8e..92d6f6e37 100644 --- a/AndorsTrail/res/xml/mountainlake9.tmx +++ b/AndorsTrail/res/xml/mountainlake9.tmx @@ -82,6 +82,57 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/remgard0.tmx b/AndorsTrail/res/xml/remgard0.tmx index 44a10159b..1b0228c93 100644 --- a/AndorsTrail/res/xml/remgard0.tmx +++ b/AndorsTrail/res/xml/remgard0.tmx @@ -81,28 +81,28 @@ - + - - + + - + - + - + - + diff --git a/AndorsTrail/res/xml/remgard1.tmx b/AndorsTrail/res/xml/remgard1.tmx index 36a0060d0..c1d87c08c 100644 --- a/AndorsTrail/res/xml/remgard1.tmx +++ b/AndorsTrail/res/xml/remgard1.tmx @@ -75,38 +75,36 @@ - + - + - + - + - - diff --git a/AndorsTrail/res/xml/remgard2.tmx b/AndorsTrail/res/xml/remgard2.tmx index 9a572020d..092840a1b 100644 --- a/AndorsTrail/res/xml/remgard2.tmx +++ b/AndorsTrail/res/xml/remgard2.tmx @@ -75,19 +75,19 @@ - + - + - + diff --git a/AndorsTrail/res/xml/remgard3.tmx b/AndorsTrail/res/xml/remgard3.tmx index 76f533b0b..db0ee6b9c 100644 --- a/AndorsTrail/res/xml/remgard3.tmx +++ b/AndorsTrail/res/xml/remgard3.tmx @@ -78,16 +78,16 @@ - + - + - + @@ -105,7 +105,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard4.tmx b/AndorsTrail/res/xml/remgard4.tmx index db72c0d94..727eeaf47 100644 --- a/AndorsTrail/res/xml/remgard4.tmx +++ b/AndorsTrail/res/xml/remgard4.tmx @@ -75,19 +75,19 @@ - + - + - + diff --git a/AndorsTrail/res/xml/remgard_armour.tmx b/AndorsTrail/res/xml/remgard_armour.tmx index 683310bec..bd67f45ee 100644 --- a/AndorsTrail/res/xml/remgard_armour.tmx +++ b/AndorsTrail/res/xml/remgard_armour.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard_barn.tmx b/AndorsTrail/res/xml/remgard_barn.tmx index 90abbdadd..f88480ffe 100644 --- a/AndorsTrail/res/xml/remgard_barn.tmx +++ b/AndorsTrail/res/xml/remgard_barn.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard_church.tmx b/AndorsTrail/res/xml/remgard_church.tmx index 21808d396..310c6a743 100644 --- a/AndorsTrail/res/xml/remgard_church.tmx +++ b/AndorsTrail/res/xml/remgard_church.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard_clothes.tmx b/AndorsTrail/res/xml/remgard_clothes.tmx index dce9d899a..25ea18b6d 100644 --- a/AndorsTrail/res/xml/remgard_clothes.tmx +++ b/AndorsTrail/res/xml/remgard_clothes.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard_farmer1.tmx b/AndorsTrail/res/xml/remgard_farmer1.tmx index 68f6b4237..cf95d5be5 100644 --- a/AndorsTrail/res/xml/remgard_farmer1.tmx +++ b/AndorsTrail/res/xml/remgard_farmer1.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard_farmer2.tmx b/AndorsTrail/res/xml/remgard_farmer2.tmx index f34fc3d80..0a4632c50 100644 --- a/AndorsTrail/res/xml/remgard_farmer2.tmx +++ b/AndorsTrail/res/xml/remgard_farmer2.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard_farmer3.tmx b/AndorsTrail/res/xml/remgard_farmer3.tmx index 4a4698234..56a39c7e5 100644 --- a/AndorsTrail/res/xml/remgard_farmer3.tmx +++ b/AndorsTrail/res/xml/remgard_farmer3.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard_prison.tmx b/AndorsTrail/res/xml/remgard_prison.tmx index 02e417e89..c42918005 100644 --- a/AndorsTrail/res/xml/remgard_prison.tmx +++ b/AndorsTrail/res/xml/remgard_prison.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard_school.tmx b/AndorsTrail/res/xml/remgard_school.tmx index ca67d94b6..3a4901626 100644 --- a/AndorsTrail/res/xml/remgard_school.tmx +++ b/AndorsTrail/res/xml/remgard_school.tmx @@ -71,8 +71,8 @@ - - + + diff --git a/AndorsTrail/res/xml/remgard_tavern0.tmx b/AndorsTrail/res/xml/remgard_tavern0.tmx index 11616ded0..0325f5d24 100644 --- a/AndorsTrail/res/xml/remgard_tavern0.tmx +++ b/AndorsTrail/res/xml/remgard_tavern0.tmx @@ -72,13 +72,13 @@ - + - + - - + + diff --git a/AndorsTrail/res/xml/remgard_tavern1.tmx b/AndorsTrail/res/xml/remgard_tavern1.tmx index a1e49edd9..48f3d2b21 100644 --- a/AndorsTrail/res/xml/remgard_tavern1.tmx +++ b/AndorsTrail/res/xml/remgard_tavern1.tmx @@ -69,10 +69,10 @@ - + - - + + diff --git a/AndorsTrail/res/xml/remgard_villager1.tmx b/AndorsTrail/res/xml/remgard_villager1.tmx index 821409fe3..09a6b8463 100644 --- a/AndorsTrail/res/xml/remgard_villager1.tmx +++ b/AndorsTrail/res/xml/remgard_villager1.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard_villager2.tmx b/AndorsTrail/res/xml/remgard_villager2.tmx index 358fa242d..49db41349 100644 --- a/AndorsTrail/res/xml/remgard_villager2.tmx +++ b/AndorsTrail/res/xml/remgard_villager2.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard_villager3.tmx b/AndorsTrail/res/xml/remgard_villager3.tmx index c0da650d9..b2d0ee78a 100644 --- a/AndorsTrail/res/xml/remgard_villager3.tmx +++ b/AndorsTrail/res/xml/remgard_villager3.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard_villager4.tmx b/AndorsTrail/res/xml/remgard_villager4.tmx index 26ffc959c..48313ec36 100644 --- a/AndorsTrail/res/xml/remgard_villager4.tmx +++ b/AndorsTrail/res/xml/remgard_villager4.tmx @@ -55,12 +55,12 @@ - eJxjYCAdbGaH0JwsDAyG7AhxEB8EgtlQ1XuyMjBoAbEkUN4Rqn4iG4Q/C0gnA3EJkh4rVgQGgTYgvRCkDqh+FVRdC5odpIC7QL0XoOaBgB4rppouJPPfIrFBaqVYMfV0k+keAAHdDPs= + eJxjYCAdbGaH0JwsDAyG7AhxEB8EgtlQ1XuyMjBoAbEkUN4Rqn4iG4Q/C0gnA3EJkh4rVgQGgTYgvRCkDqh+FVRdC5odpIC7QL0XoOaBgB4rppouJPPfoqmVYsXU002mewAlQQ1i - eJxjYCAd/GcmXT0/KwODFivtzMcFdrFRbv57EtWTAgC+ZQcA + eJxjYCAd/GcmXT0/KwODFit1zEeXx6d+FxsDw3sS1GMD6PqpCQAfjQj0 @@ -72,13 +72,13 @@ - + - + diff --git a/AndorsTrail/res/xml/remgard_villager5.tmx b/AndorsTrail/res/xml/remgard_villager5.tmx index e8d95d339..123e0fbd7 100644 --- a/AndorsTrail/res/xml/remgard_villager5.tmx +++ b/AndorsTrail/res/xml/remgard_villager5.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/remgard_weapon.tmx b/AndorsTrail/res/xml/remgard_weapon.tmx index 24e31f9e5..5954104f7 100644 --- a/AndorsTrail/res/xml/remgard_weapon.tmx +++ b/AndorsTrail/res/xml/remgard_weapon.tmx @@ -72,7 +72,7 @@ - + diff --git a/AndorsTrail/res/xml/waterway11.tmx b/AndorsTrail/res/xml/waterway11.tmx index b94af09e0..87d13005d 100644 --- a/AndorsTrail/res/xml/waterway11.tmx +++ b/AndorsTrail/res/xml/waterway11.tmx @@ -81,12 +81,6 @@ - - - - - - diff --git a/AndorsTrail/res/xml/waterway12.tmx b/AndorsTrail/res/xml/waterway12.tmx index dfd469afa..be81c1bbd 100644 --- a/AndorsTrail/res/xml/waterway12.tmx +++ b/AndorsTrail/res/xml/waterway12.tmx @@ -65,7 +65,7 @@ - eJztk0sOACEIQ70C97/sbCcGnVI7jQtMmhh/DyjGGCNarVbrZ6HDxVHEwrzB8pGzGW/HV9bL6UuFe8rP7rL9+BUHsq/8C7szMc3fbzq8XtVPzc3ynNdR9om/TL6qvq54q+Sveozlov2cxVHhVvOuMphaZ/sOrpKDeuyQk3WLHpGPKC4= + eJztk0sOACEIQ7kC97/s7AlqwU7jApMmRtDHTzczH41Go5+FLhWHEUvnjS4f8c14Oz6zXsq+VLi3/Oxudx5PcSB25l/Y+XjYq//gqn5sbpZnPEfZN/3t5Mua65iDotfxPoOLznMWR4VbzbvK6NQ6syu4TA7aY4WUrFf0AfUrKD8= @@ -81,12 +81,6 @@ - - - - - - diff --git a/AndorsTrail/res/xml/waterway2.tmx b/AndorsTrail/res/xml/waterway2.tmx index baab82187..7a67029df 100644 --- a/AndorsTrail/res/xml/waterway2.tmx +++ b/AndorsTrail/res/xml/waterway2.tmx @@ -93,6 +93,12 @@ + + + + + + diff --git a/AndorsTrail/res/xml/waytobrimhaven3.tmx b/AndorsTrail/res/xml/waytobrimhaven3.tmx index 97c5584b9..48014c60f 100644 --- a/AndorsTrail/res/xml/waytobrimhaven3.tmx +++ b/AndorsTrail/res/xml/waytobrimhaven3.tmx @@ -81,18 +81,6 @@ - - - - - - - - - - - - diff --git a/AndorsTrail/res/xml/waytolake0.tmx b/AndorsTrail/res/xml/waytolake0.tmx index f38cbb74b..e5e121379 100644 --- a/AndorsTrail/res/xml/waytolake0.tmx +++ b/AndorsTrail/res/xml/waytolake0.tmx @@ -63,7 +63,7 @@ eJzllV8KgCAMh4voZJ2gbmIXV6j3UlQYQ9d0FkLfiw/On/vnHAaPmfx6hVWC09JBRzfQq/HJEGegHmUH9ykf4h6M+8mWstOJO5eZtuVwjnxbLjh/yvq5Z3zl0KL/Ipx6lNC7b6vN+ybIPeSLXpHiYs69ixo4MbeM4W/96XCzQTojoF4tuI5SPXw+pacKYsZ/FK5FiRbWa9EnUIN6Nwdzjrwxb3rgBpUuOAU= - + eJztkkEKACAIBPcL/v+z3cXMaIqCBE9t0yiZJPt9vDWR8zU6j3I+n93NHCp+2fuRR8Yj9kxwdvDIOXfw6JmrRc5L7+MV3q2OvihHg3mrfgpYqzxydySr50dyyX9yshtV7iEk @@ -72,7 +72,7 @@ - + @@ -82,6 +82,47 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/waytolake1.tmx b/AndorsTrail/res/xml/waytolake1.tmx index 22b7cd8ea..a8c0bd43f 100644 --- a/AndorsTrail/res/xml/waytolake1.tmx +++ b/AndorsTrail/res/xml/waytolake1.tmx @@ -63,7 +63,7 @@ eJxjYCAP/GcmUyMW8AFo1nsC5n0gwT5CbiPGPlLMIzUsqG0eIb+Q4ldqAFLiCpsedP3kpDVkPej6yQkPZD30Dk9iwUYW7OLkxAc+MyjN++j5j9LwJMU9uMIIGWBzTyErA0MRK4TtzEq8fcMdAADYlh+1 - + eJzVkzEOACAIA/kC//+sKyFVWtDBJiQOeAVENzNvRFTn/k+8yDkxs9jaci7yYnwRC9WliulVyd3l3Hh3hneqg+EpUmeHzhWz46/s+2TWaN8nu8R47Fgsk9WrXirezX8yjQWWgRGJ @@ -82,6 +82,52 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/waytolake2.tmx b/AndorsTrail/res/xml/waytolake2.tmx index 6f5b73c3d..ec4d50e96 100644 --- a/AndorsTrail/res/xml/waytolake2.tmx +++ b/AndorsTrail/res/xml/waytolake2.tmx @@ -55,7 +55,7 @@ - eJyVVDFuAjEQ5A6bHvKE8AOoeQIS0CORvACa1EmV76SjzTXhAfwEevCKW914mfUpI6G7M+vZWe+sBwOOY8i/h9EJBJzD89q87t5n8P7i8LE80zr/XrR5ahI7M7FeHsSy5ZuY2Kqw97V+XtNat4HHjhPfPv0OhFfOGznnhF/O9xjy3nwmrq+Y723gf8bD0BjN34HXqIhQy6jnjFEvcqpfVKPWYuNYn5G3pBMhcaJX+hwN5y/xrgfVjXoxRwmntPc25Hs9IOeC1Gzn7lo9+of4I56Uvi1J3au0vjbahFNg7wWFrm/BN/rcJa63ls/6THCpuvef0OUq4RTypwft6z52OjWf5GJ6+uCdQclDOIclj3jcglE7c/Y+VE7r6RJEj3C9Gx+qLz9gDnHOvfvrP57GOHZ/eWfg+aLPAwKZEfS17hFO1NMQX21i7lEF+lpnkGm3uhlXCfbO9yAa7rZbRw8= + eJyVVEFuwjAQJMHm3vYJ9Adw5glItHeklhfQC2c48R1uXMkFHtCflDv1SlllvJl1xEhRHGc9O/bOejTiOIf8exydQMBv6M/N6248g/Gbw8fyvNf596LNU5PYmYn18iCWLd+ria0Ka6d1f073ug489iXxbdPzQ3jlvJFzTvjlfM8hr80+cR1ivraB/4xHcYS4JvT/sT0qIuxlMnDGqBc51S+qUfdi41idkbekEyFxolfqHA3nhXjXg+pGvZijhFta+xjztR6Qc0H2bPvuXuW1FVyJJ6VuS7LvVZr/MNqEU2DvBYXOr8E3+v5KXN8tn/WZ4K/qxqfQ5SrhFvK3B63rNnY6NZ/kYnqG4J1ByUPYhyWPeNyCSdtz9j5UTuvpEkSPcG2MD9WXO+hD7HPv/nrG0xjH7i/vDDxfDHlAID2CvtY1wol6GuKrz5h7VIG+1h5k2q1uxlWCvfM9iIZ/5nRHmw== @@ -63,9 +63,9 @@ eJxjYICAD8wMcPAeiU0u+E8FM5ABzE0fqGguyCxq+BXmJmqYRU1zkMFgDDcYICetbGQh3bxCVtLtgZkH0ltEpn508IWROuYMJKBGeFAzTYIAvnQECnNS3EuNNI7sP0rLQ2T3gPwBY5MbD9Qun5HTNDXzCjZAyHxnGto9WACuvAMAKi8j4w== - + - eJy90VEOwCAIA1Cu4P0v65c/BENbiyQmm24vWFZErLRO5X11TXguy+1V5bJuew6/enfdH3Hj8ozmgvTA5tHNgflPzasynfNVPbRfxFNmzHrI+ev3Pz0lH7Y31e3qxWdKsSeyzeaktwGX3RgL + eJy9klEKACAIQ72C979sX/2I0ja1QRBWj7HlZuZhXcW5ujZ4U6xpXqYpVjWb6mbDM+rXij2aC+KB8Y70wLxT88qYSheVH5WH+kX/Htsxy0POu/d/8pR8WG8q96UOn5HC3sg2Mjd5B/rxGBw= @@ -82,6 +82,52 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/waytolake3.tmx b/AndorsTrail/res/xml/waytolake3.tmx index 5ee7f165a..5dd8df6ae 100644 --- a/AndorsTrail/res/xml/waytolake3.tmx +++ b/AndorsTrail/res/xml/waytolake3.tmx @@ -63,7 +63,7 @@ eJxjYKAf+MCMSqOzidGLDP4zo9LobHxmvceiDiaGLIdNHS59xABnVuLUERsuyCAQaHYQFvNx+ZdcQEwYD7R56OFMbLjjMo8QICW+vjAi2IVAdxWhuY2c+MJnPznhi0sPuWnpP5a8j88eYszD5hZ8bsMW1sj6cLmF3LQzFPIJpQAAxDgreg== - + eJztkkkKACAMA/OF/v+zgsdSaxIFLxaKCzpNlwAQ36cjrXnv8Bhz9GFx7pj5Puep6KreVX8YbpcPW5OXdXfmZKfL4VV8d45XutT+MPG7Oqi8iqHoVYxlKTFv8NQenzAGxzASzA== @@ -82,6 +82,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/waytolake4.tmx b/AndorsTrail/res/xml/waytolake4.tmx index dbdca11e7..89eca7a97 100644 --- a/AndorsTrail/res/xml/waytolake4.tmx +++ b/AndorsTrail/res/xml/waytolake4.tmx @@ -82,6 +82,87 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/waytolake5.tmx b/AndorsTrail/res/xml/waytolake5.tmx index 24c787a32..01c60a5a3 100644 --- a/AndorsTrail/res/xml/waytolake5.tmx +++ b/AndorsTrail/res/xml/waytolake5.tmx @@ -55,7 +55,7 @@ - eJxjYBh+oIyddma3Qc3uYGFgeMLGwKDMBOEfodDOZBbs4jDzWVkZGGYC7WBjJc/8E0jmC7Ghyu0Ayq1kh7hBCclPvsyU2wUCgmj2gcyPxWO2ChOm+0AgAMmcajQz0e1URjMDBvqR4smJDRKP6IAJKP6ZEcL+wogp/xmLGLpbCakj1jx6AmxhgQ5A6Q89figBpJpnD3UjTA96vCPLIQNYvOALa38WTL3oeeU/MyINkRLX8UhqkfMDNeL+P5a8NFjSFC4AAESoHkE= + eJxjYBh+oIyddma3Qc3uYGFgeMLGwKDMBOEfodDOZBbs4jDzWVkZGGYC7WBjJc/8E0jmC7Ghyu0Ayq1kh7hBCclPvsyU2wUCgmj2gcyPxWO2ChOm+0AgAMmcaii7nx27ncpoZsBAP1I8ObFB4hEdMAHFPzNC2F8YMeU/YxFDdyshdcSaBwORzIg0osSGXy2pAJSOQWaDwoKJgNmg9IceP5QAUs2zh4YBTA96vCPLIQNYvOALa38WTL3oeeU/MyINkRLX8UhqkfMDsWkEH/iPJS9Rw1xaAgBQmCEb @@ -63,9 +63,9 @@ eJxjYKA/+M9MO3NpafZ7GppNKzDUw9qIjfpm0wqQY/YHIvUQazayecTqwacOl3nE5AV8aeQDM+nmIbsHX34kN6/C3INP7xdG0s1FNpsWgFw3DSQAACZdI6w= - + - eJwTZGBgEBzFRGEGNJraZmMDtDIXmz2k2kcuIMYuYs3AJ0/IbFx2EXILsW4mJU2RGta0MJtUPdR0N7n+w6UHFyDGT8ToI9W95LiHFEwrc2mFAe+2FCA= + eJztUkEOACAI4gv+/7PdmyxwcouNdUiBzAJQnxJxndvaHVK6nY/rN4Xi5Wiw+5c283plUTM7O+XM293X7VqnPj071sOgvEnpc/NO8rj/kdBN8QDgbRR1 @@ -82,6 +82,47 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/waytomountaincave0.tmx b/AndorsTrail/res/xml/waytomountaincave0.tmx index 7b3f27279..b1b419b6b 100644 --- a/AndorsTrail/res/xml/waytomountaincave0.tmx +++ b/AndorsTrail/res/xml/waytomountaincave0.tmx @@ -69,14 +69,12 @@ - - + - diff --git a/AndorsTrail/res/xml/waytomountaincave1.tmx b/AndorsTrail/res/xml/waytomountaincave1.tmx index e0a0449ae..05c2e3223 100644 --- a/AndorsTrail/res/xml/waytomountaincave1.tmx +++ b/AndorsTrail/res/xml/waytomountaincave1.tmx @@ -75,11 +75,10 @@ - - + diff --git a/AndorsTrail/res/xml/waytomountaincave2.tmx b/AndorsTrail/res/xml/waytomountaincave2.tmx index 24d55d6bf..14ae283db 100644 --- a/AndorsTrail/res/xml/waytomountaincave2.tmx +++ b/AndorsTrail/res/xml/waytomountaincave2.tmx @@ -69,7 +69,7 @@ - + diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java index 4dee14f32..eba2f07ea 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java @@ -207,7 +207,7 @@ public class ActorStatsController { } private static class VisualEffect { - public final int visualEffectID; + public int visualEffectID; public int effectValue; public VisualEffect(int visualEffectID) { this.visualEffectID = visualEffectID; @@ -257,16 +257,12 @@ public class ActorStatsController { } } if (effectValue != 0) { - if (existingVisualEffect == null) existingVisualEffect = new VisualEffect(visualEffectID); + if (existingVisualEffect == null) { + existingVisualEffect = new VisualEffect(visualEffectID); + } else if (Math.abs(effectValue) > Math.abs(existingVisualEffect.effectValue)) { + existingVisualEffect.visualEffectID = visualEffectID; + } existingVisualEffect.effectValue += effectValue; - /* - view.effectController.startEffect( - view.mainActivity.mainview - , actor.position - , visualEffectID - , effectValue - , null - , 0);*/ } return existingVisualEffect; }