diff --git a/AndorsTrail/res/raw/conversationlist_stoutford.json b/AndorsTrail/res/raw/conversationlist_stoutford.json
index 186c669d5..074af15ee 100644
--- a/AndorsTrail/res/raw/conversationlist_stoutford.json
+++ b/AndorsTrail/res/raw/conversationlist_stoutford.json
@@ -4,12 +4,26 @@
"id":"sign_stoutford_gate"
},
{
- "message":"I should go ask the inn keeper about this bed before using it.",
+ "message":"The owner shouts: \"Hey ! These beds aren't for strangers ! Come here !\"",
"id":"stoutford_bed_locked"
},
{
- "message":"Don't cause trouble.",
- "id":"stoutford_gateguard_0"
+ "message":"What do you want kid ?",
+ "id":"stoutford_gateguard_0",
+ "replies":[
+ {
+ "nextPhraseID":"soutford_gateguard_what_0",
+ "text":"What is this place ?"
+ },
+ {
+ "nextPhraseID":"soutford_gateguard_who_0",
+ "text":"What are you doing here ?"
+ },
+ {
+ "nextPhraseID":"stoutford_gateguard_andor_0",
+ "text":"Have you seen my brother Andor ?"
+ }
+ ]
},
{
"message":"Sorry. I have work to do.",
@@ -22,5 +36,1257 @@
{
"message":"Welcome to Stoutford kid.",
"id":"stoutford_commoner_0"
+ },
+ {
+ "message":"Can't you see I'm busy ? Go talk to my brother Jen, he's always slacking off in the field.",
+ "id":"stoutford_farmer_jan_0"
+ },
+ {
+ "message":"Can't you see I'm busy ? Go talk to my brother Jan, he's always slacking off in the house.",
+ "id":"stoutford_farmer_jen_0"
+ },
+ {
+ "message":"",
+ "id":"kayla_0",
+ "replies":[
+ {
+ "nextPhraseID":"kayla_1",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"Hello.",
+ "id":"kayla_1",
+ "replies":[
+ {
+ "nextPhraseID":"kayla_2",
+ "text":"Who are you ?"
+ }
+ ]
+ },
+ {
+ "message":"I'm Kayla. I love making clothes, shoes and boots.",
+ "id":"kayla_2"
+ },
+ {
+ "message":"Don't cause trouble.",
+ "id":"stoutford_guard1_0"
+ },
+ {
+ "message":"This is Stoutford. Our small village has been the resting place of choice for many merchants on their way between Fallhaven and the Blackwater moutain.",
+ "id":"soutford_gateguard_what_0",
+ "replies":[
+ {
+ "nextPhraseID":"soutford_gateguard_what_1",
+ "text":"Has been ?"
+ }
+ ]
+ },
+ {
+ "message":"Yes. It seems the road is closed somehow. Maybe this is related to the monsters attacks we have been suffering from recently.",
+ "id":"soutford_gateguard_what_1",
+ "replies":[
+ {
+ "nextPhraseID":"soutford_gateguard_what_2",
+ "text":"Is there anything I can do to help ?"
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"Whatever..."
+ }
+ ]
+ },
+ {
+ "message":"I don't know. You look very young. Try talking to our priest.",
+ "id":"soutford_gateguard_what_2",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_gateguard_0",
+ "text":"I have other questions..."
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"Thank you."
+ }
+ ]
+ },
+ {
+ "message":"I'm guarding the town's gate. ",
+ "id":"soutford_gateguard_who_0",
+ "replies":[
+ {
+ "nextPhraseID":"soutford_gateguard_who_1",
+ "text":"Guarding against what ?"
+ }
+ ]
+ },
+ {
+ "message":"In the past, troublemakers that bother the citizens or merchants. Nowadays, it's mainly the monsters, when I can handle them.",
+ "id":"soutford_gateguard_who_1",
+ "replies":[
+ {
+ "nextPhraseID":"soutford_gateguard_who_2",
+ "text":"What monsters ?"
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"Pathetic..."
+ }
+ ]
+ },
+ {
+ "message":"You should talk to our priest about that.",
+ "id":"soutford_gateguard_who_2",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_gateguard_0",
+ "text":"I have other questions..."
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"Thank you."
+ }
+ ]
+ },
+ {
+ "message":"I do recall some kid that looked a bit like you a while ago. He stayed here a couple of days, and never came back as far as I can tell.",
+ "id":"stoutford_gateguard_andor_0",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_gateguard_andor_1",
+ "text":"What did he do here ?"
+ },
+ {
+ "nextPhraseID":"stoutford_gateguard_andor_2",
+ "text":"Do you know where he was going ?"
+ }
+ ]
+ },
+ {
+ "message":"I can't really tell. No known trouble at least. He headed straight to the tavern, and I didn't see him before he left.",
+ "id":"stoutford_gateguard_andor_1",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_gateguard_andor_2",
+ "text":"Do you know where he was going ?"
+ },
+ {
+ "nextPhraseID":"stoutford_gateguard_0",
+ "text":"I have other questions..."
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"Thank you."
+ }
+ ]
+ },
+ {
+ "message":"No.",
+ "id":"stoutford_gateguard_andor_2",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_gateguard_andor_1",
+ "text":"What did he do here ?"
+ },
+ {
+ "nextPhraseID":"stoutford_gateguard_0",
+ "text":"I have other questions..."
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"Thank you."
+ }
+ ]
+ },
+ {
+ "id":"tahalendor_0",
+ "replies":[
+ {
+ "nextPhraseID":"tahalendor_rumblings10x_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":106,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"tahalendor_rumblings10x_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":103,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"tahalendor_rumblings10x_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":100,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"tahalendor_rumblings90_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":90,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"tahalendor_rumblings80_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":80,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"tahalendor_initial_0",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"How dare you come back here after all you've done ?",
+ "id":"tahalendor_initial_0",
+ "replies":[
+ {
+ "nextPhraseID":"tahalendor_initial_1",
+ "text":"Wait. What ?"
+ },
+ {
+ "nextPhraseID":"tahalendor_initial_2",
+ "text":"Actually, it's the first time we meet."
+ }
+ ]
+ },
+ {
+ "message":"Go away ! You're not welcome here !",
+ "id":"tahalendor_initial_1",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"Okay..."
+ }
+ ],
+ "rewards":[
+ {
+ "value":10,
+ "rewardID":"rumblings",
+ "rewardType":"questProgress"
+ }
+ ]
+ },
+ {
+ "message":"Nonsense ! Go away !",
+ "id":"tahalendor_initial_2",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"Okay..."
+ }
+ ],
+ "rewards":[
+ {
+ "value":10,
+ "rewardID":"rumblings",
+ "rewardType":"questProgress"
+ }
+ ]
+ },
+ {
+ "id":"yolgen_0",
+ "replies":[
+ {
+ "nextPhraseID":"yolgen_initial_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":80,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"yolgen_rumblings50_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":50,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"yolgen_rumblings20_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":20,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"yolgen_rumblings10_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":10,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"yolgen_initial_0",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"Go with the shadow.",
+ "id":"yolgen_initial_0",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"Shadow be with you."
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"Whatever."
+ }
+ ]
+ },
+ {
+ "message":"Walk in the shadow kid. I have to apologize for my master Tahalendor.",
+ "id":"yolgen_rumblings10_0",
+ "replies":[
+ {
+ "nextPhraseID":"yolgen_rumblings10_1",
+ "text":"Crazy old geezer... What's wrong with him ?"
+ },
+ {
+ "nextPhraseID":"yolgen_rumblings10_1",
+ "text":"Can you explain ?"
+ }
+ ]
+ },
+ {
+ "message":"My master is wise and old, but his sight is not as sharp as it once was. He took you for someone else.",
+ "id":"yolgen_rumblings10_1",
+ "replies":[
+ {
+ "nextPhraseID":"yolgen_rumblings10_2",
+ "text":"Who ?"
+ }
+ ]
+ },
+ {
+ "message":"To his credit, I have to admit you look a bit like him. I don't know his name.",
+ "id":"yolgen_rumblings10_2",
+ "replies":[
+ {
+ "nextPhraseID":"yolgen_rumblings10_3",
+ "text":"That must be my brother Andor !"
+ },
+ {
+ "nextPhraseID":"yolgen_rumblings10_3",
+ "text":"Go on."
+ }
+ ]
+ },
+ {
+ "message":"He came around here not long ago, stayed a couple of days from what I heard. Since then, we have been hearing frequent rumbles in the church, coming from the underground.",
+ "id":"yolgen_rumblings10_3",
+ "replies":[
+ {
+ "nextPhraseID":"yolgen_rumblings10_4",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"It can be as loud as to make the whole church shake. It even damaged the walls and the roof.",
+ "id":"yolgen_rumblings10_4",
+ "replies":[
+ {
+ "nextPhraseID":"yolgen_rumblings10_5",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"This church is the refuge for all the villagers when monsters attack. We are really worried now.",
+ "id":"yolgen_rumblings10_5",
+ "replies":[
+ {
+ "nextPhraseID":"yolgen_rumblings10_6",
+ "text":"I can't believe Andor has anything to do with this. Can you tell me more ?"
+ },
+ {
+ "nextPhraseID":"yolgen_rumblings10_6",
+ "text":"Is there anything I can do to help ?"
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"Whatever... It's none of my business."
+ }
+ ],
+ "rewards":[
+ {
+ "value":20,
+ "rewardID":"rumblings",
+ "rewardType":"questProgress"
+ }
+ ]
+ },
+ {
+ "message":"I told you all I know. Maybe others in town have seen him.",
+ "id":"yolgen_rumblings10_6",
+ "replies":[
+ {
+ "nextPhraseID":"yolgen_rumblings10_7",
+ "text":"Thank you for your help."
+ },
+ {
+ "nextPhraseID":"yolgen_rumblings10_7",
+ "text":"Guess I'll have to look into it."
+ }
+ ]
+ },
+ {
+ "message":"Shadow be with you.",
+ "id":"yolgen_rumblings10_7"
+ },
+ {
+ "message":"Hello again. Have you found anything about these noises ?",
+ "id":"yolgen_rumblings20_0",
+ "replies":[
+ {
+ "nextPhraseID":"yolgen_rumblings10_7",
+ "text":"No. Not yet."
+ }
+ ]
+ },
+ {
+ "id":"stoutford_thief_0",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_thief_rumblings20_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":20,
+ "requireID":"rumblings"
+ },
+ {
+ "requireType":"questProgress",
+ "value":71,
+ "requireID":"farrik"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"stoutford_thief_initial_0",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"Wanna trade ?",
+ "id":"stoutford_thief_initial_1",
+ "replies":[
+ {
+ "nextPhraseID":"S",
+ "text":"Sure."
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"No."
+ }
+ ]
+ },
+ {
+ "message":"Hey kid. A \"common friend\" told me about you.",
+ "id":"stoutford_thief_rumblings20_0",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_thief_rumblings20_1",
+ "text":"Who ?"
+ }
+ ]
+ },
+ {
+ "message":"Shhh ! Quiet here. You helped the guild, so I'll help you too.",
+ "id":"stoutford_thief_rumblings20_1",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_thief_rumblings20_2",
+ "text":"Help me do what ?"
+ },
+ {
+ "nextPhraseID":"stoutford_thief_rumblings20_2",
+ "text":"Great !"
+ }
+ ]
+ },
+ {
+ "message":"A kid that looked like you was here. He apparently did some business with the owner and the regulars.",
+ "id":"stoutford_thief_rumblings20_2",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_thief_rumblings20_3",
+ "text":"N"
+ }
+ ],
+ "rewards":[
+ {
+ "value":25,
+ "rewardID":"rumblings",
+ "rewardType":"questProgress"
+ }
+ ]
+ },
+ {
+ "message":"They were very careful, and even I couldn't catch a glimpse of their deeds, but you should be cautious if you deal with them.",
+ "id":"stoutford_thief_rumblings20_3",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_thief_rumblings20_4",
+ "text":"Thanks for the advice. I'll take care."
+ },
+ {
+ "nextPhraseID":"stoutford_thief_rumblings20_4",
+ "text":"I can handle myself ! I don't fear them, or anyone else !"
+ }
+ ]
+ },
+ {
+ "message":"Just sayin'. Do what you will.",
+ "id":"stoutford_thief_rumblings20_4",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_thief_initial_1",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"Psst.",
+ "id":"stoutford_thief_initial_0",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_thief_initial_1",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"An unknown force prevents you to go further.",
+ "id":"stoutford_cellar_locked_key"
+ },
+ {
+ "id":"glasforn_0",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings103_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":103,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings70_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":70,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings60_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":60,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings50_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":50,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings30_0",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":30,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"glasforn_initial_0",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"I'm Glasforn, proud owner of this fine establishment.",
+ "id":"glasforn_initial_who_0",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_initial_bed_0",
+ "text":"Can I use one of your beds ?"
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings20_0",
+ "text":"What can you tell me about the strange noises in the church ?",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":20,
+ "requireID":"rumblings"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "message":"Sorry, none are available today.",
+ "id":"glasforn_initial_bed_0",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_initial_who_0",
+ "text":"Who are you ?"
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings20_0",
+ "text":"What can you tell me about the strange noises in the church ?",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":20,
+ "requireID":"rumblings"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "message":"What about them ?",
+ "id":"glasforn_rumblings20_0",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings20_1",
+ "text":"Well, I heard they may be related to my brother Andor. I'm looking for him."
+ }
+ ]
+ },
+ {
+ "message":"You indeed look a lot like him....",
+ "id":"glasforn_rumblings20_1",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings20_2",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"Okay, I can believe that you are Andor's brother. You should have told me earlier !",
+ "id":"glasforn_rumblings20_2",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings20_3",
+ "text":"Why ?"
+ }
+ ]
+ },
+ {
+ "message":"Hello.",
+ "id":"glasforn_initial_0",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_initial_who_0",
+ "text":"Who are you ?"
+ },
+ {
+ "nextPhraseID":"glasforn_initial_bed_0",
+ "text":"Can I use one of your beds ?"
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings20_0",
+ "text":"What can you tell me about the strange noises in the church ?",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":20,
+ "requireID":"rumblings"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "message":"Well, you see, I keep some beds for occasions like this one. You can use the one in the corner, near the painting, if you wish to rest.",
+ "id":"glasforn_rumblings20_3",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings20_4",
+ "text":"For free ?"
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"Thanks."
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings20_5",
+ "text":"About those noises..."
+ }
+ ],
+ "rewards":[
+ {
+ "value":30,
+ "rewardID":"rumblings",
+ "rewardType":"questProgress"
+ }
+ ]
+ },
+ {
+ "message":"Sure.",
+ "id":"glasforn_rumblings20_4",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"Thank you."
+ }
+ ]
+ },
+ {
+ "message":"Oh, you'll definitely enjoy our beds. I'm very proud of them. ",
+ "id":"glasforn_rumblings20_5",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings20_6",
+ "text":"...yes but..."
+ }
+ ]
+ },
+ {
+ "message":"Our food isn't bad either. Go see our cook. He's weird but works great.",
+ "id":"glasforn_rumblings20_6",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"..."
+ }
+ ]
+ },
+ {
+ "message":"So kid, have you tried your bed ? Our beds are the best !",
+ "id":"glasforn_rumblings30_0",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings30_1",
+ "text":"About Andor..."
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings30_1",
+ "text":"About those noises..."
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings30_1",
+ "text":"Not yet."
+ }
+ ]
+ },
+ {
+ "message":"You really should. You'll thank me afterwards.",
+ "id":"glasforn_rumblings30_1"
+ },
+ {
+ "id":"stoutford_lich_killed_0",
+ "replies":[
+ {
+ "nextPhraseID":"stoutford_lich_killed_1",
+ "text":"N",
+ "requires":[
+ {
+ "requireType":"killedMonster",
+ "value":1,
+ "requireID":"stoutford_lich"
+ },
+ {
+ "negate":true,
+ "requireType":"questProgress",
+ "value":50,
+ "requireID":"rumblings"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "message":"You hear a loud rumble, then nothing. Silence. What was that monster ?",
+ "id":"stoutford_lich_killed_1",
+ "rewards":[
+ {
+ "value":50,
+ "rewardID":"rumblings",
+ "rewardType":"questProgress"
+ },
+ {
+ "rewardID":"Active",
+ "mapName":"stoutford_tavern",
+ "rewardType":"deactivateMapObjectGroup"
+ }
+ ]
+ },
+ {
+ "message":"Wha... impossible... how did you...",
+ "id":"glasforn_rumblings50_0",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings50_1",
+ "text":"I should kill you right now !"
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings50_1",
+ "text":"What was that beast ?"
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings50_1",
+ "text":"What did you do to me ?"
+ }
+ ]
+ },
+ {
+ "message":"You... you should be dead !",
+ "id":"glasforn_rumblings50_1",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings60_0",
+ "text":"And so should you."
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings60_0",
+ "text":"Stop. Talk. Tell me everything."
+ }
+ ]
+ },
+ {
+ "message":"Wait. Ok. I stand no chance against you. I'll tell you all I know.",
+ "id":"glasforn_rumblings60_0",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings60_1",
+ "text":"It'd better be worth it."
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings60_1",
+ "text":"Go ahead."
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings60_1",
+ "text":"I'm all hears."
+ }
+ ],
+ "rewards":[
+ {
+ "value":60,
+ "rewardID":"rumblings",
+ "rewardType":"questProgress"
+ }
+ ]
+ },
+ {
+ "message":"It was Andor. He made us do it, and promised to rid us of the Shadow church if we helped.",
+ "id":"glasforn_rumblings60_1",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings60_2",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"When he came, he asked me for a \"private\" place where he could do his weird stuff undisturbed. It had to be underground, and it had to be in the city. I have no idea why.",
+ "id":"glasforn_rumblings60_2",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings60_3",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"I showed him the cellar under the old derelict house.",
+ "id":"glasforn_rumblings60_3",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings60_4",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"I think he spent several days in there, as we didn't see him. Around that time, the rumbles in the church began and we knew he would be keeping his promise.",
+ "id":"glasforn_rumblings60_4",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings60_5",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"When he returned, he ordered me to drug you and make you prisoner in the cellar should you come here, otherwise he would kill us all.",
+ "id":"glasforn_rumblings60_5",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings60_6",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"He gave me this, told me to wear it when I bring you to the cellar, and left. Take it. It scares me anyway. The monsters' attacks began shortly after.",
+ "id":"glasforn_rumblings60_6",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings70_0",
+ "text":"N"
+ }
+ ],
+ "rewards":[
+ {
+ "value":1,
+ "rewardID":"necklace_undead",
+ "rewardType":"giveItem"
+ },
+ {
+ "value":70,
+ "rewardID":"rumblings",
+ "rewardType":"questProgress"
+ }
+ ]
+ },
+ {
+ "message":"That's all I know, I swear. Please spare me. You can use the bed safely now.",
+ "id":"glasforn_rumblings70_0",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings70_1",
+ "text":"I'll spare you. For now. But no more tricks. Or else..."
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings70_1",
+ "text":"I guess this was all necessary."
+ }
+ ],
+ "rewards":[
+ {
+ "rewardID":"Inactive",
+ "mapName":"stoutford_tavern",
+ "rewardType":"activateMapObjectGroup"
+ }
+ ]
+ },
+ {
+ "message":"I swear. You'll be my honored guest for life.",
+ "id":"glasforn_rumblings70_1"
+ },
+ {
+ "message":"Hello again. Have you found anything about these noises ? It seems they have stopped.",
+ "id":"yolgen_rumblings50_0",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"No. Not yet."
+ },
+ {
+ "nextPhraseID":"yolgen_rumblings50_1",
+ "text":"Yes. I think I found the cause."
+ }
+ ]
+ },
+ {
+ "message":"Great. You should talk to my master. I told him you were not who he thought you were.",
+ "id":"yolgen_rumblings50_1",
+ "replies":[
+ {
+ "nextPhraseID":"yolgen_initial_0",
+ "text":"N"
+ }
+ ],
+ "rewards":[
+ {
+ "value":80,
+ "rewardID":"rumblings",
+ "rewardType":"questProgress"
+ }
+ ]
+ },
+ {
+ "message":"You ! You saved us !",
+ "id":"tahalendor_rumblings80_0",
+ "replies":[
+ {
+ "nextPhraseID":"tahalendor_rumblings80_1",
+ "text":"Not thanks to you..."
+ },
+ {
+ "nextPhraseID":"tahalendor_rumblings80_1",
+ "text":"Indeed."
+ },
+ {
+ "nextPhraseID":"tahalendor_rumblings80_1",
+ "text":"That was the right thing to do."
+ }
+ ]
+ },
+ {
+ "message":"All my apologies for earlier. I took you for someone else. Do you know what was causing the rumbles ?",
+ "id":"tahalendor_rumblings80_1",
+ "replies":[
+ {
+ "nextPhraseID":"tahalendor_rumblings80_2",
+ "text":"(Show Demon heart) Some monster. Here's what it left when I killed it.",
+ "requires":[
+ {
+ "requireType":"inventoryKeep",
+ "value":1,
+ "requireID":"eliszylae_heart"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"tahalendor_rumblings80_2bis",
+ "text":"Not really..."
+ }
+ ]
+ },
+ {
+ "message":"Oh my. It's the heart of a lich ! These are nasty creatures. ",
+ "id":"tahalendor_rumblings80_2",
+ "replies":[
+ {
+ "nextPhraseID":"tahalendor_rumblings80_3",
+ "text":"These ? You mean there are others ?"
+ }
+ ]
+ },
+ {
+ "message":"They aren't common, but I have heard stories. They are powerful and live underground. They seem to be related to Kazaul somehow. ",
+ "id":"tahalendor_rumblings80_3",
+ "replies":[
+ {
+ "nextPhraseID":"tahalendor_rumblings80_4",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"I'm surprised such a young boy managed to survive encountering one, let alone actually kill it.",
+ "id":"tahalendor_rumblings80_4",
+ "replies":[
+ {
+ "nextPhraseID":"tahalendor_rumblings80_5",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"Too bad. Come back when you know more.",
+ "id":"tahalendor_rumblings80_2bis"
+ },
+ {
+ "message":"You know, since those monsters' attacks, we don't have much to offer, but take these. By the way, do you have any idea of who might be responsible for all this ?",
+ "id":"tahalendor_rumblings80_5",
+ "replies":[
+ {
+ "nextPhraseID":"tahalendor_rumblings100_0",
+ "text":"Not really."
+ },
+ {
+ "nextPhraseID":"tahalendor_rumblings103_0",
+ "text":"It was all Glasforn's doing. The tavern owner.",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":70,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"tahalendor_rumblings106_0",
+ "text":"It was my brother Andor. I need to find him.",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":70,
+ "requireID":"rumblings"
+ }
+ ]
+ }
+ ],
+ "rewards":[
+ {
+ "value":90,
+ "rewardID":"rumblings",
+ "rewardType":"questProgress"
+ },
+ {
+ "rewardID":"tahalendor_present",
+ "rewardType":"dropList"
+ }
+ ]
+ },
+ {
+ "message":"It's a shame we cannot punish the culprits. Thank you for your help kid.",
+ "id":"tahalendor_rumblings100_0",
+ "rewards":[
+ {
+ "value":100,
+ "rewardID":"rumblings",
+ "rewardType":"questProgress"
+ }
+ ]
+ },
+ {
+ "message":"That fool ! We'll make him pay. Thank you for your help kid.",
+ "id":"tahalendor_rumblings103_0",
+ "rewards":[
+ {
+ "value":103,
+ "rewardID":"rumblings",
+ "rewardType":"questProgress"
+ },
+ {
+ "rewardID":"stoutford_drinkers",
+ "mapName":"stoutford_tavern",
+ "rewardType":"removeSpawnArea"
+ }
+ ]
+ },
+ {
+ "message":"That is troublesome. I have no idea were he went when he left Stoutford, but Kazaul has always been linked to the Undertell, south of here. Thank you for your help kid.",
+ "id":"tahalendor_rumblings106_0",
+ "replies":[
+ {
+ "nextPhraseID":"tahalendor_rumblings10x_0",
+ "text":"N"
+ }
+ ]
+ },
+ {
+ "message":"Go with the shadow child.",
+ "id":"tahalendor_rumblings10x_0",
+ "replies":[
+ {
+ "nextPhraseID":"X",
+ "text":"Shadow be with you."
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"Whatever."
+ }
+ ]
+ },
+ {
+ "message":"Thank you for your help. Do you have any idea of who might be responsible for all this ?",
+ "id":"tahalendor_rumblings90_0",
+ "replies":[
+ {
+ "nextPhraseID":"tahalendor_rumblings100_0",
+ "text":"Not really."
+ },
+ {
+ "nextPhraseID":"tahalendor_rumblings103_0",
+ "text":"It was all Glasforn's doing. The tavern owner.",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":70,
+ "requireID":"rumblings"
+ }
+ ]
+ },
+ {
+ "nextPhraseID":"tahalendor_rumblings106_0",
+ "text":"It was my brother Andor. I need to find him.",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "value":70,
+ "requireID":"rumblings"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "message":"Boohoohoo.... the whole city hates me now. Even my dear customers left.",
+ "id":"glasforn_rumblings103_0",
+ "replies":[
+ {
+ "nextPhraseID":"glasforn_rumblings103_1",
+ "text":"You deserved it."
+ },
+ {
+ "nextPhraseID":"glasforn_rumblings103_1",
+ "text":"Well done."
+ },
+ {
+ "nextPhraseID":"X",
+ "text":"Whatever."
+ }
+ ]
+ },
+ {
+ "message":"Boohoohoo...",
+ "id":"glasforn_rumblings103_1"
}
]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/droplists_stoutford.json b/AndorsTrail/res/raw/droplists_stoutford.json
new file mode 100644
index 000000000..15bdaadbd
--- /dev/null
+++ b/AndorsTrail/res/raw/droplists_stoutford.json
@@ -0,0 +1,52 @@
+[
+ {
+ "id":"eliszylae_droplist",
+ "items":[
+ {
+ "itemID":"eliszylae_heart",
+ "quantity":{
+ "min":1,
+ "max":1
+ },
+ "chance":"100"
+ },
+ {
+ "itemID":"gold",
+ "quantity":{
+ "min":150,
+ "max":200
+ },
+ "chance":"100"
+ }
+ ]
+ },
+ {
+ "id":"tahalendor_present",
+ "items":[
+ {
+ "itemID":"apple_green",
+ "quantity":{
+ "min":2,
+ "max":3
+ },
+ "chance":"100"
+ },
+ {
+ "itemID":"bread",
+ "quantity":{
+ "min":2,
+ "max":4
+ },
+ "chance":"100"
+ },
+ {
+ "itemID":"apple_red",
+ "quantity":{
+ "min":2,
+ "max":3
+ },
+ "chance":"100"
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/itemlist_stoutford.json b/AndorsTrail/res/raw/itemlist_stoutford.json
new file mode 100644
index 000000000..40f7a9c55
--- /dev/null
+++ b/AndorsTrail/res/raw/itemlist_stoutford.json
@@ -0,0 +1,33 @@
+[
+ {
+ "id":"eliszylae_heart",
+ "category":"other",
+ "hasManualPrice":1,
+ "baseMarketCost":0,
+ "name":"Demon heart",
+ "displaytype":"quest",
+ "iconID":"items_misc:6"
+ },
+ {
+ "id":"necklace_undead",
+ "hitEffect":{
+ "increaseCurrentHP":{
+ "min":0,
+ "max":1
+ }
+ },
+ "category":"neck",
+ "name":"Necklace of the Undead",
+ "equipEffect":{
+
+ },
+ "displaytype":"rare",
+ "killEffect":{
+ "increaseCurrentHP":{
+ "min":0,
+ "max":3
+ }
+ },
+ "iconID":"items_necklaces_1:9"
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/monsterlist_stoutford.json b/AndorsTrail/res/raw/monsterlist_stoutford.json
index 9b6528b38..697d759c5 100644
--- a/AndorsTrail/res/raw/monsterlist_stoutford.json
+++ b/AndorsTrail/res/raw/monsterlist_stoutford.json
@@ -1,4 +1,38 @@
[
+ {
+ "id":"stoutford_farmer_jan",
+ "phraseID":"stoutford_farmer_jan_0",
+ "name":"Jan",
+ "iconID":"monsters_karvis2:1"
+ },
+ {
+ "id":"stoutford_farmer_jen",
+ "phraseID":"stoutford_farmer_jen_0",
+ "name":"Jen",
+ "iconID":"monsters_karvis2:1"
+ },
+ {
+ "id":"kayla",
+ "phraseID":"kayla_0",
+ "droplistID":"kayla_shoplist",
+ "unique":1,
+ "monsterClass":"humanoid",
+ "name":"Kayla",
+ "spawnGroup":"kayla",
+ "iconID":"monsters_rltiles4:29"
+ },
+ {
+ "id":"tahalendor",
+ "phraseID":"tahalendor_0",
+ "name":"Tahalendor",
+ "iconID":"monsters_ld1:3"
+ },
+ {
+ "id":"yolgen",
+ "phraseID":"yolgen_0",
+ "name":"Yolgen",
+ "iconID":"monsters_men:4"
+ },
{
"id":"stoutford_gateguard",
"phraseID":"stoutford_gateguard_0",
@@ -7,7 +41,7 @@
},
{
"id":"stoutford_guard1",
- "phraseID":"stoutford_gateguard_0",
+ "phraseID":"stoutford_guard1_0",
"name":"Stoutford Guard",
"iconID":"monsters_tometik2:44"
},
@@ -29,12 +63,6 @@
"name":"Commoner",
"iconID":"monsters_karvis2:2"
},
- {
- "id":"stoutford_farmer1",
- "phraseID":"stoutford_builder_0",
- "name":"Farmer",
- "iconID":"monsters_karvis2:1"
- },
{
"id":"stoutford_commoner2",
"phraseID":"stoutford_commoner_0",
@@ -77,14 +105,15 @@
},
{
"id":"stoutford_innkeeper",
- "phraseID":"stoutford_builder_0",
- "name":"Inn Keeper",
+ "phraseID":"glasforn_0",
+ "name":"Glasforn",
"iconID":"monsters_ld1:33"
},
{
"id":"stoutford_thief",
- "phraseID":"stoutford_gateguard_0",
- "name":"Thief",
+ "phraseID":"stoutford_thief_0",
+ "droplistID":"stoutford_thief_shoplist",
+ "name":"Quiet Thief",
"iconID":"monsters_rogue1:0"
},
{
@@ -107,22 +136,47 @@
"name":"Blacksmith",
"iconID":"monsters_ld1:29"
},
- {
- "id":"stoutford_acolyte",
- "phraseID":"chapelgoer",
- "name":"Acolyte",
- "iconID":"monsters_men:4"
- },
- {
- "id":"stoutford_priest",
- "phraseID":"chapelgoer",
- "name":"Priest",
- "iconID":"monsters_ld1:3"
- },
{
"id":"stoutford_worshiper",
"phraseID":"chapelgoer",
"name":"Praying woman",
"iconID":"monsters_men:6"
+ },
+ {
+ "blockChance":90,
+ "maxAP":10,
+ "maxHP":135,
+ "unique":1,
+ "droplistID":"eliszylae_droplist",
+ "criticalSkill":40,
+ "attackCost":2,
+ "damageResistance":2,
+ "attackChance":80,
+ "attackDamage":{
+ "min":1,
+ "max":6
+ },
+ "id":"stoutford_lich",
+ "hitEffect":{
+ "increaseCurrentHP":{
+ "min":2,
+ "max":4
+ },
+ "conditionsTarget":[
+ {
+ "duration":2,
+ "condition":"feebleness_minor",
+ "magnitude":2,
+ "chance":"15"
+ }
+ ]
+ },
+ "moveCost":5,
+ "monsterClass":"undead",
+ "name":"Eliszylae",
+ "movementAggressionType":"wholeMap",
+ "iconID":"monsters_liches:0",
+ "spawnGroup":"stoutford_lich",
+ "criticalMultiplier":2.0
}
]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/questlist_stoutford.json b/AndorsTrail/res/raw/questlist_stoutford.json
new file mode 100644
index 000000000..1ef1b874b
--- /dev/null
+++ b/AndorsTrail/res/raw/questlist_stoutford.json
@@ -0,0 +1,67 @@
+[
+ {
+ "id":"rumblings",
+ "name":"Rumblings",
+ "showInLog":1,
+ "stages":[
+ {
+ "progress":10,
+ "logText":"The priest in Stoutford looks scared of me and of what I did, but we never met before. Can this have something to do with Andor ?"
+ },
+ {
+ "progress":20,
+ "logText":"The priest's acolyte, Yolgen, told me that Andor was here a while ago, and since then, scary noises resonate in the church, seemingly coming from the underground."
+ },
+ {
+ "progress":25,
+ "logText":"A member of the Thieve's Guild in the tavern of Stoutford told me that the tavern owner dealt with Andor."
+ },
+ {
+ "progress":30,
+ "logText":"Glasforn, the owner of the tavern of Stoutford, admits to knowing Andor, but evades all my questions by boasting about his beds' quality."
+ },
+ {
+ "progress":50,
+ "logText":"After sleeping in Glasforn's bed, I woke up in a cave, and was attacked by a monster. I killed it, but I should go see Glasforn again."
+ },
+ {
+ "progress":60,
+ "logText":"When Glasforn saw me, he was really scared. Hopefully I'll get some informations from him."
+ },
+ {
+ "progress":70,
+ "logText":"I confronted Glasforn. He admited everything, but blamed Andor for it. How can Andor be involved in this ?"
+ },
+ {
+ "progress":80,
+ "logText":"Yolgen told me the rumbles have stopped. I should talk to the priest."
+ },
+ {
+ "progress":85,
+ "logText":"The priest told me the monster was a lich. I should keep its heart safe."
+ },
+ {
+ "progress":90,
+ "logText":"The priest thanked me for saving his church and asked for the culprit."
+ },
+ {
+ "progress":100,
+ "rewardExperience":2000,
+ "finishesQuest":1,
+ "logText":"I told him I do not know who was responsible."
+ },
+ {
+ "progress":103,
+ "rewardExperience":2500,
+ "finishesQuest":1,
+ "logText":"I told him Glasforn was responsible."
+ },
+ {
+ "progress":106,
+ "rewardExperience":2500,
+ "finishesQuest":1,
+ "logText":"I told him Andor was responsible."
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index 6f28f43b5..3f02270c0 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -37,6 +37,7 @@
- @raw/itemlist_v070
- @raw/itemlist_v070_questitems
- @raw/itemlist_shortcut_lodar
+ - @raw/itemlist_stoutford
- @raw/itemlist_pathway_fallhaven
@@ -58,6 +59,7 @@
- @raw/droplists_v070_shops
- @raw/droplists_v070_mobs
- @raw/droplists_shortcut_lodar
+ - @raw/droplists_stoutford
- @raw/droplists_pathway_fallhaven
@@ -75,6 +77,7 @@
- @raw/questlist_v070_lowyna
- @raw/questlist_v070_misc
- @raw/questlist_shortcut_lodar
+ - @raw/questlist_stoutford
- @raw/questlist_pathway_fallhaven
- @raw/questlist_halvor_surprise
diff --git a/AndorsTrail/res/xml/stoutford_cellar.tmx b/AndorsTrail/res/xml/stoutford_cellar.tmx
index 5266add04..ee67746ec 100644
--- a/AndorsTrail/res/xml/stoutford_cellar.tmx
+++ b/AndorsTrail/res/xml/stoutford_cellar.tmx
@@ -1,4 +1,5 @@
+
diff --git a/AndorsTrail/res/xml/stoutford_cellar2.tmx b/AndorsTrail/res/xml/stoutford_cellar2.tmx
index c7201d7df..ba00038a4 100644
--- a/AndorsTrail/res/xml/stoutford_cellar2.tmx
+++ b/AndorsTrail/res/xml/stoutford_cellar2.tmx
@@ -1,4 +1,5 @@
+
diff --git a/AndorsTrail/res/xml/stoutford_church.tmx b/AndorsTrail/res/xml/stoutford_church.tmx
index fad24ee2d..c90dc0ec8 100644
--- a/AndorsTrail/res/xml/stoutford_church.tmx
+++ b/AndorsTrail/res/xml/stoutford_church.tmx
@@ -150,26 +150,10 @@
-
-
-
-
+
+
+
+
diff --git a/AndorsTrail/res/xml/stoutford_cottage2.tmx b/AndorsTrail/res/xml/stoutford_cottage2.tmx
index ad63f1cca..9afd6e426 100644
--- a/AndorsTrail/res/xml/stoutford_cottage2.tmx
+++ b/AndorsTrail/res/xml/stoutford_cottage2.tmx
@@ -1,4 +1,5 @@
+
diff --git a/AndorsTrail/res/xml/stoutford_farmhouse1.tmx b/AndorsTrail/res/xml/stoutford_farmhouse1.tmx
index d1c134bbb..df657a742 100644
--- a/AndorsTrail/res/xml/stoutford_farmhouse1.tmx
+++ b/AndorsTrail/res/xml/stoutford_farmhouse1.tmx
@@ -1,4 +1,5 @@
+
diff --git a/AndorsTrail/res/xml/stoutford_ne.tmx b/AndorsTrail/res/xml/stoutford_ne.tmx
index 34b38448e..59addff61 100644
--- a/AndorsTrail/res/xml/stoutford_ne.tmx
+++ b/AndorsTrail/res/xml/stoutford_ne.tmx
@@ -1,4 +1,5 @@
+
diff --git a/AndorsTrail/res/xml/stoutford_tavern.tmx b/AndorsTrail/res/xml/stoutford_tavern.tmx
index 4ff44fc5d..cb545246f 100644
--- a/AndorsTrail/res/xml/stoutford_tavern.tmx
+++ b/AndorsTrail/res/xml/stoutford_tavern.tmx
@@ -148,23 +148,49 @@
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index b4b81c93e..86ef2b4d8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -18,9 +18,9 @@ public final class AndorsTrailApplication extends Application {
public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
- public static final boolean DEVELOPMENT_FASTSPEED = false;
+ public static final boolean DEVELOPMENT_FASTSPEED = true;
public static final boolean DEVELOPMENT_VALIDATEDATA = true;
- public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
+ public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED;
public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 43;
public static final String CURRENT_VERSION_DISPLAY = "0.7.2dev";
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
index f5a59d042..526e935e7 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
@@ -146,10 +146,10 @@ public final class ConversationController {
}
}
- private void deactivateSpawnArea(String mapName, String monsterTypeSpawnGroup, boolean removeAllMonsters) {
+ private void deactivateSpawnArea(String mapName, String areaID, boolean removeAllMonsters) {
PredefinedMap map = findMapForScriptEffect(mapName);
for (MonsterSpawnArea area : map.spawnAreas) {
- if (!area.areaID.equals(monsterTypeSpawnGroup)) continue;
+ if (!area.areaID.equals(areaID)) continue;
controllers.monsterSpawnController.deactivateSpawnArea(area, removeAllMonsters);
}
}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
index 5e62a4938..c112c1e64 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
@@ -42,7 +42,9 @@ public final class MapController {
continue;
case whenEntering:
// Do not trigger event if the player already was on the same MapObject before.
- if (mapObject.position.contains(lastPosition)) return;
+ if (mapObject.position.contains(lastPosition)) continue;
+ break;
+ case onEveryStep:
break;
}
handleMapEvent(mapObject, newPosition);
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 b68e6e8bf..86b7f073b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
@@ -55,6 +55,7 @@ public final class PredefinedMap {
this.spawnAreas = spawnAreas;
this.initiallyActiveMapObjectGroups = initiallyActiveMapObjectGroups;
this.activeMapObjectGroups = new LinkedList();
+ this.activeMapObjectGroups.addAll(this.initiallyActiveMapObjectGroups);
assert(size.width > 0);
assert(size.height > 0);
this.isOutdoors = isOutdoors;
@@ -91,7 +92,7 @@ public final class PredefinedMap {
for (MapObject o : eventObjects) {
if (!o.isActive) continue;
if (!o.position.contains(p)) continue;
- if (!activeMapObjectGroups.contains(o.group)) continue;
+ //if (!activeMapObjectGroups.contains(o.group)) continue;
if (result == null) result = new ArrayList();
result.add(o);
}
@@ -208,6 +209,9 @@ public final class PredefinedMap {
private void activateMapObjects() {
if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
L.log("Applying active status to all map objects in map "+name);
+ if (name.equalsIgnoreCase("home")) {
+ L.log("Home active");
+ }
}
for (MapObject o : eventObjects) {
o.isActive = activeMapObjectGroups.contains(o.group);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
index 79849c5b4..f1e7142ce 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
@@ -160,6 +160,18 @@ public final class TMXMapTranslator {
L.log("OPTIMIZE: Map " + m.name + ", key " + object.name + "@" + topLeft.toString() + " has unrecognized property \"" + p.name + "\".");
}
}
+ if (requireId == null && object.name != null) {
+ String[] fields = object.name.split(":");
+ if (fields.length == 2) {
+ requireType = Requirement.RequirementType.questProgress;
+ requireValue = Integer.parseInt(fields[1]);
+ requireId = fields[0];
+ } else if (fields.length == 3) {
+ requireValue = Integer.parseInt(fields[2]);
+ requireType = Requirement.RequirementType.valueOf(fields[0]);
+ requireId = fields[1];
+ }
+ }
mapObjects.add(MapObject.createKeyArea(position, phraseID, new Requirement(requireType, requireId, requireValue, requireNegation), group.name));
} else if (object.type.equals("rest")) {
mapObjects.add(MapObject.createRestArea(position, object.name, group.name));