diff --git a/AndorsTrail/.gitignore b/AndorsTrail/.gitignore new file mode 100644 index 000000000..9296430ec --- /dev/null +++ b/AndorsTrail/.gitignore @@ -0,0 +1,4 @@ +gen +bin +.metadata +.svn diff --git a/AndorsTrail/.svnignore b/AndorsTrail/.svnignore new file mode 100644 index 000000000..a1da47162 --- /dev/null +++ b/AndorsTrail/.svnignore @@ -0,0 +1,4 @@ +gen +bin +.metadata +.git diff --git a/AndorsTrail/res/drawable/monsters_rltiles2.png b/AndorsTrail/res/drawable/monsters_rltiles2.png index b471f544c..81e13c450 100644 Binary files a/AndorsTrail/res/drawable/monsters_rltiles2.png and b/AndorsTrail/res/drawable/monsters_rltiles2.png differ diff --git a/AndorsTrail/res/values-fr/content_conversationlist.xml b/AndorsTrail/res/values-fr/content_conversationlist.xml index d9d5fcd48..1546af4d4 100644 --- a/AndorsTrail/res/values-fr/content_conversationlist.xml +++ b/AndorsTrail/res/values-fr/content_conversationlist.xml @@ -368,7 +368,7 @@ [id|message|rewards[rewardType|rewardID|value|]|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|requires_Type|]|]; -{vacor|||{{|vacor_return_complete|vacor:60||||}{|vacor_return2|vacor:40||||}{|vacor_select1|||||}}|}; +{vacor|||{{|vacor_return_complete|vacor:60||||}{|vacor_return2|vacor:40||||}{|vacor_42|vacor:30||||}{|vacor_select1|||||}}|}; {vacor_select1|||{{|vacor_return1|vacor:20||||}{|vacor_begin|||||}}|}; {vacor_begin|Bonjour.||{{N|vacor_2|||||}}|}; {vacor_2|Qui es-tu ? Le genre aventurier ? Hmm. Tu pourrais peut-être m\'être utile.||{{N|vacor_3|||||}}|}; diff --git a/AndorsTrail/res/values-fr/content_itemlist.xml b/AndorsTrail/res/values-fr/content_itemlist.xml index 5f8487b96..821207dee 100644 --- a/AndorsTrail/res/values-fr/content_itemlist.xml +++ b/AndorsTrail/res/values-fr/content_itemlist.xml @@ -341,7 +341,7 @@ {helm_redeye2|items_armours:24|Chapeau des yeux de sang|2||0|1|1|-5|||||||0|1|8||||||||||||||||||||||}; {helm_defend1|items_armours_3:31|Casque du Défenseur|2||0|1975|1|||||-3|||||8|1|||||||||||||||||||||}; {helm_protector0|items_armours_3:31|Casque d\'allure étrange|2|1|1|0|1|-9|||||||0|1|5||||||||||||||||||||||}; -{helm_protector|items_armours_3:31|Protecteur sombre|2|3|0|1794|1|-6|||||||0|1|13||||||||||||||||||||||}; +{helm_protector|items_armours_3:31|Protecteur sombre|2|3|0|3119|1|-6|||||||0|1|13|1|||||||||||||||||||||}; {armour_chain_remg|items_armours_3:13|Cotte de mailles de Remgard|3||0|8927|1|||||-7|||||25||||||||||||||||||||||}; {armour_cvest1|items_armours_3:5|Veste de combat|3||0|1116|1|||||15|||||8||||||||||||||||||||||}; diff --git a/AndorsTrail/res/values-it/content_conversationlist.xml b/AndorsTrail/res/values-it/content_conversationlist.xml index 98004a4c8..d136dc5d3 100644 --- a/AndorsTrail/res/values-it/content_conversationlist.xml +++ b/AndorsTrail/res/values-it/content_conversationlist.xml @@ -368,7 +368,7 @@ [id|message|rewards[rewardType|rewardID|value|]|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|requires_Type|]|]; -{vacor|||{{|vacor_return_complete|vacor:60||||}{|vacor_return2|vacor:40||||}{|vacor_select1|||||}}|}; +{vacor|||{{|vacor_return_complete|vacor:60||||}{|vacor_return2|vacor:40||||}{|vacor_42|vacor:30||||}{|vacor_select1|||||}}|}; {vacor_select1|||{{|vacor_return1|vacor:20||||}{|vacor_begin|||||}}|}; {vacor_begin|Ciao.||{{N|vacor_2|||||}}|}; {vacor_2|Cosa sei, una specie di avventuriero? Hm. Forse puoi essermi utile.||{{N|vacor_3|||||}}|}; diff --git a/AndorsTrail/res/values-ru/content_conversationlist.xml b/AndorsTrail/res/values-ru/content_conversationlist.xml index c42c6fc23..a17e06096 100644 --- a/AndorsTrail/res/values-ru/content_conversationlist.xml +++ b/AndorsTrail/res/values-ru/content_conversationlist.xml @@ -368,7 +368,7 @@ [id|message|rewards[rewardType|rewardID|value|]|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|requires_Type|]|]; -{vacor|||{{|vacor_return_complete|vacor:60||||}{|vacor_return2|vacor:40||||}{|vacor_select1|||||}}|}; +{vacor|||{{|vacor_return_complete|vacor:60||||}{|vacor_return2|vacor:40||||}{|vacor_42|vacor:30||||}{|vacor_select1|||||}}|}; {vacor_select1|||{{|vacor_return1|vacor:20||||}{|vacor_begin|||||}}|}; {vacor_begin|Привет.||{{N|vacor_2|||||}}|}; {vacor_2|Юный авантюрист? Хм. Возможно ты будешь мне полезен.||{{N|vacor_3|||||}}|}; diff --git a/AndorsTrail/res/values-ru/content_itemlist.xml b/AndorsTrail/res/values-ru/content_itemlist.xml index 37dabe93e..cf12d951e 100644 --- a/AndorsTrail/res/values-ru/content_itemlist.xml +++ b/AndorsTrail/res/values-ru/content_itemlist.xml @@ -342,7 +342,7 @@ {helm_redeye2|items_armours:24|Шапка кровавых глаз|2||0|1|1|-5|||||||0|1|8||||||||||||||||||||||}; {helm_defend1|items_armours_3:31|Шлем защитника|2||0|1975|1|||||-3|||||8|1|||||||||||||||||||||}; {helm_protector0|items_armours_3:31|Странно выглядящий шлем|2|1|1|0|1|-9|||||||0|1|5||||||||||||||||||||||}; -{helm_protector|items_armours_3:31|Темный покровитель|2|3|0|1794|1|-6|||||||0|1|13||||||||||||||||||||||}; +{helm_protector|items_armours_3:31|Темный покровитель|2|3|0|3119|1|-6|||||||0|1|13|1|||||||||||||||||||||}; {armour_chain_remg|items_armours_3:13|Ремгардская кольчуга|3||0|8927|1|||||-7|||||25||||||||||||||||||||||}; {armour_cvest1|items_armours_3:5|Бронежилет|3||0|1116|1|||||15|||||8||||||||||||||||||||||}; diff --git a/AndorsTrail/res/values/content_conversationlist.xml b/AndorsTrail/res/values/content_conversationlist.xml index 402e95370..377a5a965 100644 --- a/AndorsTrail/res/values/content_conversationlist.xml +++ b/AndorsTrail/res/values/content_conversationlist.xml @@ -368,7 +368,7 @@ [id|message|rewards[rewardType|rewardID|value|]|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|requires_Type|]|]; -{vacor|||{{|vacor_return_complete|vacor:60||||}{|vacor_return2|vacor:40||||}{|vacor_select1|||||}}|}; +{vacor|||{{|vacor_return_complete|vacor:60||||}{|vacor_return2|vacor:40||||}{|vacor_42|vacor:30||||}{|vacor_select1|||||}}|}; {vacor_select1|||{{|vacor_return1|vacor:20||||}{|vacor_begin|||||}}|}; {vacor_begin|Hello.||{{N|vacor_2|||||}}|}; {vacor_2|What are you, some kind of adventurer? Hm. Maybe you can be of use to me.||{{N|vacor_3|||||}}|}; @@ -4102,4 +4102,31 @@ }|}; + +[id|message|rewards[rewardType|rewardID|value|]|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|requires_Type|]|]; +{sign_waterwaycave|You notice a slight draft blowing across your ankles as you stand admiring the quality of this woven coil of rope.||{ + {Take the rope.|sign_waterwaycave2|||||} + {Leave it alone.|X|||||} + }|}; +{sign_waterwaycave2|Despite your efforts to collect the rope, you find that it runs into what appears to be a crack in the stone wall before you. Unfortunately, this seems to be an adventure for another day.|||}; +{sign_bwm31|(You notice some torn papers on the floor. From the looks of it, these pages seem to have been torn from a larger journal.)||{{Read the journal.|sign_bwm31_1|||||}}|}; +{sign_bwm31_1|Brakas, day 4. Why, oh why did I venture up here?||{{N|sign_bwm31_2|||||}}|}; +{sign_bwm31_2|These things are too strong for me. The first few of them went down pretty easily, but these .. things .. up here are just too strong for me.||{{N|sign_bwm31_3|||||}}|}; +{sign_bwm31_3|I am now almost out of potions as well.||{{N|sign_bwm31_4|||||}}|}; +{sign_bwm31_4|As I am writing this journal, I can hear them growling outside the cabin. I need to rest some more before I can have a try at killing some of them again.||{{N|sign_bwm31_5|||||}}|}; +{sign_bwm31_5|(The paper is full of dirt, but you still manage to read most of it)||{{Continue reading.|sign_bwm31_6|||||}}|}; +{sign_bwm31_6|Brakas, day 7. By the Shadow, I cannot even get down the mountain now! These things are in the way, and I am too weak to get past them now.||{{N|sign_bwm31_7|||||}}|}; +{sign_bwm31_7|My potions are now all used up. How will I ever get out of here?!||{{N|sign_bwm31_8|||||}}|}; +{sign_bwm31_8|Getting weaker. Must rest.||{{Continue reading.|sign_bwm31_9|||||}}|}; +{sign_bwm31_9|Brakas, day 9. Success! I managed to kill some of the monsters that were closest to the cabin, and some of them were carrying vials of minor healing that I could pick up!||{{N|sign_bwm31_10|||||}}|}; +{sign_bwm31_10|I don\'t recall ever being so happy about seeing some of these potions!||{{N|sign_bwm31_11|||||}}|}; +{sign_bwm31_11|With these, I might be able to get down the mountain again!||{{N|sign_bwm31_12|||||}}|}; +{sign_bwm31_12|Ha ha, those bastards down in Prim didn\'t get rid of me that easily.||{{N|sign_bwm31_13|||||}}|}; +{sign_bwm31_13|Maybe if I gather enough of these potions from the monsters around the cabin, I might have enough to safely make it down again.||{{Continue reading.|sign_bwm31_14|||||}}|}; +{sign_bwm31_14|Brakas, day 10. I have now managed to gather enough healing potions to feel confident that I will make it down alive.||{{N|sign_bwm31_15|||||}}|}; +{sign_bwm31_15|I just hope that those disgusting snakes will stay away from me this time, with their nasty venom.||{{N|sign_bwm31_16|||||}}|}; +{sign_bwm31_16|If luck is on my side, I might even be home safe by nightfall.||{{N|sign_bwm31_17|||||}}|}; +{sign_bwm31_17|(The journal has no more pages)|||}; + + diff --git a/AndorsTrail/res/values/content_questlist.xml b/AndorsTrail/res/values/content_questlist.xml index a1f3f006d..6c1346c98 100644 --- a/AndorsTrail/res/values/content_questlist.xml +++ b/AndorsTrail/res/values/content_questlist.xml @@ -300,7 +300,7 @@ {25|I should deliver the shipment to the Feygard patrol captain stationed in the Foaming Flask tavern.|||} {26|Gandoren tells me that Ailshara has expressed some interest in the Feygard shipments, and urges me to stay away from her.|||} {30|Ailshara is indeed interested in the shipment, and wants me to help Nor City with the supplies instead.|||} - {35|If I want to help Ailshara on behalf Nor City, I should deliver the shipment to the smith in Vilegard.|||} + {35|If I want to help Ailshara and Nor City, I should deliver the shipment to the smith in Vilegard instead.|||} {50|I have delivered the shipment to the Feygard patrol captain in the Foaming Flask tavern. I should go tell Gandoren in the Crossroads guardhouse that the shipment is delivered.|||} {55|I have delivered the shipment to the smith in Vilegard.|||} {56|The Vilegard smith gave me a shipment of degraded items that I should deliver to the Feygard patrol captain in the Foaming Flask tavern instead of the normal ones.|||} diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml index 2f51e038e..be8c96299 100644 --- a/AndorsTrail/res/values/strings.xml +++ b/AndorsTrail/res/values/strings.xml @@ -482,7 +482,7 @@ Dark blessing of the Shadow Resistance against all types of conditions - Lowers the chance of being afflicted with all types of conditions by %1$d %% for every skill level. This includes all types conditions caused by monster attacks such as Poison, Dazed or Fatigue. + Lowers the chance of being afflicted with all types of conditions by %1$d %%. This includes all types conditions caused by monster attacks such as Poison, Dazed or Fatigue. Move to top Move to bottom diff --git a/AndorsTrail/res/xml/blackwater_mountain0.tmx b/AndorsTrail/res/xml/blackwater_mountain0.tmx index 7160862e5..ef431eeae 100644 --- a/AndorsTrail/res/xml/blackwater_mountain0.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain0.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain1.tmx b/AndorsTrail/res/xml/blackwater_mountain1.tmx index 69f5bf6b7..aa6044fd3 100644 --- a/AndorsTrail/res/xml/blackwater_mountain1.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain10.tmx b/AndorsTrail/res/xml/blackwater_mountain10.tmx index dffe8cd9e..32248a47b 100644 --- a/AndorsTrail/res/xml/blackwater_mountain10.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain10.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain11.tmx b/AndorsTrail/res/xml/blackwater_mountain11.tmx index e8d59943c..85b541596 100644 --- a/AndorsTrail/res/xml/blackwater_mountain11.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain11.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain12.tmx b/AndorsTrail/res/xml/blackwater_mountain12.tmx index 32ed9211f..55c30cb52 100644 --- a/AndorsTrail/res/xml/blackwater_mountain12.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain12.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain14.tmx b/AndorsTrail/res/xml/blackwater_mountain14.tmx index 01dfaa4b6..ce866ef66 100644 --- a/AndorsTrail/res/xml/blackwater_mountain14.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain14.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain15.tmx b/AndorsTrail/res/xml/blackwater_mountain15.tmx index fa4c71371..e86f6e761 100644 --- a/AndorsTrail/res/xml/blackwater_mountain15.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain15.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain16.tmx b/AndorsTrail/res/xml/blackwater_mountain16.tmx index 13da46dd3..673934fc5 100644 --- a/AndorsTrail/res/xml/blackwater_mountain16.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain16.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain2.tmx b/AndorsTrail/res/xml/blackwater_mountain2.tmx index 5db0a0a6a..b794a7b3d 100644 --- a/AndorsTrail/res/xml/blackwater_mountain2.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain2.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain3.tmx b/AndorsTrail/res/xml/blackwater_mountain3.tmx index 8747ae5c8..eebc76151 100644 --- a/AndorsTrail/res/xml/blackwater_mountain3.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain3.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain30.tmx b/AndorsTrail/res/xml/blackwater_mountain30.tmx index 99b317470..b03f68729 100644 --- a/AndorsTrail/res/xml/blackwater_mountain30.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain30.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain31.tmx b/AndorsTrail/res/xml/blackwater_mountain31.tmx index bac661f42..3eb401717 100644 --- a/AndorsTrail/res/xml/blackwater_mountain31.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain31.tmx @@ -55,7 +55,7 @@ - eJxjYMAPlNhR+dZAvhcLA4MNVDwaSMcAcQYQG6Gp9Qbyo4BqfYD0ZTYGhggkeSc0tdOA/CdANY+hmA/IrwbS61gh8nJsCLXL0PTCwBIW3P7AJbcfyVxOqF3VzAwMkcyY+s4jqSUWAAAITw7b + eJxjYMAPlNhR+dZAvhcLA4MNVDwaSMcAcQYQG6Gp9Qbyo4BqfYD0ZTYGhggkeSc0tdOA/CdANY+hmA/IrwbS61gh8nJsCLXLkPTaI7GXsOD2By65/UjmckLtqmZmYIhkxtR3HkktsQAANAgPIQ== @@ -82,6 +82,7 @@ + diff --git a/AndorsTrail/res/xml/blackwater_mountain32.tmx b/AndorsTrail/res/xml/blackwater_mountain32.tmx index 9e17810cc..bc54140b9 100644 --- a/AndorsTrail/res/xml/blackwater_mountain32.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain32.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain4.tmx b/AndorsTrail/res/xml/blackwater_mountain4.tmx index 9ec04589f..61ca24d96 100644 --- a/AndorsTrail/res/xml/blackwater_mountain4.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain4.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain40.tmx b/AndorsTrail/res/xml/blackwater_mountain40.tmx index 8a6d68760..ceff05456 100644 --- a/AndorsTrail/res/xml/blackwater_mountain40.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain40.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/crossglen.tmx b/AndorsTrail/res/xml/crossglen.tmx index 2befc6086..9b1fa5b34 100644 --- a/AndorsTrail/res/xml/crossglen.tmx +++ b/AndorsTrail/res/xml/crossglen.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/crossroads.tmx b/AndorsTrail/res/xml/crossroads.tmx index f744459cf..fa9fde77b 100644 --- a/AndorsTrail/res/xml/crossroads.tmx +++ b/AndorsTrail/res/xml/crossroads.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fallhaven_ne.tmx b/AndorsTrail/res/xml/fallhaven_ne.tmx index 4699277f0..303b38c6b 100644 --- a/AndorsTrail/res/xml/fallhaven_ne.tmx +++ b/AndorsTrail/res/xml/fallhaven_ne.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fallhaven_nw.tmx b/AndorsTrail/res/xml/fallhaven_nw.tmx index dae088ce0..6a918a7ac 100644 --- a/AndorsTrail/res/xml/fallhaven_nw.tmx +++ b/AndorsTrail/res/xml/fallhaven_nw.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fallhaven_se.tmx b/AndorsTrail/res/xml/fallhaven_se.tmx index b70035746..7a0d2c190 100644 --- a/AndorsTrail/res/xml/fallhaven_se.tmx +++ b/AndorsTrail/res/xml/fallhaven_se.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fallhaven_sw.tmx b/AndorsTrail/res/xml/fallhaven_sw.tmx index 75394c26e..d74f5bed3 100644 --- a/AndorsTrail/res/xml/fallhaven_sw.tmx +++ b/AndorsTrail/res/xml/fallhaven_sw.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields0.tmx b/AndorsTrail/res/xml/fields0.tmx index d512c7816..7d4c5435b 100644 --- a/AndorsTrail/res/xml/fields0.tmx +++ b/AndorsTrail/res/xml/fields0.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields1.tmx b/AndorsTrail/res/xml/fields1.tmx index 0a4d54ebb..b2e404111 100644 --- a/AndorsTrail/res/xml/fields1.tmx +++ b/AndorsTrail/res/xml/fields1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields10.tmx b/AndorsTrail/res/xml/fields10.tmx index 8df667f2c..9398a2326 100644 --- a/AndorsTrail/res/xml/fields10.tmx +++ b/AndorsTrail/res/xml/fields10.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields11.tmx b/AndorsTrail/res/xml/fields11.tmx index 1a3ad5a24..9d0ac4bc2 100644 --- a/AndorsTrail/res/xml/fields11.tmx +++ b/AndorsTrail/res/xml/fields11.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields12.tmx b/AndorsTrail/res/xml/fields12.tmx index da777718f..cea8b8773 100644 --- a/AndorsTrail/res/xml/fields12.tmx +++ b/AndorsTrail/res/xml/fields12.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields2.tmx b/AndorsTrail/res/xml/fields2.tmx index 2791f5703..06da3f6fc 100644 --- a/AndorsTrail/res/xml/fields2.tmx +++ b/AndorsTrail/res/xml/fields2.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields3.tmx b/AndorsTrail/res/xml/fields3.tmx index 7c8012a01..0bd2e8067 100644 --- a/AndorsTrail/res/xml/fields3.tmx +++ b/AndorsTrail/res/xml/fields3.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields4.tmx b/AndorsTrail/res/xml/fields4.tmx index 515af3896..7d3c607a5 100644 --- a/AndorsTrail/res/xml/fields4.tmx +++ b/AndorsTrail/res/xml/fields4.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields5.tmx b/AndorsTrail/res/xml/fields5.tmx index 9dd6abc59..563ce5f49 100644 --- a/AndorsTrail/res/xml/fields5.tmx +++ b/AndorsTrail/res/xml/fields5.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields6.tmx b/AndorsTrail/res/xml/fields6.tmx index db953956f..fdb2856bf 100644 --- a/AndorsTrail/res/xml/fields6.tmx +++ b/AndorsTrail/res/xml/fields6.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields7.tmx b/AndorsTrail/res/xml/fields7.tmx index c96874de7..9fd6d633e 100644 --- a/AndorsTrail/res/xml/fields7.tmx +++ b/AndorsTrail/res/xml/fields7.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields8.tmx b/AndorsTrail/res/xml/fields8.tmx index bed7bc9a4..25e3dcf11 100644 --- a/AndorsTrail/res/xml/fields8.tmx +++ b/AndorsTrail/res/xml/fields8.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/fields9.tmx b/AndorsTrail/res/xml/fields9.tmx index bde18f8ee..15da77b9e 100644 --- a/AndorsTrail/res/xml/fields9.tmx +++ b/AndorsTrail/res/xml/fields9.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/flagstone0.tmx b/AndorsTrail/res/xml/flagstone0.tmx index 58ffb6bae..97fd65035 100644 --- a/AndorsTrail/res/xml/flagstone0.tmx +++ b/AndorsTrail/res/xml/flagstone0.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/gapfiller1.tmx b/AndorsTrail/res/xml/gapfiller1.tmx index aec33edca..daebd9077 100644 --- a/AndorsTrail/res/xml/gapfiller1.tmx +++ b/AndorsTrail/res/xml/gapfiller1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/gapfiller3.tmx b/AndorsTrail/res/xml/gapfiller3.tmx index 0447ee782..668edf3aa 100644 --- a/AndorsTrail/res/xml/gapfiller3.tmx +++ b/AndorsTrail/res/xml/gapfiller3.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/gapfiller4.tmx b/AndorsTrail/res/xml/gapfiller4.tmx index e4987c2e8..995b432f6 100644 --- a/AndorsTrail/res/xml/gapfiller4.tmx +++ b/AndorsTrail/res/xml/gapfiller4.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/loneford1.tmx b/AndorsTrail/res/xml/loneford1.tmx index 0c76891dd..8fdf2ffac 100644 --- a/AndorsTrail/res/xml/loneford1.tmx +++ b/AndorsTrail/res/xml/loneford1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/loneford2.tmx b/AndorsTrail/res/xml/loneford2.tmx index 7c92e77a1..042c03398 100644 --- a/AndorsTrail/res/xml/loneford2.tmx +++ b/AndorsTrail/res/xml/loneford2.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake0.tmx b/AndorsTrail/res/xml/mountainlake0.tmx index e9ca25498..912116cb8 100644 --- a/AndorsTrail/res/xml/mountainlake0.tmx +++ b/AndorsTrail/res/xml/mountainlake0.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake1.tmx b/AndorsTrail/res/xml/mountainlake1.tmx index ae4247bfa..0f386d4d8 100644 --- a/AndorsTrail/res/xml/mountainlake1.tmx +++ b/AndorsTrail/res/xml/mountainlake1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake10.tmx b/AndorsTrail/res/xml/mountainlake10.tmx index e6aff6556..f4aaeb946 100644 --- a/AndorsTrail/res/xml/mountainlake10.tmx +++ b/AndorsTrail/res/xml/mountainlake10.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake10a.tmx b/AndorsTrail/res/xml/mountainlake10a.tmx index 6bae1437f..4fbf92b9d 100644 --- a/AndorsTrail/res/xml/mountainlake10a.tmx +++ b/AndorsTrail/res/xml/mountainlake10a.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake11.tmx b/AndorsTrail/res/xml/mountainlake11.tmx index a64719ef0..ee677762b 100644 --- a/AndorsTrail/res/xml/mountainlake11.tmx +++ b/AndorsTrail/res/xml/mountainlake11.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake12.tmx b/AndorsTrail/res/xml/mountainlake12.tmx index 9ba4f1e6c..78c2e8ada 100644 --- a/AndorsTrail/res/xml/mountainlake12.tmx +++ b/AndorsTrail/res/xml/mountainlake12.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake13.tmx b/AndorsTrail/res/xml/mountainlake13.tmx index 2b0fcb86c..f68715a48 100644 --- a/AndorsTrail/res/xml/mountainlake13.tmx +++ b/AndorsTrail/res/xml/mountainlake13.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake13a.tmx b/AndorsTrail/res/xml/mountainlake13a.tmx index fcb26c781..91e71600b 100644 --- a/AndorsTrail/res/xml/mountainlake13a.tmx +++ b/AndorsTrail/res/xml/mountainlake13a.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake2.tmx b/AndorsTrail/res/xml/mountainlake2.tmx index 916eedd30..03b2e45ac 100644 --- a/AndorsTrail/res/xml/mountainlake2.tmx +++ b/AndorsTrail/res/xml/mountainlake2.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake3.tmx b/AndorsTrail/res/xml/mountainlake3.tmx index 831d4d3cd..a868a1527 100644 --- a/AndorsTrail/res/xml/mountainlake3.tmx +++ b/AndorsTrail/res/xml/mountainlake3.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake4.tmx b/AndorsTrail/res/xml/mountainlake4.tmx index 7ba53c33e..9e2e619bc 100644 --- a/AndorsTrail/res/xml/mountainlake4.tmx +++ b/AndorsTrail/res/xml/mountainlake4.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake5.tmx b/AndorsTrail/res/xml/mountainlake5.tmx index 4ac1c267d..2b611fe33 100644 --- a/AndorsTrail/res/xml/mountainlake5.tmx +++ b/AndorsTrail/res/xml/mountainlake5.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake6.tmx b/AndorsTrail/res/xml/mountainlake6.tmx index 2f9b5bdb1..d50369402 100644 --- a/AndorsTrail/res/xml/mountainlake6.tmx +++ b/AndorsTrail/res/xml/mountainlake6.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake7.tmx b/AndorsTrail/res/xml/mountainlake7.tmx index 99ee7facd..0a013eb36 100644 --- a/AndorsTrail/res/xml/mountainlake7.tmx +++ b/AndorsTrail/res/xml/mountainlake7.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake8.tmx b/AndorsTrail/res/xml/mountainlake8.tmx index 0f901a377..1518a37ce 100644 --- a/AndorsTrail/res/xml/mountainlake8.tmx +++ b/AndorsTrail/res/xml/mountainlake8.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/mountainlake9.tmx b/AndorsTrail/res/xml/mountainlake9.tmx index e79ac85ae..e31961cb1 100644 --- a/AndorsTrail/res/xml/mountainlake9.tmx +++ b/AndorsTrail/res/xml/mountainlake9.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/remgard0.tmx b/AndorsTrail/res/xml/remgard0.tmx index eac63ac36..bc317cc4c 100644 --- a/AndorsTrail/res/xml/remgard0.tmx +++ b/AndorsTrail/res/xml/remgard0.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/remgard1.tmx b/AndorsTrail/res/xml/remgard1.tmx index 589bbf579..73f072193 100644 --- a/AndorsTrail/res/xml/remgard1.tmx +++ b/AndorsTrail/res/xml/remgard1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/remgard2.tmx b/AndorsTrail/res/xml/remgard2.tmx index 092840a1b..f47502484 100644 --- a/AndorsTrail/res/xml/remgard2.tmx +++ b/AndorsTrail/res/xml/remgard2.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/remgard3.tmx b/AndorsTrail/res/xml/remgard3.tmx index 85d5a38f0..7adf4ba91 100644 --- a/AndorsTrail/res/xml/remgard3.tmx +++ b/AndorsTrail/res/xml/remgard3.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/remgard4.tmx b/AndorsTrail/res/xml/remgard4.tmx index 727eeaf47..396830985 100644 --- a/AndorsTrail/res/xml/remgard4.tmx +++ b/AndorsTrail/res/xml/remgard4.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/road1.tmx b/AndorsTrail/res/xml/road1.tmx index a3338baa3..0c1617c56 100644 --- a/AndorsTrail/res/xml/road1.tmx +++ b/AndorsTrail/res/xml/road1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/road2.tmx b/AndorsTrail/res/xml/road2.tmx index bfa047c50..c94116d3d 100644 --- a/AndorsTrail/res/xml/road2.tmx +++ b/AndorsTrail/res/xml/road2.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/road3.tmx b/AndorsTrail/res/xml/road3.tmx index 22810cf9d..ab8a65b7e 100644 --- a/AndorsTrail/res/xml/road3.tmx +++ b/AndorsTrail/res/xml/road3.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/road4.tmx b/AndorsTrail/res/xml/road4.tmx index 6f1daa00d..311c972dc 100644 --- a/AndorsTrail/res/xml/road4.tmx +++ b/AndorsTrail/res/xml/road4.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/road4_gargoylecave.tmx b/AndorsTrail/res/xml/road4_gargoylecave.tmx index 66542ca9a..0931e2890 100644 --- a/AndorsTrail/res/xml/road4_gargoylecave.tmx +++ b/AndorsTrail/res/xml/road4_gargoylecave.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/road5.tmx b/AndorsTrail/res/xml/road5.tmx index 8947baf3a..4add1bf95 100644 --- a/AndorsTrail/res/xml/road5.tmx +++ b/AndorsTrail/res/xml/road5.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/roadbeforecrossroads.tmx b/AndorsTrail/res/xml/roadbeforecrossroads.tmx index 226a4c881..ac4128ae8 100644 --- a/AndorsTrail/res/xml/roadbeforecrossroads.tmx +++ b/AndorsTrail/res/xml/roadbeforecrossroads.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/roadtocarntower0.tmx b/AndorsTrail/res/xml/roadtocarntower0.tmx index ed245712d..79b732a67 100644 --- a/AndorsTrail/res/xml/roadtocarntower0.tmx +++ b/AndorsTrail/res/xml/roadtocarntower0.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/roadtocarntower1.tmx b/AndorsTrail/res/xml/roadtocarntower1.tmx index b6aa25b2f..a0493fa9c 100644 --- a/AndorsTrail/res/xml/roadtocarntower1.tmx +++ b/AndorsTrail/res/xml/roadtocarntower1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/roadtocarntower2.tmx b/AndorsTrail/res/xml/roadtocarntower2.tmx index 2b1a3fcad..17289d78f 100644 --- a/AndorsTrail/res/xml/roadtocarntower2.tmx +++ b/AndorsTrail/res/xml/roadtocarntower2.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/vilegard_n.tmx b/AndorsTrail/res/xml/vilegard_n.tmx index 62b53a66f..f3cfacc44 100644 --- a/AndorsTrail/res/xml/vilegard_n.tmx +++ b/AndorsTrail/res/xml/vilegard_n.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/vilegard_s.tmx b/AndorsTrail/res/xml/vilegard_s.tmx index 1fdc89c7c..d8b0b3e73 100644 --- a/AndorsTrail/res/xml/vilegard_s.tmx +++ b/AndorsTrail/res/xml/vilegard_s.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/vilegard_sw.tmx b/AndorsTrail/res/xml/vilegard_sw.tmx index e560e8f27..68e2affa3 100644 --- a/AndorsTrail/res/xml/vilegard_sw.tmx +++ b/AndorsTrail/res/xml/vilegard_sw.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway0.tmx b/AndorsTrail/res/xml/waterway0.tmx index 708b192a0..e0e057a7c 100644 --- a/AndorsTrail/res/xml/waterway0.tmx +++ b/AndorsTrail/res/xml/waterway0.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway1.tmx b/AndorsTrail/res/xml/waterway1.tmx index a6f559da9..d228af412 100644 --- a/AndorsTrail/res/xml/waterway1.tmx +++ b/AndorsTrail/res/xml/waterway1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway10.tmx b/AndorsTrail/res/xml/waterway10.tmx index 539c3b9d4..dd088ae1d 100644 --- a/AndorsTrail/res/xml/waterway10.tmx +++ b/AndorsTrail/res/xml/waterway10.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway11.tmx b/AndorsTrail/res/xml/waterway11.tmx index b3b47e261..ad18c6c25 100644 --- a/AndorsTrail/res/xml/waterway11.tmx +++ b/AndorsTrail/res/xml/waterway11.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway11_east.tmx b/AndorsTrail/res/xml/waterway11_east.tmx index cc4075b49..672808c54 100644 --- a/AndorsTrail/res/xml/waterway11_east.tmx +++ b/AndorsTrail/res/xml/waterway11_east.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway12.tmx b/AndorsTrail/res/xml/waterway12.tmx index 2eddf5fdc..2d5da1c21 100644 --- a/AndorsTrail/res/xml/waterway12.tmx +++ b/AndorsTrail/res/xml/waterway12.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway13.tmx b/AndorsTrail/res/xml/waterway13.tmx index 0a632ddbd..1c193878f 100644 --- a/AndorsTrail/res/xml/waterway13.tmx +++ b/AndorsTrail/res/xml/waterway13.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway14.tmx b/AndorsTrail/res/xml/waterway14.tmx index 8ba313b99..d4f364cff 100644 --- a/AndorsTrail/res/xml/waterway14.tmx +++ b/AndorsTrail/res/xml/waterway14.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway15.tmx b/AndorsTrail/res/xml/waterway15.tmx index 2c64eb284..da883bf81 100644 --- a/AndorsTrail/res/xml/waterway15.tmx +++ b/AndorsTrail/res/xml/waterway15.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway2.tmx b/AndorsTrail/res/xml/waterway2.tmx index 7a67029df..d381d79e0 100644 --- a/AndorsTrail/res/xml/waterway2.tmx +++ b/AndorsTrail/res/xml/waterway2.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway3.tmx b/AndorsTrail/res/xml/waterway3.tmx index 5296a8cb4..43a576982 100644 --- a/AndorsTrail/res/xml/waterway3.tmx +++ b/AndorsTrail/res/xml/waterway3.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway4.tmx b/AndorsTrail/res/xml/waterway4.tmx index ac42044a7..6b2a0f2a6 100644 --- a/AndorsTrail/res/xml/waterway4.tmx +++ b/AndorsTrail/res/xml/waterway4.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway5.tmx b/AndorsTrail/res/xml/waterway5.tmx index ff3647468..8e7245dc5 100644 --- a/AndorsTrail/res/xml/waterway5.tmx +++ b/AndorsTrail/res/xml/waterway5.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway6.tmx b/AndorsTrail/res/xml/waterway6.tmx index 9e0321fae..11a4f68f2 100644 --- a/AndorsTrail/res/xml/waterway6.tmx +++ b/AndorsTrail/res/xml/waterway6.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway7.tmx b/AndorsTrail/res/xml/waterway7.tmx index 790e070f1..49e0b3fe8 100644 --- a/AndorsTrail/res/xml/waterway7.tmx +++ b/AndorsTrail/res/xml/waterway7.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway8.tmx b/AndorsTrail/res/xml/waterway8.tmx index 558b90336..6c6f88b4d 100644 --- a/AndorsTrail/res/xml/waterway8.tmx +++ b/AndorsTrail/res/xml/waterway8.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterway9.tmx b/AndorsTrail/res/xml/waterway9.tmx index 99c393ca9..60dab4c9c 100644 --- a/AndorsTrail/res/xml/waterway9.tmx +++ b/AndorsTrail/res/xml/waterway9.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waterwayextention.tmx b/AndorsTrail/res/xml/waterwayextention.tmx index 02696872e..780c5dcf5 100644 --- a/AndorsTrail/res/xml/waterwayextention.tmx +++ b/AndorsTrail/res/xml/waterwayextention.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waytobrimhaven0.tmx b/AndorsTrail/res/xml/waytobrimhaven0.tmx index cb3f5ee2e..0819284bc 100644 --- a/AndorsTrail/res/xml/waytobrimhaven0.tmx +++ b/AndorsTrail/res/xml/waytobrimhaven0.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waytobrimhaven1.tmx b/AndorsTrail/res/xml/waytobrimhaven1.tmx index d8143f41d..1c1eb8d5f 100644 --- a/AndorsTrail/res/xml/waytobrimhaven1.tmx +++ b/AndorsTrail/res/xml/waytobrimhaven1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waytobrimhaven2.tmx b/AndorsTrail/res/xml/waytobrimhaven2.tmx index f11f14879..588538c7b 100644 --- a/AndorsTrail/res/xml/waytobrimhaven2.tmx +++ b/AndorsTrail/res/xml/waytobrimhaven2.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waytobrimhaven3.tmx b/AndorsTrail/res/xml/waytobrimhaven3.tmx index 48014c60f..f9a7d4e8e 100644 --- a/AndorsTrail/res/xml/waytobrimhaven3.tmx +++ b/AndorsTrail/res/xml/waytobrimhaven3.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waytolake0.tmx b/AndorsTrail/res/xml/waytolake0.tmx index fed2725bd..4ca15ef6a 100644 --- a/AndorsTrail/res/xml/waytolake0.tmx +++ b/AndorsTrail/res/xml/waytolake0.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waytolake1.tmx b/AndorsTrail/res/xml/waytolake1.tmx index a004e4b54..5431d9243 100644 --- a/AndorsTrail/res/xml/waytolake1.tmx +++ b/AndorsTrail/res/xml/waytolake1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waytolake2.tmx b/AndorsTrail/res/xml/waytolake2.tmx index ec4d50e96..e6032ffde 100644 --- a/AndorsTrail/res/xml/waytolake2.tmx +++ b/AndorsTrail/res/xml/waytolake2.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waytolake3.tmx b/AndorsTrail/res/xml/waytolake3.tmx index 5dd8df6ae..4e821678e 100644 --- a/AndorsTrail/res/xml/waytolake3.tmx +++ b/AndorsTrail/res/xml/waytolake3.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waytomountaincave0.tmx b/AndorsTrail/res/xml/waytomountaincave0.tmx index b1b419b6b..986aca713 100644 --- a/AndorsTrail/res/xml/waytomountaincave0.tmx +++ b/AndorsTrail/res/xml/waytomountaincave0.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waytomountaincave1.tmx b/AndorsTrail/res/xml/waytomountaincave1.tmx index 05c2e3223..e8ef8108d 100644 --- a/AndorsTrail/res/xml/waytomountaincave1.tmx +++ b/AndorsTrail/res/xml/waytomountaincave1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/waytomountaincave2.tmx b/AndorsTrail/res/xml/waytomountaincave2.tmx index 14ae283db..7e8b5d717 100644 --- a/AndorsTrail/res/xml/waytomountaincave2.tmx +++ b/AndorsTrail/res/xml/waytomountaincave2.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild0.tmx b/AndorsTrail/res/xml/wild0.tmx index 836d26f0f..5e5133b86 100644 --- a/AndorsTrail/res/xml/wild0.tmx +++ b/AndorsTrail/res/xml/wild0.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild1.tmx b/AndorsTrail/res/xml/wild1.tmx index 548c753a3..db3b22e60 100644 --- a/AndorsTrail/res/xml/wild1.tmx +++ b/AndorsTrail/res/xml/wild1.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild10.tmx b/AndorsTrail/res/xml/wild10.tmx index ae9cb9bea..48def199e 100644 --- a/AndorsTrail/res/xml/wild10.tmx +++ b/AndorsTrail/res/xml/wild10.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild11.tmx b/AndorsTrail/res/xml/wild11.tmx index e181d1a09..6536479b6 100644 --- a/AndorsTrail/res/xml/wild11.tmx +++ b/AndorsTrail/res/xml/wild11.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild11_clearing.tmx b/AndorsTrail/res/xml/wild11_clearing.tmx index ce56eeb03..92537e150 100644 --- a/AndorsTrail/res/xml/wild11_clearing.tmx +++ b/AndorsTrail/res/xml/wild11_clearing.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild12.tmx b/AndorsTrail/res/xml/wild12.tmx index 30a4d59d7..9420a38c2 100644 --- a/AndorsTrail/res/xml/wild12.tmx +++ b/AndorsTrail/res/xml/wild12.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild13.tmx b/AndorsTrail/res/xml/wild13.tmx index 679b4f552..c62e7e1f2 100644 --- a/AndorsTrail/res/xml/wild13.tmx +++ b/AndorsTrail/res/xml/wild13.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild14.tmx b/AndorsTrail/res/xml/wild14.tmx index c4211ee4b..1727ab505 100644 --- a/AndorsTrail/res/xml/wild14.tmx +++ b/AndorsTrail/res/xml/wild14.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild14_clearing.tmx b/AndorsTrail/res/xml/wild14_clearing.tmx index 4750ab8db..6e9c5705a 100644 --- a/AndorsTrail/res/xml/wild14_clearing.tmx +++ b/AndorsTrail/res/xml/wild14_clearing.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild15.tmx b/AndorsTrail/res/xml/wild15.tmx index 61310d442..a1f43025a 100644 --- a/AndorsTrail/res/xml/wild15.tmx +++ b/AndorsTrail/res/xml/wild15.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild16.tmx b/AndorsTrail/res/xml/wild16.tmx index e6d18a7a3..625ccc05c 100644 --- a/AndorsTrail/res/xml/wild16.tmx +++ b/AndorsTrail/res/xml/wild16.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild17.tmx b/AndorsTrail/res/xml/wild17.tmx index bfe1d2f4d..39faa7892 100644 --- a/AndorsTrail/res/xml/wild17.tmx +++ b/AndorsTrail/res/xml/wild17.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild2.tmx b/AndorsTrail/res/xml/wild2.tmx index f6da80c6e..f9345b81c 100644 --- a/AndorsTrail/res/xml/wild2.tmx +++ b/AndorsTrail/res/xml/wild2.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild3.tmx b/AndorsTrail/res/xml/wild3.tmx index 29a1a75e5..83602a26b 100644 --- a/AndorsTrail/res/xml/wild3.tmx +++ b/AndorsTrail/res/xml/wild3.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild4.tmx b/AndorsTrail/res/xml/wild4.tmx index 2770759b5..8e8c91269 100644 --- a/AndorsTrail/res/xml/wild4.tmx +++ b/AndorsTrail/res/xml/wild4.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild5.tmx b/AndorsTrail/res/xml/wild5.tmx index 99e8aa4e8..d3cb51348 100644 --- a/AndorsTrail/res/xml/wild5.tmx +++ b/AndorsTrail/res/xml/wild5.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild6.tmx b/AndorsTrail/res/xml/wild6.tmx index f016808d0..3dae45790 100644 --- a/AndorsTrail/res/xml/wild6.tmx +++ b/AndorsTrail/res/xml/wild6.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild7.tmx b/AndorsTrail/res/xml/wild7.tmx index 947ccf7b1..d09ea08b5 100644 --- a/AndorsTrail/res/xml/wild7.tmx +++ b/AndorsTrail/res/xml/wild7.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild8.tmx b/AndorsTrail/res/xml/wild8.tmx index 4a097bca5..0fe214d0f 100644 --- a/AndorsTrail/res/xml/wild8.tmx +++ b/AndorsTrail/res/xml/wild8.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/wild9.tmx b/AndorsTrail/res/xml/wild9.tmx index 4a826d994..346812999 100644 --- a/AndorsTrail/res/xml/wild9.tmx +++ b/AndorsTrail/res/xml/wild9.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/res/xml/woodcave0.tmx b/AndorsTrail/res/xml/woodcave0.tmx index c573ee152..8389dcf7e 100644 --- a/AndorsTrail/res/xml/woodcave0.tmx +++ b/AndorsTrail/res/xml/woodcave0.tmx @@ -1,5 +1,8 @@ + + + diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java index 2272ef75f..62f364d3d 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java @@ -110,7 +110,7 @@ public final class SkillCollection { initializeSkill(new SkillInfo(SKILL_RESISTANCE_MENTAL, MAX_LEVEL_RESISTANCE, false, null)); initializeSkill(new SkillInfo(SKILL_RESISTANCE_PHYSICAL_CAPACITY, MAX_LEVEL_RESISTANCE, false, null)); initializeSkill(new SkillInfo(SKILL_RESISTANCE_BLOOD_DISORDER, MAX_LEVEL_RESISTANCE, false, null)); - initializeSkill(new SkillInfo(SKILL_SHADOW_BLESS, SkillInfo.MAXLEVEL_NONE, true, null)); + initializeSkill(new SkillInfo(SKILL_SHADOW_BLESS, 1, true, null)); } public SkillInfo getSkill(int skillID) { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java index b222f7563..a96d825d5 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java @@ -173,22 +173,26 @@ public final class ResourceLoader { private static void prepareTilesets(DynamicTileLoader loader, int mTileSize) { final Size dst_sz1x1 = new Size(mTileSize, mTileSize); final Size dst_sz2x2 = new Size(mTileSize*2, mTileSize*2); + final Size dst_sz2x3 = new Size(mTileSize*2, mTileSize*3); final Size defaultTileSize = dst_sz1x1; final Size src_sz1x1 = new Size(1, 1); + final Size src_sz2x1 = new Size(2, 1); + final Size src_sz3x1 = new Size(3, 1); final Size src_sz6x1 = new Size(6, 1); final Size src_sz7x1 = new Size(7, 1); + final Size src_sz20x12 = new Size(20, 12); final Size src_mapTileSize = new Size(16, 8); final Size src_mapTileSize7 = new Size(16, 7); loader.prepareTileset(R.drawable.char_hero, "char_hero", src_sz1x1, defaultTileSize); loader.prepareTileset(R.drawable.ui_selections, "ui_selections", new Size(5, 1), defaultTileSize); - loader.prepareTileset(R.drawable.ui_quickslots, "ui_quickslots", new Size(2, 1), defaultTileSize); + loader.prepareTileset(R.drawable.ui_quickslots, "ui_quickslots", src_sz2x1, defaultTileSize); loader.prepareTileset(R.drawable.ui_icon_equipment, "ui_icon_equipment", src_sz1x1, defaultTileSize); loader.prepareTileset(R.drawable.ui_splatters1, "ui_splatters1", new Size(8, 2), defaultTileSize); loader.prepareTileset(R.drawable.actorconditions_1, "actorconditions_1", new Size(14, 8), defaultTileSize); - loader.prepareTileset(R.drawable.actorconditions_2, "actorconditions_2", new Size(3, 1), defaultTileSize); + loader.prepareTileset(R.drawable.actorconditions_2, "actorconditions_2", src_sz3x1, defaultTileSize); loader.prepareTileset(R.drawable.items_armours, "items_armours", new Size(14, 3), defaultTileSize); loader.prepareTileset(R.drawable.items_weapons, "items_weapons", new Size(14, 6), defaultTileSize); @@ -196,38 +200,50 @@ public final class ResourceLoader { loader.prepareTileset(R.drawable.items_consumables, "items_consumables", new Size(14, 5), defaultTileSize); loader.prepareTileset(R.drawable.items_books, "items_books", new Size(11, 1), defaultTileSize); loader.prepareTileset(R.drawable.items_misc, "items_misc", new Size(14, 4), defaultTileSize); - loader.prepareTileset(R.drawable.items_misc_2, "items_misc_2", new Size(20, 12), defaultTileSize); - loader.prepareTileset(R.drawable.items_misc_3, "items_misc_3", new Size(20, 12), defaultTileSize); + loader.prepareTileset(R.drawable.items_misc_2, "items_misc_2", src_sz20x12, defaultTileSize); + loader.prepareTileset(R.drawable.items_misc_3, "items_misc_3", src_sz20x12, defaultTileSize); loader.prepareTileset(R.drawable.items_misc_4, "items_misc_4", new Size(20, 4), defaultTileSize); loader.prepareTileset(R.drawable.items_necklaces_1, "items_necklaces_1", new Size(10, 3), defaultTileSize); loader.prepareTileset(R.drawable.items_weapons_3, "items_weapons_3", new Size(13, 5), defaultTileSize); - loader.prepareTileset(R.drawable.items_armours_2, "items_armours_2", new Size(7, 1), defaultTileSize); + loader.prepareTileset(R.drawable.items_armours_2, "items_armours_2", src_sz7x1, defaultTileSize); loader.prepareTileset(R.drawable.items_armours_3, "items_armours_3", new Size(10, 4), defaultTileSize); + loader.prepareTileset(R.drawable.items_rings_1, "items_rings_1", new Size(10, 3), defaultTileSize); + loader.prepareTileset(R.drawable.monsters_armor1, "monsters_armor1", src_sz1x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_cyclops, "monsters_cyclops", src_sz1x1, dst_sz2x3); loader.prepareTileset(R.drawable.monsters_demon1, "monsters_demon1", src_sz1x1, dst_sz2x2); loader.prepareTileset(R.drawable.monsters_dogs, "monsters_dogs", src_sz7x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_eye1, "monsters_eye1", src_sz1x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_eye2, "monsters_eye2", src_sz1x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_eye3, "monsters_eye3", src_sz1x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_eye4, "monsters_eye4", src_sz1x1, defaultTileSize); loader.prepareTileset(R.drawable.monsters_ghost1, "monsters_ghost1", src_sz1x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_hydra1, "monsters_hydra1", src_sz1x1, dst_sz2x2); loader.prepareTileset(R.drawable.monsters_insects, "monsters_insects", src_sz6x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_karvis1, "monsters_karvis1", src_sz2x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_karvis2, "monsters_karvis2", new Size(9, 1), defaultTileSize); + loader.prepareTileset(R.drawable.monsters_ld1, "monsters_ld1", new Size(20, 12), defaultTileSize); + loader.prepareTileset(R.drawable.monsters_ld2, "monsters_ld2", new Size(20, 12), defaultTileSize); loader.prepareTileset(R.drawable.monsters_liches, "monsters_liches", new Size(4, 1), defaultTileSize); - loader.prepareTileset(R.drawable.monsters_mage2, "monsters_mage2", src_sz1x1, defaultTileSize); - loader.prepareTileset(R.drawable.monsters_mage, "monsters_mage", src_sz1x1, defaultTileSize); - loader.prepareTileset(R.drawable.monsters_man1, "monsters_man1", src_sz1x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_mage, "monsters_mage", src_sz1x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_mage2, "monsters_mage2", src_sz1x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_man1, "monsters_man1", src_sz1x1, defaultTileSize); loader.prepareTileset(R.drawable.monsters_men, "monsters_men", new Size(9, 1), defaultTileSize); loader.prepareTileset(R.drawable.monsters_men2, "monsters_men2", new Size(10, 1), defaultTileSize); loader.prepareTileset(R.drawable.monsters_misc, "monsters_misc", new Size(12, 1), defaultTileSize); loader.prepareTileset(R.drawable.monsters_rats, "monsters_rats", new Size(5, 1), defaultTileSize); + loader.prepareTileset(R.drawable.monsters_redshrike1, "monsters_redshrike1", src_sz6x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_rltiles1, "monsters_rltiles1", new Size(20, 8), defaultTileSize); + loader.prepareTileset(R.drawable.monsters_rltiles2, "monsters_rltiles2", new Size(20, 9), defaultTileSize); + loader.prepareTileset(R.drawable.monsters_rltiles3, "monsters_rltiles3", new Size(10, 3), defaultTileSize); loader.prepareTileset(R.drawable.monsters_rogue1, "monsters_rogue1", src_sz1x1, defaultTileSize); loader.prepareTileset(R.drawable.monsters_skeleton1, "monsters_skeleton1", src_sz1x1, defaultTileSize); loader.prepareTileset(R.drawable.monsters_skeleton2, "monsters_skeleton2", src_sz1x1, defaultTileSize); loader.prepareTileset(R.drawable.monsters_snakes, "monsters_snakes", src_sz6x1, defaultTileSize); + loader.prepareTileset(R.drawable.monsters_wraiths, "monsters_wraiths", src_sz3x1, defaultTileSize); loader.prepareTileset(R.drawable.monsters_zombie1, "monsters_zombie1", src_sz1x1, defaultTileSize); - loader.prepareTileset(R.drawable.monsters_rltiles1, "monsters_rltiles1", new Size(20, 8), defaultTileSize); - loader.prepareTileset(R.drawable.monsters_rltiles2, "monsters_rltiles2", new Size(20, 9), defaultTileSize); - loader.prepareTileset(R.drawable.monsters_rltiles3, "monsters_rltiles3", new Size(10, 3), defaultTileSize); - loader.prepareTileset(R.drawable.monsters_karvis2, "monsters_karvis2", new Size(9, 1), defaultTileSize); - loader.prepareTileset(R.drawable.monsters_ld1, "monsters_ld1", new Size(20, 12), defaultTileSize); - loader.prepareTileset(R.drawable.monsters_ld2, "monsters_ld2", new Size(20, 12), defaultTileSize); - + loader.prepareTileset(R.drawable.monsters_zombie2, "monsters_zombie2", src_sz1x1, defaultTileSize); + loader.prepareTileset(R.drawable.map_tiles_1_1, "map_tiles_1_1.png", src_mapTileSize, defaultTileSize); loader.prepareTileset(R.drawable.map_tiles_1_2, "map_tiles_1_2.png", src_mapTileSize, defaultTileSize); loader.prepareTileset(R.drawable.map_tiles_1_3, "map_tiles_1_3.png", src_mapTileSize, defaultTileSize); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java index 4d10a40b0..f1f233050 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java @@ -212,8 +212,6 @@ public final class TileManager { (new AsyncTask() { @Override protected Void doInBackground(Void... arg0) { - L.log("-> cacheAdjacentMaps"); - long start = System.currentTimeMillis(); adjacentMapTiles = null; HashSet adjacentMapNames = new HashSet(); @@ -227,12 +225,8 @@ public final class TileManager { for (String mapName : adjacentMapNames) { addTileIDsFor(tileIDs, mapName, res, world); } - long duration = System.currentTimeMillis() - start; - L.log(" -- cacheAdjacentMaps " + duration + "ms"); adjacentMapTiles = tileCache.loadTilesFor(tileIDs, res); - duration = System.currentTimeMillis() - start; - L.log(" <- cacheAdjacentMaps " + duration + "ms"); return null; } }).execute();