OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into stoutford_tests

Browse Source 
Conflicts:
	AndorsTrail/res/values/loadresources.xml
This commit is contained in:
Zukero
2017-07-25 21:33:55 +02:00
parent da0663bea6 ee838d67c8
commit 45d3ab9fb5
21 changed files with 339 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
AndorsTrail/res/drawable/map_indoor_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 168 KiB

After

Width:  |  Height:  |  Size: 173 KiB

4
AndorsTrail/res/raw/actorconditions_v070.json
View File

@@ -2,7 +2,7 @@
{
"id":"slime",
"iconID":"actorconditions_1:56",
"name":"Corrosive Slime",
"name":"Corrosive slime",
"category":"physical",
"isStacking":1,
"roundEffect":{
@@ -21,7 +21,7 @@
"iconID":"actorconditions_1:44",
"name":"Heightened senses",
"category":"physical",
"isPositive":1,
"isPositive":1,
"abilityEffect":{
"increaseAttackChance":5,
"increaseAttackDamage":{

4
AndorsTrail/res/raw/conversationlist_blackwater_harlenn.json
View File

@@ -179,7 +179,7 @@
},
{
"id":"harlenn_6",
"message":"Most of the time, we spend in the settlement or up here on the mountain.",
"message":"We spend most of our time in the settlement up here on the mountain.",
"replies":[
{
"text":"N",
@@ -1139,4 +1139,4 @@
}
]
}
]
]

10
AndorsTrail/res/raw/conversationlist_buceth.json
View File

@@ -373,7 +373,7 @@
},
{
"id":"buceth_17",
"message":"A while later, the men return. They explain that some of the methods that are used in the village have now been prohibited across the whole land.",
"message":"A while later, the men return. They explain that some of the ways things are done in the village have now been prohibited across the whole land.",
"replies":[
{
"text":"N",
@@ -383,7 +383,7 @@
},
{
"id":"buceth_18",
"message":"Without going into specifics, let's say that these are methods that have been used for past generations in your village.",
"message":"Without going into specifics, let's say that these are ways that have been used for past generations in your village.",
"replies":[
{
"text":"N",
@@ -393,7 +393,7 @@
},
{
"id":"buceth_19",
"message":"Changing the way things are done without these methods will require quite an effort. A lot of people in the village are upset because of this news from the men.",
"message":"Changing the way things are done will require quite an effort for people to adjust. A lot of people in the village are upset because of this news from the men.",
"replies":[
{
"text":"N",
@@ -403,7 +403,7 @@
},
{
"id":"buceth_20",
"message":"Now, tell me. Would you in secret continue using the old methods your past generations have used, or would you instead convert to the way that the men are advocating?",
"message":"Now, tell me. Would you in secret continue using the old ways your past generations have used, or would you instead convert to the ways that the men are advocating?",
"replies":[
{
"text":"I would continue using the old ways in secret.",
@@ -414,7 +414,7 @@
"nextPhraseID":"buceth_21_2"
},
{
"text":"I would only use the methods that are allowed.",
"text":"I would only use the ways that are allowed.",
"nextPhraseID":"buceth_22"
},
{

2
AndorsTrail/res/raw/conversationlist_foamingflask_guards.json
View File

@@ -24,7 +24,7 @@
"message":"We will stand tall. Feygard, city of peace!",
"replies":[
{
"text":"I should better leave",
"text":"I had better be going",
"nextPhraseID":"X"
},
{

6
AndorsTrail/res/raw/conversationlist_kaori.json
View File

@@ -71,7 +71,7 @@
},
{
"id":"kaori_3",
"message":"He did? I guess you are not all that bad as I first thought.",
"message":"He did? I guess you are not as bad as I first thought.",
"replies":[
{
"text":"N",
@@ -147,7 +147,7 @@
},
{
"id":"kaori_11",
"message":"Up until recently, we have been using special potions made of ground bones as healing. These potions are very potent healing potions, and were used for several purposes.",
"message":"Up until recently, we have been using special potions made of ground bones for healing. These were very potent healing potions, and were used for several purposes.",
"replies":[
{
"text":"N",
@@ -178,7 +178,7 @@
"nextPhraseID":"kaori_15"
},
{
"text":"I already have some of those potions with me that you can have",
"text":"I already have some of those potions with me that you can have.",
"nextPhraseID":"kaori_20",
"requires":[
{

2
AndorsTrail/res/raw/conversationlist_mikhail.json
View File

@@ -321,7 +321,7 @@
"replies":[
{
"text":"N",
"nextPhraseID":"mikhail_rats_start3"
"nextPhraseID":"mikhail_rats_start2a"
}
]
},

32
AndorsTrail/res/raw/conversationlist_mikhail_foodpoison.json Normal file
View File

@@ -0,0 +1,32 @@
[
{
"id":"mikhail_rats_start2a",
"message":"Another way to regain your strength is to eat some food. You can buy some for yourself from Mara at the town hall. But watch out - I hear that raw meat can sometimes give you food poisoning.",
"replies":[
{
"text":"N",
"nextPhraseID":"mikhail_rats_start2b"
}
]
},
{
"id":"mikhail_rats_start2b",
"message":"If that happens, perhaps the town priest can do something to help you. Otherwise, just rest until you feel better.",
"replies":[
{
"text":"N",
"nextPhraseID":"mikhail_rats_start2c"
}
]
},
{
"id":"mikhail_rats_start2c",
"message":"Me, I can't really afford the meat, so I just stick to my bread!",
"replies":[
{
"text":"N",
"nextPhraseID":"mikhail_rats_start3"
}
]
}
]

4
AndorsTrail/res/raw/conversationlist_toszylae.json
View File

@@ -154,7 +154,7 @@
},
{
"id":"sign_toszylae_1",
"message":"(Among the remains of the lich 'Toszylae' that you defeated, you find a strange looking helmet.)",
"message":"(On the shrine that was behind the lich 'Toszylae' that you defeated, you find a strange looking helmet.)",
"rewards":[
{
"rewardType":"questProgress",
@@ -170,6 +170,6 @@
},
{
"id":"sign_toszylae_2",
"message":"(You see the remains of the lich 'Toszylae' that you defeated.)"
"message":"(You see an empty shrine where you found the strange looking helmet.)"
}
]

36
AndorsTrail/res/raw/conversationlist_toszylae_fix.json Normal file
View File

@@ -0,0 +1,36 @@
[
{
"id":"trigger_toszylae_1",
"replies":[
{
"nextPhraseID":"X",
"requires":[
{
"requireType":"killedMonster",
"requireID":"toszylae",
"value":1,
"negate":true
}
]
},
{
"nextPhraseID":"X",
"requires":[
{
"requireType":"questProgress",
"requireID":"darkprotector",
"value":10
}
]
},
{
"text":"N",
"nextPhraseID":"trigger_toszylae_2"
}
]
},
{
"id":"trigger_toszylae_2",
"message":"(You notice a strange helmet on the shrine. It looks like it might be valuable. Perhaps you should take it.)"
}
]

4
AndorsTrail/res/raw/conversationlist_ulirfendor.json
View File

@@ -819,7 +819,7 @@
},
{
"id":"ulirfendor_infected_14",
"message":"The ritual proceeds with the carrier being eaten alive by the rotworms and their eggs. Also, the process can have .. shall we say .. unusual effects on the carrier.",
"message":"The ritual proceeds with the carrier being eaten from the inside by the rotworms and their eggs, in effect, giving birth to the creatures within. Also, the process can have .. shall we say .. unusual effects on the carrier before that.",
"replies":[
{
"text":"N",
@@ -833,7 +833,7 @@
"replies":[
{
"text":"N",
"nextPhraseID":"ulirfendor_infected_16"
"nextPhraseID":"ulirfendor_infected_17"
}
],
"rewards":[

1
AndorsTrail/res/raw/itemlist_v070.json
View File

@@ -1712,6 +1712,7 @@
"id":"gem_fire",
"iconID":"items_misc_5:26",
"name":"Gem of warmth",
"displaytype":"extraordinary",
"hasManualPrice":1,
"baseMarketCost":25,
"category":"gem"

2
AndorsTrail/res/raw/monsterlist_v070_lodar5cave.json
View File

@@ -1,7 +1,7 @@
[
{
"id":"caveburr1",
"name":"Young posionous cave burrower",
"name":"Young poisonous cave burrower",
"iconID":"monsters_rltiles2:161",
"maxHP":57,
"moveCost":5,

4
AndorsTrail/res/raw/questlist_v0611_2.json
View File

@@ -186,7 +186,7 @@
},
{
"id":"sisterfight",
"name":"A difference in opinion",
"name":"A difference of opinion",
"showInLog":1,
"stages":[
{
@@ -203,7 +203,7 @@
},
{
"progress":30,
"logText":"One matter that the sisters disagree on currently is the color of a certain potion that the town potion-maker Hjaldar used to make. Elwyl says that the potion of accuracy focus that Hjaldar used to make was a blue potion, but Elwel insists that the potion had a green substance."
"logText":"One matter that the sisters disagree on currently is the color of a certain potion that the town potion-maker Hjaldar used to make. Elwyl says that the potion of accuracy focus that Hjaldar used to make was a blue potion, but Elwel insists that the potion was a green substance."
},
{
"progress":31,

2
AndorsTrail/res/values/authors.xml
View File

@@ -19,6 +19,7 @@
Additional programming by Lucas Delvallet<br />
Additional programming by Florian Doublet<br />
Additional programming by M.H. Alkotob<br />
Additional programming by Olivier Dragon<br />
Additional graphics by Karvis<br />
Russian translation by Dreamer..., e.solodookhin, shell.andor, konstmih, istasman, Aleksey Kabanov, Alexander Zubok, Paul Sulemenkov and dromoz<br />
Italian translation by k6blue, liogiu, Joker and Andrea Luciano Damico<br />
@@ -39,6 +40,7 @@
Additional ideas by Nicholas Franks (Taledus)<br />
Additional content and ideas by Tom Jobes<br />
Additional content and ideas by Stan "Meirerion"<br />
Additional content by Richard Jackson (rijackson741)<br />
<br />
<a href="http://telles0808.deviantart.com/art/RPG-Maker-VX-RTP-Tileset-159218223">Map tilesets graphics by telles0808</a><br />
<a href="http://ails.deviantart.com/art/420-Pixel-Art-Icons-for-RPG-129892453">Item tilesets graphics by Ails</a><br />

5
AndorsTrail/res/values/loadresources.xml
View File

@@ -243,8 +243,9 @@
<item>@raw/conversationlist_pathway_fallhaven</item>
<item>@raw/conversationlist_halvor_surprise</item>
<item>@raw/conversationlist_stoutford</item>
<!-- <item>@raw/conversationlist_stoutford_roots_love</item>
--> </array>
<!-- <item>@raw/conversationlist_stoutford_roots_love</item> -->
<item>@raw/conversationlist_toszylae_fix</item>
</array>
<array name="loadresource_monsters">
<item>@raw/monsterlist_crossglen_animals</item>

411
AndorsTrail/res/xml/waytobrimhavencave3a.tmx
View File

@@ -1,238 +1,285 @@
<?xml version="1.0" ?><!DOCTYPE map SYSTEM 'http://mapeditor.org/dtd/1.0/map.dtd'><map height="22" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="20">
<tileset firstgid="1" name="map_bed_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_bed_1.png" width="512"/>
</tileset><tileset firstgid="129" name="map_border_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_border_1.png" width="512"/>
</tileset><tileset firstgid="257" name="map_bridge_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_bridge_1.png" width="512"/>
</tileset><tileset firstgid="385" name="map_bridge_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_bridge_2.png" width="512"/>
</tileset><tileset firstgid="513" name="map_broken_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_broken_1.png" width="512"/>
</tileset><tileset firstgid="641" name="map_cavewall_1" tileheight="32" tilewidth="32">
<image height="192" source="../drawable/map_cavewall_1.png" width="576"/>
</tileset><tileset firstgid="749" name="map_cavewall_2" tileheight="32" tilewidth="32">
<image height="192" source="../drawable/map_cavewall_2.png" width="576"/>
</tileset><tileset firstgid="857" name="map_cavewall_3" tileheight="32" tilewidth="32">
<image height="192" source="../drawable/map_cavewall_3.png" width="576"/>
</tileset><tileset firstgid="965" name="map_cavewall_4" tileheight="32" tilewidth="32">
<image height="192" source="../drawable/map_cavewall_4.png" width="576"/>
</tileset><tileset firstgid="1073" name="map_chair_table_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_chair_table_1.png" width="512"/>
</tileset><tileset firstgid="1201" name="map_chair_table_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_chair_table_2.png" width="512"/>
</tileset><tileset firstgid="1329" name="map_crate_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_crate_1.png" width="512"/>
</tileset><tileset firstgid="1457" name="map_cupboard_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_cupboard_1.png" width="512"/>
</tileset><tileset firstgid="1585" name="map_curtain_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_curtain_1.png" width="512"/>
</tileset><tileset firstgid="1713" name="map_entrance_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_entrance_1.png" width="512"/>
</tileset><tileset firstgid="1841" name="map_entrance_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_entrance_2.png" width="512"/>
</tileset><tileset firstgid="1969" name="map_fence_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_fence_1.png" width="512"/>
</tileset><tileset firstgid="2097" name="map_fence_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_fence_2.png" width="512"/>
</tileset><tileset firstgid="2225" name="map_fence_3" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_fence_3.png" width="512"/>
</tileset><tileset firstgid="2353" name="map_fence_4" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_fence_4.png" width="512"/>
</tileset><tileset firstgid="2481" name="map_ground_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_ground_1.png" width="512"/>
</tileset><tileset firstgid="2609" name="map_ground_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_ground_2.png" width="512"/>
</tileset><tileset firstgid="2737" name="map_ground_3" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_ground_3.png" width="512"/>
</tileset><tileset firstgid="2865" name="map_ground_4" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_ground_4.png" width="512"/>
</tileset><tileset firstgid="2993" name="map_ground_5" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_ground_5.png" width="512"/>
</tileset><tileset firstgid="3121" name="map_ground_6" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_ground_6.png" width="512"/>
</tileset><tileset firstgid="3249" name="map_ground_7" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_ground_7.png" width="512"/>
</tileset><tileset firstgid="3377" name="map_ground_8" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_ground_8.png" width="512"/>
</tileset><tileset firstgid="3505" name="map_house_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_house_1.png" width="512"/>
</tileset><tileset firstgid="3633" name="map_house_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_house_2.png" width="512"/>
</tileset><tileset firstgid="3761" name="map_indoor_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_indoor_1.png" width="512"/>
</tileset><tileset firstgid="3889" name="map_indoor_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_indoor_2.png" width="512"/>
</tileset><tileset firstgid="4017" name="map_kitchen_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_kitchen_1.png" width="512"/>
</tileset><tileset firstgid="4145" name="map_outdoor_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_outdoor_1.png" width="512"/>
</tileset><tileset firstgid="4273" name="map_pillar_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_pillar_1.png" width="512"/>
</tileset><tileset firstgid="4401" name="map_pillar_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_pillar_2.png" width="512"/>
</tileset><tileset firstgid="4529" name="map_plant_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_plant_1.png" width="512"/>
</tileset><tileset firstgid="4657" name="map_plant_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_plant_2.png" width="512"/>
</tileset><tileset firstgid="4785" name="map_rock_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_rock_1.png" width="512"/>
</tileset><tileset firstgid="4913" name="map_rock_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_rock_2.png" width="512"/>
</tileset><tileset firstgid="5041" name="map_roof_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_roof_1.png" width="512"/>
</tileset><tileset firstgid="5169" name="map_roof_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_roof_2.png" width="512"/>
</tileset><tileset firstgid="5297" name="map_roof_3" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_roof_3.png" width="512"/>
</tileset><tileset firstgid="5425" name="map_shop_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_shop_1.png" width="512"/>
</tileset><tileset firstgid="5553" name="map_sign_ladder_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_sign_ladder_1.png" width="512"/>
</tileset><tileset firstgid="5681" name="map_table_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_table_1.png" width="512"/>
</tileset><tileset firstgid="5809" name="map_trail_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_trail_1.png" width="512"/>
</tileset><tileset firstgid="5937" name="map_transition_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_transition_1.png" width="512"/>
</tileset><tileset firstgid="6065" name="map_transition_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_transition_2.png" width="512"/>
</tileset><tileset firstgid="6193" name="map_transition_3" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_transition_3.png" width="512"/>
</tileset><tileset firstgid="6321" name="map_transition_4" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_transition_4.png" width="512"/>
</tileset><tileset firstgid="6449" name="map_transition_5" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_transition_5.png" width="512"/>
</tileset><tileset firstgid="6577" name="map_tree_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_tree_1.png" width="512"/>
</tileset><tileset firstgid="6705" name="map_tree_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_tree_2.png" width="512"/>
</tileset><tileset firstgid="6833" name="map_wall_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_wall_1.png" width="512"/>
</tileset><tileset firstgid="6961" name="map_wall_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_wall_2.png" width="480"/>
</tileset><tileset firstgid="7081" name="map_wall_3" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_wall_3.png" width="480"/>
</tileset><tileset firstgid="7201" name="map_wall_4" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_wall_4.png" width="480"/>
</tileset><tileset firstgid="7321" name="map_window_1" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_window_1.png" width="512"/>
</tileset><tileset firstgid="7449" name="map_window_2" tileheight="32" tilewidth="32">
<image height="256" source="../drawable/map_window_2.png" width="512"/>
</tileset><layer height="22" name="Ground" width="20">
<data compression="zlib" encoding="base64">eJy1VMENgzAMRDwZoCt1z6yQMEJKF6BRu0A7RoOaE9bJJoG2j5OF4S44ti/0XRcKLoQpIyr5QJygYOHeMmYR7xlJyXviRNIaC/eV8RTxNHzAeU+cRJqT4LYAejKX6JxWLSdqajlH48VSg6/UFA099BTcVGoIG/+GmoPyDj31xtxs3XcwNJe+XY25se7bV2p4GHOz1ffaneydo3/paXe4F9oe/1ILcAf2pQVO0XYib/HY39jr0CvNC9kTx371tvOwAjnsrtybWYlR6MHbpB5y2F2eaY7Sr/Ct1Ptm/o5wtRnQetkCjYfnNwwJ0eI=</data>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
<map version="1.0" orientation="orthogonal" width="20" height="22" tilewidth="32" tileheight="32">
<tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_bed_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_border_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_bridge_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_bridge_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_broken_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
</tileset>
<tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
</tileset>
<tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
<image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
</tileset>
<tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
<image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
</tileset>
<tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_crate_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_curtain_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_entrance_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_entrance_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_fence_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_fence_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
<image source="../drawable/map_fence_3.png" width="512" height="256"/>
</tileset>
<tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
<image source="../drawable/map_fence_4.png" width="512" height="256"/>
</tileset>
<tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_ground_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_ground_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
<image source="../drawable/map_ground_3.png" width="512" height="256"/>
</tileset>
<tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
<image source="../drawable/map_ground_4.png" width="512" height="256"/>
</tileset>
<tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
<image source="../drawable/map_ground_5.png" width="512" height="256"/>
</tileset>
<tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
<image source="../drawable/map_ground_6.png" width="512" height="256"/>
</tileset>
<tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
<image source="../drawable/map_ground_7.png" width="512" height="256"/>
</tileset>
<tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
<image source="../drawable/map_ground_8.png" width="512" height="256"/>
</tileset>
<tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_house_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_house_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_indoor_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_indoor_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_pillar_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_pillar_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_plant_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_plant_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_rock_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_rock_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_roof_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_roof_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
<image source="../drawable/map_roof_3.png" width="512" height="256"/>
</tileset>
<tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_shop_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_table_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_trail_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_transition_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_transition_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
<image source="../drawable/map_transition_3.png" width="512" height="256"/>
</tileset>
<tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
<image source="../drawable/map_transition_4.png" width="512" height="256"/>
</tileset>
<tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
<image source="../drawable/map_transition_5.png" width="512" height="256"/>
</tileset>
<tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_tree_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_tree_2.png" width="512" height="256"/>
</tileset>
<tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_wall_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_wall_2.png" width="480" height="256"/>
</tileset>
<tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
<image source="../drawable/map_wall_3.png" width="480" height="256"/>
</tileset>
<tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
<image source="../drawable/map_wall_4.png" width="480" height="256"/>
</tileset>
<tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_window_1.png" width="512" height="256"/>
</tileset>
<tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_window_2.png" width="512" height="256"/>
</tileset>
<layer name="Ground" width="20" height="22">
<data encoding="base64" compression="zlib">
eJy1VMENgzAMRDwZoCt1z6yQMEJKF6BRu0A7RoOaE9bJJoG2j5OF4S44ti/0XRcKLoQpIyr5QJygYOHeMmYR7xlJyXviRNIaC/eV8RTxNHzAeU+cRJqT4LYAejKX6JxWLSdqajlH48VSg6/UFA099BTcVGoIG/+GmoPyDj31xtxs3XcwNJe+XY25se7bV2p4GHOz1ffaneydo3/paXe4F9oe/1ILcAf2pQVO0XYib/HY39jr0CvNC9kTx371tvOwAjnsrtybWYlR6MHbpB5y2F2eaY7Sr/Ct1Ptm/o5wtRnQetkCjYfnNwwJ0eI=
</data>
</layer>
<layer height="22" name="Objects" width="20">
<data compression="zlib" encoding="base64">eJy9VEsKwjAQDdGFdVFaC0LF83hP6Q28gngI3Xahpe5cqDvzkCGTdCZUQR+U5jNvZvJmEmP+g9tiuLayn/tZM07vxp37qkr2D9RKDHDB2UzffAmt27/kIQfoBJ+wPeQ+JuZb929s+OeYuLiPwphnEfrsI7uYpwHnmJXGZOXwTK2iDyDldrT+PAAf75fhHCCd5wm9OaA9P3PDxlgnf1qP1NbXHLlI52vZPnBynLPTemd9bOjU27Q+MSju1fHuheeS5lJeqfy0/dReJugi1SWexzzKVesx1EWKRTnVNrxjiDemXxvFhvfP2L7XfH/L/wdIP97fks6Adqdi+/hd0t4+6a1E76J28EF3Nbbjfchjoe+03KXepbo07A7+qlYv6M5MzA==</data>
<layer name="Objects" width="20" height="22">
<data encoding="base64" compression="zlib">
eJy9VEsKwjAQDdGFdVFaC0LF83hPyQ28gngI3XYhpe5cWHfmIUMm6Uypgj4ozWfezOTNJMb8B/fVcG1jP/ezZZzOj1v/VZXsH6iVGOCCs5u/+RIav9/nMQdoBZ+wPeUhJuZ7/3c2/nPMfNy+MOZZxD67xC7lacA5FqUxWTk8U6PoA0i5nW04D8DHx3U8B0jn5YjeHNCen9mxMdbJn9YjtQ01Ry7S+Rq2D1w85+q1PtgQGzp1dlyfFBT35nmPInBJcymvsfy0/bG9TNBFqks6T3mUq9ZjqIsUi3KqbXzHEG9KvzrFhvfP1L7XfH/L/wdIP97fks6AdqdS+/Rd0t4+6a1E76J28EF3NbXjfchjoe+03KXepbo4dgd/VasXRN1M3A==
</data>
</layer>
<layer height="22" name="Above" width="20">
<data compression="zlib" encoding="base64">eJxjYKAdOCyGXYxZmDQ9MHEQNmNB1X8Jh3pkPbjk8OklRQ8+ewiZBwPIfiLHbejmESOOD1zG46fFTKSbh81PC4kwB90NsHAixk+XccQVCDwXgJgFokGAmPDGZidM33cBVJoYQE684APkxMsoIA5gS0u4ACxeCZVNpJqHDNDLUErNQ3crPrej2z2Y0x0AeNEqEQ==</data>
<layer name="No helm" width="20" height="22">
<data encoding="base64" compression="zlib">
eJxjYBgF+MBLvoF2wSgYBaNgFIwCcgAAk10A+A==
</data>
</layer>
<layer height="22" name="Walkable" visible="0" width="20">
<data compression="zlib" encoding="base64">eJzbKMbAsHEEYxCA0bgAueZQ6i5qmIPNb+ToJVWOHD+RG97INC7zCJlLTLzjMg+XWkJ+phQQG86EzMBnFqnupCRdoruX0jRPab6h1Dx84TLQ5hGKN/S4IEY9sYCW8YSOAdid9N4=</data>
<layer name="Above" width="20" height="22">
<data encoding="base64" compression="zlib">
eJxjYKAdOCyGXYxZmDQ9MHEQNmNB1X8Jh3pkPbjk8OklRQ8+ewiZBwPIfiLHbejmESOOD1zG46fFTKSbh81PC4kwB90NsHAixk+XccQVCDwXgJgFokGAmPDGZidM33cBVJoYQE684APkxMsoIA5gS0u4ACxeCZVNpJqHDNDLUErNQ3crPrej2z2Y0x0AeNEqEQ==
</data>
</layer>
<layer name="Walkable" width="20" height="22" visible="0">
<data encoding="base64" compression="zlib">
eJzbKMbAsHEEYxCA0bgAueZQ6i5qmIPNb+ToJVWOHD+RG97INC7zCJlLTLzjMg+XWkJ+phQQG86EzMBnFqnupCRdoruX0jRPab6h1Dx84TLQ5hGKN/S4IEY9sYCW8YSOAdid9N4=
</data>
</layer>
<objectgroup name="Mapevents">
<object height="32" name="south" type="mapchange" width="96" x="96" y="544">
<object name="south" type="mapchange" x="96" y="544" width="96" height="32">
<properties>
<property name="map" value="waytobrimhavencave3b"/>
<property name="place" value="north"/>
</properties>
</object>
<object height="32" name="sign_toszylae" type="sign" width="32" x="320" y="96"/>
<object name="sign_toszylae" type="sign" x="352" y="96" width="32" height="32"/>
<object name="trigger_toszylae_1" type="script" x="256" y="96" width="32" height="32">
<properties>
<property name="when" value="enter"/>
</properties>
</object>
</objectgroup>
<objectgroup name="Spawn">
<object height="32" name="toszylae" type="spawn" width="32" x="320" y="96">
<object name="toszylae" type="spawn" x="320" y="96" width="32" height="32">
<properties>
<property name="spawngroup" value="toszylae"/>
</properties>
</object>
<object height="32" name="allaceph_4" type="spawn" width="32" x="224" y="96">
<object name="allaceph_4" type="spawn" x="224" y="96" width="32" height="32">
<properties>
<property name="spawngroup" value="allaceph_4"/>
</properties>
</object>
<object height="32" name="toszylae_guard" type="spawn" width="32" x="288" y="96">
<object name="toszylae_guard" type="spawn" x="288" y="96" width="32" height="32">
<properties>
<property name="spawngroup" value="toszylae_guard"/>
</properties>
</object>
<object height="32" name="allaceph_4_1" type="spawn" width="64" x="96" y="224">
<object name="allaceph_4_1" type="spawn" x="96" y="224" width="64" height="32">
<properties>
<property name="quantity" value="2"/>
<property name="spawngroup" value="allaceph_4"/>
</properties>
</object>
<object height="32" name="allaceph_4_2" type="spawn" width="32" x="320" y="512">
<object name="allaceph_4_2" type="spawn" x="320" y="512" width="32" height="32">
<properties>
<property name="spawngroup" value="allaceph_4"/>
</properties>
</object>
<object height="160" name="allaceph_3" type="spawn" width="448" x="160" y="320">
<object name="allaceph_3" type="spawn" x="160" y="320" width="448" height="160">
<properties>
<property name="quantity" value="2"/>
<property name="spawngroup" value="allaceph_3"/>
</properties>
</object>
<object height="32" name="allaceph_4_3" type="spawn" width="32" x="288" y="640">
<object name="allaceph_4_3" type="spawn" x="288" y="640" width="32" height="32">
<properties>
<property name="spawngroup" value="allaceph_4"/>
</properties>
</object>
<object height="32" name="allaceph_3_1" type="spawn" width="64" x="224" y="640">
<object name="allaceph_3_1" type="spawn" x="224" y="640" width="64" height="32">
<properties>
<property name="spawngroup" value="allaceph_3"/>
</properties>
</object>
<object height="32" name="allaceph_3_2" type="spawn" width="64" x="416" y="608">
<object name="allaceph_3_2" type="spawn" x="416" y="608" width="64" height="32">
<properties>
<property name="spawngroup" value="allaceph_3"/>
</properties>
</object>
<object height="160" name="allaceph_3_3" type="spawn" width="160" x="448" y="192">
<object name="allaceph_3_3" type="spawn" x="448" y="192" width="160" height="160">
<properties>
<property name="spawngroup" value="allaceph_3"/>
</properties>
</object>
</objectgroup>
<objectgroup name="Keys"/>
</map>
<objectgroup name="Replace">
<object name="darkprotector:10" type="replace" x="384" y="96" width="32" height="32">
<properties>
<property name="Objects" value="No helm"/>
</properties>
</object>
</objectgroup>
</map>

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
View File

@@ -318,7 +318,7 @@ public final class HeroinfoActivity_Inventory extends Fragment {
private ItemType getSelectedItemType(AdapterContextMenuInfo info) {
return inventoryListAdapter.getItem(info.position).itemType;
return getSelectedItemType(info.position);
}
@Override
public boolean onContextItemSelected(MenuItem item) {

11
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
View File

@@ -55,10 +55,9 @@ public final class CombatController implements VisualEffectCompletedCallback {
public void exitCombat(boolean pickupLootBags) {
setCombatSelection(null, null);
world.model.uiSelections.isInCombat = false;
combatTurnListeners.onCombatEnded();
world.model.uiSelections.selectedPosition = null;
world.model.uiSelections.selectedMonster = null;
controllers.gameRoundController.resetRoundTimers();
endOfCombatRound();
if (pickupLootBags && totalExpThisFight > 0) {
controllers.itemController.lootMonsterBags(killedMonsterBags, totalExpThisFight);
} else {
@@ -557,6 +556,14 @@ public final class CombatController implements VisualEffectCompletedCallback {
}
}
public void endOfCombatRound() {
combatTurnListeners.onCombatEnded();
world.model.worldData.tickWorldTime();
controllers.gameRoundController.resetRoundTimers();
controllers.actorStatsController.applyConditionsToPlayer(world.model.player, false);
controllers.actorStatsController.applyConditionsToMonsters(world.model.currentMap, true);
}
public void monsterSteppedOnPlayer(Monster m) {
setCombatSelection(m);
enterCombat(BeginTurnAs.monsters);

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
View File

@@ -171,10 +171,8 @@ public final class Player extends Actor {
return v;
}
private static final int EXP_base = 55;
private static final int EXP_D = 400;
private static final int EXP_powbase = 2;
private static int getRequiredExperienceForNextLevel(int currentLevel) {
return (int) (EXP_base * Math.pow(currentLevel, EXP_powbase + currentLevel/EXP_D));
return (int) (EXP_base * currentLevel * currentLevel);
}
public boolean canLevelup() {

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
View File

@@ -197,6 +197,10 @@ public final class SkillListAdapter extends ArrayAdapter<SkillInfo> {
&& item2.canLevelUpSkillTo(player, player.getSkillLevel(item2.id) +1))
return 1;
else { // Then compare by number of requirements (complexity)
if(item1.levelupRequirements == null)
return -1;
if(item2.levelupRequirements == null)
return 1;
if(item1.levelupRequirements.length< item2.levelupRequirements.length)
return -1;
else if(item1.levelupRequirements.length > item2.levelupRequirements.length)