Bugfixes to the 4 new quests in crossroads- and fields maps.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@161 08aca716-68be-ccc6-4d58-36f5abd142ac
This commit is contained in:
oskar.wiksten
2011-09-19 17:52:06 +00:00
parent 7b35217f24
commit 8fdc8b41df
16 changed files with 434 additions and 423 deletions

View File

@@ -406,10 +406,10 @@ public final class R {
/** Do not translate this.
*/
public static final int about_authors=0x7f050000;
public static final int about_button1=0x7f050113;
public static final int about_button2=0x7f050114;
public static final int about_button3=0x7f050115;
public static final int about_contents1=0x7f050116;
public static final int about_button1=0x7f050116;
public static final int about_button2=0x7f050117;
public static final int about_button3=0x7f050118;
public static final int about_contents1=0x7f050119;
/**
This is the GNU GPL v2 text, originally from
http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -417,24 +417,24 @@ public final class R {
http://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html
*/
public static final int about_contents3=0x7f050117;
public static final int about_contents3=0x7f05011a;
/** 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=0x7f050130;
public static final int actorconditioninfo_category=0x7f05019e;
public static final int actorconditioninfo_constant_effect=0x7f05014e;
public static final int actorconditioninfo_effect_every_full_round=0x7f050150;
public static final int actorconditioninfo_effect_every_round=0x7f05014f;
public static final int actorcondition_info_removes_all=0x7f050133;
public static final int actorconditioninfo_category=0x7f0501a1;
public static final int actorconditioninfo_constant_effect=0x7f050151;
public static final int actorconditioninfo_effect_every_full_round=0x7f050153;
public static final int actorconditioninfo_effect_every_round=0x7f050152;
public static final int actorconditions_v069=0x7f050001;
public static final int actorconditions_v069_bwm=0x7f050002;
public static final int actorinfo_attack=0x7f0500d1;
public static final int actorinfo_attacksperturn=0x7f0500cf;
public static final int actorinfo_basetraits=0x7f0500d5;
public static final int actorinfo_class=0x7f0500cc;
public static final int actorinfo_criticalhit=0x7f0500d2;
public static final int actorinfo_attack=0x7f0500d4;
public static final int actorinfo_attacksperturn=0x7f0500d2;
public static final int actorinfo_basetraits=0x7f0500d8;
public static final int actorinfo_class=0x7f0500cf;
public static final int actorinfo_criticalhit=0x7f0500d5;
/** ===========================================
Added in v0.6.9
===========================================
@@ -444,63 +444,63 @@ public final class R {
===========================================
Added in v0.6.9
*/
public static final int actorinfo_currentconditions=0x7f05012f;
public static final int actorinfo_currenttraits=0x7f0500d6;
public static final int actorinfo_defense=0x7f0500d3;
public static final int actorinfo_difficulty=0x7f0500cd;
public static final int actorinfo_health=0x7f0500ce;
public static final int actorinfo_movecost=0x7f0500d4;
public static final int actorinfo_movesperturn=0x7f0500d0;
public static final int app_name=0x7f050076;
public static final int bulkselection_select_all=0x7f050153;
public static final int bulkselection_sell_confirmation=0x7f050155;
public static final int bulkselection_sell_confirmation_title=0x7f050154;
public static final int bulkselection_totalcost_buy=0x7f050151;
public static final int bulkselection_totalcost_sell=0x7f050152;
public static final int combat_attack=0x7f0500a2;
public static final int combat_begin_flee=0x7f0500a8;
public static final int combat_endturn=0x7f0500a6;
public static final int actorinfo_currentconditions=0x7f050132;
public static final int actorinfo_currenttraits=0x7f0500d9;
public static final int actorinfo_defense=0x7f0500d6;
public static final int actorinfo_difficulty=0x7f0500d0;
public static final int actorinfo_health=0x7f0500d1;
public static final int actorinfo_movecost=0x7f0500d7;
public static final int actorinfo_movesperturn=0x7f0500d3;
public static final int app_name=0x7f050079;
public static final int bulkselection_select_all=0x7f050156;
public static final int bulkselection_sell_confirmation=0x7f050158;
public static final int bulkselection_sell_confirmation_title=0x7f050157;
public static final int bulkselection_totalcost_buy=0x7f050154;
public static final int bulkselection_totalcost_sell=0x7f050155;
public static final int combat_attack=0x7f0500a5;
public static final int combat_begin_flee=0x7f0500ab;
public static final int combat_endturn=0x7f0500a9;
/** <string name="combat_endcombat">End combat</string>
<string name="combat_endcombat">Kampf beenden</string>
<string name="combat_endcombat">End combat</string>
<string name="combat_endcombat">End combat</string>
<string name="combat_endcombat">End combat</string>
*/
public static final int combat_flee=0x7f0500a7;
public static final int combat_flee_failed=0x7f0500a9;
public static final int combat_hero_dies=0x7f0500b5;
public static final int combat_monsteraction=0x7f0500ac;
public static final int combat_monsterhealth=0x7f0500ab;
public static final int combat_move=0x7f0500a3;
public static final int combat_not_enough_ap=0x7f0500b4;
public static final int combat_result_herohit=0x7f0500b1;
public static final int combat_result_herohitcritical=0x7f0500b2;
public static final int combat_result_herokillsmonster=0x7f0500b3;
public static final int combat_result_heromiss=0x7f0500b0;
public static final int combat_result_monsterhit=0x7f0500ae;
public static final int combat_result_monsterhitcritical=0x7f0500af;
public static final int combat_flee=0x7f0500aa;
public static final int combat_flee_failed=0x7f0500ac;
public static final int combat_hero_dies=0x7f0500b8;
public static final int combat_monsteraction=0x7f0500af;
public static final int combat_monsterhealth=0x7f0500ae;
public static final int combat_move=0x7f0500a6;
public static final int combat_not_enough_ap=0x7f0500b7;
public static final int combat_result_herohit=0x7f0500b4;
public static final int combat_result_herohitcritical=0x7f0500b5;
public static final int combat_result_herokillsmonster=0x7f0500b6;
public static final int combat_result_heromiss=0x7f0500b3;
public static final int combat_result_monsterhit=0x7f0500b1;
public static final int combat_result_monsterhitcritical=0x7f0500b2;
/** <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by long-clicking a place with no adjacent monster, before you may end the combat.</string>
<string name="combat_cannotexitcombat">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.</string>
<string name="combat_cannotexitcombat">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.</string>
<string name="combat_cannotexitcombat">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.</string>
<string name="combat_cannotexitcombat">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.</string>
*/
public static final int combat_result_monstermiss=0x7f0500ad;
public static final int combat_spell=0x7f0500a5;
public static final int combat_status_ap=0x7f0500aa;
public static final int combat_use=0x7f0500a4;
public static final int conversation_leave=0x7f0500fc;
public static final int conversation_lostgold=0x7f0500f8;
public static final int conversation_next=0x7f0500fb;
public static final int combat_result_monstermiss=0x7f0500b0;
public static final int combat_spell=0x7f0500a8;
public static final int combat_status_ap=0x7f0500ad;
public static final int combat_use=0x7f0500a7;
public static final int conversation_leave=0x7f0500ff;
public static final int conversation_lostgold=0x7f0500fb;
public static final int conversation_next=0x7f0500fe;
/** <string name="conversation_title">%1$s says</string>
<string name="conversation_title">%1$s sagt</string>
<string name="conversation_title">%1$s Dit</string>
*/
public static final int conversation_rewardexp=0x7f0500f6;
public static final int conversation_rewardgold=0x7f0500f7;
public static final int conversation_rewarditem=0x7f0500f9;
public static final int conversation_rewarditems=0x7f0500fa;
public static final int conversation_title=0x7f0501a2;
public static final int conversation_rewardexp=0x7f0500f9;
public static final int conversation_rewardgold=0x7f0500fa;
public static final int conversation_rewarditem=0x7f0500fc;
public static final int conversation_rewarditems=0x7f0500fd;
public static final int conversation_title=0x7f0501a5;
public static final int conversationlist_alynndir=0x7f050026;
public static final int conversationlist_ambelie=0x7f05002a;
public static final int conversationlist_benbyr=0x7f05004a;
@@ -523,7 +523,7 @@ public final class R {
public static final int conversationlist_crossglen_leta=0x7f050004;
public static final int conversationlist_crossglen_odair=0x7f050009;
public static final int conversationlist_crossglen_tharal=0x7f050006;
public static final int conversationlist_debug=0x7f050074;
public static final int conversationlist_debug=0x7f050077;
public static final int conversationlist_erinith=0x7f050046;
public static final int conversationlist_fallhaven=0x7f05000b;
public static final int conversationlist_fallhaven_arcir=0x7f050011;
@@ -574,302 +574,305 @@ 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=0x7f050088;
public static final int dialog_confirmexit_message=0x7f05008a;
public static final int dialog_confirmexit_title=0x7f050089;
public static final int dialog_groundloot_message=0x7f0500c2;
public static final int dialog_groundloot_title=0x7f0500c1;
public static final int dialog_loading_failed_incorrectversion=0x7f050087;
public static final int dialog_loading_failed_message=0x7f050086;
public static final int dialog_loading_failed_title=0x7f050085;
public static final int dialog_loading_message=0x7f050084;
public static final int dialog_loot_foundgold=0x7f0500bf;
public static final int dialog_loot_pickall=0x7f0500be;
public static final int dialog_loot_pickedupitems=0x7f0500c0;
public static final int dialog_monsterencounter_info=0x7f050090;
public static final int dialog_monsterencounter_message=0x7f05008f;
public static final int dialog_monsterencounter_title=0x7f05008e;
public static final int dialog_monsterloot_gainedexp=0x7f0500c5;
public static final int dialog_monsterloot_message=0x7f0500c4;
public static final int dialog_monsterloot_title=0x7f0500c3;
public static final int dialog_newversion_message=0x7f050119;
public static final int dialog_newversion_title=0x7f050118;
public static final int dialog_paused_message=0x7f05008c;
public static final int dialog_paused_resume=0x7f05008d;
public static final int dialog_paused_title=0x7f05008b;
public static final int dialog_rest_confirm_message=0x7f050111;
public static final int dialog_rest_message=0x7f050112;
public static final int dialog_rest_title=0x7f050110;
public static final int dialog_close=0x7f05008b;
public static final int dialog_confirmexit_message=0x7f05008d;
public static final int dialog_confirmexit_title=0x7f05008c;
public static final int dialog_groundloot_message=0x7f0500c5;
public static final int dialog_groundloot_title=0x7f0500c4;
public static final int dialog_loading_failed_incorrectversion=0x7f05008a;
public static final int dialog_loading_failed_message=0x7f050089;
public static final int dialog_loading_failed_title=0x7f050088;
public static final int dialog_loading_message=0x7f050087;
public static final int dialog_loot_foundgold=0x7f0500c2;
public static final int dialog_loot_pickall=0x7f0500c1;
public static final int dialog_loot_pickedupitems=0x7f0500c3;
public static final int dialog_monsterencounter_info=0x7f050093;
public static final int dialog_monsterencounter_message=0x7f050092;
public static final int dialog_monsterencounter_title=0x7f050091;
public static final int dialog_monsterloot_gainedexp=0x7f0500c8;
public static final int dialog_monsterloot_message=0x7f0500c7;
public static final int dialog_monsterloot_title=0x7f0500c6;
public static final int dialog_newversion_message=0x7f05011c;
public static final int dialog_newversion_title=0x7f05011b;
public static final int dialog_paused_message=0x7f05008f;
public static final int dialog_paused_resume=0x7f050090;
public static final int dialog_paused_title=0x7f05008e;
public static final int dialog_rest_confirm_message=0x7f050114;
public static final int dialog_rest_message=0x7f050115;
public static final int dialog_rest_title=0x7f050113;
public static final int droplists_crossglen=0x7f05004b;
public static final int droplists_crossglen_outside=0x7f05004c;
public static final int droplists_debug=0x7f050072;
public static final int droplists_debug=0x7f050075;
public static final int droplists_fallhaven=0x7f05004d;
public static final int droplists_v0610_monsters=0x7f050054;
public static final int droplists_v0610_npcs=0x7f050053;
public static final int droplists_v0610_shops=0x7f050052;
public static final int droplists_v068=0x7f05004f;
public static final int droplists_v069_monsters=0x7f050051;
public static final int droplists_v069_npcs=0x7f050050;
public static final int droplists_wilderness=0x7f05004e;
public static final int exit=0x7f050077;
public static final int exit_to_menu=0x7f050078;
public static final int heroinfo_actionpoints=0x7f0500a0;
public static final int heroinfo_char=0x7f050095;
public static final int heroinfo_gold=0x7f05009f;
public static final int heroinfo_inv=0x7f050096;
public static final int heroinfo_inventory=0x7f05009e;
public static final int heroinfo_level=0x7f05009b;
public static final int heroinfo_levelup=0x7f05009a;
public static final int heroinfo_quests=0x7f0500a1;
public static final int heroinfo_skill=0x7f050098;
public static final int heroinfo_spell=0x7f050099;
public static final int heroinfo_totalexperience=0x7f05009c;
public static final int heroinfo_wear=0x7f050097;
public static final int heroinfo_wornequipment=0x7f05009d;
public static final int inventory_assign=0x7f050145;
public static final int inventory_assign_slot1=0x7f050146;
public static final int inventory_assign_slot2=0x7f050147;
public static final int inventory_assign_slot3=0x7f050148;
public static final int inventory_drop=0x7f0500ba;
public static final int inventory_equip=0x7f0500b7;
public static final int inventory_info=0x7f0500b6;
public static final int inventory_item_dropped=0x7f0500bc;
public static final int inventory_item_equipped=0x7f0500bd;
public static final int inventory_item_used=0x7f0500bb;
public static final int inventory_unassign=0x7f050149;
public static final int inventory_unequip=0x7f0500b8;
public static final int inventory_use=0x7f0500b9;
public static final int itemcategory_money=0x7f0500e5;
public static final int itemcategory_other=0x7f0500ef;
public static final int itemcategory_potion=0x7f0500ee;
public static final int itemcategory_shield=0x7f0500e7;
public static final int itemcategory_weapon=0x7f0500e6;
public static final int itemcategory_wearable_body=0x7f0500e9;
public static final int itemcategory_wearable_feet=0x7f0500eb;
public static final int itemcategory_wearable_hand=0x7f0500ea;
public static final int itemcategory_wearable_head=0x7f0500e8;
public static final int itemcategory_wearable_neck=0x7f0500ec;
public static final int itemcategory_wearable_ring=0x7f0500ed;
public static final int iteminfo_action_equip=0x7f0500e0;
public static final int iteminfo_action_equip_ap=0x7f0500e3;
public static final int iteminfo_action_unequip=0x7f0500e1;
public static final int iteminfo_action_unequip_ap=0x7f0500e4;
public static final int iteminfo_action_use=0x7f0500df;
public static final int iteminfo_action_use_ap=0x7f0500e2;
public static final int exit=0x7f05007a;
public static final int exit_to_menu=0x7f05007b;
public static final int heroinfo_actionpoints=0x7f0500a3;
public static final int heroinfo_char=0x7f050098;
public static final int heroinfo_gold=0x7f0500a2;
public static final int heroinfo_inv=0x7f050099;
public static final int heroinfo_inventory=0x7f0500a1;
public static final int heroinfo_level=0x7f05009e;
public static final int heroinfo_levelup=0x7f05009d;
public static final int heroinfo_quests=0x7f0500a4;
public static final int heroinfo_skill=0x7f05009b;
public static final int heroinfo_spell=0x7f05009c;
public static final int heroinfo_totalexperience=0x7f05009f;
public static final int heroinfo_wear=0x7f05009a;
public static final int heroinfo_wornequipment=0x7f0500a0;
public static final int inventory_assign=0x7f050148;
public static final int inventory_assign_slot1=0x7f050149;
public static final int inventory_assign_slot2=0x7f05014a;
public static final int inventory_assign_slot3=0x7f05014b;
public static final int inventory_drop=0x7f0500bd;
public static final int inventory_equip=0x7f0500ba;
public static final int inventory_info=0x7f0500b9;
public static final int inventory_item_dropped=0x7f0500bf;
public static final int inventory_item_equipped=0x7f0500c0;
public static final int inventory_item_used=0x7f0500be;
public static final int inventory_unassign=0x7f05014c;
public static final int inventory_unequip=0x7f0500bb;
public static final int inventory_use=0x7f0500bc;
public static final int itemcategory_money=0x7f0500e8;
public static final int itemcategory_other=0x7f0500f2;
public static final int itemcategory_potion=0x7f0500f1;
public static final int itemcategory_shield=0x7f0500ea;
public static final int itemcategory_weapon=0x7f0500e9;
public static final int itemcategory_wearable_body=0x7f0500ec;
public static final int itemcategory_wearable_feet=0x7f0500ee;
public static final int itemcategory_wearable_hand=0x7f0500ed;
public static final int itemcategory_wearable_head=0x7f0500eb;
public static final int itemcategory_wearable_neck=0x7f0500ef;
public static final int itemcategory_wearable_ring=0x7f0500f0;
public static final int iteminfo_action_equip=0x7f0500e3;
public static final int iteminfo_action_equip_ap=0x7f0500e6;
public static final int iteminfo_action_unequip=0x7f0500e4;
public static final int iteminfo_action_unequip_ap=0x7f0500e7;
public static final int iteminfo_action_use=0x7f0500e2;
public static final int iteminfo_action_use_ap=0x7f0500e5;
/** <string name="key_required">A specific key is required to pass.</string>
<string name="key_required">Hier kommt man nur mit einem bestimmten Schlüssel weiter.</string>
<string name="key_required">Une clé spécifique est requise pour passer.</string>
*/
public static final int iteminfo_category=0x7f0500de;
public static final int iteminfo_effect_chance_of=0x7f050131;
public static final int iteminfo_effect_decrease_current_ap=0x7f05013b;
public static final int iteminfo_effect_decrease_current_hp=0x7f050139;
public static final int iteminfo_effect_decrease_max_ap=0x7f050140;
public static final int iteminfo_effect_decrease_max_hp=0x7f05013e;
public static final int iteminfo_effect_decrease_movecost=0x7f050142;
public static final int iteminfo_effect_duration=0x7f050132;
public static final int iteminfo_effect_increase_current_ap=0x7f05013c;
public static final int iteminfo_effect_increase_current_hp=0x7f05013a;
public static final int iteminfo_effect_increase_max_ap=0x7f05013f;
public static final int iteminfo_effect_increase_max_hp=0x7f05013d;
public static final int iteminfo_effect_increase_movecost=0x7f050141;
public static final int iteminfo_effect_works_on_source=0x7f050133;
public static final int iteminfo_effect_works_on_target=0x7f050134;
public static final int iteminfo_effect_works_when_equipped=0x7f050138;
public static final int iteminfo_effect_works_when_hitting_target=0x7f050135;
public static final int iteminfo_effect_works_when_killing_target=0x7f050136;
public static final int iteminfo_effect_works_when_used=0x7f050137;
public static final int itemlist_animal=0x7f05005a;
public static final int itemlist_armour=0x7f050057;
public static final int itemlist_debug=0x7f050071;
public static final int itemlist_food=0x7f050058;
public static final int itemlist_junk=0x7f05005b;
public static final int itemlist_money=0x7f050053;
public static final int itemlist_necklaces=0x7f050056;
public static final int itemlist_potions=0x7f050059;
public static final int itemlist_quest=0x7f05005c;
public static final int itemlist_rings=0x7f050055;
public static final int itemlist_v0610_1=0x7f050061;
public static final int itemlist_v068=0x7f05005d;
public static final int itemlist_v069=0x7f05005e;
public static final int itemlist_v069_2=0x7f05005f;
public static final int itemlist_v069_questitems=0x7f050060;
public static final int itemlist_weapons=0x7f050054;
public static final int key_required=0x7f0501a1;
public static final int levelup_add_attackchance=0x7f05010a;
public static final int levelup_add_attackchance_description=0x7f05010b;
public static final int levelup_add_attackdamage=0x7f05010c;
public static final int levelup_add_attackdamage_description=0x7f05010d;
public static final int levelup_add_blockchance=0x7f05010e;
public static final int levelup_add_blockchance_description=0x7f05010f;
public static final int levelup_add_health=0x7f050108;
public static final int levelup_add_health_description=0x7f050109;
public static final int levelup_adds_new_skillpoint=0x7f05019a;
public static final int levelup_buttontext=0x7f050107;
public static final int levelup_description=0x7f050106;
public static final int levelup_title=0x7f050105;
public static final int loadsave_save_overwrite_confirmation=0x7f05019d;
public static final int loadsave_save_overwrite_confirmation_title=0x7f05019c;
public static final int loadsave_save_to_new_slot=0x7f05019b;
public static final int loadsave_selectslot=0x7f050081;
public static final int loadsave_slot_empty=0x7f050082;
public static final int loadsave_title_load=0x7f050080;
public static final int loadsave_title_save=0x7f05007f;
public static final int menu_load=0x7f05007c;
public static final int menu_pause=0x7f050079;
public static final int menu_save=0x7f05007b;
public static final int menu_save_failed=0x7f05007e;
public static final int menu_save_gamesaved=0x7f05007d;
public static final int menu_settings=0x7f05007a;
public static final int monster_difficulty_easy=0x7f0500c7;
public static final int monster_difficulty_hard=0x7f0500c9;
public static final int monster_difficulty_impossible=0x7f0500cb;
public static final int monster_difficulty_normal=0x7f0500c8;
public static final int monster_difficulty_veryeasy=0x7f0500c6;
public static final int monster_difficulty_veryhard=0x7f0500ca;
public static final int monsterlist_crossglen_animals=0x7f050062;
public static final int monsterlist_crossglen_npcs=0x7f050064;
public static final int monsterlist_debug=0x7f050075;
public static final int monsterlist_fallhaven_animals=0x7f050063;
public static final int monsterlist_fallhaven_npcs=0x7f050065;
public static final int monsterlist_v0610_monsters1=0x7f05006a;
public static final int monsterlist_v0610_npcs1=0x7f05006b;
public static final int monsterlist_v068_npcs=0x7f050067;
public static final int monsterlist_v069_monsters=0x7f050068;
public static final int monsterlist_v069_npcs=0x7f050069;
public static final int monsterlist_wilderness=0x7f050066;
public static final int preferences_combat_category=0x7f050129;
public static final int preferences_combat_speed=0x7f05012b;
public static final int preferences_combat_speed_title=0x7f05012a;
public static final int preferences_dialog_category=0x7f050122;
public static final int preferences_dialog_confirmattack=0x7f050126;
public static final int preferences_dialog_confirmattack_title=0x7f050125;
public static final int preferences_dialog_confirmrest=0x7f050124;
public static final int preferences_dialog_confirmrest_title=0x7f050123;
public static final int preferences_dialog_monsterloot=0x7f050128;
public static final int preferences_dialog_monsterloot_title=0x7f050127;
public static final int preferences_display_category=0x7f05011f;
public static final int preferences_display_fullscreen=0x7f050121;
public static final int preferences_display_fullscreen_title=0x7f050120;
public static final int preferences_display_scaling_factor=0x7f050144;
public static final int preferences_display_scaling_factor_title=0x7f050143;
public static final int preferences_movement_category=0x7f05012c;
public static final int preferences_movement_dpad_minimizeable=0x7f05014d;
public static final int preferences_movement_dpad_minimizeable_title=0x7f05014c;
public static final int preferences_movement_dpad_position=0x7f05014b;
public static final int iteminfo_category=0x7f0500e1;
public static final int iteminfo_effect_chance_of=0x7f050134;
public static final int iteminfo_effect_decrease_current_ap=0x7f05013e;
public static final int iteminfo_effect_decrease_current_hp=0x7f05013c;
public static final int iteminfo_effect_decrease_max_ap=0x7f050143;
public static final int iteminfo_effect_decrease_max_hp=0x7f050141;
public static final int iteminfo_effect_decrease_movecost=0x7f050145;
public static final int iteminfo_effect_duration=0x7f050135;
public static final int iteminfo_effect_increase_current_ap=0x7f05013f;
public static final int iteminfo_effect_increase_current_hp=0x7f05013d;
public static final int iteminfo_effect_increase_max_ap=0x7f050142;
public static final int iteminfo_effect_increase_max_hp=0x7f050140;
public static final int iteminfo_effect_increase_movecost=0x7f050144;
public static final int iteminfo_effect_works_on_source=0x7f050136;
public static final int iteminfo_effect_works_on_target=0x7f050137;
public static final int iteminfo_effect_works_when_equipped=0x7f05013b;
public static final int iteminfo_effect_works_when_hitting_target=0x7f050138;
public static final int iteminfo_effect_works_when_killing_target=0x7f050139;
public static final int iteminfo_effect_works_when_used=0x7f05013a;
public static final int itemlist_animal=0x7f05005c;
public static final int itemlist_armour=0x7f050059;
public static final int itemlist_debug=0x7f050074;
public static final int itemlist_food=0x7f05005a;
public static final int itemlist_junk=0x7f05005d;
public static final int itemlist_money=0x7f050055;
public static final int itemlist_necklaces=0x7f050058;
public static final int itemlist_potions=0x7f05005b;
public static final int itemlist_quest=0x7f05005e;
public static final int itemlist_rings=0x7f050057;
public static final int itemlist_v0610_1=0x7f050063;
public static final int itemlist_v0610_2=0x7f050064;
public static final int itemlist_v068=0x7f05005f;
public static final int itemlist_v069=0x7f050060;
public static final int itemlist_v069_2=0x7f050061;
public static final int itemlist_v069_questitems=0x7f050062;
public static final int itemlist_weapons=0x7f050056;
public static final int key_required=0x7f0501a4;
public static final int levelup_add_attackchance=0x7f05010d;
public static final int levelup_add_attackchance_description=0x7f05010e;
public static final int levelup_add_attackdamage=0x7f05010f;
public static final int levelup_add_attackdamage_description=0x7f050110;
public static final int levelup_add_blockchance=0x7f050111;
public static final int levelup_add_blockchance_description=0x7f050112;
public static final int levelup_add_health=0x7f05010b;
public static final int levelup_add_health_description=0x7f05010c;
public static final int levelup_adds_new_skillpoint=0x7f05019d;
public static final int levelup_buttontext=0x7f05010a;
public static final int levelup_description=0x7f050109;
public static final int levelup_title=0x7f050108;
public static final int loadsave_save_overwrite_confirmation=0x7f0501a0;
public static final int loadsave_save_overwrite_confirmation_title=0x7f05019f;
public static final int loadsave_save_to_new_slot=0x7f05019e;
public static final int loadsave_selectslot=0x7f050084;
public static final int loadsave_slot_empty=0x7f050085;
public static final int loadsave_title_load=0x7f050083;
public static final int loadsave_title_save=0x7f050082;
public static final int menu_load=0x7f05007f;
public static final int menu_pause=0x7f05007c;
public static final int menu_save=0x7f05007e;
public static final int menu_save_failed=0x7f050081;
public static final int menu_save_gamesaved=0x7f050080;
public static final int menu_settings=0x7f05007d;
public static final int monster_difficulty_easy=0x7f0500ca;
public static final int monster_difficulty_hard=0x7f0500cc;
public static final int monster_difficulty_impossible=0x7f0500ce;
public static final int monster_difficulty_normal=0x7f0500cb;
public static final int monster_difficulty_veryeasy=0x7f0500c9;
public static final int monster_difficulty_veryhard=0x7f0500cd;
public static final int monsterlist_crossglen_animals=0x7f050065;
public static final int monsterlist_crossglen_npcs=0x7f050067;
public static final int monsterlist_debug=0x7f050078;
public static final int monsterlist_fallhaven_animals=0x7f050066;
public static final int monsterlist_fallhaven_npcs=0x7f050068;
public static final int monsterlist_v0610_monsters1=0x7f05006d;
public static final int monsterlist_v0610_npcs1=0x7f05006e;
public static final int monsterlist_v068_npcs=0x7f05006a;
public static final int monsterlist_v069_monsters=0x7f05006b;
public static final int monsterlist_v069_npcs=0x7f05006c;
public static final int monsterlist_wilderness=0x7f050069;
public static final int preferences_combat_category=0x7f05012c;
public static final int preferences_combat_speed=0x7f05012e;
public static final int preferences_combat_speed_title=0x7f05012d;
public static final int preferences_dialog_category=0x7f050125;
public static final int preferences_dialog_confirmattack=0x7f050129;
public static final int preferences_dialog_confirmattack_title=0x7f050128;
public static final int preferences_dialog_confirmrest=0x7f050127;
public static final int preferences_dialog_confirmrest_title=0x7f050126;
public static final int preferences_dialog_monsterloot=0x7f05012b;
public static final int preferences_dialog_monsterloot_title=0x7f05012a;
public static final int preferences_display_category=0x7f050122;
public static final int preferences_display_fullscreen=0x7f050124;
public static final int preferences_display_fullscreen_title=0x7f050123;
public static final int preferences_display_scaling_factor=0x7f050147;
public static final int preferences_display_scaling_factor_title=0x7f050146;
public static final int preferences_movement_category=0x7f05012f;
public static final int preferences_movement_dpad_minimizeable=0x7f050150;
public static final int preferences_movement_dpad_minimizeable_title=0x7f05014f;
public static final int preferences_movement_dpad_position=0x7f05014e;
/** ===========================================
Added in v0.6.10
*/
public static final int preferences_movement_dpad_position_title=0x7f05014a;
public static final int preferences_movementmethod=0x7f05012e;
public static final int preferences_movementmethod_title=0x7f05012d;
public static final int questlist=0x7f05006d;
public static final int questlist_debug=0x7f050073;
public static final int preferences_movement_dpad_position_title=0x7f05014d;
public static final int preferences_movementmethod=0x7f050131;
public static final int preferences_movementmethod_title=0x7f050130;
public static final int questlist=0x7f050070;
public static final int questlist_debug=0x7f050076;
/** These quests do not need translation:
*/
public static final int questlist_nondisplayed=0x7f05006c;
public static final int questlist_v0610=0x7f050070;
public static final int questlist_v068=0x7f05006e;
public static final int questlist_v069=0x7f05006f;
public static final int questlog_includecompleted_prompt=0x7f05011b;
public static final int questlog_queststatus=0x7f05011c;
public static final int questlog_queststatus_completed=0x7f05011e;
public static final int questlog_queststatus_inprogress=0x7f05011d;
public static final int questlog_title=0x7f05011a;
public static final int savegame_currenthero_displayinfo=0x7f050083;
public static final int shop_buy=0x7f0500fd;
public static final int shop_buyitem=0x7f050100;
public static final int shop_infoitem=0x7f0500ff;
public static final int shop_item_bought=0x7f050103;
public static final int shop_item_sold=0x7f050104;
public static final int shop_sell=0x7f0500fe;
public static final int shop_sellitem=0x7f050101;
public static final int shop_yourgold=0x7f050102;
public static final int skill_current_level=0x7f050193;
public static final int skill_current_level_with_maximum=0x7f050194;
public static final int skill_longdescription_barkskin=0x7f050182;
public static final int skill_longdescription_barter=0x7f050180;
public static final int skill_longdescription_better_criticals=0x7f050184;
public static final int skill_longdescription_cleave=0x7f050188;
public static final int skill_longdescription_coinfinder=0x7f050186;
public static final int skill_longdescription_dodge=0x7f050181;
public static final int skill_longdescription_eater=0x7f050189;
public static final int skill_longdescription_evasion=0x7f05018b;
public static final int skill_longdescription_fortitude=0x7f05018a;
public static final int skill_longdescription_lower_exploss=0x7f05018d;
public static final int skill_longdescription_magicfinder=0x7f05018e;
public static final int skill_longdescription_more_criticals=0x7f050183;
public static final int skill_longdescription_more_exp=0x7f050187;
public static final int skill_longdescription_regeneration=0x7f05018c;
public static final int skill_longdescription_resistance_blood_disorder=0x7f050191;
public static final int skill_longdescription_resistance_mental=0x7f05018f;
public static final int skill_longdescription_resistance_physical_capacity=0x7f050190;
public static final int skill_longdescription_speed=0x7f050185;
public static final int skill_longdescription_weapon_chance=0x7f05017e;
public static final int skill_longdescription_weapon_dmg=0x7f05017f;
public static final int skill_number_of_increases_one=0x7f050198;
public static final int skill_number_of_increases_several=0x7f050199;
public static final int skill_prerequisite_level=0x7f050196;
public static final int skill_prerequisite_other_skill=0x7f050195;
public static final int skill_prerequisite_stat=0x7f050197;
public static final int skill_shortdescription_barkskin=0x7f05016e;
public static final int skill_shortdescription_barter=0x7f05016c;
public static final int skill_shortdescription_better_criticals=0x7f050170;
public static final int skill_shortdescription_cleave=0x7f050174;
public static final int skill_shortdescription_coinfinder=0x7f050172;
public static final int skill_shortdescription_dodge=0x7f05016d;
public static final int skill_shortdescription_eater=0x7f050175;
public static final int skill_shortdescription_evasion=0x7f050177;
public static final int skill_shortdescription_fortitude=0x7f050176;
public static final int skill_shortdescription_lower_exploss=0x7f050179;
public static final int skill_shortdescription_magicfinder=0x7f05017a;
public static final int skill_shortdescription_more_criticals=0x7f05016f;
public static final int skill_shortdescription_more_exp=0x7f050173;
public static final int skill_shortdescription_regeneration=0x7f050178;
public static final int skill_shortdescription_resistance_blood_disorder=0x7f05017d;
public static final int skill_shortdescription_resistance_mental=0x7f05017b;
public static final int skill_shortdescription_resistance_physical_capacity=0x7f05017c;
public static final int skill_shortdescription_speed=0x7f050171;
public static final int skill_shortdescription_weapon_chance=0x7f05016a;
public static final int skill_shortdescription_weapon_dmg=0x7f05016b;
public static final int skill_title_barkskin=0x7f05015a;
public static final int skill_title_barter=0x7f050158;
public static final int skill_title_better_criticals=0x7f05015c;
public static final int skill_title_cleave=0x7f050160;
public static final int skill_title_coinfinder=0x7f05015e;
public static final int skill_title_dodge=0x7f050159;
public static final int skill_title_eater=0x7f050161;
public static final int skill_title_evasion=0x7f050163;
public static final int skill_title_fortitude=0x7f050162;
public static final int skill_title_lower_exploss=0x7f050165;
public static final int skill_title_magicfinder=0x7f050166;
public static final int skill_title_more_criticals=0x7f05015b;
public static final int skill_title_more_exp=0x7f05015f;
public static final int skill_title_regeneration=0x7f050164;
public static final int skill_title_resistance_blood_disorder=0x7f050169;
public static final int skill_title_resistance_mental=0x7f050167;
public static final int skill_title_resistance_physical_capacity=0x7f050168;
public static final int skill_title_speed=0x7f05015d;
public static final int skill_title_weapon_chance=0x7f050156;
public static final int skill_title_weapon_dmg=0x7f050157;
public static final int skillinfo_action_levelup=0x7f050192;
public static final int startscreen_about=0x7f0500f3;
public static final int startscreen_continue=0x7f0500f0;
public static final int startscreen_enterheroname=0x7f0500f4;
public static final int startscreen_load=0x7f0500f5;
public static final int startscreen_newgame=0x7f0500f1;
public static final int startscreen_newgame_confirm=0x7f0500f2;
public static final int status_ap=0x7f050093;
public static final int status_exp=0x7f050094;
public static final int status_hp=0x7f050091;
public static final int status_mp=0x7f050092;
public static final int traitsinfo_attack_chance=0x7f0500d8;
public static final int traitsinfo_attack_cost=0x7f0500d7;
public static final int traitsinfo_attack_damage=0x7f0500d9;
public static final int traitsinfo_base_max_ap=0x7f0501a0;
public static final int traitsinfo_base_max_hp=0x7f05019f;
public static final int traitsinfo_criticalhit_chance=0x7f0500da;
public static final int traitsinfo_criticalhit_multiplier=0x7f0500db;
public static final int traitsinfo_defense_chance=0x7f0500dc;
public static final int traitsinfo_defense_damageresist=0x7f0500dd;
public static final int questlist_nondisplayed=0x7f05006f;
public static final int questlist_v0610=0x7f050073;
public static final int questlist_v068=0x7f050071;
public static final int questlist_v069=0x7f050072;
public static final int questlog_includecompleted_prompt=0x7f05011e;
public static final int questlog_queststatus=0x7f05011f;
public static final int questlog_queststatus_completed=0x7f050121;
public static final int questlog_queststatus_inprogress=0x7f050120;
public static final int questlog_title=0x7f05011d;
public static final int savegame_currenthero_displayinfo=0x7f050086;
public static final int shop_buy=0x7f050100;
public static final int shop_buyitem=0x7f050103;
public static final int shop_infoitem=0x7f050102;
public static final int shop_item_bought=0x7f050106;
public static final int shop_item_sold=0x7f050107;
public static final int shop_sell=0x7f050101;
public static final int shop_sellitem=0x7f050104;
public static final int shop_yourgold=0x7f050105;
public static final int skill_current_level=0x7f050196;
public static final int skill_current_level_with_maximum=0x7f050197;
public static final int skill_longdescription_barkskin=0x7f050185;
public static final int skill_longdescription_barter=0x7f050183;
public static final int skill_longdescription_better_criticals=0x7f050187;
public static final int skill_longdescription_cleave=0x7f05018b;
public static final int skill_longdescription_coinfinder=0x7f050189;
public static final int skill_longdescription_dodge=0x7f050184;
public static final int skill_longdescription_eater=0x7f05018c;
public static final int skill_longdescription_evasion=0x7f05018e;
public static final int skill_longdescription_fortitude=0x7f05018d;
public static final int skill_longdescription_lower_exploss=0x7f050190;
public static final int skill_longdescription_magicfinder=0x7f050191;
public static final int skill_longdescription_more_criticals=0x7f050186;
public static final int skill_longdescription_more_exp=0x7f05018a;
public static final int skill_longdescription_regeneration=0x7f05018f;
public static final int skill_longdescription_resistance_blood_disorder=0x7f050194;
public static final int skill_longdescription_resistance_mental=0x7f050192;
public static final int skill_longdescription_resistance_physical_capacity=0x7f050193;
public static final int skill_longdescription_speed=0x7f050188;
public static final int skill_longdescription_weapon_chance=0x7f050181;
public static final int skill_longdescription_weapon_dmg=0x7f050182;
public static final int skill_number_of_increases_one=0x7f05019b;
public static final int skill_number_of_increases_several=0x7f05019c;
public static final int skill_prerequisite_level=0x7f050199;
public static final int skill_prerequisite_other_skill=0x7f050198;
public static final int skill_prerequisite_stat=0x7f05019a;
public static final int skill_shortdescription_barkskin=0x7f050171;
public static final int skill_shortdescription_barter=0x7f05016f;
public static final int skill_shortdescription_better_criticals=0x7f050173;
public static final int skill_shortdescription_cleave=0x7f050177;
public static final int skill_shortdescription_coinfinder=0x7f050175;
public static final int skill_shortdescription_dodge=0x7f050170;
public static final int skill_shortdescription_eater=0x7f050178;
public static final int skill_shortdescription_evasion=0x7f05017a;
public static final int skill_shortdescription_fortitude=0x7f050179;
public static final int skill_shortdescription_lower_exploss=0x7f05017c;
public static final int skill_shortdescription_magicfinder=0x7f05017d;
public static final int skill_shortdescription_more_criticals=0x7f050172;
public static final int skill_shortdescription_more_exp=0x7f050176;
public static final int skill_shortdescription_regeneration=0x7f05017b;
public static final int skill_shortdescription_resistance_blood_disorder=0x7f050180;
public static final int skill_shortdescription_resistance_mental=0x7f05017e;
public static final int skill_shortdescription_resistance_physical_capacity=0x7f05017f;
public static final int skill_shortdescription_speed=0x7f050174;
public static final int skill_shortdescription_weapon_chance=0x7f05016d;
public static final int skill_shortdescription_weapon_dmg=0x7f05016e;
public static final int skill_title_barkskin=0x7f05015d;
public static final int skill_title_barter=0x7f05015b;
public static final int skill_title_better_criticals=0x7f05015f;
public static final int skill_title_cleave=0x7f050163;
public static final int skill_title_coinfinder=0x7f050161;
public static final int skill_title_dodge=0x7f05015c;
public static final int skill_title_eater=0x7f050164;
public static final int skill_title_evasion=0x7f050166;
public static final int skill_title_fortitude=0x7f050165;
public static final int skill_title_lower_exploss=0x7f050168;
public static final int skill_title_magicfinder=0x7f050169;
public static final int skill_title_more_criticals=0x7f05015e;
public static final int skill_title_more_exp=0x7f050162;
public static final int skill_title_regeneration=0x7f050167;
public static final int skill_title_resistance_blood_disorder=0x7f05016c;
public static final int skill_title_resistance_mental=0x7f05016a;
public static final int skill_title_resistance_physical_capacity=0x7f05016b;
public static final int skill_title_speed=0x7f050160;
public static final int skill_title_weapon_chance=0x7f050159;
public static final int skill_title_weapon_dmg=0x7f05015a;
public static final int skillinfo_action_levelup=0x7f050195;
public static final int startscreen_about=0x7f0500f6;
public static final int startscreen_continue=0x7f0500f3;
public static final int startscreen_enterheroname=0x7f0500f7;
public static final int startscreen_load=0x7f0500f8;
public static final int startscreen_newgame=0x7f0500f4;
public static final int startscreen_newgame_confirm=0x7f0500f5;
public static final int status_ap=0x7f050096;
public static final int status_exp=0x7f050097;
public static final int status_hp=0x7f050094;
public static final int status_mp=0x7f050095;
public static final int traitsinfo_attack_chance=0x7f0500db;
public static final int traitsinfo_attack_cost=0x7f0500da;
public static final int traitsinfo_attack_damage=0x7f0500dc;
public static final int traitsinfo_base_max_ap=0x7f0501a3;
public static final int traitsinfo_base_max_hp=0x7f0501a2;
public static final int traitsinfo_criticalhit_chance=0x7f0500dd;
public static final int traitsinfo_criticalhit_multiplier=0x7f0500de;
public static final int traitsinfo_defense_chance=0x7f0500df;
public static final int traitsinfo_defense_damageresist=0x7f0500e0;
}
public static final class style {
public static final int Theme_NoBackground=0x7f0a0000;

View File

@@ -2152,17 +2152,20 @@
<string name="conversationlist_tinlyn">
[id|message|progressQuest|rewardDropListID|replies[text|nextPhraseID|requires_Progress|requires_itemID|requires_Quantity|]|];
{tinlyn||||{
{|tinlyn_killedsheep_1|benbyr:21|||}
{|tinlyn_killedsheep_1|tinlyn:60|||}
{|tinlyn_complete_1|tinlyn:31|||}
{|tinlyn_complete_1|tinlyn:30|||}
{|tinlyn_look_1|tinlyn:15|||}
{|tinlyn_story_1||||}
}|};
{tinlyn_killedsheep_1|You attacked my sheep! Get away from me you filthy murderer!||||};
{tinlyn_complete_1|Hello again. Thank you for helping me find my lost sheep.|||{
{I talked to Benbyr and heard the story about you two.|tinlyn_benbyr_1|benbyr:10|||}
}|};
{tinlyn_story_1|Hello there. You wounldn\'t happen to want to help an old shepherd do you?|||{{What\'s the problem?|tinlyn_story_2||||}}|};
{tinlyn_story_2|You see, I tend my flock of sheep here. These fields are excellent pastures for them.|||{{N|tinlyn_story_3||||}}|};
{tinlyn_story_3|But the thing is, I have lost four of them. Now I won\'t dare leave the ones I still have in my sight to go look for the lost ones.|||{{N|tinlyn_story_3_1||||}}|};
{tinlyn_story_3|But the thing is, I have lost four of them. Now I won\'t dare leave the ones I still have in my sight to go look for the lost ones.|tinlyn:10||{{N|tinlyn_story_3_1||||}}|};
{tinlyn_story_3_1||||{
{|tinlyn_story_6|tinlyn:15|||}
{|tinlyn_story_4||||}
@@ -2230,9 +2233,9 @@
{tinlyn_lostsheep_placed_1||tinlyn:25||{{|tinlyn_lostsheep_placed_2||||}}|};
{tinlyn_lostsheep_placed_2|(You place the bells around the neck of the sheep.)||||};
{tinlyn_lostsheep_atk||||{{|tinlyn_lostsheep_atk1|tinlyn:15|||}{|F||||}}|};
{tinlyn_lostsheep_atk1|tinlyn:60|||{{|tinlyn_sheep_atk||||}}|};
{tinlyn_lostsheep_atk1||tinlyn:60||{{|tinlyn_sheep_atk||||}}|};
{tinlyn_sheep|Baah!|||{{Attack|tinlyn_lostsheep_atk|benbyr:20|||}}|};
{tinlyn_sheep_atk|benbyr:21|||{{|F||||}}|};
{tinlyn_sheep_atk||benbyr:21||{{|F||||}}|};
</string>
<string name="conversationlist_benbyr">

View File

@@ -362,4 +362,14 @@
}|};
</string>
<string name="droplists_v0610_npcs">
[id|items[itemID|quantity_Min|quantity_Max|chance|]|];
{tinlyn_bells|{{tinlyn_bells|4|4|100|}}|};
{fieldwasp_unique|{{gold|0|10|70|}{hadracor_waspwing|1|1|100|}}|};
{tinlyn_sheep|{{meat|0|3|70|}{tinlyn_sheep_meat|1|1|100|}}|};
</string>
<string name="droplists_v0610_monsters">
</string>
</resources>

View File

@@ -98,11 +98,11 @@
{vial_empty2|items_consumables:57|Empty vial|31||1|4|||||||||||||||||||||||||||||||||};
{vial_empty3|items_consumables:59|Empty flask|31||1|6|||||||||||||||||||||||||||||||||};
{vial_empty4|items_consumables:58|Empty potion|31||1|11|||||||||||||||||||||||||||||||||};
{health_minor|items_consumables:35|Potion of minor health|20||1|5||||||||||||||1|5|5|||||||||||||||||};
{health_minor2|items_consumables:35|Potion of minor health|20|||18||||||||||||||1|5|5|||||||||||||||||};
{health|items_consumables:49|Potion of health|20|||40||||||||||||||1|10|10|||||||||||||||||};
{health_major|items_consumables:28|Potion of major health|20||1|210||||||||||||||1|40|40|||||||||||||||||};
{health_major2|items_consumables:28|Potion of major health|20|||280||||||||||||||1|40|40|||||||||||||||||};
{health_minor|items_consumables:35|Minor potion of health|20||1|5||||||||||||||1|5|5|||||||||||||||||};
{health_minor2|items_consumables:35|Minor potion of health|20|||18||||||||||||||1|5|5|||||||||||||||||};
{health|items_consumables:49|Regular potion of health|20|||40||||||||||||||1|10|10|||||||||||||||||};
{health_major|items_consumables:28|Major potion of health|20||1|210||||||||||||||1|40|40|||||||||||||||||};
{health_major2|items_consumables:28|Major potion of health|20|||280||||||||||||||1|40|40|||||||||||||||||};
{mead|items_consumables:51|Mead|20|||15||||||||||||||1|1|1|||||||||||||||||};
{milk|items_consumables:55|Milk|20|||21||||||||||||||1|2|2|||||||||||||||||};
{bonemeal_potion|items_consumables:34|Bonemeal potion|20||1|45||||||||||||||1|40|40|||||||||||||||||};
@@ -301,4 +301,12 @@
{ring_protector|items_jewelry:4|Ring of the protector|7|4|0|3744|1|3||||20|||0|3|14||||||||||||||||||||||};
</string>
<string name="itemlist_v0610_2">
[id|iconID|name|category|displaytype|hasManualPrice|baseMarketCost|hasEquipEffect|equip_boostMaxHP|equip_boostMaxAP|equip_moveCostPenalty|equip_attackCost|equip_attackChance|equip_criticalChance|equip_criticalMultiplier|equip_attackDamage_Min|equip_attackDamage_Max|equip_blockChance|equip_damageResistance|equip_conditions[condition|magnitude|]|hasUseEffect|use_boostHP_Min|use_boostHP_Max|use_boostAP_Min|use_boostAP_Max|use_conditionsSource[condition|magnitude|duration|chance|]|hasHitEffect|hit_boostHP_Min|hit_boostHP_Max|hit_boostAP_Min|hit_boostAP_Max|hit_conditionsSource[condition|magnitude|duration|chance|]|hit_conditionsTarget[condition|magnitude|duration|chance|]|hasKillEffect|kill_boostHP_Min|kill_boostHP_Max|kill_boostAP_Min|kill_boostAP_Max|kill_conditionsSource[condition|magnitude|duration|chance|]|];
{erinith_book|items_books:0|Erinith\'s book|31|1|1|0|||||||||||||||||||||||||||||||||};
{hadracor_waspwing|items_misc:52|Giant wasp wing|31|1|1|0|||||||||||||||||||||||||||||||||};
{tinlyn_bells|items_necklaces_1:10|Tinlyn\'s sheep bell|31|1|1|0|||||||||||||||||||||||||||||||||};
{tinlyn_sheep_meat|items_consumables:25|Meat from Tinlyn\'s sheep|31|1|1|0|||||||||||||||||||||||||||||||||};
</string>
</resources>

View File

@@ -264,7 +264,7 @@
{25|I have found all four of Tinlyn\'s lost sheep.|||}
{30|Tinlyn thanked me for finding his lost sheep.|350|1|}
{31|Tinlyn thanked me for finding his lost sheep, but he had no reward to give me.|200|1|}
{60|I have attacked at least one of Tinlyn\'s sheep and is therefore unable to return them all to Tinlyn.||1|}
{60|I have attacked at least one of Tinlyn\'s lost sheep and is therefore unable to return them all to Tinlyn.||1|}
}|};
{benbyr|Cheap cuts|1|{
{10|I have met Benbyr outside the Crossroads guardhouse. He wants to get revenge on an old \'business partner\' of his - Tinlyn. Benbyr wants me to kill all Tinlyn\'s sheep.|||}

View File

@@ -21,6 +21,7 @@
<item>@string/itemlist_v069_questitems</item>
<item>@string/itemlist_v069_2</item>
<item>@string/itemlist_v0610_1</item>
<item>@string/itemlist_v0610_2</item>
</array>
<array name="loadresource_droplists">
@@ -32,6 +33,8 @@
<item>@string/droplists_v069_npcs</item>
<item>@string/droplists_v069_monsters</item>
<item>@string/droplists_v0610_shops</item>
<item>@string/droplists_v0610_npcs</item>
<item>@string/droplists_v0610_monsters</item>
</array>
<array name="loadresource_quests">

View File

@@ -102,7 +102,7 @@
<object name="sign_fields1" type="sign" x="416" y="416" width="32" height="32"/>
</objectgroup>
<objectgroup name="Spawn uniques" width="30" height="30" visible="0">
<object name="tinlyn_lostsheep" type="spawn" x="32" y="32" width="896" height="896">
<object name="tinlyn_lostsheep1" type="spawn" x="32" y="32" width="896" height="896">
<properties>
<property name="respawn" value="false"/>
</properties>

View File

@@ -95,7 +95,7 @@
</object>
</objectgroup>
<objectgroup name="Spawn uniques" width="30" height="30" visible="0">
<object name="tinlyn_lostsheep" type="spawn" x="32" y="32" width="896" height="896">
<object name="tinlyn_lostsheep2" type="spawn" x="32" y="32" width="896" height="896">
<properties>
<property name="respawn" value="false"/>
</properties>

View File

@@ -83,7 +83,7 @@
</object>
</objectgroup>
<objectgroup name="Spawn uniques" width="20" height="20" visible="0">
<object name="tinlyn_lostsheep" type="spawn" x="64" y="64" width="544" height="544">
<object name="tinlyn_lostsheep3" type="spawn" x="64" y="64" width="544" height="544">
<properties>
<property name="respawn" value="false"/>
</properties>

View File

@@ -107,7 +107,7 @@
</object>
</objectgroup>
<objectgroup name="Spawn uniques" width="30" height="30">
<object name="tinlyn_lostsheep" type="spawn" x="32" y="32" width="800" height="128">
<object name="tinlyn_lostsheep4" type="spawn" x="32" y="32" width="800" height="128">
<properties>
<property name="respawn" value="false"/>
</properties>
@@ -118,7 +118,7 @@
</properties>
</object>
</objectgroup>
<objectgroup name="Spawn monsters" width="30" height="30">
<objectgroup name="Spawn monsters" width="30" height="30" visible="0">
<object name="fieldcritter_2" type="spawn" x="64" y="64" width="768" height="96"/>
</objectgroup>
<objectgroup name="Keys" width="30" height="30"/>

View File

@@ -12,6 +12,7 @@ import android.content.Intent;
import android.content.DialogInterface.OnDismissListener;
import android.graphics.drawable.BitmapDrawable;
import android.net.Uri;
import android.os.Bundle;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ListView;
@@ -37,6 +38,7 @@ import com.gpl.rpg.AndorsTrail.activity.ShopActivity;
import com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity;
import com.gpl.rpg.AndorsTrail.activity.StartScreenActivity;
import com.gpl.rpg.AndorsTrail.context.ViewContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.Controller;
import com.gpl.rpg.AndorsTrail.controller.ItemController;
import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
@@ -72,40 +74,48 @@ public final class Dialogs {
*/
public static void showKeyArea(final MainActivity currentActivity, final ViewContext context, String phraseID) {
showConversation(currentActivity, context, phraseID, "");
showConversation(currentActivity, context, phraseID, null);
}
public static void showMapSign(final MainActivity currentActivity, final ViewContext context, String phraseID) {
showConversation(currentActivity, context, phraseID, "");
showConversation(currentActivity, context, phraseID, null);
}
public static void showConversation(final MainActivity currentActivity, final ViewContext context, final String phraseID, final Monster npc) {
showConversation(currentActivity, context, phraseID, npc.monsterTypeID);
}
private static void showConversation(final MainActivity currentActivity, final ViewContext context, final String phraseID, String monsterTypeID) {
context.gameRoundController.pause();
Intent intent = new Intent(currentActivity, ConversationActivity.class);
Uri.Builder b = Uri.parse("content://com.gpl.rpg.AndorsTrail/conversation/" + phraseID).buildUpon();
b.appendQueryParameter("monsterTypeID", monsterTypeID);
intent.setData(b.build());
intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/conversation/" + phraseID));
addMonsterIdentifiers(intent, npc);
currentActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_CONVERSATION);
}
public static void addMonsterIdentifiers(Intent intent, Monster monster) {
if (monster == null) return;
intent.putExtra("x", monster.position.x);
intent.putExtra("y", monster.position.y);
}
public static Monster getMonsterFromIntent(Intent intent, final WorldContext world) {
Bundle params = intent.getExtras();
if (params == null) return null;
if (!params.containsKey("x")) return null;
int x = params.getInt("x");
int y = params.getInt("y");
return world.model.currentMap.getMonsterAt(x, y);
}
public static void showMonsterEncounter(final MainActivity currentActivity, final ViewContext context, final Monster monster) {
context.gameRoundController.pause();
Intent intent = new Intent(currentActivity, MonsterEncounterActivity.class);
intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/monsterencounter"));
intent.putExtra("x", monster.position.x);
intent.putExtra("y", monster.position.y);
addMonsterIdentifiers(intent, monster);
currentActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_MONSTERENCOUNTER);
}
public static void showMonsterInfo(final Activity currentActivity, final Monster monster) {
Intent intent = new Intent(currentActivity, MonsterInfoActivity.class);
intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/monsterinfo"));
intent.putExtra("x", monster.position.x);
intent.putExtra("y", monster.position.y);
addMonsterIdentifiers(intent, monster);
currentActivity.startActivity(intent);
}

View File

@@ -26,14 +26,15 @@ import android.widget.TextView;
import android.widget.TextView.BufferType;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.Dialogs;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.ConversationController;
import com.gpl.rpg.AndorsTrail.conversation.ConversationCollection;
import com.gpl.rpg.AndorsTrail.conversation.Phrase;
import com.gpl.rpg.AndorsTrail.conversation.Phrase.Reply;
import com.gpl.rpg.AndorsTrail.model.actor.ActorTraits;
import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
import com.gpl.rpg.AndorsTrail.model.actor.Actor;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.model.item.Loot;
import com.gpl.rpg.AndorsTrail.resource.TileStore;
@@ -53,7 +54,7 @@ public final class ConversationActivity extends Activity {
private Button nextButton;
private Button leaveButton;
private ListView statementList;
private MonsterType monsterType;
private Monster npc;
private RadioGroup replyGroup;
private OnClickListener radioButtonListener;
private boolean displayActors = true;
@@ -68,15 +69,9 @@ public final class ConversationActivity extends Activity {
requestWindowFeature(Window.FEATURE_NO_TITLE);
Uri uri = getIntent().getData();
final String monsterTypeID = uri.getQueryParameter("monsterTypeID");
if (monsterTypeID != null && monsterTypeID.length() > 0) {
displayActors = true;
monsterType = world.monsterTypes.getMonsterType(monsterTypeID);
assert(monsterType != null);
} else {
displayActors = false;
monsterType = null;
}
this.npc = Dialogs.getMonsterFromIntent(getIntent(), world);
displayActors = (npc != null);
String phraseID = uri.getLastPathSegment().toString();
if (savedInstanceState != null) {
phraseID = savedInstanceState.getString("phraseID");
@@ -132,10 +127,11 @@ public final class ConversationActivity extends Activity {
ConversationActivity.this.finish();
return;
} else if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_SHOP)) {
assert(monsterType != null);
assert(monsterType.dropList != null);
assert(npc != null);
assert(npc.dropList != null);
Intent intent = new Intent(this, ShopActivity.class);
intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/shop/" + monsterType.id));
intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/shop"));
Dialogs.addMonsterIdentifiers(intent, npc);
startActivityForResult(intent, MainActivity.INTENTREQUEST_SHOP);
return;
} else if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_ATTACK)) {
@@ -183,7 +179,7 @@ public final class ConversationActivity extends Activity {
}
}
addConversationStatement(monsterType, message, NPCConversationColor);
addConversationStatement(npc, message, NPCConversationColor);
if (isPhraseOnlyNextReply(phrase)) {
nextButton.setEnabled(true);
@@ -234,7 +230,7 @@ public final class ConversationActivity extends Activity {
} else {
r = getSelectedReply();
if (r == null) return;
addConversationStatement(player.traits, r.text, playerConversationColor);
addConversationStatement(player, r.text, playerConversationColor);
}
replyGroup.removeAllViews();
@@ -242,12 +238,12 @@ public final class ConversationActivity extends Activity {
setPhrase(r.nextPhrase);
}
private void addConversationStatement(ActorTraits traits, String text, int color) {
private void addConversationStatement(Actor actor, String text, int color) {
ConversationStatement s = new ConversationStatement();
if (displayActors) {
assert(traits != null);
s.iconID = traits.iconID;
s.actorName = traits.name;
assert(actor != null);
s.iconID = actor.traits.iconID;
s.actorName = actor.traits.name;
} else {
s.iconID = ConversationStatement.NO_ICON;
}

View File

@@ -1,7 +1,6 @@
package com.gpl.rpg.AndorsTrail.activity;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.view.Window;
@@ -27,11 +26,7 @@ public final class MonsterEncounterActivity extends Activity {
requestWindowFeature(Window.FEATURE_NO_TITLE);
final Intent intent = getIntent();
final Bundle params = intent.getExtras();
int x = params.getInt("x");
int y = params.getInt("y");
final Monster monster = world.model.currentMap.getMonsterAt(x, y);
final Monster monster = Dialogs.getMonsterFromIntent(getIntent(), world);
if (monster == null) {
finish();
return;

View File

@@ -3,6 +3,7 @@ package com.gpl.rpg.AndorsTrail.activity;
import java.util.Arrays;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.Dialogs;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.CombatController;
@@ -12,7 +13,6 @@ import com.gpl.rpg.AndorsTrail.view.RangeBar;
import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.view.Window;
@@ -22,22 +22,16 @@ import android.widget.ImageView;
import android.widget.TextView;
public final class MonsterInfoActivity extends Activity {
private WorldContext world;
private Monster monster;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
this.world = app.world;
final WorldContext world = app.world;
requestWindowFeature(Window.FEATURE_NO_TITLE);
final Intent intent = getIntent();
final Bundle params = intent.getExtras();
int x = params.getInt("x");
int y = params.getInt("y");
this.monster = world.model.currentMap.getMonsterAt(x, y);
if (this.monster == null) {
final Monster monster = Dialogs.getMonsterFromIntent(getIntent(), world);
if (monster == null) {
finish();
return;
}

View File

@@ -4,7 +4,6 @@ import android.app.Activity;
import android.app.TabActivity;
import android.content.Intent;
import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
import android.widget.ListView;
import android.widget.TabHost;
@@ -16,7 +15,7 @@ import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.ItemController;
import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
@@ -33,6 +32,8 @@ public final class ShopActivity extends TabActivity implements OnContainerItemCl
private ItemContainer container_buy;
private TextView shop_buy_gc;
private TextView shop_sell_gc;
private ShopItemContainerAdapter buyListAdapter;
private ShopItemContainerAdapter sellListAdapter;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -44,10 +45,7 @@ public final class ShopActivity extends TabActivity implements OnContainerItemCl
AndorsTrailApplication.setWindowParameters(this, app.preferences);
Uri uri = getIntent().getData();
String monsterTypeID = uri.getLastPathSegment().toString();
final MonsterType npcType = world.monsterTypes.getMonsterType(monsterTypeID);
final Monster npc = Dialogs.getMonsterFromIntent(getIntent(), world);
final Player player = world.model.player;
setContentView(R.layout.shop);
@@ -69,23 +67,13 @@ public final class ShopActivity extends TabActivity implements OnContainerItemCl
shoplist_sell = (ListView) h.findViewById(R.id.shop_sell_list);
Loot merchantLoot = new Loot();
npcType.dropList.createRandomLoot(merchantLoot, player);
npc.dropList.createRandomLoot(merchantLoot, player);
container_buy = merchantLoot.items;
shoplist_buy.setAdapter(new ShopItemContainerAdapter(
this
, world.tileStore
, player
, container_buy
, this
, false));
shoplist_sell.setAdapter(new ShopItemContainerAdapter(
this
, world.tileStore
, player
, player.inventory
, this
, true));
buyListAdapter = new ShopItemContainerAdapter(this, world.tileStore, player, container_buy, this, false);
sellListAdapter = new ShopItemContainerAdapter(this, world.tileStore, player, player.inventory, this, true);
shoplist_buy.setAdapter(buyListAdapter);
shoplist_sell.setAdapter(sellListAdapter);
update();
}
@@ -204,9 +192,9 @@ public final class ShopActivity extends TabActivity implements OnContainerItemCl
}
private void updateBuyItemList() {
((ShopItemContainerAdapter) shoplist_buy.getAdapter()).notifyDataSetChanged();
buyListAdapter.notifyDataSetChanged();
}
private void updateSellItemList() {
((ShopItemContainerAdapter) shoplist_sell.getAdapter()).notifyDataSetChanged();
sellListAdapter.notifyDataSetChanged();
}
}

View File

@@ -184,6 +184,7 @@ public final class ResourceLoader {
loader.prepareTileset(R.drawable.items_consumables, "items_consumables", new Size(14, 5), defaultTileSize);
loader.prepareTileset(R.drawable.items_books, "items_books", new Size(11, 1), defaultTileSize);
loader.prepareTileset(R.drawable.items_misc, "items_misc", new Size(14, 4), defaultTileSize);
loader.prepareTileset(R.drawable.items_necklaces_1, "items_necklaces_1", new Size(10, 3), defaultTileSize);
//loader.prepareTileset(R.drawable.monsters_armor1, "monsters_armor1", src_sz1x1, defaultTileSize);
loader.prepareTileset(R.drawable.monsters_demon1, "monsters_demon1", src_sz1x1, dst_sz2x2);