diff --git a/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java b/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java index 2c70c908f..fe38905b5 100644 --- a/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java +++ b/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java @@ -319,25 +319,25 @@ public final class R { public static final int inventoryitem=0x7f0a0000; } public static final class string { - public static final int about_button1=0x7f0500ed; - public static final int about_button2=0x7f0500ee; - public static final int about_button3=0x7f0500ef; - public static final int about_contents1=0x7f0500f0; - public static final int about_contents2=0x7f0500f1; - public static final int about_contents3=0x7f0500f2; + public static final int about_button1=0x7f0500ee; + public static final int about_button2=0x7f0500ef; + public static final int about_button3=0x7f0500f0; + public static final int about_contents1=0x7f0500f1; + public static final int about_contents2=0x7f0500f2; + public static final int about_contents3=0x7f0500f3; /** Translated as: affliction / statuseffect / temporary effect Translated as: affliction / statuseffect / temporary effect Translated as: affliction / statuseffect / temporary effect Translated as: affliction / statuseffect / temporary effect */ - public static final int actorcondition_info_removes_all=0x7f05010b; + public static final int actorcondition_info_removes_all=0x7f05010c; public static final int actorconditions_v069=0x7f050000; public static final int actorconditions_v069_bwm=0x7f050001; - public static final int actorinfo_attack=0x7f0500ab; - public static final int actorinfo_attacksperturn=0x7f0500a9; - public static final int actorinfo_basetraits=0x7f0500af; - public static final int actorinfo_class=0x7f0500a6; - public static final int actorinfo_criticalhit=0x7f0500ac; + public static final int actorinfo_attack=0x7f0500ac; + public static final int actorinfo_attacksperturn=0x7f0500aa; + public static final int actorinfo_basetraits=0x7f0500b0; + public static final int actorinfo_class=0x7f0500a7; + public static final int actorinfo_criticalhit=0x7f0500ad; /** =========================================== Added in v0.6.9 =========================================== @@ -347,58 +347,58 @@ public final class R { =========================================== Added in v0.6.9 */ - public static final int actorinfo_currentconditions=0x7f05010a; - public static final int actorinfo_currenttraits=0x7f0500b0; - public static final int actorinfo_defense=0x7f0500ad; - public static final int actorinfo_difficulty=0x7f0500a7; - public static final int actorinfo_health=0x7f0500a8; - public static final int actorinfo_movecost=0x7f0500ae; - public static final int actorinfo_movesperturn=0x7f0500aa; - public static final int app_name=0x7f050050; - public static final int combat_attack=0x7f05007c; - public static final int combat_begin_flee=0x7f050082; - public static final int combat_endturn=0x7f050080; + public static final int actorinfo_currentconditions=0x7f05010b; + public static final int actorinfo_currenttraits=0x7f0500b1; + public static final int actorinfo_defense=0x7f0500ae; + public static final int actorinfo_difficulty=0x7f0500a8; + public static final int actorinfo_health=0x7f0500a9; + public static final int actorinfo_movecost=0x7f0500af; + public static final int actorinfo_movesperturn=0x7f0500ab; + public static final int app_name=0x7f050051; + public static final int combat_attack=0x7f05007d; + public static final int combat_begin_flee=0x7f050083; + public static final int combat_endturn=0x7f050081; /** End combat Kampf beenden End combat End combat End combat */ - public static final int combat_flee=0x7f050081; - public static final int combat_flee_failed=0x7f050083; - public static final int combat_hero_dies=0x7f05008f; - public static final int combat_monsteraction=0x7f050086; - public static final int combat_monsterhealth=0x7f050085; - public static final int combat_move=0x7f05007d; - public static final int combat_not_enough_ap=0x7f05008e; - public static final int combat_result_herohit=0x7f05008b; - public static final int combat_result_herohitcritical=0x7f05008c; - public static final int combat_result_herokillsmonster=0x7f05008d; - public static final int combat_result_heromiss=0x7f05008a; - public static final int combat_result_monsterhit=0x7f050088; - public static final int combat_result_monsterhitcritical=0x7f050089; + public static final int combat_flee=0x7f050082; + public static final int combat_flee_failed=0x7f050084; + public static final int combat_hero_dies=0x7f050090; + public static final int combat_monsteraction=0x7f050087; + public static final int combat_monsterhealth=0x7f050086; + public static final int combat_move=0x7f05007e; + public static final int combat_not_enough_ap=0x7f05008f; + public static final int combat_result_herohit=0x7f05008c; + public static final int combat_result_herohitcritical=0x7f05008d; + public static final int combat_result_herokillsmonster=0x7f05008e; + public static final int combat_result_heromiss=0x7f05008b; + public static final int combat_result_monsterhit=0x7f050089; + public static final int combat_result_monsterhitcritical=0x7f05008a; /** You cannot exit combat since there are adjacent monsters. You first have to move by longclicking a place with no adjacent monster, before you may end the combat. Du kannst den Kampf nicht verlassen, weil noch Gegner in der Nähe sind.Du musst dich zunächst auf ein Feld bewegen, wo dich die Gegner nicht mehr erreichen können. You cannot exit combat since there are adjacent monsters. You first have to move by longclicking a place with no adjacent monster, before you may end the combat. You cannot exit combat since there are adjacent monsters. You first have to move by longclicking a place with no adjacent monster, before you may end the combat. You cannot exit combat since there are adjacent monsters. You first have to move by longclicking a place with no adjacent monster, before you may end the combat. */ - public static final int combat_result_monstermiss=0x7f050087; - public static final int combat_spell=0x7f05007f; - public static final int combat_status_ap=0x7f050084; - public static final int combat_use=0x7f05007e; - public static final int conversation_leave=0x7f0500d6; - public static final int conversation_lostgold=0x7f0500d2; - public static final int conversation_next=0x7f0500d5; + public static final int combat_result_monstermiss=0x7f050088; + public static final int combat_spell=0x7f050080; + public static final int combat_status_ap=0x7f050085; + public static final int combat_use=0x7f05007f; + public static final int conversation_leave=0x7f0500d7; + public static final int conversation_lostgold=0x7f0500d3; + public static final int conversation_next=0x7f0500d6; /** %1$s says %1$s sagt %1$s Dit */ - public static final int conversation_rewardexp=0x7f0500d0; - public static final int conversation_rewardgold=0x7f0500d1; - public static final int conversation_rewarditem=0x7f0500d3; - public static final int conversation_rewarditems=0x7f0500d4; - public static final int conversation_title=0x7f050125; + public static final int conversation_rewardexp=0x7f0500d1; + public static final int conversation_rewardgold=0x7f0500d2; + public static final int conversation_rewarditem=0x7f0500d4; + public static final int conversation_rewarditems=0x7f0500d5; + public static final int conversation_title=0x7f050126; public static final int conversationlist_alynndir=0x7f050026; public static final int conversationlist_ambelie=0x7f05002a; public static final int conversationlist_crossglen=0x7f050005; @@ -446,105 +446,105 @@ public final class R { public static final int conversationlist_vilegard_villagers=0x7f050022; public static final int conversationlist_wilderness=0x7f050019; public static final int conversationlist_wrye=0x7f05002d; - public static final int dialog_close=0x7f050062; - public static final int dialog_confirmexit_message=0x7f050064; - public static final int dialog_confirmexit_title=0x7f050063; - public static final int dialog_groundloot_message=0x7f05009c; - public static final int dialog_groundloot_title=0x7f05009b; - public static final int dialog_loading_failed_incorrectversion=0x7f050061; - public static final int dialog_loading_failed_message=0x7f050060; - public static final int dialog_loading_failed_title=0x7f05005f; - public static final int dialog_loading_message=0x7f05005e; - public static final int dialog_loot_foundgold=0x7f050099; - public static final int dialog_loot_pickall=0x7f050098; - public static final int dialog_loot_pickedupitems=0x7f05009a; - public static final int dialog_monsterencounter_info=0x7f05006a; - public static final int dialog_monsterencounter_message=0x7f050069; - public static final int dialog_monsterencounter_title=0x7f050068; - public static final int dialog_monsterloot_gainedexp=0x7f05009f; - public static final int dialog_monsterloot_message=0x7f05009e; - public static final int dialog_monsterloot_title=0x7f05009d; - public static final int dialog_newversion_message=0x7f0500f4; - public static final int dialog_newversion_title=0x7f0500f3; - public static final int dialog_paused_message=0x7f050066; - public static final int dialog_paused_resume=0x7f050067; - public static final int dialog_paused_title=0x7f050065; - public static final int dialog_rest_confirm_message=0x7f0500eb; - public static final int dialog_rest_message=0x7f0500ec; - public static final int dialog_rest_title=0x7f0500ea; + public static final int dialog_close=0x7f050063; + public static final int dialog_confirmexit_message=0x7f050065; + public static final int dialog_confirmexit_title=0x7f050064; + public static final int dialog_groundloot_message=0x7f05009d; + public static final int dialog_groundloot_title=0x7f05009c; + public static final int dialog_loading_failed_incorrectversion=0x7f050062; + public static final int dialog_loading_failed_message=0x7f050061; + public static final int dialog_loading_failed_title=0x7f050060; + public static final int dialog_loading_message=0x7f05005f; + public static final int dialog_loot_foundgold=0x7f05009a; + public static final int dialog_loot_pickall=0x7f050099; + public static final int dialog_loot_pickedupitems=0x7f05009b; + public static final int dialog_monsterencounter_info=0x7f05006b; + public static final int dialog_monsterencounter_message=0x7f05006a; + public static final int dialog_monsterencounter_title=0x7f050069; + public static final int dialog_monsterloot_gainedexp=0x7f0500a0; + public static final int dialog_monsterloot_message=0x7f05009f; + public static final int dialog_monsterloot_title=0x7f05009e; + public static final int dialog_newversion_message=0x7f0500f5; + public static final int dialog_newversion_title=0x7f0500f4; + public static final int dialog_paused_message=0x7f050067; + public static final int dialog_paused_resume=0x7f050068; + public static final int dialog_paused_title=0x7f050066; + public static final int dialog_rest_confirm_message=0x7f0500ec; + public static final int dialog_rest_message=0x7f0500ed; + public static final int dialog_rest_title=0x7f0500eb; public static final int droplists_crossglen=0x7f050032; public static final int droplists_crossglen_outside=0x7f050033; public static final int droplists_debug=0x7f050031; public static final int droplists_fallhaven=0x7f050034; public static final int droplists_v068=0x7f050036; public static final int droplists_wilderness=0x7f050035; - public static final int exit=0x7f050051; - public static final int exit_to_menu=0x7f050052; - public static final int heroinfo_actionpoints=0x7f05007a; - public static final int heroinfo_char=0x7f05006f; - public static final int heroinfo_gold=0x7f050079; - public static final int heroinfo_inv=0x7f050070; - public static final int heroinfo_inventory=0x7f050078; - public static final int heroinfo_level=0x7f050075; - public static final int heroinfo_levelup=0x7f050074; - public static final int heroinfo_quests=0x7f05007b; - public static final int heroinfo_skill=0x7f050072; - public static final int heroinfo_spell=0x7f050073; - public static final int heroinfo_totalexperience=0x7f050076; - public static final int heroinfo_wear=0x7f050071; - public static final int heroinfo_wornequipment=0x7f050077; - public static final int inventory_assign=0x7f050120; - public static final int inventory_assign_slot1=0x7f050121; - public static final int inventory_assign_slot2=0x7f050122; - public static final int inventory_assign_slot3=0x7f050123; - public static final int inventory_drop=0x7f050094; - public static final int inventory_equip=0x7f050091; - public static final int inventory_info=0x7f050090; - public static final int inventory_item_dropped=0x7f050096; - public static final int inventory_item_equipped=0x7f050097; - public static final int inventory_item_used=0x7f050095; - public static final int inventory_unequip=0x7f050092; - public static final int inventory_use=0x7f050093; - public static final int itemcategory_money=0x7f0500bf; - public static final int itemcategory_other=0x7f0500c9; - public static final int itemcategory_potion=0x7f0500c8; - public static final int itemcategory_shield=0x7f0500c1; - public static final int itemcategory_weapon=0x7f0500c0; - public static final int itemcategory_wearable_body=0x7f0500c3; - public static final int itemcategory_wearable_feet=0x7f0500c5; - public static final int itemcategory_wearable_hand=0x7f0500c4; - public static final int itemcategory_wearable_head=0x7f0500c2; - public static final int itemcategory_wearable_neck=0x7f0500c6; - public static final int itemcategory_wearable_ring=0x7f0500c7; - public static final int iteminfo_action_equip=0x7f0500ba; - public static final int iteminfo_action_equip_ap=0x7f0500bd; - public static final int iteminfo_action_unequip=0x7f0500bb; - public static final int iteminfo_action_unequip_ap=0x7f0500be; - public static final int iteminfo_action_use=0x7f0500b9; - public static final int iteminfo_action_use_ap=0x7f0500bc; + public static final int exit=0x7f050052; + public static final int exit_to_menu=0x7f050053; + public static final int heroinfo_actionpoints=0x7f05007b; + public static final int heroinfo_char=0x7f050070; + public static final int heroinfo_gold=0x7f05007a; + public static final int heroinfo_inv=0x7f050071; + public static final int heroinfo_inventory=0x7f050079; + public static final int heroinfo_level=0x7f050076; + public static final int heroinfo_levelup=0x7f050075; + public static final int heroinfo_quests=0x7f05007c; + public static final int heroinfo_skill=0x7f050073; + public static final int heroinfo_spell=0x7f050074; + public static final int heroinfo_totalexperience=0x7f050077; + public static final int heroinfo_wear=0x7f050072; + public static final int heroinfo_wornequipment=0x7f050078; + public static final int inventory_assign=0x7f050121; + public static final int inventory_assign_slot1=0x7f050122; + public static final int inventory_assign_slot2=0x7f050123; + public static final int inventory_assign_slot3=0x7f050124; + public static final int inventory_drop=0x7f050095; + public static final int inventory_equip=0x7f050092; + public static final int inventory_info=0x7f050091; + public static final int inventory_item_dropped=0x7f050097; + public static final int inventory_item_equipped=0x7f050098; + public static final int inventory_item_used=0x7f050096; + public static final int inventory_unequip=0x7f050093; + public static final int inventory_use=0x7f050094; + public static final int itemcategory_money=0x7f0500c0; + public static final int itemcategory_other=0x7f0500ca; + public static final int itemcategory_potion=0x7f0500c9; + public static final int itemcategory_shield=0x7f0500c2; + public static final int itemcategory_weapon=0x7f0500c1; + public static final int itemcategory_wearable_body=0x7f0500c4; + public static final int itemcategory_wearable_feet=0x7f0500c6; + public static final int itemcategory_wearable_hand=0x7f0500c5; + public static final int itemcategory_wearable_head=0x7f0500c3; + public static final int itemcategory_wearable_neck=0x7f0500c7; + public static final int itemcategory_wearable_ring=0x7f0500c8; + public static final int iteminfo_action_equip=0x7f0500bb; + public static final int iteminfo_action_equip_ap=0x7f0500be; + public static final int iteminfo_action_unequip=0x7f0500bc; + public static final int iteminfo_action_unequip_ap=0x7f0500bf; + public static final int iteminfo_action_use=0x7f0500ba; + public static final int iteminfo_action_use_ap=0x7f0500bd; /** A specific key is required to pass. Hier kommt man nur mit einem bestimmten Schlüssel weiter. Une clé spécifique est requise pour passer. */ - public static final int iteminfo_category=0x7f0500b8; - public static final int iteminfo_effect_chance_of=0x7f05010c; - public static final int iteminfo_effect_decrease_current_ap=0x7f050116; - public static final int iteminfo_effect_decrease_current_hp=0x7f050114; - public static final int iteminfo_effect_decrease_max_ap=0x7f05011b; - public static final int iteminfo_effect_decrease_max_hp=0x7f050119; - public static final int iteminfo_effect_decrease_movecost=0x7f05011d; - public static final int iteminfo_effect_duration=0x7f05010d; - public static final int iteminfo_effect_increase_current_ap=0x7f050117; - public static final int iteminfo_effect_increase_current_hp=0x7f050115; - public static final int iteminfo_effect_increase_max_ap=0x7f05011a; - public static final int iteminfo_effect_increase_max_hp=0x7f050118; - public static final int iteminfo_effect_increase_movecost=0x7f05011c; - public static final int iteminfo_effect_works_on_source=0x7f05010e; - public static final int iteminfo_effect_works_on_target=0x7f05010f; - public static final int iteminfo_effect_works_when_equipped=0x7f050113; - public static final int iteminfo_effect_works_when_hitting_target=0x7f050110; - public static final int iteminfo_effect_works_when_killing_target=0x7f050111; - public static final int iteminfo_effect_works_when_used=0x7f050112; + public static final int iteminfo_category=0x7f0500b9; + public static final int iteminfo_effect_chance_of=0x7f05010d; + public static final int iteminfo_effect_decrease_current_ap=0x7f050117; + public static final int iteminfo_effect_decrease_current_hp=0x7f050115; + public static final int iteminfo_effect_decrease_max_ap=0x7f05011c; + public static final int iteminfo_effect_decrease_max_hp=0x7f05011a; + public static final int iteminfo_effect_decrease_movecost=0x7f05011e; + public static final int iteminfo_effect_duration=0x7f05010e; + public static final int iteminfo_effect_increase_current_ap=0x7f050118; + public static final int iteminfo_effect_increase_current_hp=0x7f050116; + public static final int iteminfo_effect_increase_max_ap=0x7f05011b; + public static final int iteminfo_effect_increase_max_hp=0x7f050119; + public static final int iteminfo_effect_increase_movecost=0x7f05011d; + public static final int iteminfo_effect_works_on_source=0x7f05010f; + public static final int iteminfo_effect_works_on_target=0x7f050110; + public static final int iteminfo_effect_works_when_equipped=0x7f050114; + public static final int iteminfo_effect_works_when_hitting_target=0x7f050111; + public static final int iteminfo_effect_works_when_killing_target=0x7f050112; + public static final int iteminfo_effect_works_when_used=0x7f050113; public static final int itemlist_animal=0x7f05003f; public static final int itemlist_armour=0x7f05003c; public static final int itemlist_debug=0x7f050038; @@ -558,34 +558,34 @@ public final class R { public static final int itemlist_v068=0x7f050042; public static final int itemlist_v069=0x7f050043; public static final int itemlist_weapons=0x7f050039; - public static final int key_required=0x7f050124; - public static final int levelup_add_attackchance=0x7f0500e4; - public static final int levelup_add_attackchance_description=0x7f0500e5; - public static final int levelup_add_attackdamage=0x7f0500e6; - public static final int levelup_add_attackdamage_description=0x7f0500e7; - public static final int levelup_add_blockchance=0x7f0500e8; - public static final int levelup_add_blockchance_description=0x7f0500e9; - public static final int levelup_add_health=0x7f0500e2; - public static final int levelup_add_health_description=0x7f0500e3; - public static final int levelup_buttontext=0x7f0500e1; - public static final int levelup_description=0x7f0500e0; - public static final int levelup_title=0x7f0500df; - public static final int loadsave_selectslot=0x7f05005b; - public static final int loadsave_slot_empty=0x7f05005c; - public static final int loadsave_title_load=0x7f05005a; - public static final int loadsave_title_save=0x7f050059; - public static final int menu_load=0x7f050056; - public static final int menu_pause=0x7f050053; - public static final int menu_save=0x7f050055; - public static final int menu_save_failed=0x7f050058; - public static final int menu_save_gamesaved=0x7f050057; - public static final int menu_settings=0x7f050054; - public static final int monster_difficulty_easy=0x7f0500a1; - public static final int monster_difficulty_hard=0x7f0500a3; - public static final int monster_difficulty_impossible=0x7f0500a5; - public static final int monster_difficulty_normal=0x7f0500a2; - public static final int monster_difficulty_veryeasy=0x7f0500a0; - public static final int monster_difficulty_veryhard=0x7f0500a4; + public static final int key_required=0x7f050125; + public static final int levelup_add_attackchance=0x7f0500e5; + public static final int levelup_add_attackchance_description=0x7f0500e6; + public static final int levelup_add_attackdamage=0x7f0500e7; + public static final int levelup_add_attackdamage_description=0x7f0500e8; + public static final int levelup_add_blockchance=0x7f0500e9; + public static final int levelup_add_blockchance_description=0x7f0500ea; + public static final int levelup_add_health=0x7f0500e3; + public static final int levelup_add_health_description=0x7f0500e4; + public static final int levelup_buttontext=0x7f0500e2; + public static final int levelup_description=0x7f0500e1; + public static final int levelup_title=0x7f0500e0; + public static final int loadsave_selectslot=0x7f05005c; + public static final int loadsave_slot_empty=0x7f05005d; + public static final int loadsave_title_load=0x7f05005b; + public static final int loadsave_title_save=0x7f05005a; + public static final int menu_load=0x7f050057; + public static final int menu_pause=0x7f050054; + public static final int menu_save=0x7f050056; + public static final int menu_save_failed=0x7f050059; + public static final int menu_save_gamesaved=0x7f050058; + public static final int menu_settings=0x7f050055; + public static final int monster_difficulty_easy=0x7f0500a2; + public static final int monster_difficulty_hard=0x7f0500a4; + public static final int monster_difficulty_impossible=0x7f0500a6; + public static final int monster_difficulty_normal=0x7f0500a3; + public static final int monster_difficulty_veryeasy=0x7f0500a1; + public static final int monster_difficulty_veryhard=0x7f0500a5; public static final int monsterlist_crossglen_animals=0x7f050045; public static final int monsterlist_crossglen_npcs=0x7f050047; public static final int monsterlist_debug=0x7f050044; @@ -595,58 +595,63 @@ public final class R { public static final int monsterlist_v069_monsters=0x7f05004b; public static final int monsterlist_v069_npcs=0x7f05004c; public static final int monsterlist_wilderness=0x7f050049; - public static final int preferences_combat_category=0x7f050104; - public static final int preferences_combat_speed=0x7f050106; - public static final int preferences_combat_speed_title=0x7f050105; - public static final int preferences_dialog_category=0x7f0500fd; - public static final int preferences_dialog_confirmattack=0x7f050101; - public static final int preferences_dialog_confirmattack_title=0x7f050100; - public static final int preferences_dialog_confirmrest=0x7f0500ff; - public static final int preferences_dialog_confirmrest_title=0x7f0500fe; - public static final int preferences_dialog_monsterloot=0x7f050103; - public static final int preferences_dialog_monsterloot_title=0x7f050102; - public static final int preferences_display_category=0x7f0500fa; - public static final int preferences_display_fullscreen=0x7f0500fc; - public static final int preferences_display_fullscreen_title=0x7f0500fb; - public static final int preferences_display_scaling_factor=0x7f05011f; - public static final int preferences_display_scaling_factor_title=0x7f05011e; - public static final int preferences_movement_category=0x7f050107; - public static final int preferences_movementmethod=0x7f050109; - public static final int preferences_movementmethod_title=0x7f050108; + public static final int preferences_combat_category=0x7f050105; + public static final int preferences_combat_speed=0x7f050107; + public static final int preferences_combat_speed_title=0x7f050106; + public static final int preferences_dialog_category=0x7f0500fe; + public static final int preferences_dialog_confirmattack=0x7f050102; + public static final int preferences_dialog_confirmattack_title=0x7f050101; + public static final int preferences_dialog_confirmrest=0x7f050100; + public static final int preferences_dialog_confirmrest_title=0x7f0500ff; + public static final int preferences_dialog_monsterloot=0x7f050104; + public static final int preferences_dialog_monsterloot_title=0x7f050103; + public static final int preferences_display_category=0x7f0500fb; + public static final int preferences_display_fullscreen=0x7f0500fd; + public static final int preferences_display_fullscreen_title=0x7f0500fc; + public static final int preferences_display_scaling_factor=0x7f050120; + public static final int preferences_display_scaling_factor_title=0x7f05011f; + public static final int preferences_movement_category=0x7f050108; + public static final int preferences_movementmethod=0x7f05010a; + public static final int preferences_movementmethod_title=0x7f050109; public static final int questlist=0x7f05004e; + /** These quests do not need translation: + */ public static final int questlist_debug=0x7f05004d; - public static final int questlist_v068=0x7f05004f; - public static final int questlog_includecompleted_prompt=0x7f0500f6; - public static final int questlog_queststatus=0x7f0500f7; - public static final int questlog_queststatus_completed=0x7f0500f9; - public static final int questlog_queststatus_inprogress=0x7f0500f8; - public static final int questlog_title=0x7f0500f5; - public static final int savegame_currenthero_displayinfo=0x7f05005d; - public static final int shop_buy=0x7f0500d7; - public static final int shop_buyitem=0x7f0500da; - public static final int shop_infoitem=0x7f0500d9; - public static final int shop_item_bought=0x7f0500dd; - public static final int shop_item_sold=0x7f0500de; - public static final int shop_sell=0x7f0500d8; - public static final int shop_sellitem=0x7f0500db; - public static final int shop_yourgold=0x7f0500dc; - public static final int startscreen_about=0x7f0500cd; - public static final int startscreen_continue=0x7f0500ca; - public static final int startscreen_enterheroname=0x7f0500ce; - public static final int startscreen_load=0x7f0500cf; - public static final int startscreen_newgame=0x7f0500cb; - public static final int startscreen_newgame_confirm=0x7f0500cc; - public static final int status_ap=0x7f05006d; - public static final int status_exp=0x7f05006e; - public static final int status_hp=0x7f05006b; - public static final int status_mp=0x7f05006c; - public static final int traitsinfo_attack_chance=0x7f0500b2; - public static final int traitsinfo_attack_cost=0x7f0500b1; - public static final int traitsinfo_attack_damage=0x7f0500b3; - public static final int traitsinfo_criticalhit_chance=0x7f0500b4; - public static final int traitsinfo_criticalhit_multiplier=0x7f0500b5; - public static final int traitsinfo_defense_chance=0x7f0500b6; - public static final int traitsinfo_defense_damageresist=0x7f0500b7; + /** These quests do not need translation: + */ + public static final int questlist_nondisplayed=0x7f05004f; + public static final int questlist_v068=0x7f050050; + public static final int questlog_includecompleted_prompt=0x7f0500f7; + public static final int questlog_queststatus=0x7f0500f8; + public static final int questlog_queststatus_completed=0x7f0500fa; + public static final int questlog_queststatus_inprogress=0x7f0500f9; + public static final int questlog_title=0x7f0500f6; + public static final int savegame_currenthero_displayinfo=0x7f05005e; + public static final int shop_buy=0x7f0500d8; + public static final int shop_buyitem=0x7f0500db; + public static final int shop_infoitem=0x7f0500da; + public static final int shop_item_bought=0x7f0500de; + public static final int shop_item_sold=0x7f0500df; + public static final int shop_sell=0x7f0500d9; + public static final int shop_sellitem=0x7f0500dc; + public static final int shop_yourgold=0x7f0500dd; + public static final int startscreen_about=0x7f0500ce; + public static final int startscreen_continue=0x7f0500cb; + public static final int startscreen_enterheroname=0x7f0500cf; + public static final int startscreen_load=0x7f0500d0; + public static final int startscreen_newgame=0x7f0500cc; + public static final int startscreen_newgame_confirm=0x7f0500cd; + public static final int status_ap=0x7f05006e; + public static final int status_exp=0x7f05006f; + public static final int status_hp=0x7f05006c; + public static final int status_mp=0x7f05006d; + public static final int traitsinfo_attack_chance=0x7f0500b3; + public static final int traitsinfo_attack_cost=0x7f0500b2; + public static final int traitsinfo_attack_damage=0x7f0500b4; + public static final int traitsinfo_criticalhit_chance=0x7f0500b5; + public static final int traitsinfo_criticalhit_multiplier=0x7f0500b6; + public static final int traitsinfo_defense_chance=0x7f0500b7; + public static final int traitsinfo_defense_damageresist=0x7f0500b8; } public static final class style { public static final int Theme_NoBackground=0x7f090000; diff --git a/AndorsTrail/res/drawable/monsters_rltiles1.png b/AndorsTrail/res/drawable/monsters_rltiles1.png index 72b4a81a1..3cde8b73c 100644 Binary files a/AndorsTrail/res/drawable/monsters_rltiles1.png and b/AndorsTrail/res/drawable/monsters_rltiles1.png differ diff --git a/AndorsTrail/res/drawable/monsters_rltiles2.png b/AndorsTrail/res/drawable/monsters_rltiles2.png index 25da43a1c..b15bc65e5 100644 Binary files a/AndorsTrail/res/drawable/monsters_rltiles2.png and b/AndorsTrail/res/drawable/monsters_rltiles2.png differ diff --git a/AndorsTrail/res/values-it/questlist.xml b/AndorsTrail/res/values-it/questlist.xml index 84aeb10e3..798c05fcf 100644 --- a/AndorsTrail/res/values-it/questlist.xml +++ b/AndorsTrail/res/values-it/questlist.xml @@ -9,14 +9,11 @@ {leta|Marito scomparso|1|{{10|Leta del villaggio di Crossglen vuole che cerchi suo marito Oromir.||0|}{20|Ho trovato Oromir nel villaggio di Crossglen, che si nascondeva da Leta.||0|}{100|Ho detto a Leta che Oromir si nasconde nel villaggio di Crossglen.|30|1|}}|}; {odair|Infestazione di topi|1|{{10|Odair mi chiede di pulire la grotta dall\'invasione dei ratti. In particolare di uccidere il topo più grosso e poi tornare da Odair.||0|}{100|Ho aiutato Odair a eliminare i ratti nella grotta-magazzino al villaggio di Crossglen.|30|1|}}|}; {bonemeal|Sostanze vietate|1|{{10|Leonid del municipio di Crossglen mi dice che c\'era un problema in paese qualche settimana fa. A quanto pare, Lord Geomyr ha vietato qualsiasi uso di farine animali come sostanza di guarigione.\n\nTharal, il sacerdote della città dovrebbe saperne di più.||0|}{20|Tharal non vuole parlare di farina d\'ossa. Potrei convincerlo portandogli 5 ali d\' insetto.||0|}{30|Tharal dice che la farina d\'ossa è molto potente come sostanza guaritrice, ed è abbastanza sconvolto dal fatto che è diventato illegale. Dovrei andare a vedere Thoronir in Fallhaven se voglio saperne di più. Dovrei dirgli la password \'Bagliore dell\'Ombra\'.||0|}{40|Ho parlato con Thoronir in Fallhaven. Egli potrebbe creare una pozione di farina d\'ossa se gli porto 5 ossa. Dovrebbero esserci alcuni scheletri in una casa abbandonata a nord di Fallhaven.||0|}{100|Ho portato le ossa a Thoronir. Ora è in grado di preparare la pozione.\nPerò devo fare attenzione ad usarla, Lord Geomyr ne ha vietato l\'uso.|90|1|}}|}; -{crossglen|TODO|0|{{1|||0|}}|}; {jan|Amici di Fallen|1|{{10|Jan mi racconta la sua storia, di Gandir e Irogotu. I tre amici che scavarono una miniera per cercare un tesoro, ma hanno litigato. Irogotu in preda alla rabbia ha ucciso Gandir, rubandogli un anello.\nDovrei prendere l\'anello a Irogotu e riportarlo a Jan.||0|}{100|Ho portato l\'anello di Gandir a Jan, e vendicato il suo amico. Irogotu è morto.|150|1|}}|}; {bucus|Chiave di Luthor|1|{{10|Bucus in Fallhaven potrebbe sapere qualcosa di Andor. Ma vuole la chiave di Luthor che è nelle catacombe sotto la chiesa di Fallhaven.||0|}{20|Le catacombe sotto la chiesa di Fallhaven sono chiuse. Athamyr è l\'unico che ha sia il permesso che il coraggio di entrarvi. Dovrei andare a trovarlo nella sua casa a sud-ovest della chiesa.||0|}{30|Athamyr vuole un pò di carne cotta, e poi forse mi dirà qualcosa di più.||0|}{40|Ho portato la carne cotta ad Athamyr.|70|0|}{50|Athamyr mi ha dato il permesso di entrare nelle catacombe sotto la chiesa Fallhaven.||0|}{100|Ho portato a Bucus la chiave di Luthor.|215|1|}}|}; {fallhavendrunk|Racconto dell\'ubriaco|1|{{10|Un ubriaco fuori dalla taverna di Fallhaven cominciò a raccontarmi la sua storia, ma vuole che io gli porti dell\'idromele. Non so se la sua storia porterà a nulla.||0|}{100|L\'ubriaco mi ha detto che aveva l\'abitudine di viaggiare con Unnmir. Dovrei andare a parlare con Unnmir.||1|}}|}; {calomyran|I segreti di Calomyran|1|{{10|Un vecchio di Fallhaven ha perso il suo libro \'Calomyran Secrets\'. Dovrei andare a cercarlo. Forse nella casa di Arcir a sud?||0|}{20|Ho trovato una pagina strappata da un libro intitolato \'Calomyran Secrets\' con il nome di \'Larcal\' scritto sopra.||0|}{100|Ho dato il libro al vecchio.|60|1|}}|}; -{fallhaventavern|Stanza in affitto|0|{{10|||1|}}|}; {nocmar|Tesori perduti|1|{{10|Unnmir mi ha detto che era un avventuriero, e mi ha dato il suggerimento di andare a trovare Nocmar. La sua casa è a sud-ovest della taverna in Fallhaven.||0|}{20|Nocmar mi dice che era un fabbro. Ma Lord Geomyr ha vietato l\'uso di Acciaio puro, così non può forgiare più le sue armi.\nSe riesco a trovare un Pietra pura e portarglielo, dovrebbe essere in grado di forgiare il nuovo Acciaio puro!.||0|}{200|Ho trovato un Pietra pura per Nocmar. Ora avrà degli oggetti di Acciaio puro da vendere|120|1|}}|}; -{arcir|Elythara|0|{{10|||0|}}|}; {flagstone|Antichi segreti|1|{{10|Ho incontrato una guardia all\'esterno di una fortezza chiamata Flagstone. La guardia mi ha parlato di Flagstone, che era un campo di prigionia per i lavoratori in fuga dal Monte Galmore. Recentemente, c\'è stato un aumento di mostri non-morti che fuoriusciva da Flagstone. Dovrei studiare l\'origine dei mostri non-morti. La guardia mi dice di tornare a lui se ho bisogno di aiuto.||0|}{20|Ho trovato un tunnel scavato sotto Flagstone, che sembra portare a una grotta più grande. La grotta è sorvegliata da un demone a cui non sono nemmeno in grado di avvicinarmi. Forse la guardia fuori Flagstone ne sà di più?||0|}{30|La guardia mi dice che l\'ex guardiano di Flagstone portava sempre una collana con se!. La collana probabilmente contiene le informazioni per avvicinarsi al demone. Dovrei tornare dalla guardia per le informazioni della collana, una volta che l\'avrò trovata.||0|}{31|Ho trovato l\'ex guardiano di Flagstone, era al piano superiore.||0|}{40|Ho imparato la formula per avvicinarmi la demone. \'Daylight Shadow\'.|160|0|}{50|Nei sotterranei di Flagstone, ho trovato la fonte di creazione dei non morti. Una creatura nata dal dolore degli ex prigionieri.||0|}{60|Ho trovato un prigioniero vivo, Narael, nei sotterranei di Flagstone. Narael una volta era un cittadino di Nor City. E\' troppo debole per camminare, ma se riesco a trovare la moglie, in città, verrei ricompensato.|210|1|}}|}; {vacor|Pezzi mancanti|1|{{10|Un mago chiamato Vacor nel sud-ovest di Fallhaven ha cercato di lanciare un incantesimo di fenditura.\nC\'è qualcosa che non va in lui, sembrava molto ossessionato dal suo incantesimo. Sta cercando di ottenere un qualche tipo di forza da esso.||0|}{20|Vacor vuole che io gli porti i quattro pezzi dell\'incantesimo che gli è stato rubato. I banditi dovrebbero essere da qualche parte a sud di Fallhaven.||0|}{30|Ho portato i quattro pezzi dell\'incantesimo a Vacor.|120|0|}{40|Vacor mi racconta del suo ex apprendista Unzel, che aveva iniziato a mettere in discussione Vacor. Vacor ora vuole uccidere Unzel. Dovrei essere in grado di trovarlo a sud-ovest, fuori di Fallhaven. Dovrei portare il suo anello con sigillo a Vacor una volta che l\'ho ucciso.||0|}{50|Unzel mi dà la scelta di schierarmi con lui o con Vacor.||0|}{51|Ho scelto di schierarmi con Unzel. Dovrei andare a sud-ovest di Fallhaven a parlare con Vacor circa Unzel e l\'Ombra.||0|}{53|Ho iniziato a lottare con Unzel. Vorrei portare il suo anello a Vacor una volta ucciso.||0|}{54|Ho iniziato a lottare con Vacor. Vorrei portare il suo anello a Unzel una volta ucciso.||0|}{60|Ho ucciso Unzel e ho informato Vacor.|160|1|}{61|Ho ucciso Vacor e ho informato Unzel.|160|1|}}|}; diff --git a/AndorsTrail/res/values-ru/questlist.xml b/AndorsTrail/res/values-ru/questlist.xml index 6267bafca..28b55f562 100644 --- a/AndorsTrail/res/values-ru/questlist.xml +++ b/AndorsTrail/res/values-ru/questlist.xml @@ -9,14 +9,11 @@ {leta|Пропавший муж|1|{{10|Лета из деревни Долина креста хочет, чтобы я поискал ее мужа Оромира.||0|}{20|Я нашел Оромира в деревне Долина креста, он скрывался от своей жены Леты.||0|}{100|Я сказал Лете где прячется Оромир.|30|1|}}|}; {odair|Крысиное заражение|1|{{10|Одаир хочет, чтобы я очистил пещеру поставки в деревне Долина креста от крыс. В частности, я должен убить большую крысу и вернуться к Одаиру.||0|}{100|Я помог Одаиру очистить пещеры поставки от крыс в деревне Долина креста.|30|1|}}|}; {bonemeal|Запрещенные вещества|1|{{10|Леонид в мэрии Долины креста сказал мне, что было нарушение в деревне несколько недель назад. По-видимому, Лорд Геомир запретил любое использование костной муки, как исцеляющего вещества. \n\n Фарал, городской священник, должен знать больше.||0|}{20|Фарал не хочет говорить о костной муке. Я мог бы уговорить его принеся ему 5 крыльев насекомых.||0|}{30|Фарал сказал мне, что костная мука является очень мощным, исцеляющим веществом, и весьма расстроен тем, что оно теперь запрещено. Я должен найти Форонира в Фоллхейвене, если я хочу узнать больше. Нужно сказать ему пароль \"Сияние тени\".||0|}{40|Я поговорил с Форониром в Фоллхейвене. Он сможет смешать мне зелье из костной муки, если я принесу ему 5 костей скелета. В заброшенном доме к северу от Фоллхейвена должно быть несколько скелетов.||0|}{100|Я принес кости Форониру. Он теперь в состоянии снабдить меня зельем из костной муки.\nЯ должен быть осторожным при использовании, так как Лорд Геомир запретила его приминение.|90|1|}}|}; -{crossglen|TODO|0|{{1|||0|}}|}; {jan|Погибшие друзья|1|{{10|Ян рассказал мне свою историю о нем, Гандиру и Ироготу. Три бывших друга пошли в дыру вырыть скрытые сокровища, но они поссорились и начали драться. Ирогот убил Гандира в своем гневе. \nЯ должен забрать кольцо Гандира у Ирогота, и отдать Яну, когда оно будет у меня.||0|}{100|Я принес Яну кольцо Гандира, и отомстил за его друга. Ирогот мертв.|150|1|}}|}; {bucus|Ключ для Лютора|1|{{10|Бикус из Фоллхейвена что-то зает об Эндоре. Он хочет что-бы я принес ему ключ Лютера из катакомб под Фоллхейвенской церковью.||0|}{20|Катакомбы под Фоллхейвенской церковью заперты. Афамир только у него есть право и мужество спускаться в них. Я должен увидеться с ним на юго-западе от церкви.||0|}{30|Афамир просит принести ему немного мяса, может тогда он сможет поговорить со мной.||0|}{40|Я принес немного мяса Афамиру.|70|0|}{50|Афамир дал мне разрешение спуститься в катакомбы под Фоллхейвенской церковью.||0|}{100|Я принес Бикусу ключ Лютора.|215|1|}}|}; {fallhavendrunk|Рассказ пьяницы|1|{{10|Пьяница возле тавены в Фоллхейвене начал рассказывать историю, но вдруг попросил принести ему эль. Я незнаю приведет ли его история к чему либо.||0|}{100|Пьяница рассказал что путешествовал с Унмиром. Я должен поговорить с Унмиром.||1|}}|}; {calomyran|Секрет Каломирана|1|{{10|Пожилой мужчина на улице в Фоллхейвене потерял книгу \"Секреты Каломирана\". Я должен найти ее. Может она в доме Арсира на юге?||0|}{20|Я нашел вырванную страницу из книги \"Секреты Каломирана\" с именем \'Ларкал\', записанным на ней.||0|}{100|Я вернул старику книгу.|60|1|}}|}; -{fallhaventavern|Аренда комнаты|0|{{10|||1|}}|}; {nocmar|Утраченные сокровища|1|{{10|Унмир сказал мне, что когда-то был авантюристом и дал мне намек идти поговорить с Нокмаром. Его дом на юго-западе от таверны в Фоллхейвене.||0|}{20|Нокмар сказал мне, что он когда-то был кузнецом. Но Лорд Геомир запретил использование сердечной стали, и теперь он не может ковать свое фирменное оружие.\nЕсли я смогу найти сердечную сталь и принести её Нокмару, он снова сможет ковать.||0|}{200|Я принес сердечную сталь Нокмару. Теперь у него появились изделия из неё.|120|1|}}|}; -{arcir|Элифара|0|{{10|||0|}}|}; {flagstone|Древние секреты|1|{{10|Я встретил стражника у крепости называемой Флагстоун. Он рассказал мне о Флагстоуне, который раньше был лагерем для беглых рабов из Горы Галмор. В последнее время наблюдается большая активность нежити и монстров в Флагстоуне. Я решил исследовать источник нежити и монстров. Страж сказал мне, чтобы возвратился к нему, если мне понадобится помощь.||0|}{20|Я обнаружил туннель под Флагстоуном, который, кажется, ведет к большой пещере. Пещера охраняется демоном, так что я даже не могу подойти. Может быть, страж за пределами Флагстоуна знает больше?||0|}{30|Страж рассказал мне, что бывший надзиратель носил ожерелье, которым он дорожил. На ожерелье, вероятно, слова, необходимые для подхода мимо демона. Я должен вернуться к стражу, чтобы расшифровать сообщение на ожерелье, когда я найду его.||0|}{31|Я нашел бывшего надзирателя Флагстоуна на верхнем уровне.||0|}{40|Я узнал слова необходимые для подхода мимо демона под Флагстоуном. \"Дневная Тень\".|160|0|}{50|Глубоко под Флагстоуном, я нашел источник заражения нежити. Существа рождаются из горя бывших узников Флагстоуна.||0|}{60|Я нашел одного заключенного, Нараеля, жившего глубоко под Флагстоуном. Нараель был гражданином города Нор. Он слишком слаб, чтобы ходить, но если я смогу найти его жену в г.Нор, я буду щедро награжден.|210|1|}}|}; {vacor|Пропавшие части|1|{{10|Маг, назвавшийся Вакором, на юго-западе Фаллхейвена пытался создать Заклинание разрыва.\nC ним что-то не так, он очень одержим своим заклинанием. Бормотал про какую-то силу.||0|}{20|Вакор хочет, чтобы я принес ему четыре части Заклинания разрыва, он утверждает, что они были украдены у него. Бандиты должны быть где-то к югу от Фоллхейвена.||0|}{30|Я принес четыре части Pаклинания разрыва Вакору.|120|0|}{40|Вакор рассказал мне о своем бывшем ученике Унзеле, что мешает ему. Он попросил меня убить Унзела и принести его перстень, как доказательство. Унзел может быть на юго-западе от Фоллхейвена||0|}{50|Унзел дал мне выбор, идти с ним, или с Вакором.||0|}{51|Я выбрал сторону Унзела. Я должен отправиться на юго-запад Фоллхейвена и поговорить с Вакором о Унзеле и Тени.||0|}{53|Я начал битву с Унзелем. Я должен принести его перстень Вакору.||0|}{54|Я начал битву с Вакором. Я должен принести его перстень Унзелу.||0|}{60|Я убил Унзела и сообщил об этом Вакору.|160|1|}{61|Я убил Вакора и сообщил об этом Унзелу.|160|1|}}|}; diff --git a/AndorsTrail/res/values/itemlist.xml b/AndorsTrail/res/values/itemlist.xml index 8d61964a6..f2ddc44cb 100644 --- a/AndorsTrail/res/values/itemlist.xml +++ b/AndorsTrail/res/values/itemlist.xml @@ -193,9 +193,9 @@ {bwm_dagger|items_tiles:89|Blackwater dagger|0|539|1||||3|40|||1|1|5||{{blackwater_misery|1|}}||||||||||||||||||||}; {bwm_dagger_venom|items_tiles:89|Blackwater poisoned dagger|0|1552|1||||3|45|||1|1|||{{blackwater_misery|1|}}|||||||1||||||{{poison_weak|1|5|50|}}|||||||}; -{bwm_ironsword|items_tiles:70|Blackwater iron sword|0|1224|1||||5|50|||3|7|5||{{blackwater_misery|1|}}||||||||||||||||||||}; +{bwm_ironsword|items_tiles:70|Blackwater iron sword|0|1224|1||||4|50|||3|7|5||{{blackwater_misery|1|}}||||||||||||||||||||}; {bwm_leather_armour|items_tiles:183|Blackwater leather armour|3|2551|1||||||||||25|1|{{blackwater_misery|1|}}||||||||||||||||||||}; -{bwm_leather_cap|items_tiles:192|Blackwater leather cap|2|722|1|5|||||||||45||{{blackwater_misery|1|}}||||||||||||||||||||}; +{bwm_leather_cap|items_tiles:192|Blackwater leather cap|2|722|1|5|||||||||21||{{blackwater_misery|1|}}||||||||||||||||||||}; {bwm_combat_ring|items_tiles:268|Blackwater ring of combat|7|595|1|||||5|||0|7|||{{blackwater_misery|1|}}||||||||||||||||||||}; {bwm_brew|items_tiles:51|Blackwater brew|20|57||||||||||||||1|15|15|||{{intoxicated|1|10|100|}}||||||||||||||}; {woodcutter_hatchet|items_tiles:141|Woodcutter\'s hatchet|0|0|1||||6|9|||6|12|||||||||||||||||||||||}; diff --git a/AndorsTrail/res/values/monsterlist.xml b/AndorsTrail/res/values/monsterlist.xml index 086e756ea..b8dcead5f 100644 --- a/AndorsTrail/res/values/monsterlist.xml +++ b/AndorsTrail/res/values/monsterlist.xml @@ -27,7 +27,7 @@ {monsters_snakes:1|Forest Snake|forestsnake||7|||10|110|||1|2|10||snake|||||||||}; {monsters_snakes:3|Young Cave Snake|cavesnake1||8|||5|110|10|2|2|2|10||snake|||||||||}; {monsters_snakes:3|Cave Snake|cavesnake1||12|||5|110|20|2|2|2|15||snake|||||||||}; -{monsters_snakes:3|Venomous Cave Snake|cavesnake2||15|||5|110|40|2|2|2|10||snake|||||||||}; +{monsters_snakes:3|Venomous Cave Snake|cavesnake2|1x1|15|10||5|110|40|2|2|2|10||snake||1||||||{{poison_weak|1|1|10|}}|}; {monsters_snakes:3|Tough Cave Snake|cavesnake2||21|||5|110|20|2|2|2|15||snake|||||||||}; {monsters_rats:4|Basilisk|cavesnake2_boss||40|||7|40|||3|9|50|2|cavecritter|||||||||}; {monsters_liches:0|Snake servant|cavesnake3||35|||5|80|40|3|2|3|10|1|lich1|||||||||}; @@ -224,14 +224,13 @@ {monsters_rltiles2:22|Carrion crawler|carrioncrawler_2|1x1|55|10|5|5|50|||3|8|40|4|carrioncrawler||1||||||{{poison_weak|1|5|20|}}|}; {monsters_rltiles2:21|Tough carrion crawler|carrioncrawler_3|1x1|59|10|5|5|59|||4|9|40|5|carrioncrawler||1||||||{{poison_weak|1|5|20|}}|}; {monsters_rltiles1:47|Restless dead|restless_dead_1|1x1|25|10|5|5|50|80|2|0|3|140|3|restless_dead_1|||||||||}; -{monsters_rltiles1:49|Kazaul grave spawn|restless_dead_1|1x1|45|10|5|5|110|40|2|2|5|35|3|restless_dead_1|||||||||}; +{monsters_rltiles1:49|Grave spawn|restless_dead_1|1x1|45|10|5|5|110|40|2|2|5|35|3|restless_dead_1|||||||||}; {monsters_rltiles1:47|Restless apparition|restless_dead_2|1x1|29|10|5|3|90|60|3|2|6|10|1|restless_dead_2|||||||||}; {monsters_rltiles1:27|Skeletal reaper|restless_dead_2|1x1|15|10|5|5|150|20|2|0|9|110||restless_dead_2|||||||||}; -{monsters_rltiles1:41|Kazaul spawn|kazaul_1|1x1|45|10|5|3|130|50|2|3|5|45|1|kazaul_1|||||||||}; -{monsters_rltiles1:45|Kazaul devourer|kazaul_2|1x1|45|10|5|3|140|40|2|3|7|30|1|kazaul_2|||||||||}; -{monsters_rltiles1:42|Kazaul guardian|kazaul_guardian|1x1|120|10|5|5|140|40|2|3|8|35|3|kazaul_guardian|kazaul_guardian||||||||}; +{monsters_rltiles1:41|Kazaul spawn|kazaul_1|1x1|45|10|5|3|70|50|2|3|5|90|1|kazaul_1|||||||||}; +{monsters_rltiles1:45|Kazaul imp|kazaul_2|1x1|45|10|5|3|70|40|2|3|7|105|1|kazaul_2|||||||||}; +{monsters_rltiles1:42|Kazaul guardian|kazaul_guardian|1x1|95|10|5|5|70|40|2|3|8|90|3|kazaul_guardian|kazaul_guardian||||||||}; {monsters_misc:9|Keknazar|keknazar|1x1|90|10|5|5|50|20|3|3|9|70|8|keknazar|keknazar||||||||}; - @@ -245,6 +244,62 @@ {monsters_men:4|Agent6|bwm_agent_6|1x1||10|5|5|||||||||bwm_agent_6_start||||||||}; {monsters_rltiles2:81|Arghest|arghest|1x1||10|5|5|||||||||arghest||||||||}; {monsters_rltiles1:67|Tonis|tonis|1x1||10|5|5|||||||||tonis||||||||}; + +{monsters_rltiles1:74|Moyra|moyra|1x1||10|5|5||||||||prim_commoner|moyra||||||||}; +{karvis_npc:6|Prim citizen|prim_commoner1|1x1||10|5|5||||||||prim_commoner1|prim_commoner1||||||||}; +{monsters_rltiles1:68|Prim commoner|prim_commoner2|1x1||10|5|5||||||||prim_commoner|prim_commoner2||||||||}; +{karvis_npc:2|Prim resident|prim_commoner3|1x1||10|5|5||||||||prim_commoner|prim_commoner3||||||||}; +{monsters_rltiles1:84|Prim evoker|prim_commoner4|1x1||10|5|5||||||||prim_commoner|prim_commoner4||||||||}; +{monsters_rltiles1:72|Laecca|laecca|1x1||10|5|5|||||||||laecca||||||||}; +{karvis_npc:0|Prim cook|prim_cook|1x1||10|5|5|||||||||prim_cook||||||||}; +{monsters_rltiles1:63|Prim visitor|prim_innguest|1x1||10|5|5|||||||||prim_innguest||||||||}; +{monsters_rltiles2:81|Birgil|birgil|1x1||10|5|5|||||||||birgil||||||||}; +{monsters_rltiles1:106|Prim tavern guest|prim_tavern_guest1|1x1||10|5|5|||||||||prim_tavern_guest1||||||||}; +{monsters_rltiles1:106|Prim tavern regular|prim_tavern_guest2|1x1||10|5|5|||||||||prim_tavern_guest2||||||||}; +{monsters_rltiles1:106|Prim bar guest|prim_tavern_guest3|1x1||10|5|5|||||||||prim_tavern_guest3||||||||}; +{monsters_rltiles1:106|Prim bar regular|prim_tavern_guest4|1x1||10|5|5|||||||||prim_tavern_guest4||||||||}; +{monsters_rltiles1:88|Prim armorer|prim_armorer|1x1||10|5|5||||||||prim_armorer|prim_armorer||||||||}; +{monsters_men2:0|Jueth|prim_tailor|1x1||10|5|5||||||||prim_tailor|prim_tailor||||||||}; +{karvis_npc:7|Bjorgur|bjorgur|1x1||10|5|5|||||||||bjorgur||||||||}; +{monsters_rltiles2:81|Prim prisoner|prim_prisoner|1x1||10|5|5|||||||||||||||||}; +{karvis_npc:3|Fulus|fulus|1x1||10|5|5|||||||||fulus||||||||}; +{monsters_rltiles1:92|Guthbered|guthbered|1x1||10|5|5|||||||||guthbered||||||||}; +{monsters_rltiles1:76|Guthbered\'s bodyguard|guthbered_guard|1x1||10|5|5|||||||||guthbered_guard||||||||}; +{monsters_rltiles1:65|Prim weapon guard|prim_guard1|1x1||10|5|5|||||||||prim_guard1||||||||}; +{monsters_warrior1:0|Prim sentry|prim_guard2|1x1||10|5|5|||||||||prim_guard2||||||||}; +{monsters_rltiles1:65|Prim guard|prim_guard4|1x1||10|5|5|||||||||prim_guard4||||||||}; +{monsters_rltiles1:76|Tired Prim guard|prim_guard3|1x1||10|5|5|||||||||prim_guard3||||||||}; +{monsters_rltiles1:69|Prim treasury guard|prim_treasury_guard|1x1||10|5|5|||||||||prim_treasury_guard||||||||}; +{monsters_rltiles2:93|Samar|prim_priest|1x1||10|5|5|||||||||prim_priest||||||||}; +{monsters_rltiles1:83|Prim priestly acolyte|prim_acolyte|1x1||10|5|5|||||||||prim_acolyte||||||||}; +{monsters_rltiles1:74|Studying Prim pupil|prim_pupil1|1x1||10|5|5|||||||||prim_pupil1||||||||}; +{monsters_rltiles1:74|Reading Prim pupil|prim_pupil2|1x1||10|5|5|||||||||prim_pupil2||||||||}; +{monsters_rltiles1:74|Prim pupil|prim_pupil3|1x1||10|5|5|||||||||prim_pupil1||||||||}; + +{monsters_warrior1:0|Blackwater entrance guard|blackwater_entranceguard|1x1|30|10|||||||||||blackwater_entranceguard||||||||}; +{karvis_npc:2|Blackwater dinner guest|blackwater_guest1|1x1|20|10|||||||||||blackwater_guest||||||||}; +{monsters_man1:0|Blackwater inhabitant|blackwater_guest2|1x1|10|10|||||||||||blackwater_guest||||||||}; +{karvis_npc:0|Blackwater cook|blackwater_cook|1x1||10|5|5|||||||||blackwater_cook||||||||}; +{monsters_rltiles1:86|Keneg|keneg|1x1||10|5|5|||||||||keneg||||||||}; +{monsters_rltiles1:85|Mazeg|mazeg|1x1||10|5|5|||||||||mazeg||||||||}; +{monsters_rltiles1:88|Waeges|waeges|1x1||10|5|5||||||||waeges|waeges||||||||}; +{monsters_rltiles1:66|Blackwater fighter|blackwater_fighter|1x1||10|5|5|||||||||blackwater_fighter||||||||}; +{monsters_rltiles1:83|Ungorm|ungorm|1x1||10|5|5|||||||||ungorm||||||||}; +{monsters_rltiles1:74|Blackwater pupil|blackwater_pupil|1x1||10|5|5|||||||||blackwater_pupil||||||||}; +{monsters_rltiles1:81|Laede|blackwater_sleephall|1x1||10|5|5|||||||||laede||||||||}; +{monsters_men2:9|Herec|herec|1x1||10|5|5|||||||||herec||||||||}; +{monsters_rltiles1:87|Iducus|iducus|1x1||10|5|5||||||||iducus|iducus||||||||}; +{monsters_rltiles1:80|Blackwater priest|blackwater_priest|1x1||10|5|5|||||||||blackwater_priest||||||||}; +{monsters_rltiles1:84|Studying Blackwater priest|blackwater_pupil|1x1||10|5|5|||||||||blackwater_pupil||||||||}; +{monsters_rltiles1:76|Blackwater guard|blackwater_guard1|1x1||10|5|5|||||||||blackwater_guard1||||||||}; +{monsters_rltiles1:76|Blackwater border patrol|blackwater_guard2|1x1||10|5|5|||||||||blackwater_guard2||||||||}; +{monsters_rltiles1:76|Harlenn\'s bodyguard|blackwater_bossguard|1x1||10|5|5|||||||||blackwater_bossguard||||||||}; +{monsters_men:3|Blackwater throneroom guard|blackwater_throneguard|1x1||10|5|5|||||||||blackwater_throneguard||||||||}; +{monsters_men2:6|Harlenn|harlenn|1x1||10|5|5|||||||||Harlenn||||||||}; +{monsters_men2:4|Throdna|throdna|1x1||10|5|5|||||||||throdna||||||||}; +{monsters_rltiles1:85|Throdna\'s guard|throdna_guard|1x1||10|5|5|||||||||throdna_guard||||||||}; +{monsters_rltiles1:80|Blackwater mage|blackwater_acolyte|1x1||10|5|5|||||||||blackwater_acolyte||||||||}; + diff --git a/AndorsTrail/res/values/questlist.xml b/AndorsTrail/res/values/questlist.xml index 4153a5f4d..00c28cc51 100644 --- a/AndorsTrail/res/values/questlist.xml +++ b/AndorsTrail/res/values/questlist.xml @@ -1,6 +1,7 @@ + [id|name|showInLog|stages[progress|logText|rewardExperience|finishesQuest|]|]; {debugquest|Debug Quest|1|{{10|I have talked to the NPC||0|}{20|I have asked the NPC for more info.|20|0|}{100|I have given the items to the NPC|40|1|}}|}; @@ -14,21 +15,26 @@ {leta|Missing husband|1|{{10|Leta in Crossglen village wants me to look for her husband Oromir.||0|}{20|I have found Oromir in Crossglen village, hiding from his wife Leta.||0|}{100|I have told Leta that Oromir is hiding in Crossglen village.|30|1|}}|}; {odair|Rat infestation|1|{{10|Odair wants me to clear the supply cave in Crossglen village of rats. In particular, I should kill the large rat and return to Odair.||0|}{100|I have helped Odair clear out the rats in the supply cave in Crossglen village.|30|1|}}|}; {bonemeal|Disallowed substance|1|{{10|Leonid in Crossglen town hall tells me that there was a disturbance in the village some weeks ago. Apparently, Lord Geomyr has banned all use of bonemeal as a healing substance.\n\nTharal, the town priest should know more.||0|}{20|Tharal does not want to talk about bonemeal. I might be able to persuade him by bringing him 5 insect wings.||0|}{30|Tharal tells me that bonemeal is a very potent healing substance, and is quite upset that it is not allowed anymore. I should go see Thoronir in Fallhaven if I want to learn more. I should tell him the password \'Glow of the Shadow\'.||0|}{40|I have talked to Thoronir in Fallhaven. He might be able to mix me a bonemeal potion if I bring him 5 skeletal bones. There should be some skeletons in an abandoned house north of Fallhaven.||0|}{100|I have brought the bones to Thoronir. He is now able to supply me with bonemeal potions.\nI should be careful when using them though, since Lord Geomyr has banned their use.|90|1|}}|}; -{crossglen|TODO|0|{{1|||0|}}|}; {jan|Fallen friends|1|{{10|Jan tells me his story where, he and his two friends Gandir and Irogotu, went down the hole to dig for a hidden treasure, but they started fighting and Irogotu killed Gandir in his rage.\nI should bring back Gandir\'s ring from Irogotu, and see Jan when I have it.||0|}{100|Irogotu is dead. I have brought Jan the ring of Gandir, and avenged his friend.|150|1|}}|}; {bucus|Key of Luthor|1|{{10|Bucus in Fallhaven might know something about Andor. He wants me to bring him the key of Luthor from the catacombs beneath Fallhaven church.||0|}{20|The catacombs beneath Fallhaven church are closed off. Athamyr is the only one with both permission and the bravery to enter them. I should go see him in his house southwest of the church.||0|}{30|Athamyr wants me to bring him some cooked meat, then maybe he will want to talk more.||0|}{40|I brought some cooked meat to Athamyr.|70|0|}{50|Athamyr has given me permission to enter the catacombs beneath Fallhaven church.||0|}{100|I brought Bucus the key of Luthor.|215|1|}}|}; {fallhavendrunk|Drunken tale|1|{{10|A drunk outside Fallhaven tavern began telling me his story, but wants me to bring him some mead. I don\'t know if his story will lead anywhere though.||0|}{100|The drunk told me he used to travel with Unnmir. I should go talk to Unnmir.||1|}}|}; {calomyran|Calomyran secrets|1|{{10|An old man standing outside in Fallhaven has lost his book \'Calomyran Secrets\'. I should go look for it. Maybe in Arcir\'s house to the south?||0|}{20|I found a torn page of a book called \'Calomyran Secrets\' with the name \'Larcal\' written on it.||0|}{100|I gave the book back to the old man.|60|1|}}|}; -{fallhaventavern|Room to rent|0|{{10|||1|}}|}; {nocmar|Lost treasures|1|{{10|Unnmir told me he used to be an adventurer, and gave me a hint to go see Nocmar. His house is just southwest of the tavern in Fallhaven.||0|}{20|Nocmar tells me he used to be a smith. But Lord Geomyr has banned the use of heartsteel, so he cannot forge his weapons anymore.\nIf I can find a heartstone and bring it to Nocmar, he should be able to forge the heartsteel again.||0|}{200|I have brought a heartstone to Nocmar. He should have heartsteel items available now.|120|1|}}|}; -{arcir|Elythara|0|{{10|||0|}}|}; {flagstone|Ancient secrets|1|{{10|I met a guard on sentry outside a fortress called Flagstone. The guard told me that Flagstone used to be a prison camp for runaway workers from Mount Galmore. Recently, there has been an increase in undead monsters pouring out from Flagstone. I should investigate the source of the undead monsters. The guard tells me to return to him if I need help.||0|}{20|I found a dug out tunnel beneath Flagstone, that seems to lead to a larger cave. The cave is guarded by a demon that I am not even able to approach. Maybe the guard outside Flagstone knows more?||0|}{30|The guard tells me that the former warden used to have a necklace that he always wore. The necklace probably has the words required to approach the demon. I should return to the guard to decipher any message on the necklace once I have found it.||0|}{31|I found the former warden of Flagstone on the upper level. I should return to the guard now.||0|}{40|I have learned the words required to approach the demon beneath Flagstone. \'Daylight Shadow\'.|160|0|}{50|Deep beneath Flagstone, I found the source of the undead infestation. A creature born from the grief of the former prisoners of Flagstone.||0|}{60|I found one prisoner, Narael, alive deep beneath Flagstone. Narael was once a citizen of Nor City. He is too weak to walk by himself, but if I can find his wife in Nor City, I would be handsomely rewarded.|210|1|}}|}; {vacor|Missing pieces|1|{{10|A mage called Vacor in southwest Fallhaven has been trying to cast a rift spell.\nThere was something not right about him, he seemed very obsessed with his spell. Something about him gaining a power from it.||0|}{20|Vacor wants me to bring him the four pieces of the rift spell that he claims was stolen from him. The four bandits should be somewhere south of Fallhaven.||0|}{30|I have brought the four pieces of the rift spell to Vacor.|120|0|}{40|Vacor tells me about his former apprentice Unzel, who had started to question Vacor. Vacor now wants me to kill Unzel. I should be able to find him to the southwest outside of Fallhaven. I should bring his signet ring to Vacor once I have killed him.||0|}{50|Unzel gives me a choice to side with either Vacor or him.||0|}{51|I have chosen to side with Unzel. I should go to southwest Fallhaven to talk to Vacor about Unzel and the Shadow.||0|}{53|I started a fight with Unzel. I should bring his ring to Vacor once he is dead.||0|}{54|I started a fight with Vacor. I should bring his ring to Unzel once he is dead.||0|}{60|I have killed Unzel and told Vacor about the deed.|160|1|}{61|I have killed Vacor and told Unzel about the deed.|160|1|}}|}; - + + [id|name|showInLog|stages[progress|logText|rewardExperience|finishesQuest|]|]; {nondisplay|Placeholder for hidden quests|0|{{10|Tavern room in Foaming Flask (not displayed)||0|}}|}; +{crossglen|TODO|0|{{1|||0|}}|}; +{fallhaventavern|Room to rent|0|{{10|||1|}}|}; +{arcir|Elythara|0|{{10|||0|}}|}; + + + +[id|name|showInLog|stages[progress|logText|rewardExperience|finishesQuest|]|]; {farrik|Night visit|1|{{10|Farrik in the Fallhaven thieves guild told me of a plan to help a fellow thief escape from Fallhaven prison.||0|}{20|Farrik in the Fallhaven thieves guild told me the details of the plan, and I accepted to help him. The guard captain apparently has a drinking problem. The plan is that I get a prepared mead from the cook in the thieves guild that will knock out the guard captain in the prison. I might be required to bribe the guard captain.||0|}{25|I got the prepared mead from the cook in the thieves guild.||0|}{30|I told Farrik that I don\'t fully agree with their plan. I might tell the guard captain about their shady plan.||0|}{32|I have given the prepared mead to the guard captain.||0|}{40|I have told the guard captain of the plan that the thieves have to release their friend.||0|}{50|The guard captain wants me to tell the thieves that the security will be lowered for tonight. We might be able to catch some of the thieves.||0|}{60|I managed to bribe the guard captain into drinking the prepared mead. He should be out during the night allowing the thieves to break their friend free.||0|}{70|Farrik rewarded me for helping the thieves guild.|150|1|}{80|I have told Farrik that the security will be lowered tonight.||0|}{90|The guard captain thanked me for helping him plan to catch the thieves. He said he will also tell other guards that I helped him.|170|1|}}|}; {lodar|A lost potion|1|{{10|I should find a potioner called Lodar. Umar in Fallhaven thieves guild told me I that I will need to know the right words to pass a guardian in order to reach Lodar\'s hideaway.||0|}{15|Umar told me I should go see someone galled Ogam in Vilegard. Ogam can supply me with the right words to reach Lodar\'s hideaway.||0|}{20|I have visited Ogam in southwest Vilegard. He was talking in what seemed like riddles. I could barely make out some details when I asked about Lodar\'s hideaway. \'Halfway between the Shadow and the light. Rocky formations.\' and the words \'Glow of the Shadow.\' were among the things he said. I am not sure what they mean.||0|}}|}; {vilegard|Trusting an outsider|1|{{10|The people of Vilegard are very suspicious of outsiders. I was told to go see Jolnor in the Vilegard chapel if I want to gain their trust.||0|}{20|I have talked to Jolnor in the Vilegard chapel. He suggests I help three infuential people in order to gain the trust of the people in Vilegard. I should help Kaori, Wrye and Jolnor in Vilegard.||0|}{30|I have helped all three people in Vilegard that Jolnor suggested. Now the people of Vilegard should trust me more.|210|1|}}|}; diff --git a/AndorsTrail/res/xml/blackwater_mountain10.tmx b/AndorsTrail/res/xml/blackwater_mountain10.tmx index a5bedf0cc..1be598da8 100644 --- a/AndorsTrail/res/xml/blackwater_mountain10.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain10.tmx @@ -96,7 +96,7 @@ - + @@ -107,6 +107,11 @@ + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain11.tmx b/AndorsTrail/res/xml/blackwater_mountain11.tmx index fa838c9e2..0449ffb7e 100644 --- a/AndorsTrail/res/xml/blackwater_mountain11.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain11.tmx @@ -63,7 +63,7 @@ eJzdVr1OAzEMvippXwXmiomxQgJ1RmLmEeAVYGhhBMQzVFUFIz9i6dQNBh4D6TrDUBzlrLNcOz93JyHxSVYuOec+23HsK4oa/X4hYmn9uIJxY+L6Ej5t2tpKWHMoK94n9n6p6LeBZFcTXSk+e73ttaGwhqDxTtHn8TmvbDgQ9ox6uj2lwKvph2zi+qin2eNwaL0cD/zcxUDSxz1zeL8GOSPx5vojNnfffoA9j6aO8Yn1gqAxoPpo09xsn4/k7z18c0Jse4c9H0aOsQTUR5sk3pi/XUDinVVzelYOF+DvJcv/Kby7ypBrE+dFYCxvgPM28d5pcGe2VuLMeScC177xMgvkLcep9Wem5RXnlTA2XpzuF8jC+HOJ+T4M8Gr3N4S36hsx30P+ts3nhdHHjYnHmeezBOlM0HdpLBN4EbQ27MDzLpk/w/NLhrxGeKcD3ce20OpVSj63RVf53AWvls+5/TSXV8vnUD/NrZU5+fxt6j7Ke3BqrUQ7c/OK9lHag3+YTQ6016f0fXcn7xrkNLXpyMo2Omj3CLnxrlNItaCJjRpvDnJrFq1bf4HUf7P/hl8KjK1Z - + eJztk1EOwCAMQrmC97/s/htFutJ+SdLEaN1jigvAevWqqdDc7/gOQr+6d9d32xvXgb2HLOM055byP5NcgLMr+clwT+OsB8a9qYvLfLA5JzebrS7uzUdXrmJPRlVupRRup9y5cnPVM2R39oersjvzPMl1+WBchHVFqqcTd+otqefCPDq5Ds+V+59mT3E/5pUnQA== @@ -132,6 +132,32 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain13.tmx b/AndorsTrail/res/xml/blackwater_mountain13.tmx index 036f7fea6..06eacbaf9 100644 --- a/AndorsTrail/res/xml/blackwater_mountain13.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain13.tmx @@ -78,7 +78,11 @@ - + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain21.tmx b/AndorsTrail/res/xml/blackwater_mountain21.tmx index be28660b9..77458f040 100644 --- a/AndorsTrail/res/xml/blackwater_mountain21.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain21.tmx @@ -48,14 +48,14 @@ - + eJwLYmRgaKQSDoLiiViwMzMDgwsQT2ZjYJgCxBOBeBIbdrUwDDOvFqjPkQGTxoZbgWaW4pCHmYdLLzH4END8w2zkm1fBhluOHPM6iDAvEU94oeNyKrsPHybWvN0sDAx7WIgzr5GK7gOZNZGK5oHMCmRAYEcGVD45GACNyk6D - eJxjYGBg+M/MwLCZnYGBkwVCI4McID8TKoasxhCIVwL1cbFAMDLIBYrPYmNgkGSB0CA+LgBSkwqUd4SaJ8UCwYFo7ljFhkoHA9WGAPFiIH8JEC8E4kVsCPXJQDMuAPmbgHgzECcimVcP5O9iQ6XD8LgRBlYiqUlG8jPInmS0MMBnHkztRlbs8tjM0wKq1WaF0JpQWosV1byDQL4IWrjhAlas2DGyeReRzNuPFLaFQL8dheJjQHwaiL8hyeuxQjA62IkUJufZMOWxAWRz0M08CTTvKpI7iDXvNNB/Z1iwuxEb+EbArbj8S4oZ5AIAglYu5w== + eJxjYGBg+M/MwLCZnYGBkwVCI4McID8TKoasxhCIVwL1cbFAMDLIBYrPYmNgkGSB0CA+LgBSkwqUd4SaJ8UCwYFo7ljFhkoHA9WGAPFiIH8JEC8E4kVsCPXJQDMuAPmbgHgzECcimVcP5O9iQ6XD8LgRBlYiqUlG8jPInmS0MMBnHkztRlbs8tjM0wKq1WaF0JpQWosV1byDQL4I1J+/2BjwAitW7BjZvItI5u1HMq8Q6LejUHwMiE8D8TckeT1WCEYHO5HC5DwB9yGbhY0NAieB5l1Fcgex5p0G+u8MC3Y3YgPfCLgVl39JMYNcAABqbi/n @@ -76,7 +76,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - - diff --git a/AndorsTrail/res/xml/blackwater_mountain22.tmx b/AndorsTrail/res/xml/blackwater_mountain22.tmx index 0bccbf4b7..54636c0e2 100644 --- a/AndorsTrail/res/xml/blackwater_mountain22.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain22.tmx @@ -76,6 +76,32 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain23.tmx b/AndorsTrail/res/xml/blackwater_mountain23.tmx index 347dc37a9..6fe72b1e8 100644 --- a/AndorsTrail/res/xml/blackwater_mountain23.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain23.tmx @@ -76,6 +76,12 @@ - + + + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain24.tmx b/AndorsTrail/res/xml/blackwater_mountain24.tmx index b4224e11a..2504e67a7 100644 --- a/AndorsTrail/res/xml/blackwater_mountain24.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain24.tmx @@ -76,6 +76,12 @@ - + + + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain25.tmx b/AndorsTrail/res/xml/blackwater_mountain25.tmx index 712642e70..2bd981306 100644 --- a/AndorsTrail/res/xml/blackwater_mountain25.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain25.tmx @@ -76,6 +76,37 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain26.tmx b/AndorsTrail/res/xml/blackwater_mountain26.tmx index 92885bfa5..365ee7cd2 100644 --- a/AndorsTrail/res/xml/blackwater_mountain26.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain26.tmx @@ -77,5 +77,11 @@ - + + + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain27.tmx b/AndorsTrail/res/xml/blackwater_mountain27.tmx index 4c79935f9..6e0c69baf 100644 --- a/AndorsTrail/res/xml/blackwater_mountain27.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain27.tmx @@ -48,7 +48,7 @@ - + eJwLYmRgCCICN+LBMDUT8WCYGkcGBgZXJMwJxSBxbGpAfHQ1jVA1MIyNPxFNDBs/kAE7dkRiAwAAIxj1 @@ -58,12 +58,12 @@ eJxjYEAAJXYGnMCbhYEhHChvxI7ggzAyiIbyndgR/Gg0NffYGBh+s0HY61gZGDgYIJgXye53bKh6YGrwgXtA/feB+AGSOZJA80WA/F5WAprxAAAhxgpR - + eJwTZGBgEBwAzECEPD41DESoQbeHHD0Ae9IEDg== - + eJxjYCAO/GceODXn2BkYzgPxBXbcarCZ+54ZP58YAABvJgpz @@ -77,5 +77,7 @@ - + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain28.tmx b/AndorsTrail/res/xml/blackwater_mountain28.tmx index 03995da23..bdcba013b 100644 --- a/AndorsTrail/res/xml/blackwater_mountain28.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain28.tmx @@ -77,5 +77,11 @@ - + + + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain29.tmx b/AndorsTrail/res/xml/blackwater_mountain29.tmx index 37c9d67de..5ba8a2f09 100644 --- a/AndorsTrail/res/xml/blackwater_mountain29.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain29.tmx @@ -50,7 +50,7 @@ - eJxTY2BgUKMRTmeiLoaZW86EHXsw45bDh2HmBuDAEcwQ2hJKWwNpbySMSx/M3DpmVDFc6onF2NxLqrn7WRgYDrCgsqlhLi73guIPFg4gGsTHZQeI74EnXJHVlTOhipVTyVxTLDgASmMzN4JIcwXxYHLDfriZm44Wp+h8XBikDp+5+NIKPlxOwFxsaYVYDAAGU2Dz + eJxTY2BgUKMRTmeiLoaZW86EHXsw45bDh2HmBuDAEcwQ2hJKWwNpbySMSx/M3DpmVDFc6onF2NxLqrn7WRgYDrCgsqlhLi73guIPFg4gGsTHZQeI74EnXJHVlTOhipVTyVxTLDgASmMzN4JIcznxYHLDfriZm44Wp+h8XBikDp+5+NIKPlxOwFxsaYVYDACBtV+j @@ -65,7 +65,7 @@ - eJwTZGBgEBzFcIwNEKsPG41uLi47cNlLyD0MDPjdTor+gTIXlx5keVLsI8VcdLOJiWNizSU2fRHrXnz6hoq5tAqHwWAuORgAhB8M9A== + eJwTZGBgEBzFcIwNEKsPG41uLi47cNlLyD0MDPjdTor+gTIXlx5keVLsI8VcdLOJiWNizaUkDRJKk8S6ebCZS6twGAzmkoMBvdwPvg== @@ -76,6 +76,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain30.tmx b/AndorsTrail/res/xml/blackwater_mountain30.tmx index 63697e849..36ba04f27 100644 --- a/AndorsTrail/res/xml/blackwater_mountain30.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain30.tmx @@ -55,7 +55,7 @@ - eJzVVcttwzAMZWtCE3iEAL4XPvQcZIKiEwQdI24XcD/XIE6ambJIVqgYmxBBkLJ9MJA+gLB+5KP4kQEATgg3tPGLAeBrmC+JbuBgLpqfFuZlzmaEqzP2GvTPlDFmdbBtlcN6q/TJnsUzFxuHlzkkLL76wdZ9ctanYJXxibFx7K+H9Yvw9QPTnO5QPaa9ZzHOxVOe+y4AfqK8hjR+V7pWfaC4l3VH5udz2p/fyHOO8hbSeC9q8dPxQXJhJrYvzt4Be2HsxJg5Ob5jPVgqDqr7rVqTsZ6LytAlezreubq3cMRepmLpt+heIXNHMZc13Ioe1MDg9x/nTteO1ud9rnF+v3J6HnK+/jdwTrw7WT2j9TgH1yLZ0f8kirPM40rlgaD7Ttrw8kT25vYr2+5UDUz5p90T/gByrDKT + eJzVVcuNwkAMNWDNNpASkLgjDtyQVlSAtgJEGXwayC5cEQG2pm1kW2AMscZY9hAOkeBJVuZnP48/EwCAE8IVZfxiAPip522iqjmYi+anlnmZc/WAqzL2VuifKWLMRsG2VdTrpdInexbPs5g6vMwhYfGNOrbu0Flvgn7GJ8bUsf9Zr/8JXzeY5nSHQTftjcU4F095btsD2EX5Cmm8VrpWfaC4l3VH5udz2p9z5PmNsghpvBe1+O34ILkwE9uZs3fAmzCWYsycHN9HPVgoDqr7uVqTsX4WA0OX7Ol45+rewhFv0hRtv0WvCpk7irms4VL0oAYGv/84d7p2tD7vc43z+5XT85Dz9d3AOfHuZPWM1uMc/PeSHf1PojjLPPZVHgi676QNL09kr2m/Tj7ubVeqBpr8014JF6uFMtk= @@ -63,7 +63,7 @@ eJxjYMAN/jPjkSQDgMwjxsyRaC+ldn9A0k+JvZUspNmLrP89kfYSqw4E+nC45z2afmLNw6UOJI7LLlziMH2UpC10f+Cy8wMW/xIb1pQAdDtIiTtKAMzdyOFAD3uxAVqUC4PZXkrTDK3NAwFywwZdH6nmkOsXcssrXMCEjb76hgIYjOUDAMFqN2Y= - + eJztk1EKACAIQ71C979sX4EMK5NpBA2EPnSvGTURaYk1lMn43Pe4sxnth954ZnK1J/LZXGveEnvPs2wCvad5vXk8OuVGfb39Gf8ly/s2d7XLnSru8vJbRHene7xcnEFWRIycDP/q6r8RHdI= @@ -87,6 +87,7 @@ + @@ -97,7 +98,7 @@ - + diff --git a/AndorsTrail/res/xml/blackwater_mountain33.tmx b/AndorsTrail/res/xml/blackwater_mountain33.tmx index bcbfe8471..d6bad0649 100644 --- a/AndorsTrail/res/xml/blackwater_mountain33.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain33.tmx @@ -82,6 +82,19 @@ - + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain34.tmx b/AndorsTrail/res/xml/blackwater_mountain34.tmx index 2cb0c2fb8..faa5f44c5 100644 --- a/AndorsTrail/res/xml/blackwater_mountain34.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain34.tmx @@ -82,6 +82,15 @@ - + + + + + + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain35.tmx b/AndorsTrail/res/xml/blackwater_mountain35.tmx index 412a53200..dc9add531 100644 --- a/AndorsTrail/res/xml/blackwater_mountain35.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain35.tmx @@ -58,7 +58,7 @@ eJxjYKAN+MeMiXGpA4F+dlQ+LnW4+Mji04FmubMRbx4/O351xPiDWgAAupATqg== - + eJz7x8zA8I8GGBughjpzNuqaRy111MIAcFFGhA== @@ -75,6 +75,7 @@ + diff --git a/AndorsTrail/res/xml/blackwater_mountain40.tmx b/AndorsTrail/res/xml/blackwater_mountain40.tmx index ff21dfa5b..4606607c8 100644 --- a/AndorsTrail/res/xml/blackwater_mountain40.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain40.tmx @@ -63,7 +63,7 @@ eJzbwcKAAf4zQ+gTSHI7WDDlQeA9Ehsb+I9FvpCVgaGIFVXsAzPCrHnsDAzzgXgBO2Ez8am9wgJRC7LrNSuq2tesmOph5oLk1gHV/GOG0MhqYeGArBbE/gfFID66/9DD6wMzQjwZLfy/MGLqxxZe6P7EBUBxCAA8Lym3 - + eJwTZGBgEETDDFjEcGFqqsUGSFGLSw+yOAMDpn5i3EsrtfTAALbbBi4= @@ -82,6 +82,9 @@ - + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain41.tmx b/AndorsTrail/res/xml/blackwater_mountain41.tmx index bf0a103da..349f69547 100644 --- a/AndorsTrail/res/xml/blackwater_mountain41.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain41.tmx @@ -82,6 +82,9 @@ - + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain42.tmx b/AndorsTrail/res/xml/blackwater_mountain42.tmx index 43de8f839..c011811b7 100644 --- a/AndorsTrail/res/xml/blackwater_mountain42.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain42.tmx @@ -75,7 +75,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/AndorsTrail/res/xml/blackwater_mountain43.tmx b/AndorsTrail/res/xml/blackwater_mountain43.tmx index 56901daba..887294c7c 100644 --- a/AndorsTrail/res/xml/blackwater_mountain43.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain43.tmx @@ -82,6 +82,77 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain44.tmx b/AndorsTrail/res/xml/blackwater_mountain44.tmx index e85712e24..7764a94c7 100644 --- a/AndorsTrail/res/xml/blackwater_mountain44.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain44.tmx @@ -50,22 +50,22 @@ - eJxbwsjAsITKOJ+JOhhmXj0TdTDMPG8G4vFaFtwY3bxoIs3DJUeK+zyYIWqR3YELk2MevvggxzxC8UEo7NDNIzf8oskwjxRMjHmkpH9k85KYITgZiFOYseePiWwMDIVAXALEk4C4GIgnA/EUNuLdtxqodg0b4TimRnzgMg/mR5ifCZnnCFTjBMXOQOzCDAlDkHkgmhruq4eaV0+hechpnZjyIJ4ZfzmEjgmZRwompB8AMwq2oA== + eJytlDsOAiEURZnBsC8/hYlLmMJEpzdGe9bgZwl0aqU70IXNJUAyIQM8kOKEAjh53AeohrFfJRT4gENbh6/1ybYOzrdhdF6zML6vI/pCczn1rbnJW/tUE6bUF+tHiS/Vj1R2vq80vy7TF8t2Ckp91Pvv+3bcsAc9n34fF8HYEZzBFZzADdwFvb4H1j5Fusc1+hHyuTO6M6d8c6xZWJZgxU2G2qfHGvVJ65N/+sZ3nfIfbHn8H/KJ+XS27wzG+/057RoAjm+84A== - eJxjYKA+2MwOoWPZEexsKDuXHaHmOTNCHlkfOpva4C4bgn2BDTtOZsFvhj8zgv2WDbc6Sty3nw03mxQAc995NtxsdDAJGl/INCXuUwKGFw8rAwMvEPOxQviUuM8IqF8GaI4sEMuxQviUuI8WoJgdFQ82UMQMwcVAXMKMXc1CYFi1QPEiIG4G4sVAvISEMNwNVLuHimFObPw9hfrpM5IfYX5GBtjSVyBQTRAUBwNxCI7woSYQYUfFlAJmdlRMDvjCCKE/M2KXBwCOuj/9 + eJxjYKA+2MwOoWPZEexsKDuXHaHmOTNCHlkfOpva4C4bgn2BDTtOZsFvhj8zgv2WDbc6Sty3nw03mxQAc995NtxsdDAJGl/INCXuUwKGFw8rAwMvEPOxQviUuM+IGRJHskCz5FghfErcRwtQzI6KBxsoYobgYiAuYcauZiEwrFqgeBEQNwPxYiBeQkIY7gaq3UPFMCc2/p5C/fQZyY8wPyPnb2zpKxCoJgiKg4E4BEf4UBOIsKNiSgEzOyomB3xhhNCfGbHLAwAI5UCq - eJxjYKA++M88at5QNQ+mFp+ewWSePTt1zaMUDLXwG6nmJbOQZ957ZlQan53UAtQ2j5oAAFodJ9w= + eJxjYKA++M88at5QNQ+mFp+ewWKeDCsDgz077d1HChhK4TdqHunmvWdGpSk1jxhAbfOoCQBKKCeW - eJwTZGBgEByBGAYIyeMDpKon1TxCbGx8fP4ZNQ+3edgAuemKVuZRmuZJNY8UNcT4lxDAZye6OCG7CPmBUvNwuZ8YfxILKDWPGumFUDoAACDDEgA= + eJwTZGBgEByBGAYIyeMDpKglxTxBND4uNjY+Ib/iYpNi3nB0HzZAbrqilXnUSvekxAs1/UsI4LMTXZyQXYT8QKl5uNxPjD+JBZSaR430QigdAAAz6RGJ @@ -87,7 +87,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - diff --git a/AndorsTrail/res/xml/blackwater_mountain45.tmx b/AndorsTrail/res/xml/blackwater_mountain45.tmx index e886ba33d..c20f351d2 100644 --- a/AndorsTrail/res/xml/blackwater_mountain45.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain45.tmx @@ -82,6 +82,32 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain50.tmx b/AndorsTrail/res/xml/blackwater_mountain50.tmx index 2f44b9f50..96950b9df 100644 --- a/AndorsTrail/res/xml/blackwater_mountain50.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain50.tmx @@ -82,7 +82,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/AndorsTrail/res/xml/blackwater_mountain51.tmx b/AndorsTrail/res/xml/blackwater_mountain51.tmx index 718d600ab..8750d098e 100644 --- a/AndorsTrail/res/xml/blackwater_mountain51.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain51.tmx @@ -63,7 +63,7 @@ eJxjYEAF/5kZcAJkOVxsctWdY2dguMBOWN09dgT7PR51+AAl6j5gEcOmjlg70AEALRoTlQ== - + eJwTZGBgEETCMCBIANNTHS45dHFCgJA6QTR1gljEsZmHTRyXOkIYAH0tBB8= @@ -82,6 +82,9 @@ - + + + + diff --git a/AndorsTrail/res/xml/blackwater_mountain52.tmx b/AndorsTrail/res/xml/blackwater_mountain52.tmx index e074aed74..1ddd65d7c 100644 --- a/AndorsTrail/res/xml/blackwater_mountain52.tmx +++ b/AndorsTrail/res/xml/blackwater_mountain52.tmx @@ -50,7 +50,7 @@ - eJy9k90NgCAMhIu6gYzBJq7JCG6AGziCiwjBxtr0xwfjw4WQfqHtXcgBIBMt8LxL+ouZhs6M9dyE+loVL2au5x46y5kEt47Q2cL6UAZVSD0aDM4h1Smj1RPIs0qzWIy0s+YtMuit5m9i3nKW9kJvG0uzkGZuLM/C8ufN/jQvLwsrL6+PtRcK9/Jy/5LxPNT+BH+DSnvjBHn8a6M= + eJy9k9ENgCAMRIu6gY7BJq7JBrgBbuAILiIEGpqmLX4YPy4k9IW2dyE4gNB0ZO0AkMgd15/MMlVmzuepvLE1Zs3n5SrLGQ9dt6tsYn0og0qkvhkMziHVKaPVi6RZpVksRto5ui7JF/RW89czbzlLe6G3haVZSDMXlmdh+fNmf5rXKAsrr1Efay8U7jXK/Utm5KH2J/gbqChwWHsAyVlsmw== @@ -82,6 +82,13 @@ - + + + + + + + + diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/CombatTraits.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/CombatTraits.java index 192d708a9..c8cfeba5d 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/CombatTraits.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/CombatTraits.java @@ -25,6 +25,7 @@ public class CombatTraits { set(copy); } public void set(CombatTraits copy) { + if (copy == null) return; this.attackCost = copy.attackCost; this.attackChance = copy.attackChance; this.criticalChance = copy.criticalChance; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java index aa7bc59e2..489ec0541 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java @@ -90,10 +90,8 @@ public final class MonsterTypeCollection { private static float div100(int v) { return (float) v / 100f; } - private static int getExpectedMonsterExperience(final MonsterType t) { - return getExpectedMonsterExperience(t, t.maxHP, t.maxAP); - } private static int getExpectedMonsterExperience(final CombatTraits t, final int maxHP, final int maxAP) { + if (t == null) return 0; final float avgAttackHP = t.getAttacksPerTurn(maxAP) * div100(t.attackChance) * t.damagePotential.averagef() * (1 + div100(t.criticalChance) * t.criticalMultiplier); final float avgDefenseHP = maxHP * (1 + div100(t.blockChance)) + Constants.EXP_FACTOR_DAMAGERESISTANCE * t.damageResistance; return (int) Math.ceil((avgAttackHP * 3 + avgDefenseHP) * Constants.EXP_FACTOR_SCALING); @@ -108,14 +106,6 @@ public final class MonsterTypeCollection { L.log("WARNING: Cannot find phrase \"" + t.phraseID + "\" for MonsterType \"" + t.name + "\"."); } } - - if (t.exp > 0) { - int expected_exp = getExpectedMonsterExperience(t); - - if (t.exp != expected_exp) { - L.log("WARNING: MonsterType \"" + t.name + "\" has exp=" + t.exp + ", which is different from the suggested exp=" + expected_exp); - } - } } } } diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java index 46fe58332..3103ad045 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java @@ -92,6 +92,7 @@ public final class ResourceLoader { world.quests.initialize(r.getString(R.string.questlist_debug)); } else { world.quests.initialize(r.getString(R.string.questlist)); + world.quests.initialize(r.getString(R.string.questlist_nondisplayed)); world.quests.initialize(r.getString(R.string.questlist_v068)); }