From: oskar.wiksten Date: Tue, 6 Mar 2012 20:49:22 +0000 (+0000) Subject: Bugfix for spawning NPCs on top of sign areas (such as for Ulirfendor for the "Dark... X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f498de517c2df4d88a986273630ec18b219c9ae1;p=users%2Fmchehab%2Fandors-trail.git Bugfix for spawning NPCs on top of sign areas (such as for Ulirfendor for the "Dark protector" quest). Minor conversations in Remgard. Disable Android Lint errors for building with incomplete translations. Renamed start of Remgard questline (thanks ctnbeh13). git-svn-id: https://andors-trail.googlecode.com/svn/trunk@221 08aca716-68be-ccc6-4d58-36f5abd142ac --- diff --git a/AndorsTrail/lint.xml b/AndorsTrail/lint.xml new file mode 100644 index 0000000..8a7b1fa --- /dev/null +++ b/AndorsTrail/lint.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/AndorsTrail/res/values/content_conversationlist.xml b/AndorsTrail/res/values/content_conversationlist.xml index e9b03d9..ebcc3a1 100644 --- a/AndorsTrail/res/values/content_conversationlist.xml +++ b/AndorsTrail/res/values/content_conversationlist.xml @@ -3169,8 +3169,8 @@ {thorin_what_1|Oh, not much. Well actually, I am waiting for someone - or rather, some people.||{{N|thorin_story_1|||||}}|}; {thorin_story_1|You see, me and my fellow gatherers were out investigating the poisonous nature of the Irdegh.||{{N|thorin_story_2|||||}}|}; {thorin_story_2|Apparently, I was the only one that was careful enough when handling our wares.||{{N|thorin_story_3|||||}}|}; -{thorin_story_3|The others got ill quite quick, and we hid in this cave to rest up. But we had not anticipated these bugs in here.||{{N|thorin_story_4|||||}}|}; -{thorin_story_4|Those \'Scaradon\' things are tough! They did not even seen to take any damage when I hit them.||{{N|thorin_story_5|||||}}|}; +{thorin_story_3|The others got ill quite quick, and we hid in this cave to rest up. However, we had not anticipated these bugs in here.||{{N|thorin_story_4|||||}}|}; +{thorin_story_4|Those \'Scaradon\' things are tough! They did not even seem to take any damage when I hit them.||{{N|thorin_story_5|||||}}|}; {thorin_story_5|So, that\'s where I am now. The people that sent us to investigate told us to set up camp if we encountered any problems, and they would come help us.||{{N|thorin_story_6|||||}}|}; {thorin_story_6|So far, you are the first visitor here for quite a while.||{ {You don\'t seem all that upset that your friends died.|thorin_story_6_1|||||} @@ -3726,7 +3726,7 @@ }|}; {talion_demon_2|Good. Then I am able to help you.||{{N|talion_infect_6|||||}}|}; {talion_demon_3|Then you better go take care of that first!||{{Ok, I will be back once the lich is defeated.|X|||||}}|}; -{talion_infect_6|But there is a slight problem. You see, normally my supply of potions and ingredients would be fully stocked. But with this trouble that we have here in Loneford, my supplies are lower than they have ever been before.||{{N|talion_infect_7|||||}}|}; +{talion_infect_6|But there is a slight problem. You see, normally my supply of potions and ingredients would be fully stocked. However with this trouble that we have here in Loneford, my supplies are lower than they have ever been before.||{{N|talion_infect_7|||||}}|}; {talion_infect_7|I am not even able to go out and gather new supplies, what with the illness and all.||{ {Then what can you do?|talion_infect_8|||||} {Is there anything I can do to help?|talion_infect_8|||||} @@ -3855,5 +3855,44 @@ {gylew|Beat it, kid. You shouldn\'t be out here.|||}; {gylew_henchman|Hey, I\'m trying to admire the view here. Get out of my way.|||}; - + + +[id|message|rewards[rewardType|rewardID|value|]|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|requires_Type|]|]; +{ingus|||{ + {|ingus_r1|sisterfight:10||||} + {|ingus_1|||||} + }|}; +{ingus_1|Hello there. I don\'t think I have seen you here in Remgard before.||{{N|ingus_speak1|||||}}|}; +{ingus_r1|Hello again. I hope you enjoy your stay in Remgard.||{{N|ingus_speak1|||||}}|}; +{ingus_speak1|How may I help you?||{ + {What is there to do around here?|ingus_2|||||} + {Is there a shop in town?|ingus_s1|||||} + {What is happening around town?|ingus_2|||||} + }|}; +{ingus_2|Oh, there\'s not much happening around here. We try to keep the town as peaceful as possible.||{{N|ingus_3|||||}}|}; +{ingus_3|We don\'t get many visitors up here in the mountains.||{{N|ingus_4|||||}}|}; +{ingus_4|However, lately there has been some trouble here in town.||{ + {What trouble?|ingus_t1|||||} + {Never mind that, is there a shop in town?|ingus_s1|||||} + }|}; +{ingus_t1|Oh, I don\'t know much about it. The guards say they have seen strange signs outside town, and some people have gone missing.||{{N|ingus_t2|||||}}|}; +{ingus_t2|I try to keep out of it though. Sounds like trouble to me.||{ + {Anything else?|ingus_t3|||||} + {Thank you, goodbye.|X|||||} + }|}; +{ingus_t3|Well, there\'s always the Elwille sisters, fighting as always.||{{N|ingus_t2|||||}}|}; +{ingus_t4|Last night, they must have kept the whole town awake, they way they were shouting at each other.||{{What are they fighting about?|ingus_t5|||||}}|}; +{ingus_t5|Oh .. nothing .. everything. I don\'t know. No one really puts much weight in their squabbling.||{{N|ingus_t6|||||}}|}; +{ingus_t6|They live in one of the cabins on the southern shore. *Ingus points to the southwest*.|{{0|sisterfight|10|}}|{ + {Thank you, I might go visit them. Goodbye.|X|||||} + {Thank you. Goodbye.|X|||||} + {Thank you. I wanted to ask you, is there a shop in town?|ingus_s1|||||} + }|}; +{ingus_s1|Shop? Oh yes, of course. There\'s Rothses\' and Arnal\'s shops right there. *Ingus points to the two nearby houses to the west*||{{N|ingus_t6|||||}}|}; +{ingus_s2|Also, if you have the coin, you can always spend it in the tavern down in town.||{ + {Thank you. What is happening around town?|ingus_2|||||} + {Thank you, goodbye.|X|||||} + }|}; + + diff --git a/AndorsTrail/res/values/content_questlist.xml b/AndorsTrail/res/values/content_questlist.xml index 8a46613..a3f0b11 100644 --- a/AndorsTrail/res/values/content_questlist.xml +++ b/AndorsTrail/res/values/content_questlist.xml @@ -342,7 +342,7 @@ {36|I have found some skeletal remains in the same cave that I met Thorin in.|||} {40|Thorin thanked me for helping him. In return, he has allowed me to use his bed to rest, and is willing to sell me some of his potions.|400|1|} }|}; -{algangror|Nothing but a squeak|1|{ +{algangror|Of mice and men|1|{ {10|In a lonely house on a peninsula at the northern shore of lake Laeroth up in the mountains to the north-east, I met Algangror. She has a rodent problem and needs help dealing with some of them that she has trapped in her basement.|||} {15|I have agreed to help Algangror deal with her rodent problem. I should return to her when I have killed all six rodents in her basement.|||} {20|Algangror thanked me for helping her with her problem.|500||} @@ -400,6 +400,9 @@ {50|Talion has cured me of the Kazaul rotworms. I managed to get one of the rotworms into an empty vial, and Talion told me that it would be very valuable. I cannot imagine for what.|3000||} {51|Because of my former affliction, Talion has agreed to help me by placing blessings of the Shadow upon me whenever I wish, for a fee.||1|} }|}; +{sisterfight|TODO|1|{ + {10|I heard a story about two squabbling sisters in Remgard, Elwel and Elwyl. Apparently they have kept people awake at night with the way they are shouting at each other. I should go visit them in their house on the southern shore of the city of Remgard.|||} + }|}; diff --git a/AndorsTrail/res/xml/crossglen_hall.tmx b/AndorsTrail/res/xml/crossglen_hall.tmx index dfb4526..5f08645 100644 --- a/AndorsTrail/res/xml/crossglen_hall.tmx +++ b/AndorsTrail/res/xml/crossglen_hall.tmx @@ -81,7 +81,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/AndorsTrail/res/xml/waytobrimhavencave4.tmx b/AndorsTrail/res/xml/waytobrimhavencave4.tmx index 1fd3ec2..271766d 100644 --- a/AndorsTrail/res/xml/waytobrimhavencave4.tmx +++ b/AndorsTrail/res/xml/waytobrimhavencave4.tmx @@ -63,9 +63,9 @@ eJztVksSgjAMLaCwduEBXHgEj+DJvIYHEm6Al0DcuVI62jF2kjQtEVn4NmVayEtePtSYeeJexL1fL3X4Ynh3pTHtCF7L5fi6YT0sZN/tS/pMYsNydpH6hrBmfErhDNmTAubzmunYDPFhsV4EsW+JmPvs0/ceiaMj9HV70trCQPkeq6eN71g9n93KgetFTk/srHj1aSPoV44X097hFjaNoh60aCp6BuT5+5mKW1JfPtqB88zkAcZKaaI9RyBgH2nNAwn8ul553ClaQ9SM5pxtmINUHzY5vs/VvM2B018737H/eS3AHJ9Az43NbSq+2Udzga9tOwEnvGNh8Oetm8UanDE5Dc1iKe8v6miKe9Uf0+AB9llKag== - + - eJztk0sKwEAIQ73C3P+y3ZahxsTPlEIF6Sb61EmXma0/X0/bvozeBD2qV/pk655q990z7Kg20jDsCa53D8RgdlGZHp+9kTcr8jfacYJ7ZzO1UU9GE0XVixnmFJf1lvr+LBexkYbtp7I7/MpwGW+e4LKhcjsi4y3Uh+FFXI/Nzl35T6L9JvMUp3Kbr3Pv0XHzPbI6dQ5F3x3d71G97cm8AP3KKzw= + eJztk0sKwEAIQ73C3P+y3ZahxsTPlEIF6Sb61EmXma0/X0/bvozeBD2qV/pk655q990z7Kg20jDsCa53D8RgdlGZHp+9kTcr8jfacYL7tA+qjXoymiiqXswwp7ist9T3Z7mIjTRsP5Xd4VeGy3jzBJcNldsRGW+hPgwv4npsdu7KfxLtN5mnOJXbfJ17j46b75HVqXMo+u7ofo/qbU/mBZk9K00= diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java index ce5c685..6f8e3d6 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java @@ -145,7 +145,10 @@ public final class PredefinedMap { public boolean monsterCanMoveTo(final CoordRect p) { if (!isWalkable(p)) return false; if (getMonsterAt(p) != null) return false; - if (getEventObjectAt(p.topLeft) != null) return false; + MapObject m = getEventObjectAt(p.topLeft); + if (m != null) { + if (m.type == MapObject.MAPEVENT_NEWMAP) return false; + } return true; }