From a6775a1e95f2e609c37d1ba5c5b11481bc135275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Wed, 10 Oct 2018 00:02:05 +0200 Subject: [PATCH 1/4] Fixed non verbal communications --- .../res/raw/conversationlist_agthor.json | 2 +- .../res/raw/conversationlist_algangror.json | 4 +- .../res/raw/conversationlist_benbyr.json | 2 +- .../conversationlist_blackwater_kazaul.json | 6 +- .../conversationlist_blackwater_lower.json | 2 +- .../conversationlist_blackwater_signs.json | 2 +- .../conversationlist_blackwater_throdna.json | 2 +- .../conversationlist_blackwater_upper.json | 2 +- .../res/raw/conversationlist_bwm_agent_1.json | 2 +- .../res/raw/conversationlist_bwm_agent_2.json | 2 +- .../res/raw/conversationlist_charwood1.json | 4 +- .../res/raw/conversationlist_charwood2.json | 12 ++-- .../conversationlist_crossglen_leonid.json | 2 +- .../raw/conversationlist_crossglen_odair.json | 2 +- .../raw/conversationlist_crossroads_1.json | 2 +- .../raw/conversationlist_crossroads_3.json | 2 +- .../res/raw/conversationlist_duaina.json | 6 +- .../res/raw/conversationlist_elwyl.json | 4 +- .../res/raw/conversationlist_erinith.json | 8 +-- .../res/raw/conversationlist_esfiume.json | 2 +- .../raw/conversationlist_fallhaven_drunk.json | 4 +- .../conversationlist_fallhaven_nocmar.json | 2 +- .../conversationlist_fallhaven_oldman.json | 2 +- .../conversationlist_fallhaven_potions.json | 2 +- .../conversationlist_fallhaven_tavern.json | 2 +- .../conversationlist_fallhaven_unnmir.json | 4 +- .../res/raw/conversationlist_fields_1.json | 2 +- .../conversationlist_foamingflask_guards.json | 2 +- .../res/raw/conversationlist_graveyard1.json | 28 ++++---- .../res/raw/conversationlist_guynmart.json | 2 +- .../raw/conversationlist_guynmart2_npc.json | 2 +- .../raw/conversationlist_guynmart_npc.json | 16 ++--- .../res/raw/conversationlist_hjaldar.json | 4 +- .../res/raw/conversationlist_ingus.json | 4 +- AndorsTrail/res/raw/conversationlist_jan.json | 2 +- .../res/raw/conversationlist_jhaeld.json | 4 +- .../res/raw/conversationlist_kaverin.json | 2 +- .../res/raw/conversationlist_lodar.json | 4 +- .../res/raw/conversationlist_lodarfg2.json | 4 +- .../res/raw/conversationlist_lodarfg3.json | 8 +-- .../res/raw/conversationlist_lodarfg4.json | 4 +- .../res/raw/conversationlist_loneford_2.json | 6 +- .../res/raw/conversationlist_loneford_3.json | 6 +- .../res/raw/conversationlist_maelveon.json | 4 +- .../raw/conversationlist_prim_bjorgur.json | 2 +- .../raw/conversationlist_prim_guthbered.json | 2 +- .../res/raw/conversationlist_prim_inn.json | 2 +- .../raw/conversationlist_prim_merchants.json | 2 +- .../raw/conversationlist_prim_outside.json | 4 +- .../res/raw/conversationlist_pwcave.json | 6 +- .../conversationlist_remgard_villagers1.json | 6 +- .../res/raw/conversationlist_rothses.json | 2 +- .../conversationlist_sign_waterwaycave.json | 18 ++--- .../res/raw/conversationlist_stoutford.json | 9 ++- .../conversationlist_stoutford_combined.json | 46 ++++++------ .../res/raw/conversationlist_talion_2.json | 6 +- .../raw/conversationlist_thievesguild_1.json | 2 +- .../raw/conversationlist_tinlyn_sheep.json | 22 +++--- .../res/raw/conversationlist_tiqui.json | 2 +- .../res/raw/conversationlist_toszylae.json | 20 +++--- .../raw/conversationlist_toszylae_fix.json | 2 +- .../raw/conversationlist_toszylae_guard.json | 28 ++++---- .../res/raw/conversationlist_twoteeth.json | 10 +-- .../res/raw/conversationlist_ulirfendor.json | 22 +++--- .../res/raw/conversationlist_unzel2.json | 2 +- .../res/raw/conversationlist_v0612graves.json | 70 +++++++++---------- .../res/raw/conversationlist_v070signs1.json | 4 +- .../res/raw/conversationlist_vacor2.json | 4 +- .../raw/conversationlist_vilegard_v070.json | 2 +- .../res/raw/conversationlist_woodcabin.json | 12 ++-- 70 files changed, 248 insertions(+), 249 deletions(-) diff --git a/AndorsTrail/res/raw/conversationlist_agthor.json b/AndorsTrail/res/raw/conversationlist_agthor.json index b43dd2831..d7e4d4c82 100644 --- a/AndorsTrail/res/raw/conversationlist_agthor.json +++ b/AndorsTrail/res/raw/conversationlist_agthor.json @@ -83,6 +83,6 @@ }, { "id":"agthor_guard0_1", - "message":"Agthor. Talk to him. *points at Agthor*" + "message":"Agthor. Talk to him.\n[Points at Agthor]" } ] \ No newline at end of file diff --git a/AndorsTrail/res/raw/conversationlist_algangror.json b/AndorsTrail/res/raw/conversationlist_algangror.json index 50d0617b6..ae4e3db58 100644 --- a/AndorsTrail/res/raw/conversationlist_algangror.json +++ b/AndorsTrail/res/raw/conversationlist_algangror.json @@ -534,7 +534,7 @@ "nextPhraseID":"algangror_remgard_6" }, { - "text":"(Lie) OK.", + "text":"[Lie] OK.", "nextPhraseID":"algangror_remgard_6" } ] @@ -775,7 +775,7 @@ "nextPhraseID":"algangror_told_3" }, { - "text":"(Lie) No, I have not told anyone.", + "text":"[Lie] No, I have not told anyone.", "nextPhraseID":"algangror_told_3" } ] diff --git a/AndorsTrail/res/raw/conversationlist_benbyr.json b/AndorsTrail/res/raw/conversationlist_benbyr.json index 923ac3882..95b435c7c 100644 --- a/AndorsTrail/res/raw/conversationlist_benbyr.json +++ b/AndorsTrail/res/raw/conversationlist_benbyr.json @@ -57,7 +57,7 @@ }, { "id":"benbyr_story_2", - "message":"You look like an aspiring adventurer. Are you willing to do some ... (Benbyr pauses) ... adventuring? He he.", + "message":"You look like an aspiring adventurer. Are you willing to do some ... [Benbyr pauses] ... adventuring? He he.", "replies":[ { "text":"What are we talking about here?", diff --git a/AndorsTrail/res/raw/conversationlist_blackwater_kazaul.json b/AndorsTrail/res/raw/conversationlist_blackwater_kazaul.json index 907e09059..7f9c9db0a 100644 --- a/AndorsTrail/res/raw/conversationlist_blackwater_kazaul.json +++ b/AndorsTrail/res/raw/conversationlist_blackwater_kazaul.json @@ -22,11 +22,11 @@ }, { "id":"kazaul_guardian_1", - "message":"(The guardian looks completely unaware of your presence)" + "message":"[The guardian looks completely unaware of your presence]" }, { "id":"kazaul_guardian_2", - "message":"(The guardian looks down upon you with its burning eyes)", + "message":"[The guardian looks down upon you with its burning eyes]", "replies":[ { "text":"Kazaul, defiler of the Elytharan Temple.", @@ -36,7 +36,7 @@ }, { "id":"kazaul_guardian_3", - "message":"(You see the burning eyes of the guardian instantly turn into a dark red haze)", + "message":"[You see the burning eyes of the guardian instantly turn into a dark red haze]", "replies":[ { "text":"A fight, I have been waiting for this!", diff --git a/AndorsTrail/res/raw/conversationlist_blackwater_lower.json b/AndorsTrail/res/raw/conversationlist_blackwater_lower.json index 1e594f489..24eb096c8 100644 --- a/AndorsTrail/res/raw/conversationlist_blackwater_lower.json +++ b/AndorsTrail/res/raw/conversationlist_blackwater_lower.json @@ -178,7 +178,7 @@ }, { "id":"blackwater_bossguard_1", - "message":"(The guard gives you a patronizing look, but says nothing)" + "message":"[The guard gives you a patronizing look, but says nothing]" }, { "id":"blackwater_bossguard_2", diff --git a/AndorsTrail/res/raw/conversationlist_blackwater_signs.json b/AndorsTrail/res/raw/conversationlist_blackwater_signs.json index 372cda1df..44bd821d2 100644 --- a/AndorsTrail/res/raw/conversationlist_blackwater_signs.json +++ b/AndorsTrail/res/raw/conversationlist_blackwater_signs.json @@ -1,7 +1,7 @@ [ { "id":"sign_blackwater10", - "message":"North: Prim\nWest: Elm mine\nEast: (text is unreadable due to several scratch marks in the wood)\nSouth: Stoutford" + "message":"North: Prim\nWest: Elm mine\nEast: [Text is unreadable due to several scratch marks in the wood]\nSouth: Stoutford" }, { "id":"keyarea_bwm_agent_1", diff --git a/AndorsTrail/res/raw/conversationlist_blackwater_throdna.json b/AndorsTrail/res/raw/conversationlist_blackwater_throdna.json index f8a20a4ce..177da2488 100644 --- a/AndorsTrail/res/raw/conversationlist_blackwater_throdna.json +++ b/AndorsTrail/res/raw/conversationlist_blackwater_throdna.json @@ -675,7 +675,7 @@ }, { "id":"throdna_purify_7", - "message":"(Throdna continues to mumble on about Kazaul, but you cannot make out any other words)" + "message":"[Throdna continues to mumble on about Kazaul, but you cannot make out any other words]" }, { "id":"throdna_guard", diff --git a/AndorsTrail/res/raw/conversationlist_blackwater_upper.json b/AndorsTrail/res/raw/conversationlist_blackwater_upper.json index 9b073ef5c..408d1c740 100644 --- a/AndorsTrail/res/raw/conversationlist_blackwater_upper.json +++ b/AndorsTrail/res/raw/conversationlist_blackwater_upper.json @@ -57,7 +57,7 @@ }, { "id":"keneg_3", - "message":"*Looks nervous*\nHave to hide." + "message":"[Looks nervous]\nHave to hide." }, { "id":"blackwater_notrust", diff --git a/AndorsTrail/res/raw/conversationlist_bwm_agent_1.json b/AndorsTrail/res/raw/conversationlist_bwm_agent_1.json index 82bd8225b..bbaeef2fc 100644 --- a/AndorsTrail/res/raw/conversationlist_bwm_agent_1.json +++ b/AndorsTrail/res/raw/conversationlist_bwm_agent_1.json @@ -135,7 +135,7 @@ }, { "id":"bwm_agent_1_11", - "message":"The mine shaft over there *points* has collapsed, so I guess you won't make it through there.", + "message":"The mine shaft over there [points] has collapsed, so I guess you won't make it through there.", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_bwm_agent_2.json b/AndorsTrail/res/raw/conversationlist_bwm_agent_2.json index e4af3e7a6..6189e90b7 100644 --- a/AndorsTrail/res/raw/conversationlist_bwm_agent_2.json +++ b/AndorsTrail/res/raw/conversationlist_bwm_agent_2.json @@ -147,7 +147,7 @@ "nextPhraseID":"bwm_agent_2_7" }, { - "text":"(Lie) OK, I promise to head east once we exit the mine.", + "text":"[Lie] OK, I promise to head east once we exit the mine.", "nextPhraseID":"bwm_agent_2_7" } ] diff --git a/AndorsTrail/res/raw/conversationlist_charwood1.json b/AndorsTrail/res/raw/conversationlist_charwood1.json index dce3a4c64..09621b619 100644 --- a/AndorsTrail/res/raw/conversationlist_charwood1.json +++ b/AndorsTrail/res/raw/conversationlist_charwood1.json @@ -232,7 +232,7 @@ }, { "id":"khorailla_cheddar", - "switchToNPC":"khorailla_cheddar", + "switchToNPC":"khorailla_cheddar", "message":"Ah, you really know what's good.", "replies":[ { @@ -240,5 +240,5 @@ "text":"I hope so. It was a long way to come." } ] - } + } ] \ No newline at end of file diff --git a/AndorsTrail/res/raw/conversationlist_charwood2.json b/AndorsTrail/res/raw/conversationlist_charwood2.json index bcfc77d66..4b2fa44d5 100644 --- a/AndorsTrail/res/raw/conversationlist_charwood2.json +++ b/AndorsTrail/res/raw/conversationlist_charwood2.json @@ -29,7 +29,7 @@ "message":"You there, thank the Shadow you're here! Quickly, untie these ropes!", "replies":[ { - "text":"[untie the ropes]", + "text":"[Untie the ropes]", "nextPhraseID":"falothen0_1" }, { @@ -68,11 +68,11 @@ "message":"You see the bloody remains of what looks like a human.", "replies":[ { - "text":"[examine the remains]", + "text":"[Examine the remains]", "nextPhraseID":"morenavia_1" }, { - "text":"[leave it alone]", + "text":"[Leave it alone]", "nextPhraseID":"X" } ] @@ -93,7 +93,7 @@ "message":"Please help me! I'm being held captive here.", "replies":[ { - "text":"[untie the ropes]", + "text":"[Untie the ropes]", "nextPhraseID":"fayvara0_1" }, { @@ -132,11 +132,11 @@ "message":"You see a pile of bloody body parts.", "replies":[ { - "text":"[examine the pile]", + "text":"[Examine the pile]", "nextPhraseID":"ayell_1" }, { - "text":"[leave it alone]", + "text":"[Leave it alone]", "nextPhraseID":"X" } ] diff --git a/AndorsTrail/res/raw/conversationlist_crossglen_leonid.json b/AndorsTrail/res/raw/conversationlist_crossglen_leonid.json index 50464c231..78f2bf928 100644 --- a/AndorsTrail/res/raw/conversationlist_crossglen_leonid.json +++ b/AndorsTrail/res/raw/conversationlist_crossglen_leonid.json @@ -139,7 +139,7 @@ }, { "id":"leonid_crossglen6", - "message":"On one hand, Lord Geomyr supports Crossglen with a lot of protection. *points to the soldiers in the hall*", + "message":"On one hand, Lord Geomyr supports Crossglen with a lot of protection.\n[Points to the soldiers in the hall]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_crossglen_odair.json b/AndorsTrail/res/raw/conversationlist_crossglen_odair.json index e366e0eb8..4e5d1e541 100644 --- a/AndorsTrail/res/raw/conversationlist_crossglen_odair.json +++ b/AndorsTrail/res/raw/conversationlist_crossglen_odair.json @@ -53,7 +53,7 @@ }, { "id":"odair3", - "message":"I recently went in to that cave over there *points west*, to check on our supplies. But apparently, the cave has been infested with rats.", + "message":"I recently went in to that cave over there [points west], to check on our supplies. But apparently, the cave has been infested with rats.", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_crossroads_1.json b/AndorsTrail/res/raw/conversationlist_crossroads_1.json index 984405553..68f13f584 100644 --- a/AndorsTrail/res/raw/conversationlist_crossroads_1.json +++ b/AndorsTrail/res/raw/conversationlist_crossroads_1.json @@ -31,7 +31,7 @@ }, { "id":"fanamor_3", - "message":"...sigh...", + "message":"*sigh*", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_crossroads_3.json b/AndorsTrail/res/raw/conversationlist_crossroads_3.json index 9df0a97e2..f61f543d6 100644 --- a/AndorsTrail/res/raw/conversationlist_crossroads_3.json +++ b/AndorsTrail/res/raw/conversationlist_crossroads_3.json @@ -225,7 +225,7 @@ }, { "id":"keknazar", - "message":"*hssss*\n(You hear squishing sounds as the creature starts moving towards you)", + "message":"*Hssss*\n[You hear squishing sounds as the creature starts moving towards you]", "replies":[ { "text":"For the Shadow!", diff --git a/AndorsTrail/res/raw/conversationlist_duaina.json b/AndorsTrail/res/raw/conversationlist_duaina.json index 341cb1d5c..252a1a130 100644 --- a/AndorsTrail/res/raw/conversationlist_duaina.json +++ b/AndorsTrail/res/raw/conversationlist_duaina.json @@ -41,7 +41,7 @@ }, { "id":"duaina_1", - "message":"The dreams and the visions. It is you! The child that challenges the beast. (Duaina gives you a terrified look)", + "message":"The dreams and the visions. It is you! The child that challenges the beast.\n[Duaina gives you a terrified look]", "replies":[ { "text":"So you have seen me in your visions?", @@ -349,7 +349,7 @@ }, { "id":"duaina_8", - "message":"(Duaina stares at you in silence while holding her hand over her mouth)", + "message":"[Duaina stares at you in silence while holding her hand over her mouth]", "replies":[ { "text":"What else have you seen in your visions?", @@ -363,6 +363,6 @@ }, { "id":"duaina_stop", - "message":"(Duaina stares at you in silence)" + "message":"[Duaina stares at you in silence]" } ] \ No newline at end of file diff --git a/AndorsTrail/res/raw/conversationlist_elwyl.json b/AndorsTrail/res/raw/conversationlist_elwyl.json index 051ead320..fb971806b 100644 --- a/AndorsTrail/res/raw/conversationlist_elwyl.json +++ b/AndorsTrail/res/raw/conversationlist_elwyl.json @@ -43,7 +43,7 @@ }, { "id":"elwel_2", - "message":"(Elwel mutters to herself.) Stupid kids..." + "message":"[Elwel mutters to herself] Stupid kids..." }, { "id":"elwel_3", @@ -346,7 +346,7 @@ }, { "id":"elwyl_19", - "message":"His house is up on the northeast shore of town. *Elwyl points outside*", + "message":"His house is up on the northeast shore of town.\n[Elwyl points outside]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_erinith.json b/AndorsTrail/res/raw/conversationlist_erinith.json index 385d42d7b..d93c6b149 100644 --- a/AndorsTrail/res/raw/conversationlist_erinith.json +++ b/AndorsTrail/res/raw/conversationlist_erinith.json @@ -134,7 +134,7 @@ }, { "id":"erinith_story_4", - "message":"I managed to throw the book in among the trees over there during the attack. *points to the trees directly to the north*", + "message":"I managed to throw the book in among the trees over there during the attack.\n[Points to the trees directly to the north]", "replies":[ { "text":"N", @@ -436,7 +436,7 @@ }, { "id":"erinith_gavepotion_bm_2", - "message":"Hmm, yes. I guess you have a point. Oh well, here goes. *drinks potion*", + "message":"Hmm, yes. I guess you have a point. Oh well, here goes.\n[Drinks potion]", "replies":[ { "text":"N", @@ -446,7 +446,7 @@ }, { "id":"erinith_gavepotion_major_1", - "message":"Thank you for bringing me one. *drinks potion*", + "message":"Thank you for bringing me one.\n[Drinks potion]", "replies":[ { "text":"N", @@ -463,7 +463,7 @@ }, { "id":"erinith_gavepotion_reg_1", - "message":"Thank you for bringing them to me. *drinks all four potions*", + "message":"Thank you for bringing them to me.\n[Drinks all four potions]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_esfiume.json b/AndorsTrail/res/raw/conversationlist_esfiume.json index 507d75b45..d19e779fa 100644 --- a/AndorsTrail/res/raw/conversationlist_esfiume.json +++ b/AndorsTrail/res/raw/conversationlist_esfiume.json @@ -151,7 +151,7 @@ }, { "id":"erethori6", - "message":"It's just north of here. Take the path west of our camp here, and head straight north. It's just around the bend there. *points*", + "message":"It's just north of here. Take the path west of our camp here, and head straight north. It's just around the bend there [points].", "replies":[ { "text":"Thanks, I'll go check it out.", diff --git a/AndorsTrail/res/raw/conversationlist_fallhaven_drunk.json b/AndorsTrail/res/raw/conversationlist_fallhaven_drunk.json index eb205d218..c1b146356 100644 --- a/AndorsTrail/res/raw/conversationlist_fallhaven_drunk.json +++ b/AndorsTrail/res/raw/conversationlist_fallhaven_drunk.json @@ -181,7 +181,7 @@ }, { "id":"fallhaven_drunk_10", - "message":"Oh sweet drinks of joy. May the sssshadow be with you kid. *makes big eyes*", + "message":"Oh sweet drinks of joy. May the sssshadow be with you kid.\n[Makes big eyes]", "replies":[ { "text":"N", @@ -191,7 +191,7 @@ }, { "id":"fallhaven_drunk_11", - "message":"*takes a gulp of the mead*\n\nThat's good stuff!", + "message":"[Takes a gulp of the mead]\nThat's good stuff!", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_fallhaven_nocmar.json b/AndorsTrail/res/raw/conversationlist_fallhaven_nocmar.json index 27be29883..a35c2ab83 100644 --- a/AndorsTrail/res/raw/conversationlist_fallhaven_nocmar.json +++ b/AndorsTrail/res/raw/conversationlist_fallhaven_nocmar.json @@ -253,7 +253,7 @@ }, { "id":"nocmar_complete_4", - "message":"*Nocmar places the heartstone among the heartsteel weapons*", + "message":"[Nocmar places the heartstone among the heartsteel weapons]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_fallhaven_oldman.json b/AndorsTrail/res/raw/conversationlist_fallhaven_oldman.json index 4717bc135..d490ab0da 100644 --- a/AndorsTrail/res/raw/conversationlist_fallhaven_oldman.json +++ b/AndorsTrail/res/raw/conversationlist_fallhaven_oldman.json @@ -87,7 +87,7 @@ }, { "id":"fallhaven_oldman_6", - "message":"I have no idea where it might be. You could go ask Arcir, he seems very fond of his books. *points at the house to the south*", + "message":"I have no idea where it might be. You could go ask Arcir, he seems very fond of his books.\n [Points at the house to the south]", "replies":[ { "text":"OK, I'll go ask Arcir. Goodbye.", diff --git a/AndorsTrail/res/raw/conversationlist_fallhaven_potions.json b/AndorsTrail/res/raw/conversationlist_fallhaven_potions.json index 4a4a89451..260400b82 100644 --- a/AndorsTrail/res/raw/conversationlist_fallhaven_potions.json +++ b/AndorsTrail/res/raw/conversationlist_fallhaven_potions.json @@ -302,7 +302,7 @@ }, { "id":"fallhaven_pot_antifp_q2", - "message":"[mixes the ingredients]", + "message":"[Mixes the ingredients]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_fallhaven_tavern.json b/AndorsTrail/res/raw/conversationlist_fallhaven_tavern.json index cb90a4720..725dc7c79 100644 --- a/AndorsTrail/res/raw/conversationlist_fallhaven_tavern.json +++ b/AndorsTrail/res/raw/conversationlist_fallhaven_tavern.json @@ -18,7 +18,7 @@ "message":"A room will cost you only 10 gold.", "replies":[ { - "text":"Buy [10 gold]", + "text":"[Buy for 10 gold]", "nextPhraseID":"bela_room_2", "requires":[ { diff --git a/AndorsTrail/res/raw/conversationlist_fallhaven_unnmir.json b/AndorsTrail/res/raw/conversationlist_fallhaven_unnmir.json index afdb0cebb..73702f38e 100644 --- a/AndorsTrail/res/raw/conversationlist_fallhaven_unnmir.json +++ b/AndorsTrail/res/raw/conversationlist_fallhaven_unnmir.json @@ -106,7 +106,7 @@ }, { "id":"unnmir_7", - "message":"Yeah yeah, I get it. Your brother has probably run off to some dungeon, trying to go adventuring. *rolls eyes*", + "message":"Yeah yeah, I get it. Your brother has probably run off to some dungeon, trying to go adventuring.\n[Rolls eyes]", "replies":[ { "text":"N", @@ -150,7 +150,7 @@ }, { "id":"unnmir_11", - "message":"Nice. I'll give you a hint, kid. *snickering*. Go see Nocmar over by the west side of town. Tell him I sent you.", + "message":"Nice. I'll give you a hint, kid. *snickering* Go see Nocmar over by the west side of town. Tell him I sent you.", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_fields_1.json b/AndorsTrail/res/raw/conversationlist_fields_1.json index 9ffadc3bb..2348ac694 100644 --- a/AndorsTrail/res/raw/conversationlist_fields_1.json +++ b/AndorsTrail/res/raw/conversationlist_fields_1.json @@ -29,6 +29,6 @@ }, { "id":"sign_loneford2", - "message":"Welcome to peaceful Loneford.\n(The sign also contains a drawing of a bale of hay with what looks like a farmer sitting on top.)" + "message":"Welcome to peaceful Loneford.\n[The sign also contains a drawing of a bale of hay with what looks like a farmer sitting on top]" } ] \ No newline at end of file diff --git a/AndorsTrail/res/raw/conversationlist_foamingflask_guards.json b/AndorsTrail/res/raw/conversationlist_foamingflask_guards.json index b3561fc77..be3bb0aa8 100644 --- a/AndorsTrail/res/raw/conversationlist_foamingflask_guards.json +++ b/AndorsTrail/res/raw/conversationlist_foamingflask_guards.json @@ -1,7 +1,7 @@ [ { "id":"ff_guard_1", - "message":"Ha ha, you tell him Garl!\n\n*burp*", + "message":"Ha ha, you tell him Garl! *burp*", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_graveyard1.json b/AndorsTrail/res/raw/conversationlist_graveyard1.json index 407a0f077..e2b6f3c9b 100644 --- a/AndorsTrail/res/raw/conversationlist_graveyard1.json +++ b/AndorsTrail/res/raw/conversationlist_graveyard1.json @@ -117,7 +117,7 @@ }, { "id":"algore_30", - "message":"I thought nothing more of it. I was a simple trader in Loneford with a beautiful wife and daughter.\n(Hagale takes another long swig from the bottle of Lowyna's special brew)", + "message":"I thought nothing more of it. I was a simple trader in Loneford with a beautiful wife and daughter.\n[Hagale takes another long swig from the bottle of Lowyna's special brew]", "replies":[ { "text":"N", @@ -127,7 +127,7 @@ }, { "id":"algore_40", - "message":"(Hagale takes another swig from the bottle of Lowyna's special brew)\nI realized that she wouldn't make it.\nI watched as she suffered in agonizing pain. I knew without treatment she would die in a matter of weeks.", + "message":"[Hagale takes another swig from the bottle of Lowyna's special brew]\nI realized that she wouldn't make it.\nI watched as she suffered in agonizing pain. I knew without treatment she would die in a matter of weeks.", "replies":[ { "text":"N", @@ -157,7 +157,7 @@ }, { "id":"algore_00", - "message":"(This man smells of alcohol and some plant-like substance; he is clearly intoxicated.)", + "message":"[This man smells of alcohol and some plant-like substance; he is clearly intoxicated]", "replies":[ { "text":"I defeated the undead monster and opened the chest. I found a powerful sword inside.", @@ -523,7 +523,7 @@ }, { "id":"graveyardking_1", - "message":"(You notice this undead is wearing a key around its neck.)", + "message":"[You notice this undead is wearing a key around its neck]", "replies":[ { "text":"I've come for the key.", @@ -669,7 +669,7 @@ }, { "id":"algore_87", - "message":"(Hagale finishes the second bottle of Lowyna's special brew.) ... Sure do. I hope you know what you're doing kid.", + "message":"[Hagale finishes the second bottle of Lowyna's special brew]\nSure do. I hope you know what you're doing kid.", "replies":[ { "text":"N", @@ -777,7 +777,7 @@ "message":"I heard something similar was occurring in Charwood until a young adventurer killed a vile beast in the mine beneath the city.", "replies":[ { - "text":"I was in Charwood recently and what you heard was true. (You describe your experiences in Charwood and the battle with Thukuzun)", + "text":"I was in Charwood recently and what you heard was true.\n[You describe your experiences in Charwood and the battle with Thukuzun]", "nextPhraseID":"cithurn_30" }, { @@ -995,7 +995,7 @@ "message":"Meow ... Meow.", "replies":[ { - "text":"(You scratch the cat behind the ear.)", + "text":"[You scratch the cat behind the ear]", "nextPhraseID":"cithurncatmeow_1", "requires":[ { @@ -1007,7 +1007,7 @@ ] }, { - "text":"(You stroke the cat.)", + "text":"[You stroke the cat]", "nextPhraseID":"cithurncatmeow_2", "requires":[ { @@ -1534,7 +1534,7 @@ }, { "id":"algore_11", - "message":"Alright kid!\n\n(Hagale immediately opens one of the bottles and takes a big swig, which he loudly swallows before wiping his mouth on the sleeve of his tattered shirt)\n\nYeah, I know something about that chest ... BURP ... I almost opened it.", + "message":"Alright kid!\n[Hagale immediately opens one of the bottles and takes a big swig, which he loudly swallows before wiping his mouth on the sleeve of his tattered shirt]\nYeah, I know something about that chest ... *burp* ... I almost opened it.", "replies":[ { "text":"N", @@ -1597,7 +1597,7 @@ }, { "id":"algore_32", - "message":"We were only halfway there when we were attacked by Plaguestriders. My daughter and I managed to escape...\n(Hagale takes another long swig from the bottle of Lowyna's special brew.) ...but my wife did not survive.", + "message":"We were only halfway there when we were attacked by Plaguestriders. My daughter and I managed to escape...\n[Hagale takes another long swig from the bottle of Lowyna's special brew]\n...but my wife did not survive.", "replies":[ { "text":"N", @@ -1617,7 +1617,7 @@ }, { "id":"algore_41", - "message":"I had to do something. I went to Fallhaven and begged Thoronir to make me a bonemeal potion. Although it would have cured my daughter completely, he refused because Lord Geomyr banned all use of bonemeal as a healing substance!\n(Hagale takes another long swig from the bottle of Lowyna's special brew and finishes it. He proceeds to open the second the bottle.)", + "message":"I had to do something. I went to Fallhaven and begged Thoronir to make me a bonemeal potion. Although it would have cured my daughter completely, he refused because Lord Geomyr banned all use of bonemeal as a healing substance!\n[Hagale takes another long swig from the bottle of Lowyna's special brew and finishes it. He proceeds to open the second the bottle.]", "replies":[ { "text":"N", @@ -2267,7 +2267,7 @@ }, { "id":"waterwaycaveloot", - "message":"(You have stumbled upon the remains of an adventurer that came before you. Looking at what is left of their equipment, they were ill-prepared for a place such as this. Now they have no use for their equipment or gold. You debate whether to loot the corpse. In the past you have done worse, but...)", + "message":"[You have stumbled upon the remains of an adventurer that came before you. Looking at what is left of their equipment, they were ill-prepared for a place such as this. Now they have no use for their equipment or gold. You debate whether to loot the corpse. In the past you have done worse, but...]", "replies":[ { "text":"You decide to take everything.", @@ -2484,11 +2484,11 @@ "message":"You found some crates that look as though they have been here for a very long time. One of the crates has some old, tattered clothing in it.", "replies":[ { - "text":"(Take the clothes)", + "text":"[Take the clothes]", "nextPhraseID":"old_clothes_2" }, { - "text":"(Leave the clothes)", + "text":"[Leave the clothes]", "nextPhraseID":"X" } ] diff --git a/AndorsTrail/res/raw/conversationlist_guynmart.json b/AndorsTrail/res/raw/conversationlist_guynmart.json index 358c9920d..42385a107 100644 --- a/AndorsTrail/res/raw/conversationlist_guynmart.json +++ b/AndorsTrail/res/raw/conversationlist_guynmart.json @@ -621,7 +621,7 @@ }, { "id":"guynmart_sign_steward_2", - "message":"(whispering from below) Oh, how I long to take my place here...", + "message":"[Whispering from below] Oh, how I long to take my place here...", "switchToNPC":"guynmart_steward2", "replies":[ { diff --git a/AndorsTrail/res/raw/conversationlist_guynmart2_npc.json b/AndorsTrail/res/raw/conversationlist_guynmart2_npc.json index 1a4d49764..ae7649996 100644 --- a/AndorsTrail/res/raw/conversationlist_guynmart2_npc.json +++ b/AndorsTrail/res/raw/conversationlist_guynmart2_npc.json @@ -1653,7 +1653,7 @@ }, { "id":"guynmart_wise_202", - "message":"(eating)", + "message":"[Eating]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_guynmart_npc.json b/AndorsTrail/res/raw/conversationlist_guynmart_npc.json index c34a46e49..221251134 100644 --- a/AndorsTrail/res/raw/conversationlist_guynmart_npc.json +++ b/AndorsTrail/res/raw/conversationlist_guynmart_npc.json @@ -4201,7 +4201,7 @@ }, { "id":"guynmart_cook_106", - "message":"You should have brought just 1 portion. These herbs must be used fresh. Nevertheless I will take all the herbs.\n[all herb portions taken]", + "message":"You should have brought just 1 portion. These herbs must be used fresh. Nevertheless I will take all the herbs.\n[All herb portions taken]", "replies":[ { "text":"Eh, yes of course.", @@ -4791,7 +4791,7 @@ }, { "id":"guynmart_lovis_110", - "message":"(fluting)", + "message":"[Fluting]", "replies":[ { "text":"What a lovely tune! I almost seem to understand the meaning.", @@ -4805,7 +4805,7 @@ }, { "id":"guynmart_lovis_120", - "message":"(fluting)", + "message":"[Fluting]", "replies":[ { "text":"...do me wrong...", @@ -4815,7 +4815,7 @@ }, { "id":"guynmart_lovis_130", - "message":"(fluting)", + "message":"[Fluting]", "replies":[ { "text":"...all my joy ... my delight...", @@ -6013,7 +6013,7 @@ }, { "id":"guynmart_200", - "message":"(groaning) ...open the gate...", + "message":"[Groaning] ...open the gate...", "switchToNPC":"guynmart", "replies":[ { @@ -6029,7 +6029,7 @@ }, { "id":"guynmart_250", - "message":"(groaning)", + "message":"[Groaning]", "switchToNPC":"guynmart" }, { @@ -6169,12 +6169,12 @@ }, { "id":"guynmart_s_herold_20", - "message":"(whispering) You should talk to Lovis again.", + "message":"[Whispering] You should talk to Lovis again.", "switchToNPC":"guynmart_herold" }, { "id":"guynmart_s_herold_30", - "message":"(whispering) You should talk again to Unkorh.", + "message":"[Whispering] You should talk again to Unkorh.", "switchToNPC":"guynmart_herold" }, { diff --git a/AndorsTrail/res/raw/conversationlist_hjaldar.json b/AndorsTrail/res/raw/conversationlist_hjaldar.json index cc803256b..c2ceb5427 100644 --- a/AndorsTrail/res/raw/conversationlist_hjaldar.json +++ b/AndorsTrail/res/raw/conversationlist_hjaldar.json @@ -345,7 +345,7 @@ }, { "id":"hjaldar_r9", - "message":"Now, let's see. Some of these... *Hjaldar pulls out some dried up berries and puts them in his mortar*", + "message":"Now, let's see. Some of these...\n[Hjaldar pulls out some dried up berries and puts them in his mortar]", "replies":[ { "text":"N", @@ -395,7 +395,7 @@ }, { "id":"hjaldar_r14", - "message":"*Hjaldar shakes the vials vigorously, one in each of his hands*", + "message":"[Hjaldar shakes the vials vigorously, one in each of his hands]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_ingus.json b/AndorsTrail/res/raw/conversationlist_ingus.json index c90845f04..5da3d8758 100644 --- a/AndorsTrail/res/raw/conversationlist_ingus.json +++ b/AndorsTrail/res/raw/conversationlist_ingus.json @@ -195,7 +195,7 @@ }, { "id":"ingus_t6", - "message":"They live in one of the cabins on the southern shore. *Ingus points to the south*.", + "message":"They live in one of the cabins on the southern shore.\n[Ingus points to the south]", "replies":[ { "text":"Thank you, I might go visit them. Goodbye.", @@ -220,7 +220,7 @@ }, { "id":"ingus_s1", - "message":"Shop? Oh yes, of course. There's Rothses' and Arnal's shops right there. *Ingus points to the two nearby houses to the west*", + "message":"Shop? Oh yes, of course. There's Rothses' and Arnal's shops right there.\n[Ingus points to the two nearby houses to the west]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_jan.json b/AndorsTrail/res/raw/conversationlist_jan.json index dae32762a..4d445f589 100644 --- a/AndorsTrail/res/raw/conversationlist_jan.json +++ b/AndorsTrail/res/raw/conversationlist_jan.json @@ -111,7 +111,7 @@ }, { "id":"jan_default8", - "message":"That's when it happened.\n\n*sob*\n\nOh what have we done?", + "message":"That's when it happened. *sob* Oh what have we done?", "replies":[ { "text":"Please go on.", diff --git a/AndorsTrail/res/raw/conversationlist_jhaeld.json b/AndorsTrail/res/raw/conversationlist_jhaeld.json index 9a4f8f0ad..18106cb07 100644 --- a/AndorsTrail/res/raw/conversationlist_jhaeld.json +++ b/AndorsTrail/res/raw/conversationlist_jhaeld.json @@ -224,7 +224,7 @@ }, { "id":"jhaeld_7", - "message":"(Sigh) To even think that we need to get help from children to run errands now.", + "message":"*sigh* To even think that we need to get help from children to run errands now.", "replies":[ { "text":"N", @@ -579,7 +579,7 @@ }, { "id":"jhaeld_return6", - "message":"(Jhaeld mumbles) Stupid kids...", + "message":"[Jhaeld mumbles] Stupid kids...", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_kaverin.json b/AndorsTrail/res/raw/conversationlist_kaverin.json index b844b2e0f..fd3f00aae 100644 --- a/AndorsTrail/res/raw/conversationlist_kaverin.json +++ b/AndorsTrail/res/raw/conversationlist_kaverin.json @@ -307,7 +307,7 @@ }, { "id":"kaverin_accept3", - "message":"(He gives you a sealed message.)", + "message":"[He gives you a sealed message]", "replies":[ { "text":"You can count on me, Kaverin.", diff --git a/AndorsTrail/res/raw/conversationlist_lodar.json b/AndorsTrail/res/raw/conversationlist_lodar.json index 0eb113933..c624359ed 100644 --- a/AndorsTrail/res/raw/conversationlist_lodar.json +++ b/AndorsTrail/res/raw/conversationlist_lodar.json @@ -250,7 +250,7 @@ }, { "id":"lodar_12", - "message":"Good. Take this stone, it will allow you to enter the tomb. Go below. Return once you're done.\n\n[Lodar hands you an odd looking stone that seems to be glowing from within]", + "message":"[Lodar hands you an odd looking stone that seems to be glowing from within]\nGood. Take this stone, it will allow you to enter the tomb. Go below. Return once you're done.", "replies":[ { "text":"You're not very good at giving directions, old man. I'll try to do what you ask.", @@ -2116,7 +2116,7 @@ "nextPhraseID":"lodar_d1" }, { - "text":"(Lie) Sure, this will be a secret between us.", + "text":"[Lie] Sure, this will be a secret between us.", "nextPhraseID":"lodar_d1" } ] diff --git a/AndorsTrail/res/raw/conversationlist_lodarfg2.json b/AndorsTrail/res/raw/conversationlist_lodarfg2.json index 8c4495d7d..a8d8d295d 100644 --- a/AndorsTrail/res/raw/conversationlist_lodarfg2.json +++ b/AndorsTrail/res/raw/conversationlist_lodarfg2.json @@ -67,7 +67,7 @@ }, { "id":"lodar_fg2_4", - "message":"(the guard mumbles something that you can't understand)", + "message":"[The guard mumbles something that you can't understand]", "replies":[ { "text":"N", @@ -87,7 +87,7 @@ }, { "id":"lodar_fg2_6", - "message":"(the guard continues with his mumbling)", + "message":"[The guard continues with his mumbling]", "replies":[ { "text":"Hello?", diff --git a/AndorsTrail/res/raw/conversationlist_lodarfg3.json b/AndorsTrail/res/raw/conversationlist_lodarfg3.json index 58f7e7c8b..be9badb0d 100644 --- a/AndorsTrail/res/raw/conversationlist_lodarfg3.json +++ b/AndorsTrail/res/raw/conversationlist_lodarfg3.json @@ -23,7 +23,7 @@ }, { "id":"lodar_fg3_0", - "message":"(the guard stares back at you without saying anything)", + "message":"[The guard stares back at you without saying anything]", "replies":[ { "text":"N", @@ -33,7 +33,7 @@ }, { "id":"lodar_fg3_1", - "message":"(you notice him breathing heavily, and that his hands are shaking furiously)", + "message":"[You notice him breathing heavily, and that his hands are shaking furiously]", "replies":[ { "text":"N", @@ -43,7 +43,7 @@ }, { "id":"lodar_fg3_2", - "message":"(you also notice that the whites in his eyes have turned red from the many pulsating veins)", + "message":"[You also notice that the whites in his eyes have turned red from the many pulsating veins]", "replies":[ { "text":"N", @@ -53,7 +53,7 @@ }, { "id":"lodar_fg3_3", - "message":"(the guard launches himself at you, raising his sword)", + "message":"[The guard launches himself at you, raising his sword]", "replies":[ { "text":"Fight!", diff --git a/AndorsTrail/res/raw/conversationlist_lodarfg4.json b/AndorsTrail/res/raw/conversationlist_lodarfg4.json index e2f8d7017..47d877a53 100644 --- a/AndorsTrail/res/raw/conversationlist_lodarfg4.json +++ b/AndorsTrail/res/raw/conversationlist_lodarfg4.json @@ -53,7 +53,7 @@ }, { "id":"lodar_fg4_3", - "message":"(the guard turns towards you, almost as if he didn't notice you before)", + "message":"[The guard turns towards you, almost as if he didn't notice you before]", "replies":[ { "text":"N", @@ -80,7 +80,7 @@ "nextPhraseID":"lodar_fg4_6" }, { - "text":"(Lie) Yes, I an one of them. Bow down to me.", + "text":"[Lie] Yes, I an one of them. Bow down to me.", "nextPhraseID":"lodar_fg4_6" }, { diff --git a/AndorsTrail/res/raw/conversationlist_loneford_2.json b/AndorsTrail/res/raw/conversationlist_loneford_2.json index 9973f52af..e3068684b 100644 --- a/AndorsTrail/res/raw/conversationlist_loneford_2.json +++ b/AndorsTrail/res/raw/conversationlist_loneford_2.json @@ -78,7 +78,7 @@ }, { "id":"landa_2", - "message":"(Landa gives you a terrified look.)", + "message":"[Landa gives you a terrified look]", "replies":[ { "text":"N", @@ -98,7 +98,7 @@ }, { "id":"landa_4", - "message":"Or was it you? No, it looked like you, and I have a good memory! *bites lip*", + "message":"Or was it you? No, it looked like you, and I have a good memory!\n[Bites lip]", "replies":[ { "text":"Calm down.", @@ -269,7 +269,7 @@ }, { "id":"landa_19", - "message":"Now, get out of here kid, before anyone sees you talking to me. *Looks around anxiously*", + "message":"Now, get out of here kid, before anyone sees you talking to me.\n[Looks around anxiously]", "replies":[ { "text":"Thank you Landa. Your secret is safe with me.", diff --git a/AndorsTrail/res/raw/conversationlist_loneford_3.json b/AndorsTrail/res/raw/conversationlist_loneford_3.json index fb989deb1..6de082ef9 100644 --- a/AndorsTrail/res/raw/conversationlist_loneford_3.json +++ b/AndorsTrail/res/raw/conversationlist_loneford_3.json @@ -25,7 +25,7 @@ }, { "id":"sienn_pet_1", - "message":"Pet, cute!\n(Sienn makes cuddly sounds while scratching the pet under its chin.)", + "message":"Pet, cute!\n[Sienn makes cuddly sounds while scratching the pet under its chin]", "replies":[ { "text":"Who are you?", @@ -50,14 +50,14 @@ }, { "id":"sienn_pet", - "message":"*Shriek!*\n(The creature looks up at you, showing all its teeth, while making a high-pitched piercing sound.)", + "message":"Aaargh!\n[The creature looks up at you, showing all its teeth, while making a high-pitched piercing sound]", "replies":[ { "text":"There, there. Easy now.", "nextPhraseID":"X" }, { - "text":"*slowly back away*", + "text":"[Slowly back away]", "nextPhraseID":"X" } ] diff --git a/AndorsTrail/res/raw/conversationlist_maelveon.json b/AndorsTrail/res/raw/conversationlist_maelveon.json index 301fdec31..3ef84cf87 100644 --- a/AndorsTrail/res/raw/conversationlist_maelveon.json +++ b/AndorsTrail/res/raw/conversationlist_maelveon.json @@ -1,7 +1,7 @@ [ { "id":"maelveon", - "message":"[you feel a tingling sensation in your body as the frightening figure begins to speak]", + "message":"[You feel a tingling sensation in your body as the frightening figure begins to speak]", "replies":[ { "text":"N", @@ -49,7 +49,7 @@ }, { "id":"maelveon_4", - "message":"[the figure lifts his hand and points at you]", + "message":"[The figure lifts his hand and points at you]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_prim_bjorgur.json b/AndorsTrail/res/raw/conversationlist_prim_bjorgur.json index 4054050b0..1ca9b9f93 100644 --- a/AndorsTrail/res/raw/conversationlist_prim_bjorgur.json +++ b/AndorsTrail/res/raw/conversationlist_prim_bjorgur.json @@ -40,7 +40,7 @@ "nextPhraseID":"bjorgur_9" }, { - "text":"(Lie) I went to check on the grave. Everything seems to be normal. You must be imagining things.", + "text":"[Lie] I went to check on the grave. Everything seems to be normal. You must be imagining things.", "nextPhraseID":"bjorgur_return_3", "requires":[ { diff --git a/AndorsTrail/res/raw/conversationlist_prim_guthbered.json b/AndorsTrail/res/raw/conversationlist_prim_guthbered.json index 38b7d5892..8dd06fde2 100644 --- a/AndorsTrail/res/raw/conversationlist_prim_guthbered.json +++ b/AndorsTrail/res/raw/conversationlist_prim_guthbered.json @@ -695,7 +695,7 @@ "nextPhraseID":"guthbered_workingforbwm_1" }, { - "text":"(Lie) You can trust me.", + "text":"[Lie] You can trust me.", "nextPhraseID":"guthbered_talkedto_harl_7", "requires":[ { diff --git a/AndorsTrail/res/raw/conversationlist_prim_inn.json b/AndorsTrail/res/raw/conversationlist_prim_inn.json index 91cbc4917..df88e2fd0 100644 --- a/AndorsTrail/res/raw/conversationlist_prim_inn.json +++ b/AndorsTrail/res/raw/conversationlist_prim_inn.json @@ -297,7 +297,7 @@ "nextPhraseID":"prim_cook_return_3" }, { - "text":"(Lie) Yes, he told me that I could rest in the back room if I want to.", + "text":"[Lie] Yes, he told me that I could rest in the back room if I want to.", "nextPhraseID":"prim_cook_return_4" }, { diff --git a/AndorsTrail/res/raw/conversationlist_prim_merchants.json b/AndorsTrail/res/raw/conversationlist_prim_merchants.json index 2209f91ac..684333588 100644 --- a/AndorsTrail/res/raw/conversationlist_prim_merchants.json +++ b/AndorsTrail/res/raw/conversationlist_prim_merchants.json @@ -97,7 +97,7 @@ }, { "id":"prim_guard2", - "message":"(The guard looks down on you with a condescending look)" + "message":"[The guard looks down on you with a condescending look]" }, { "id":"prim_guard3", diff --git a/AndorsTrail/res/raw/conversationlist_prim_outside.json b/AndorsTrail/res/raw/conversationlist_prim_outside.json index b94505a1e..f3fe9f59f 100644 --- a/AndorsTrail/res/raw/conversationlist_prim_outside.json +++ b/AndorsTrail/res/raw/conversationlist_prim_outside.json @@ -231,7 +231,7 @@ "nextPhraseID":"prim_commoner1_2" }, { - "text":"(Lie) Yes, I am here to help your village.", + "text":"[Lie] Yes, I am here to help your village.", "nextPhraseID":"prim_commoner1_2" } ] @@ -337,7 +337,7 @@ "nextPhraseID":"prim_commoner4_3" }, { - "text":"(Lie) Yes, I have come to help your village.", + "text":"[Lie] Yes, I have come to help your village.", "nextPhraseID":"prim_commoner4_3" } ] diff --git a/AndorsTrail/res/raw/conversationlist_pwcave.json b/AndorsTrail/res/raw/conversationlist_pwcave.json index 493502ba0..4a383fcfd 100644 --- a/AndorsTrail/res/raw/conversationlist_pwcave.json +++ b/AndorsTrail/res/raw/conversationlist_pwcave.json @@ -41,7 +41,7 @@ }, { "id":"iqhan_boss_1", - "message":"(The figure points its finger towards you, in what looks to be an order for the nearby thralls to attack you.)", + "message":"[The figure points its finger towards you, in what looks to be an order for the nearby thralls to attack you]", "replies":[ { "text":"Fight!", @@ -51,11 +51,11 @@ }, { "id":"sign_waterway1", - "message":"South: Loneford\nEast: Brimhaven.\n(You also see something written on an arrow pointing to the west, but you cannot understand the words)" + "message":"South: Loneford\nEast: Brimhaven.\n[You also see something written on an arrow pointing to the west, but you cannot understand the words]" }, { "id":"sign_waterway3", - "message":"(The sign contains writing in a language you cannot understand)" + "message":"The sign contains writing in a language you cannot understand." }, { "id":"gauward", diff --git a/AndorsTrail/res/raw/conversationlist_remgard_villagers1.json b/AndorsTrail/res/raw/conversationlist_remgard_villagers1.json index f3485f3b9..2d6ed80aa 100644 --- a/AndorsTrail/res/raw/conversationlist_remgard_villagers1.json +++ b/AndorsTrail/res/raw/conversationlist_remgard_villagers1.json @@ -87,7 +87,7 @@ }, { "id":"larni_2", - "message":"(You see Larni holding his forehead.) Hey, *cough* get out of here! This is ... *cough* ... my house!" + "message":"[You see Larni holding his forehead]\nHey, *cough* get out of here! This is ... *cough* ... my house!" }, { "id":"caeda", @@ -264,7 +264,7 @@ }, { "id":"arnal_2", - "message":"(Arnal clears his throat)", + "message":"[Arnal clears his throat]", "replies":[ { "text":"N", @@ -462,7 +462,7 @@ }, { "id":"chael", - "message":"(Chael gives you a blank stare)", + "message":"[Chael gives you a blank stare]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_rothses.json b/AndorsTrail/res/raw/conversationlist_rothses.json index d3133ffe1..a2a146a73 100644 --- a/AndorsTrail/res/raw/conversationlist_rothses.json +++ b/AndorsTrail/res/raw/conversationlist_rothses.json @@ -126,7 +126,7 @@ }, { "id":"rothses_3", - "message":"Oh, I don't know much about that. Funny you should ask. (Rothses gives you a suspicious look)", + "message":"Oh, I don't know much about that. Funny you should ask.\n[Rothses gives you a suspicious look]", "replies":[ { "text":"Are you sure? Anything you know or might have seen may be of interest.", diff --git a/AndorsTrail/res/raw/conversationlist_sign_waterwaycave.json b/AndorsTrail/res/raw/conversationlist_sign_waterwaycave.json index 6e3622273..0f39b826e 100644 --- a/AndorsTrail/res/raw/conversationlist_sign_waterwaycave.json +++ b/AndorsTrail/res/raw/conversationlist_sign_waterwaycave.json @@ -4,11 +4,11 @@ "message":"You notice a slight draft blowing across your ankles as you stand admiring the quality of this woven coil of rope.", "replies":[ { - "text":"Take the rope.", + "text":"[Take the rope]", "nextPhraseID":"sign_waterwaycave2" }, { - "text":"Leave it alone.", + "text":"[Leave it alone]", "nextPhraseID":"X" } ] @@ -19,10 +19,10 @@ }, { "id":"sign_bwm31", - "message":"(You notice some torn papers on the floor. From the looks of it, these pages seem to have been torn from a larger journal.)", + "message":"You notice some torn papers on the floor. From the looks of it, these pages seem to have been torn from a larger journal.", "replies":[ { - "text":"Read the journal.", + "text":"[Read the journal]", "nextPhraseID":"sign_bwm31_1" } ] @@ -69,10 +69,10 @@ }, { "id":"sign_bwm31_5", - "message":"(The paper is full of dirt, but you still manage to read most of it)", + "message":"[The paper is full of dirt, but you still manage to read most of it]", "replies":[ { - "text":"Continue reading.", + "text":"[Continue reading]", "nextPhraseID":"sign_bwm31_6" } ] @@ -102,7 +102,7 @@ "message":"Getting weaker. Must rest.", "replies":[ { - "text":"Continue reading.", + "text":"[Continue reading]", "nextPhraseID":"sign_bwm31_9" } ] @@ -152,7 +152,7 @@ "message":"Maybe if I gather enough of these potions from the monsters around the cabin, I might have enough to safely make it down again.", "replies":[ { - "text":"Continue reading.", + "text":"[Continue reading]", "nextPhraseID":"sign_bwm31_14" } ] @@ -189,6 +189,6 @@ }, { "id":"sign_bwm31_17", - "message":"(The journal has no more pages)" + "message":"[The journal has no more pages]" } ] \ No newline at end of file diff --git a/AndorsTrail/res/raw/conversationlist_stoutford.json b/AndorsTrail/res/raw/conversationlist_stoutford.json index ea95b1584..20b056a66 100644 --- a/AndorsTrail/res/raw/conversationlist_stoutford.json +++ b/AndorsTrail/res/raw/conversationlist_stoutford.json @@ -5,7 +5,7 @@ }, { "id":"stoutford_bed_locked", - "message":"The owner shouts: \"Hey! These beds aren't for strangers! Come here!\"" + "message":"[The owner shouts] Hey! These beds aren't for strangers! Come here!" }, { "id":"stoutford_gateguard_0", @@ -1265,7 +1265,7 @@ "message":"My sincerest apologies for earlier. I took you for someone else. Do you know what was causing the rumbles?", "replies":[ { - "text":"(Show Demon heart) Some monster. Here's what it left when I killed it.", + "text":"[Show Demon heart] Some monster. Here's what it left when I killed it.", "nextPhraseID":"tahalendor_rumblings80_2", "requires":[ { @@ -1515,7 +1515,7 @@ "requireType":"killedMonster", "requireID":"erwyn", "value":2, - "negate":true + "negate":true } ] } @@ -1564,7 +1564,7 @@ }, { "id":"tahalendor_erwyn_5", - "message":"Now I will bless them with a special enchantment...\n(Tahalendor holds the coins over the altar and mutters something you can't hear.)", + "message":"Now I will bless them with a special enchantment...\n[Tahalendor holds the coins over the altar and mutters something you can't hear]", "replies":[ { "text":"N", @@ -1579,7 +1579,6 @@ { "text":"Thank you.", "nextPhraseID":"X" - } ], "rewards":[ diff --git a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json index a787d40e5..41f25b2de 100644 --- a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json +++ b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json @@ -888,7 +888,7 @@ "message":"I might let you go if you remove that ghastly statue. Maybe I'll even give you two of those ugly plants for that. Agreed?", "replies":[ { - "text":"(lie) Agreed. Bring the Damerilias first.", + "text":"[Lie] Agreed. Bring the Damerilias first.", "nextPhraseID":"lakecave2_troll_70" }, { @@ -1897,7 +1897,7 @@ }, { "id":"stoutford_widow_thorns30_0", - "message":"Now I take three potions of the brave (chanting) ... add my prepared ingredients (chanting) ... shake it (chanting) ... shake it - ready.\nHere, be careful with it. Potions of truth are rare.", + "message":"Now I take three potions of the brave *chanting* ... add my prepared ingredients *chanting* ... shake it *chanting* ... shake it - ready.\nHere, be careful with it. Potions of truth are rare.", "replies":[ { "text":"Thank you. What do you have in mind now?", @@ -2661,7 +2661,7 @@ "message":"What ... what is this? I feel strange...", "replies":[ { - "text":"(loud voice) Tahalendor! Come in, we can start!", + "text":"[Loud voice] Tahalendor! Come in, we can start!", "nextPhraseID":"blornvale_thorns70_20", "requires":[ { @@ -5191,7 +5191,7 @@ ] }, { - "text":"(lie) He had nothing of any worth on him.", + "text":"[Lie] He had nothing of any worth on him.", "nextPhraseID":"yolgen_castle_10" } ] @@ -5279,7 +5279,7 @@ "message":"He was there without any of his ... special items? Did you look thoroughly?", "replies":[ { - "text":"(lie)Yes, but I found nothing worth having.", + "text":"[Lie] Yes, but I found nothing worth having.", "nextPhraseID":"yolgen_castle_11" }, { @@ -5400,7 +5400,7 @@ }, { "id":"stn_sign_stoutford", - "message":"Stoutford Castle\n\n(scribbled below) Death awaits you" + "message":"Stoutford Castle\n\n[Scribbled below] Death awaits you" }, { "id":"stoutford_commoner4", @@ -5721,8 +5721,8 @@ }, { "id":"berbane_102", - "message":"(loud voice) Pay attention and listen everybody! The castle is free! The trembling is over!", - "switchToNPC":"berbane", + "message":"[Loud voice] Pay attention and listen everybody! The castle is free! The trembling is over!", + "switchToNPC":"berbane", "replies":[ { "text":"...??", @@ -5739,7 +5739,7 @@ }, { "id":"berbane_110", - "message":"(loud voice) My trainee and I, we were in the castle. I demonstrated how to fight properly. Lord Erwyn himself was an especially good demonstration object.", + "message":"[Loud voice] My trainee and I, we were in the castle. I demonstrated how to fight properly. Lord Erwyn himself was an especially good demonstration object.", "replies":[ { "text":"But...", @@ -5749,7 +5749,7 @@ }, { "id":"berbane_120", - "message":"(loud voice) But we will come to the details later - after the next round.", + "message":"[Loud voice] But we will come to the details later - after the next round.", "replies":[ { "text":"No, I have...", @@ -5777,7 +5777,7 @@ }, { "id":"berbane_132", - "message":"(loud voice) Yes, he has carried my magical helmet for me. I will take it back now.", + "message":"[Loud voice] Yes, he has carried my magical helmet for me. I will take it back now.", "replies":[ { "text":"I give up.", @@ -5794,7 +5794,7 @@ }, { "id":"berbane_134", - "message":"(loud voice) Yes, he has learned much from me. But no need to thank me now.", + "message":"[Loud voice] Yes, he has learned much from me. But no need to thank me now.", "replies":[ { "text":"I give up.", @@ -5804,7 +5804,7 @@ }, { "id":"berbane_140", - "message":"(low voice) Well-behaved. \n(loud voice) And now: Mead for everyone! Let's be merry! Forget all sorrows!", + "message":"[Low voice] Well-behaved.\n[Loud voice] And now: Mead for everyone! Let's be merry! Forget all sorrows!", "rewards":[ { "rewardType":"giveItem", @@ -9709,7 +9709,7 @@ }, { "id":"stn_colonel_36", - "message":"(chuckles) Very clever. You should not trust strangers nowadays.", + "message":"*chuckles* Very clever. You should not trust strangers nowadays.", "replies":[ { "text":"Who are you and how do you know my name?", @@ -9893,7 +9893,7 @@ "message":"Take your time.", "replies":[ { - "text":"(drinking)", + "text":"[Drinking]", "nextPhraseID":"stn_colonel_74" }, { @@ -9907,7 +9907,7 @@ "message":"This is really an excellent tea, right?", "replies":[ { - "text":"(drinking)", + "text":"[Drinking]", "nextPhraseID":"stn_colonel_75" }, { @@ -9921,7 +9921,7 @@ "message":"I had not noticed that the cups are so big.", "replies":[ { - "text":"(drinking)", + "text":"[Drinking]", "nextPhraseID":"stn_colonel_76" }, { @@ -9935,7 +9935,7 @@ "message":"You are really a connoisseur.", "replies":[ { - "text":"(drinking)", + "text":"[Drinking]", "nextPhraseID":"stn_colonel_77" }, { @@ -9949,7 +9949,7 @@ "message":"We have all the time in the world. Do not hurry.", "replies":[ { - "text":"(drinking)", + "text":"[Drinking]", "nextPhraseID":"stn_colonel_79" }, { @@ -9964,7 +9964,7 @@ "switchToNPC":"none", "replies":[ { - "text":"(drinking)", + "text":"[Drinking]", "nextPhraseID":"stn_colonel_79" }, { @@ -10538,7 +10538,7 @@ ] }, { - "text":"(Lie) I don't have it anymore, sorry.", + "text":"[Lie] I don't have it anymore, sorry.", "nextPhraseID":"stn_colonel_131_4b", "requires":[ { @@ -10549,7 +10549,7 @@ ] }, { - "text":"(Lie) I don't have it anymore, sorry. This ring on my finger just looks similar.", + "text":"[Lie] I don't have it anymore, sorry. This ring on my finger just looks similar.", "nextPhraseID":"stn_colonel_131_4b", "requires":[ { @@ -11189,7 +11189,7 @@ }, { "id":"stn_horse_30", - "message":"(after drinking greedily) Neiiieieiiigh!!", + "message":"[After drinking greedily] Neiiieieiiigh!!", "replies":[ { "text":"There, now you feel better! I have to leave now.", diff --git a/AndorsTrail/res/raw/conversationlist_talion_2.json b/AndorsTrail/res/raw/conversationlist_talion_2.json index fc0b37b88..da18c5e2e 100644 --- a/AndorsTrail/res/raw/conversationlist_talion_2.json +++ b/AndorsTrail/res/raw/conversationlist_talion_2.json @@ -686,7 +686,7 @@ }, { "id":"talion_cure_4", - "message":"(Talion mixes the ground up ingredients together in the vial you brought, with some leaves and berries that he kept with him.)", + "message":"[Talion mixes the ground up ingredients together in the vial you brought, with some leaves and berries that he kept with him]", "replies":[ { "text":"N", @@ -696,7 +696,7 @@ }, { "id":"talion_cure_5", - "message":"(He gives the potion a thorough shake for quite a while.)", + "message":"[He gives the potion a thorough shake for quite a while]", "replies":[ { "text":"N", @@ -716,7 +716,7 @@ }, { "id":"talion_cure_7", - "message":"(The potion smells rancid, but you manage to drink it all down. The pain from the stomach decreases, and you feel one of the rotworms crawling up into your mouth. You quickly spit the worm out into the now empty vial.)", + "message":"[The potion smells rancid, but you manage to drink it all down. The pain from the stomach decreases, and you feel one of the rotworms crawling up into your mouth. You quickly spit the worm out into the now empty vial.]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_thievesguild_1.json b/AndorsTrail/res/raw/conversationlist_thievesguild_1.json index aef94cff0..641bae2a8 100644 --- a/AndorsTrail/res/raw/conversationlist_thievesguild_1.json +++ b/AndorsTrail/res/raw/conversationlist_thievesguild_1.json @@ -39,7 +39,7 @@ }, { "id":"thievesguild_thief_4", - "message":"He is probably in his room over there. *points*", + "message":"He is probably in his room over there [points].", "replies":[ { "text":"Thanks.", diff --git a/AndorsTrail/res/raw/conversationlist_tinlyn_sheep.json b/AndorsTrail/res/raw/conversationlist_tinlyn_sheep.json index f2a943f68..c44ad992c 100644 --- a/AndorsTrail/res/raw/conversationlist_tinlyn_sheep.json +++ b/AndorsTrail/res/raw/conversationlist_tinlyn_sheep.json @@ -76,7 +76,7 @@ "message":"Baah!", "replies":[ { - "text":"Place Tinlyn's bell around the neck of the sheep.", + "text":"[Place Tinlyn's bell around the neck of the sheep]", "nextPhraseID":"tinlyn_lostsheep1_place", "requires":[ { @@ -87,7 +87,7 @@ ] }, { - "text":"Attack", + "text":"[Attack]", "nextPhraseID":"tinlyn_lostsheep_atk", "requires":[ { @@ -104,7 +104,7 @@ "message":"Baah!", "replies":[ { - "text":"Place Tinlyn's bell around the neck of the sheep.", + "text":"[Place Tinlyn's bell around the neck of the sheep]", "nextPhraseID":"tinlyn_lostsheep2_place", "requires":[ { @@ -115,7 +115,7 @@ ] }, { - "text":"Attack", + "text":"[Attack]", "nextPhraseID":"tinlyn_lostsheep_atk", "requires":[ { @@ -132,7 +132,7 @@ "message":"Baah!", "replies":[ { - "text":"Place Tinlyn's bell around the neck of the sheep.", + "text":"[Place Tinlyn's bell around the neck of the sheep]", "nextPhraseID":"tinlyn_lostsheep3_place", "requires":[ { @@ -143,7 +143,7 @@ ] }, { - "text":"Attack", + "text":"[Attack]", "nextPhraseID":"tinlyn_lostsheep_atk", "requires":[ { @@ -160,7 +160,7 @@ "message":"Baah!", "replies":[ { - "text":"Place Tinlyn's bell around the neck of the sheep.", + "text":"[Place Tinlyn's bell around the neck of the sheep]", "nextPhraseID":"tinlyn_lostsheep4_place", "requires":[ { @@ -171,7 +171,7 @@ ] }, { - "text":"Attack", + "text":"[Attack]", "nextPhraseID":"tinlyn_lostsheep_atk", "requires":[ { @@ -188,7 +188,7 @@ "message":"Baah!", "replies":[ { - "text":"Attack", + "text":"[Attack]", "nextPhraseID":"tinlyn_lostsheep_atk", "requires":[ { @@ -349,7 +349,7 @@ }, { "id":"tinlyn_lostsheep_placed_2", - "message":"(You place one of the bells around the neck of the sheep.)" + "message":"[You place one of the bells around the neck of the sheep]" }, { "id":"tinlyn_lostsheep_atk", @@ -389,7 +389,7 @@ "message":"Baah!", "replies":[ { - "text":"Attack", + "text":"[Attack]", "nextPhraseID":"tinlyn_lostsheep_atk", "requires":[ { diff --git a/AndorsTrail/res/raw/conversationlist_tiqui.json b/AndorsTrail/res/raw/conversationlist_tiqui.json index 3ae338a74..ee1f25a36 100644 --- a/AndorsTrail/res/raw/conversationlist_tiqui.json +++ b/AndorsTrail/res/raw/conversationlist_tiqui.json @@ -282,7 +282,7 @@ }, { "id":"tiqui13", - "message":"Tiqui knows smelly person with crates. [points in the direction to where Aulowenn is]", + "message":"Tiqui knows smelly person with crates [points in the direction to where Aulowenn is].", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_toszylae.json b/AndorsTrail/res/raw/conversationlist_toszylae.json index e616f913e..60c6d7b99 100644 --- a/AndorsTrail/res/raw/conversationlist_toszylae.json +++ b/AndorsTrail/res/raw/conversationlist_toszylae.json @@ -19,7 +19,7 @@ }, { "id":"toszylae_1", - "message":"(The lich looks at you with its burning eyes, and glances at the remains of the guardian you defeated.)", + "message":"[The lich looks at you with its burning eyes, and glances at the remains of the guardian you defeated]", "replies":[ { "text":"N", @@ -39,7 +39,7 @@ }, { "id":"toszylae_3", - "message":"(The lich raises its hands towards the ceiling, chanting something you cannot understand.)", + "message":"[The lich raises its hands towards the ceiling, chanting something you cannot understand]", "replies":[ { "text":"N", @@ -49,7 +49,7 @@ }, { "id":"toszylae_4", - "message":"(While chanting, it slowly lowers its hands forward, until pointing directly at you.)", + "message":"[While chanting, it slowly lowers its hands forward, until pointing directly at you]", "replies":[ { "text":"N", @@ -69,7 +69,7 @@ }, { "id":"toszylae_6", - "message":"(As if having swallowed a thousand needles, you are suddenly stricken with a cascading series of spikes of pain throughout your stomach.)", + "message":"[As if having swallowed a thousand needles, you are suddenly stricken with a cascading series of spikes of pain throughout your stomach]", "replies":[ { "text":"N", @@ -96,7 +96,7 @@ }, { "id":"toszylae_7", - "message":"(You start to feel nauseous, and your stomach turns and twists - as if it has a life of its own.)", + "message":"[You start to feel nauseous, and your stomach turns and twists - as if it has a life of its own]", "replies":[ { "text":"N", @@ -106,7 +106,7 @@ }, { "id":"toszylae_8", - "message":"(The pain increases slightly, and you start to realize that something is moving inside of you.)", + "message":"[The pain increases slightly, and you start to realize that something is moving inside of you]", "replies":[ { "text":"N", @@ -116,7 +116,7 @@ }, { "id":"toszylae_9", - "message":"(The lich must have infected you with something.)", + "message":"[The lich must have infected you with something]", "replies":[ { "text":"What is happening to me!?", @@ -126,7 +126,7 @@ }, { "id":"toszylae_10", - "message":"(The lich seems to enjoy seeing you in pain.)", + "message":"[The lich seems to enjoy seeing you in pain]", "replies":[ { "text":"You will pay for what you did to me!", @@ -154,7 +154,7 @@ }, { "id":"sign_toszylae_1", - "message":"(On the shrine that was behind 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 an empty shrine where you found the strange looking helmet.)" + "message":"[You see an empty shrine where you found the strange looking helmet]" } ] \ No newline at end of file diff --git a/AndorsTrail/res/raw/conversationlist_toszylae_fix.json b/AndorsTrail/res/raw/conversationlist_toszylae_fix.json index 4849487f5..c059b066c 100644 --- a/AndorsTrail/res/raw/conversationlist_toszylae_fix.json +++ b/AndorsTrail/res/raw/conversationlist_toszylae_fix.json @@ -31,6 +31,6 @@ }, { "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.)" + "message":"[You notice a strange helmet on the shrine. It looks like it might be valuable. Perhaps you should take it.]" } ] \ No newline at end of file diff --git a/AndorsTrail/res/raw/conversationlist_toszylae_guard.json b/AndorsTrail/res/raw/conversationlist_toszylae_guard.json index dd40cd73f..b052ffe57 100644 --- a/AndorsTrail/res/raw/conversationlist_toszylae_guard.json +++ b/AndorsTrail/res/raw/conversationlist_toszylae_guard.json @@ -29,7 +29,7 @@ }, { "id":"toszylae_guard_1", - "message":"(The horrifying creature looks down on you with its burning eyes, and speaks in a wheezing voice)", + "message":"[The horrifying creature looks down on you with its burning eyes, and speaks in a wheezing voice]", "replies":[ { "text":"N", @@ -81,21 +81,21 @@ }, { "id":"toszylae_guard_1_n", - "message":"(The creature turns away)", + "message":"[The creature turns away]", "replies":[ { - "text":"Attack!", + "text":"[Attack]", "nextPhraseID":"toszylae_guard_1_n2" }, { - "text":"Leave the creature", + "text":"[Leave the creature]", "nextPhraseID":"X" } ] }, { "id":"toszylae_guard_1_n2", - "message":"(As you try to make your attack against the guardian, your arms are held back by an enormous force.)" + "message":"[As you try to make your attack against the guardian, your arms are held back by an enormous force]" }, { "id":"toszylae_guard_2_1", @@ -116,21 +116,21 @@ }, { "id":"toszylae_guard_2_n", - "message":"(The creature turns away)", + "message":"[The creature turns away]", "replies":[ { - "text":"Attack!", + "text":"[Attack]", "nextPhraseID":"toszylae_guard_2_n2" }, { - "text":"Leave the creature", + "text":"[Leave the creature]", "nextPhraseID":"X" } ] }, { "id":"toszylae_guard_2_n2", - "message":"(As you try to make your attack against the guardian, your arms are held back by an enormous force.)", + "message":"[As you try to make your attack against the guardian, your arms are held back by an enormous force]", "rewards":[ { "rewardType":"questProgress", @@ -156,7 +156,7 @@ "nextPhraseID":"toszylae_guard_4" }, { - "text":"Klaatu ... verata ... n ... nick... (hide the rest in a well-timed cough)", + "text":"Klaatu ... verata ... n ... nick... [hide the rest in a well-timed cough].", "nextPhraseID":"toszylae_guard_2_n" } ] @@ -180,7 +180,7 @@ }, { "id":"toszylae_guard_5", - "message":"(Its eyes pulsate in an intense glow as the creature starts moving towards you.)", + "message":"[Its eyes pulsate in an intense glow as the creature starts moving towards you]", "replies":[ { "text":"N", @@ -190,7 +190,7 @@ }, { "id":"toszylae_guard_6", - "message":"(The guardian gives off a laughter that makes the hair on the back of your neck stand up.)", + "message":"[The guardian gives off a laughter that makes the hair on the back of your neck stand up]", "replies":[ { "text":"N", @@ -210,10 +210,10 @@ }, { "id":"toszylae_guard_8", - "message":"(It raises its claw-like hands above its head, looking to get ready to strike at you.)", + "message":"[It raises its claw-like hands above its head, looking to get ready to strike at you]", "replies":[ { - "text":"Attack!", + "text":"[Attack]", "nextPhraseID":"F" } ], diff --git a/AndorsTrail/res/raw/conversationlist_twoteeth.json b/AndorsTrail/res/raw/conversationlist_twoteeth.json index 8c1be8d59..d71e91ba6 100644 --- a/AndorsTrail/res/raw/conversationlist_twoteeth.json +++ b/AndorsTrail/res/raw/conversationlist_twoteeth.json @@ -61,7 +61,7 @@ }, { "id":"twoteeth_3", - "message":"[coughs heavily]", + "message":"[Coughs heavily]", "replies":[ { "text":"N", @@ -127,7 +127,7 @@ }, { "id":"twoteeth_9", - "message":"She's in the other hut over there. *points*", + "message":"She's in the other hut over there [points].", "replies":[ { "text":"I don't think it's such a good idea to help you. I could get in trouble.", @@ -172,7 +172,7 @@ }, { "id":"twoteeth_13", - "message":"[coughs heavily]", + "message":"[Coughs heavily]", "replies":[ { "text":"Where can I find her?", @@ -186,11 +186,11 @@ }, { "id":"twoteeth_cough", - "message":"[coughs heavily]" + "message":"[Coughs heavily]" }, { "id":"twoteeth_r1", - "message":"[coughs heavily]", + "message":"[Coughs heavily]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_ulirfendor.json b/AndorsTrail/res/raw/conversationlist_ulirfendor.json index 5f3cb51cd..573c7b4e2 100644 --- a/AndorsTrail/res/raw/conversationlist_ulirfendor.json +++ b/AndorsTrail/res/raw/conversationlist_ulirfendor.json @@ -652,7 +652,7 @@ }, { "id":"ulirfendor_infected_1", - "message":"(Ulirfendor gives you a terrified look)", + "message":"[Ulirfendor gives you a terrified look]", "replies":[ { "text":"N", @@ -1322,7 +1322,7 @@ }, { "id":"ulirfendor_dp_proc_3", - "message":"(Ulirfendor places the helmet and the lich's heart on the ground before him, and opens his backpack of items.)", + "message":"[Ulirfendor places the helmet and the lich's heart on the ground before him, and opens his backpack of items]", "replies":[ { "text":"N", @@ -1332,7 +1332,7 @@ }, { "id":"ulirfendor_dp_proc_4", - "message":"(He pulls out a leathery potion case from his backpack, and takes out a vial of clear but almost shining liquid.)", + "message":"[He pulls out a leathery potion case from his backpack, and takes out a vial of clear but almost shining liquid]", "replies":[ { "text":"N", @@ -1342,7 +1342,7 @@ }, { "id":"ulirfendor_dp_proc_5", - "message":"(Ulirfendor pours the contents of the vial on the helmet and the heart in circling motions, taking good care to not spill any on the ground.)", + "message":"[Ulirfendor pours the contents of the vial on the helmet and the heart in circling motions, taking good care to not spill any on the ground]", "replies":[ { "text":"N", @@ -1362,7 +1362,7 @@ }, { "id":"ulirfendor_dp_proc_7", - "message":"(The surface of the helmet seems to freeze, almost like it had a layer of ice on it.)", + "message":"[The surface of the helmet seems to freeze, almost like it had a layer of ice on it]", "replies":[ { "text":"N", @@ -1372,7 +1372,7 @@ }, { "id":"ulirfendor_dp_proc_8", - "message":"(After a while, small cracks appear on the surface, making tiny sounds as they appear.)", + "message":"[After a while, small cracks appear on the surface, making tiny sounds as they appear]", "replies":[ { "text":"N", @@ -1382,7 +1382,7 @@ }, { "id":"ulirfendor_dp_proc_9", - "message":"(The cracks start to get larger and more dense along the surface, until the helmet is completely covered by them.)", + "message":"[The cracks start to get larger and more dense along the surface, until the helmet is completely covered by them]", "replies":[ { "text":"N", @@ -1402,7 +1402,7 @@ }, { "id":"ulirfendor_dp_proc_11", - "message":"(Ulirfendor takes aim with his foot and stomps the helmet with the heel of his boot in a powerful motion.", + "message":"[Ulirfendor takes aim with his foot and stomps the helmet with the heel of his boot in a powerful motion]", "replies":[ { "text":"N", @@ -1412,7 +1412,7 @@ }, { "id":"ulirfendor_dp_proc_12", - "message":"(The helmet completely shatters, leaving nothing but a fine dust.)", + "message":"[The helmet completely shatters, leaving nothing but a fine dust]", "replies":[ { "text":"N", @@ -1439,7 +1439,7 @@ }, { "id":"ulirfendor_dp_proc_14", - "message":"(He does the same with the heart that also seems to have completely frozen and gotten covered with cracks.)", + "message":"[He does the same with the heart that also seems to have completely frozen and gotten covered with cracks]", "replies":[ { "text":"N", @@ -1538,7 +1538,7 @@ }, { "id":"ulirfendor_dp_bless_4", - "message":"(Ulirfendor starts chanting in a tongue that you do not recognize.)", + "message":"[Ulirfendor starts chanting in a tongue that you do not recognize]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_unzel2.json b/AndorsTrail/res/raw/conversationlist_unzel2.json index db28b5628..af14a9c24 100644 --- a/AndorsTrail/res/raw/conversationlist_unzel2.json +++ b/AndorsTrail/res/raw/conversationlist_unzel2.json @@ -18,7 +18,7 @@ }, { "id":"unzel_msg2", - "message":"Hmm, yes... Let's see... (Unzel opens the sealed message and reads it)", + "message":"Hmm, yes... Let's see...\n[Unzel opens the sealed message and reads it]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_v0612graves.json b/AndorsTrail/res/raw/conversationlist_v0612graves.json index 0637b44e7..e9b25c2a6 100644 --- a/AndorsTrail/res/raw/conversationlist_v0612graves.json +++ b/AndorsTrail/res/raw/conversationlist_v0612graves.json @@ -17,7 +17,7 @@ }, { "id":"sign_fallhaven_ne_grave2", - "message":"(The stone is covered with a thin layer of green moss. The writing on the stone has eroded and is completely unreadable.)" + "message":"The stone is covered with a thin layer of green moss. The writing on the stone has eroded and is completely unreadable." }, { "id":"sign_fallhaven_ne_grave3", @@ -93,27 +93,27 @@ }, { "id":"sign_catacombs2_papers1", - "message":"(On the floor is what looks like some torn out pages from a book.)" + "message":"On the floor is what looks like some torn out pages from a book." }, { "id":"sign_catacombs2_papers2", - "message":"(You find some crumpled papers on the floor, containing scribbled notes about the fine arts of pottery making. You decide to leave them be.)" + "message":"You find some crumpled papers on the floor, containing scribbled notes about the fine arts of pottery making. You decide to leave them be." }, { "id":"sign_catacombs3_grave1", - "message":"(The grave reads: Here lies Sir Anarogas of house Gellir, son of Gellir the brave.)" + "message":"The grave reads: Here lies Sir Anarogas of house Gellir, son of Gellir the brave." }, { "id":"sign_catacombs3_grave2", - "message":"(The stench coming from the grave is unbearable. Something must have disturbed the grave recently.)" + "message":"The stench coming from the grave is unbearable. Something must have disturbed the grave recently." }, { "id":"sign_catacombs4_grave1", - "message":"(The cross reads: ta'Dreg lies here, advisor of the Shadow to king Luthor.)" + "message":"The cross reads: ta'Dreg lies here, advisor of the Shadow to king Luthor." }, { "id":"sign_catacombs4_grave2", - "message":"(The grave reads: King Luthor, our savior and leader. The grave is also adorned with the golden seal of house Luthor.)" + "message":"The grave reads: King Luthor, our savior and leader. The grave is also adorned with the golden seal of house Luthor." }, { "id":"sign_hh3_papers", @@ -121,103 +121,103 @@ }, { "id":"sign_hh3_grave", - "message":"(Someone has written the words 'Rest' and 'Shadow' on the cross, in what looks like dried blood.)" + "message":"Someone has written the words 'Rest' and 'Shadow' on the cross, in what looks like dried blood." }, { "id":"sign_bwm30_grave", - "message":"(The cross reads: Rest with the Shadow, my dear.)" + "message":"The cross reads: Rest with the Shadow, my dear." }, { "id":"sign_bwm33_grave", - "message":"(The tombstone contains writing in a language that you do not understand)" + "message":"The tombstone contains writing in a language that you do not understand." }, { "id":"sign_bwm52_grave1", - "message":"(The cross reads: Here lies Magnir the trader. Another casualty of those beasts.)" + "message":"The cross reads: Here lies Magnir the trader. Another casualty of those beasts." }, { "id":"sign_bwm52_grave2", - "message":"(The grave looks like it has been recently dug)" + "message":"The grave looks like it has been recently dug." }, { "id":"sign_bwm52_grave3", - "message":"(The cross reads: Here lies Torkurt, loyal servant of the Blackwater mountain settlement.)" + "message":"The cross reads: Here lies Torkurt, loyal servant of the Blackwater mountain settlement." }, { "id":"sign_bwm52_grave4", - "message":"(The cross reads: Here lies o'Rani, the most fierce warrior on this side of the mountain. May she rest in peace.)" + "message":"The cross reads: Here lies o'Rani, the most fierce warrior on this side of the mountain. May she rest in peace." }, { "id":"sign_bwm52_grave5", - "message":"(The cross reads: Unnamed traveller. Found on the cliff-side, killed by one of those beasts.)" + "message":"The cross reads: Unnamed traveller. Found on the cliff-side, killed by one of those beasts." }, { "id":"sign_bwm52_grave7", - "message":"(The cross reads: Here lies Trombul, the famous potion maker.)" + "message":"The cross reads: Here lies Trombul, the famous potion maker." }, { "id":"sign_bwm52_grave6", - "message":"(The cross reads: Here lies the remains of Antagnart, loved by none but remembered by everyone.)" + "message":"The cross reads: Here lies the remains of Antagnart, loved by none but remembered by everyone." }, { "id":"sign_bwm52_papers1", - "message":"(On the floor is what looks like some torn out pages from a book.)" + "message":"On the floor is what looks like some torn out pages from a book." }, { "id":"sign_bwm52_papers2", - "message":"(You find a crude drawing of one of the white wyrms, but you decide not to keep it since it must belong to someone.)" + "message":"You find a crude drawing of one of the white wyrms, but you decide not to keep it since it must belong to someone." }, { "id":"sign_pwcave1_grave", - "message":"(The cross shows lots of small indentations, as if someone hit it repeatedly with a sharp object. You can barely make out the words: Rest with the Shadow, my friend. I will avenge those beasts.)" + "message":"The cross shows lots of small indentations, as if someone hit it repeatedly with a sharp object. You can barely make out the words: Rest with the Shadow, my friend. I will avenge those beasts." }, { "id":"sign_pwcave2a_grave", - "message":"(The cross contains symbols that you cannot understand.)" + "message":"The cross contains symbols that you cannot understand." }, { "id":"sign_pwcave4_grave1", - "message":"(The cross contains symbols that you cannot understand. It looks like someone started digging up this grave recently, but stopped halfway.)" + "message":"The cross contains symbols that you cannot understand. It looks like someone started digging up this grave recently, but stopped halfway." }, { "id":"sign_pwcave4_grave2", - "message":"(The cross contains symbols that you cannot understand, in addition to a crude drawing of what you think should resemble an Izthiel beast.)" + "message":"The cross contains symbols that you cannot understand, in addition to a crude drawing of what you think should resemble an Izthiel beast." }, { "id":"sign_pwcave4_grave3", - "message":"(The cross contains symbols that you cannot understand, in addition to a crude drawing of what you think should resemble a frog.)" + "message":"The cross contains symbols that you cannot understand, in addition to a crude drawing of what you think should resemble a frog." }, { "id":"sign_pwcave4_grave4", - "message":"(The cross contains symbols that you cannot understand, but you recognize the word 'Iqhan'.)" + "message":"The cross contains symbols that you cannot understand, but you recognize the word 'Iqhan'." }, { "id":"sign_pwcave4_grave5", - "message":"(The cross contains symbols that you cannot understand, in addition to a crude drawing of what you think should resemble a sword.)" + "message":"The cross contains symbols that you cannot understand, in addition to a crude drawing of what you think should resemble a sword." }, { "id":"sign_pwcave4_grave6", - "message":"(The cross contains symbols that you cannot understand, in addition to a crude drawing of something that you cannot make out what it should resemble.)" + "message":"The cross contains symbols that you cannot understand, in addition to a crude drawing of something that you cannot make out what it should resemble." }, { "id":"sign_pwcave4_grave7", - "message":"(The cross contains symbols that you cannot understand, in addition to an elaborate drawing of a skull.)" + "message":"The cross contains symbols that you cannot understand, in addition to an elaborate drawing of a skull." }, { "id":"sign_waterway14_hole", - "message":"(You stop to notice a hole in the wall near the ground, large enough to fit something in. The ground here shows recent shoe-prints, which could indicate that the hole in the wall is a hiding place of some sort. However, it seems to be empty now.)" + "message":"You stop to notice a hole in the wall near the ground, large enough to fit something in. The ground here shows recent shoe-prints, which could indicate that the hole in the wall is a hiding place of some sort. However, it seems to be empty now." }, { "id":"sign_waterway11e_grave", - "message":"(The cross reads: Here lies Telban. A beloved friend of many, and a dreaded foe for those that did not pay up.)" + "message":"The cross reads: Here lies Telban. A beloved friend of many, and a dreaded foe for those that did not pay up." }, { "id":"sign_mountaincave0_grave", - "message":"(The cross reads: Tengil the needy lies here, after having succumbed to the nastiest of poisons. Rest with the Shadow, my friend.)" + "message":"The cross reads: Tengil the needy lies here, after having succumbed to the nastiest of poisons. Rest with the Shadow, my friend." }, { "id":"sign_mountainlake1_grave", - "message":"(The ground around the grave looks like it has been partially dug up by animals. They don't seem to have gotten anywhere yet though.)" + "message":"The ground around the grave looks like it has been partially dug up by animals. They don't seem to have gotten anywhere yet though." }, { "id":"sign_waytobrim3_grave1", @@ -233,14 +233,14 @@ }, { "id":"sign_waytolake2_grave", - "message":"(The cross is covered with a thick layer of web. You wonder why anyone would choose this place as a grave for their fallen)" + "message":"The cross is covered with a thick layer of web. You wonder why anyone would choose this place as a grave for their fallen." }, { "id":"sign_lh1_grave", - "message":"(Even though the wood on the cross looks like it was cut recently, you see no signs of anything being buried here.)" + "message":"Even though the wood on the cross looks like it was cut recently, you see no signs of anything being buried here." }, { "id":"sign_lh1_sign", - "message":"(On the wall, you see a plaque that reads 'Bring unto me, that which I cannot bear, for it makes me stronger.')" + "message":"On the wall, you see a plaque that reads: Bring unto me, that which I cannot bear, for it makes me stronger." } ] \ No newline at end of file diff --git a/AndorsTrail/res/raw/conversationlist_v070signs1.json b/AndorsTrail/res/raw/conversationlist_v070signs1.json index b4cce4788..1a3a8270e 100644 --- a/AndorsTrail/res/raw/conversationlist_v070signs1.json +++ b/AndorsTrail/res/raw/conversationlist_v070signs1.json @@ -22,7 +22,7 @@ "message":"You notice that these rocks seem out of place compared to the surroundings. Maybe they are meant to symbolize something?", "replies":[ { - "text":"Examine the stones more closely.", + "text":"[Examine the stones more closely]", "nextPhraseID":"sign_rbfcr1_2", "requires":[ { @@ -94,7 +94,7 @@ }, { "id":"sign_wdsetl0_1", - "message":"(someone has scribbled a crude addition to the sign: Unless they bring the good stuff)" + "message":"Someone has scribbled a crude addition to the sign: Unless they bring the good stuff." }, { "id":"sign_wdsetl0_grave1", diff --git a/AndorsTrail/res/raw/conversationlist_vacor2.json b/AndorsTrail/res/raw/conversationlist_vacor2.json index 8df623640..1ca9e83ca 100644 --- a/AndorsTrail/res/raw/conversationlist_vacor2.json +++ b/AndorsTrail/res/raw/conversationlist_vacor2.json @@ -161,7 +161,7 @@ }, { "id":"vacor_msg_10", - "message":"(The map shows a location to the northwest of the former prison of Flagstone.)", + "message":"[The map shows a location to the northwest of the former prison of Flagstone]", "replies":[ { "text":"N", @@ -188,7 +188,7 @@ }, { "id":"vacor_msg_12", - "message":"(Vacor opens the sealed message and starts reading)", + "message":"[Vacor opens the sealed message and starts reading]", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_vilegard_v070.json b/AndorsTrail/res/raw/conversationlist_vilegard_v070.json index 131cd4ae6..081601ad4 100644 --- a/AndorsTrail/res/raw/conversationlist_vilegard_v070.json +++ b/AndorsTrail/res/raw/conversationlist_vilegard_v070.json @@ -1,7 +1,7 @@ [ { "id":"vilegard_smith_xul_1", - "message":"[takes a step back] What ... is ... that? It can't be? No. Let me look at it.", + "message":"[Takes a step back]\nWhat ... is ... that? It can't be? No. Let me look at it.", "replies":[ { "text":"N", diff --git a/AndorsTrail/res/raw/conversationlist_woodcabin.json b/AndorsTrail/res/raw/conversationlist_woodcabin.json index 5df4c4e4a..9ef7de9c3 100644 --- a/AndorsTrail/res/raw/conversationlist_woodcabin.json +++ b/AndorsTrail/res/raw/conversationlist_woodcabin.json @@ -1,7 +1,7 @@ [ { "id":"smuggler1_0", - "message":"[mutter] Just one more..." + "message":"[Mutter] Just one more..." }, { "id":"smuggler2_0", @@ -9,7 +9,7 @@ }, { "id":"smuggler3_0", - "message":"[drool]", + "message":"[Drool]", "replies":[ { "text":"Hello?", @@ -19,7 +19,7 @@ }, { "id":"smuggler3_1", - "message":"[wipes drool]", + "message":"[Wipes drool]", "replies":[ { "text":"Can you hear me?", @@ -29,7 +29,7 @@ }, { "id":"smuggler3_2", - "message":"[blank stare]", + "message":"[Blank stare]", "replies":[ { "text":"Hello?", @@ -39,7 +39,7 @@ }, { "id":"smuggler3_3", - "message":"[makes slurping sounds with drool still left in the corner of the mouth]", + "message":"[Makes slurping sounds with drool still left in the corner of the mouth]", "replies":[ { "text":"Can you talk?", @@ -156,6 +156,6 @@ }, { "id":"pig", - "message":"[grunt]" + "message":"[Grunt]" } ] \ No newline at end of file From 0af042f94d5e8ee9f666fc6028071235d0bcfd22 Mon Sep 17 00:00:00 2001 From: Zukero Date: Wed, 24 Oct 2018 10:37:56 +0200 Subject: [PATCH 2/4] Fixed stupid issue with the new low-quality filters... --- .../src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java | 2 +- AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java index f5f66ba97..b71d932de 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java @@ -20,7 +20,7 @@ import android.view.WindowManager; public final class AndorsTrailApplication extends Application { - public static final boolean DEVELOPMENT_DEBUGRESOURCES = false; + public static final boolean DEVELOPMENT_DEBUGRESOURCES = true; public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false; public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false; public static final boolean DEVELOPMENT_DEBUGBUTTONS = true; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java index 43df31ef9..aa1ff2f04 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java @@ -387,7 +387,7 @@ public final class MainView extends SurfaceView doDrawRect_Ground(canvas, area); doDrawRect_Objects(canvas, area); doDrawRect_Above(canvas, area); - if (!useAlternateColorFilterPaint) { + if (useAlternateColorFilterPaint) { applyAlternateFilter(canvas, area); } } From 0c1afc03700b36cfb3365b512025d309b76487e0 Mon Sep 17 00:00:00 2001 From: Zukero Date: Wed, 24 Oct 2018 10:51:45 +0200 Subject: [PATCH 3/4] Changed item rarity sort order to legendary, extraordinary, rare, quest, ordinary. --- .../AndorsTrail/AndorsTrailApplication.java | 2 +- .../rpg/AndorsTrail/model/item/ItemType.java | 230 +++++++++--------- 2 files changed, 116 insertions(+), 116 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java index b71d932de..f5f66ba97 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java @@ -20,7 +20,7 @@ import android.view.WindowManager; public final class AndorsTrailApplication extends Application { - public static final boolean DEVELOPMENT_DEBUGRESOURCES = true; + public static final boolean DEVELOPMENT_DEBUGRESOURCES = false; public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false; public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false; public static final boolean DEVELOPMENT_DEBUGBUTTONS = true; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java index 9d69d1ccd..87178643c 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java @@ -1,115 +1,115 @@ -package com.gpl.rpg.AndorsTrail.model.item; - -import com.gpl.rpg.AndorsTrail.controller.Constants; -import com.gpl.rpg.AndorsTrail.model.actor.Player; -import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager; - -public final class ItemType { - - public static enum DisplayType { - ordinary - ,quest - ,legendary - ,extraordinary - ,rare; - - public static DisplayType fromString(String s, DisplayType default_) { - if (s == null) return default_; - return valueOf(s); - } - } - - public final String id; - public final int iconID; - private final String name; - private final String description; - private final boolean hasPersonalizedName; - public final ItemCategory category; - public final boolean hasManualPrice; - public final int baseMarketCost; - public final int fixedBaseMarketCost; - public final DisplayType displayType; - - public final ItemTraits_OnEquip effects_equip; - public final ItemTraits_OnUse effects_use; - public final ItemTraits_OnUse effects_hit; - public final ItemTraits_OnUse effects_kill; - public final ItemTraits_OnHitReceived effects_hitReceived; - - public ItemType( - String id - , int iconID - , String name - , String description - , ItemCategory category - , DisplayType displayType - , boolean hasManualPrice - , int fixedBaseMarketCost - , ItemTraits_OnEquip effects_equip - , ItemTraits_OnUse effects_use - , ItemTraits_OnUse effects_hit - , ItemTraits_OnUse effects_kill - , ItemTraits_OnHitReceived effects_hitReceived - ) { - this.id = id; - this.iconID = iconID; - this.name = name; - this.description = description; - this.category = category; - this.displayType = displayType; - this.hasManualPrice = hasManualPrice; - this.baseMarketCost = hasManualPrice ? fixedBaseMarketCost : calculateCost(category, effects_equip, effects_use, effects_hit, effects_kill); - this.fixedBaseMarketCost = fixedBaseMarketCost; - this.effects_equip = effects_equip; - this.effects_use = effects_use; - this.effects_hit = effects_hit; - this.effects_kill = effects_kill; - this.effects_hitReceived = effects_hitReceived; - this.hasPersonalizedName = name.contains(Constants.PLACEHOLDER_PLAYERNAME); - } - - public boolean isEquippable() { return category.isEquippable(); } - public boolean isUsable() { return category.isUsable(); } - public boolean isQuestItem() { return displayType == DisplayType.quest; } - public boolean isOrdinaryItem() { return displayType == DisplayType.ordinary; } - public boolean isWeapon() { return category.isWeapon(); } - public boolean isArmor() { return category.isArmor(); } - public boolean isShield() { return category.isShield(); } - public boolean isTwohandWeapon() { return category.isTwohandWeapon(); } - public boolean isOffhandCapableWeapon() { return category.isOffhandCapableWeapon(); } - public boolean isSellable() { - if (isQuestItem()) return false; - if (baseMarketCost == 0) return false; - return true; - } - - public String getDescription() { return description; } - public String getName(Player p) { - if (!hasPersonalizedName) return name; - else return name.replace(Constants.PLACEHOLDER_PLAYERNAME, p.getName()); - } - - public int getOverlayTileID() { - switch (displayType) { - case quest: - return TileManager.iconID_selection_yellow; - case legendary: - return TileManager.iconID_selection_green; - case extraordinary: - return TileManager.iconID_selection_blue; - case rare: - return TileManager.iconID_selection_purple; - case ordinary: - default: - return -1; - } - } - - private static int calculateCost(ItemCategory category, ItemTraits_OnEquip effects_equip, ItemTraits_OnUse effects_use, ItemTraits_OnUse effects_hit, ItemTraits_OnUse effects_kill) { - final int costEquipStats = effects_equip == null ? 0 : effects_equip.calculateEquipCost(category.isWeapon()); - final int costUse = effects_use == null ? 0 : effects_use.calculateUseCost(); - final int costHit = effects_hit == null ? 0 : effects_hit.calculateHitCost(); - final int costKill = effects_kill == null ? 0 : effects_kill.calculateKillCost(); - return Math.max(1, costEquipStats + costUse + costHit + costKill); - } -} +package com.gpl.rpg.AndorsTrail.model.item; + +import com.gpl.rpg.AndorsTrail.controller.Constants; +import com.gpl.rpg.AndorsTrail.model.actor.Player; +import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager; + +public final class ItemType { + + public static enum DisplayType { + ordinary + ,quest + ,rare + ,extraordinary + ,legendary; + + public static DisplayType fromString(String s, DisplayType default_) { + if (s == null) return default_; + return valueOf(s); + } + } + + public final String id; + public final int iconID; + private final String name; + private final String description; + private final boolean hasPersonalizedName; + public final ItemCategory category; + public final boolean hasManualPrice; + public final int baseMarketCost; + public final int fixedBaseMarketCost; + public final DisplayType displayType; + + public final ItemTraits_OnEquip effects_equip; + public final ItemTraits_OnUse effects_use; + public final ItemTraits_OnUse effects_hit; + public final ItemTraits_OnUse effects_kill; + public final ItemTraits_OnHitReceived effects_hitReceived; + + public ItemType( + String id + , int iconID + , String name + , String description + , ItemCategory category + , DisplayType displayType + , boolean hasManualPrice + , int fixedBaseMarketCost + , ItemTraits_OnEquip effects_equip + , ItemTraits_OnUse effects_use + , ItemTraits_OnUse effects_hit + , ItemTraits_OnUse effects_kill + , ItemTraits_OnHitReceived effects_hitReceived + ) { + this.id = id; + this.iconID = iconID; + this.name = name; + this.description = description; + this.category = category; + this.displayType = displayType; + this.hasManualPrice = hasManualPrice; + this.baseMarketCost = hasManualPrice ? fixedBaseMarketCost : calculateCost(category, effects_equip, effects_use, effects_hit, effects_kill); + this.fixedBaseMarketCost = fixedBaseMarketCost; + this.effects_equip = effects_equip; + this.effects_use = effects_use; + this.effects_hit = effects_hit; + this.effects_kill = effects_kill; + this.effects_hitReceived = effects_hitReceived; + this.hasPersonalizedName = name.contains(Constants.PLACEHOLDER_PLAYERNAME); + } + + public boolean isEquippable() { return category.isEquippable(); } + public boolean isUsable() { return category.isUsable(); } + public boolean isQuestItem() { return displayType == DisplayType.quest; } + public boolean isOrdinaryItem() { return displayType == DisplayType.ordinary; } + public boolean isWeapon() { return category.isWeapon(); } + public boolean isArmor() { return category.isArmor(); } + public boolean isShield() { return category.isShield(); } + public boolean isTwohandWeapon() { return category.isTwohandWeapon(); } + public boolean isOffhandCapableWeapon() { return category.isOffhandCapableWeapon(); } + public boolean isSellable() { + if (isQuestItem()) return false; + if (baseMarketCost == 0) return false; + return true; + } + + public String getDescription() { return description; } + public String getName(Player p) { + if (!hasPersonalizedName) return name; + else return name.replace(Constants.PLACEHOLDER_PLAYERNAME, p.getName()); + } + + public int getOverlayTileID() { + switch (displayType) { + case quest: + return TileManager.iconID_selection_yellow; + case legendary: + return TileManager.iconID_selection_green; + case extraordinary: + return TileManager.iconID_selection_blue; + case rare: + return TileManager.iconID_selection_purple; + case ordinary: + default: + return -1; + } + } + + private static int calculateCost(ItemCategory category, ItemTraits_OnEquip effects_equip, ItemTraits_OnUse effects_use, ItemTraits_OnUse effects_hit, ItemTraits_OnUse effects_kill) { + final int costEquipStats = effects_equip == null ? 0 : effects_equip.calculateEquipCost(category.isWeapon()); + final int costUse = effects_use == null ? 0 : effects_use.calculateUseCost(); + final int costHit = effects_hit == null ? 0 : effects_hit.calculateHitCost(); + final int costKill = effects_kill == null ? 0 : effects_kill.calculateKillCost(); + return Math.max(1, costEquipStats + costUse + costHit + costKill); + } +} From d301076f2bc8225345d3f82815e3013a1693bafe Mon Sep 17 00:00:00 2001 From: Zukero Date: Wed, 24 Oct 2018 11:16:00 +0200 Subject: [PATCH 4/4] Small fix to Halvor's dialogues, to improve consistency. --- .../res/raw/conversationlist_halvor_surprise.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/AndorsTrail/res/raw/conversationlist_halvor_surprise.json b/AndorsTrail/res/raw/conversationlist_halvor_surprise.json index 5dd539d58..ce6f4c026 100644 --- a/AndorsTrail/res/raw/conversationlist_halvor_surprise.json +++ b/AndorsTrail/res/raw/conversationlist_halvor_surprise.json @@ -1368,7 +1368,14 @@ }, { "id":"halvor_mlake_14", - "message":"Thank you. You'll find me here when you return." + "message":"Thank you. You'll find me here when you return.", + "rewards":[ + { + "rewardType":"questProgress", + "rewardID":"halvor_surprise", + "value":130 + } + ] }, { "id":"halvor_mlake_15",