diff --git a/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java b/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java index eb6e43f56..46a8922dc 100644 --- a/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java +++ b/AndorsTrail/gen/com/gpl/rpg/AndorsTrail/R.java @@ -9,31 +9,36 @@ package com.gpl.rpg.AndorsTrail; public final class R { public static final class array { - public static final int preferences_attackspeed=0x7f070003; - public static final int preferences_attackspeed_values=0x7f070004; - public static final int preferences_display_loot=0x7f070001; - public static final int preferences_display_loot_values=0x7f070002; - public static final int preferences_display_scaling_factor=0x7f070007; - public static final int preferences_display_scaling_factor_values=0x7f070008; - public static final int preferences_movementmethod_values=0x7f070006; - public static final int preferences_movementmethods=0x7f070005; - public static final int questlog_includecompleted=0x7f070000; + public static final int preferences_attackspeed=0x7f080003; + public static final int preferences_attackspeed_values=0x7f080004; + public static final int preferences_display_loot=0x7f080001; + public static final int preferences_display_loot_values=0x7f080002; + public static final int preferences_display_scaling_factor=0x7f080007; + public static final int preferences_display_scaling_factor_values=0x7f080008; + public static final int preferences_movementmethod_values=0x7f080006; + public static final int preferences_movementmethods=0x7f080005; + public static final int questlog_includecompleted=0x7f080000; } public static final class attr { } + public static final class color { + public static final int translucent_black=0x7f060000; + } public static final class dimen { - public static final int boxshape_margin=0x7f060007; - public static final int boxshape_width=0x7f060008; - public static final int conversation_statementpadding=0x7f06000a; - public static final int conversation_textsize=0x7f06000b; - public static final int dialog_iconpadding_bottom=0x7f060006; - public static final int dialog_iconpadding_right=0x7f060005; - public static final int dialog_margin=0x7f060004; - public static final int healthbar_height=0x7f060003; - public static final int section_margin=0x7f060009; - public static final int smalltext=0x7f060000; - public static final int smalltext_buttonheight=0x7f060001; - public static final int titletext=0x7f060002; + public static final int actionbar_text=0x7f07000c; + public static final int boxshape_margin=0x7f070007; + public static final int boxshape_width=0x7f070008; + public static final int conversation_statementpadding=0x7f07000a; + public static final int conversation_textsize=0x7f07000b; + public static final int dialog_iconpadding_bottom=0x7f070006; + public static final int dialog_iconpadding_right=0x7f070005; + public static final int dialog_margin=0x7f070004; + public static final int healthbar_height=0x7f070003; + public static final int section_margin=0x7f070009; + public static final int smalltext=0x7f070000; + public static final int smalltext_buttonheight=0x7f070001; + public static final int statusbar_text=0x7f07000d; + public static final int titletext=0x7f070002; } public static final class drawable { public static final int andors_trail_logo=0x7f020000; @@ -95,171 +100,172 @@ public final class R { public static final int ui_boxshape=0x7f020038; public static final int ui_debug_background=0x7f020039; public static final int ui_gradientshape=0x7f02003a; - public static final int ui_green_foreground=0x7f02003b; - public static final int ui_progress_ap=0x7f02003c; - public static final int ui_progress_exp=0x7f02003d; - public static final int ui_progress_health=0x7f02003e; - public static final int ui_purple_foreground=0x7f02003f; - public static final int ui_red_foreground=0x7f020040; - public static final int ui_startbackground=0x7f020041; - public static final int ui_statustext=0x7f020042; - public static final int ui_yellow_foreground=0x7f020043; + public static final int ui_gradientshape_translucent=0x7f02003b; + public static final int ui_green_foreground=0x7f02003c; + public static final int ui_progress_ap=0x7f02003d; + public static final int ui_progress_exp=0x7f02003e; + public static final int ui_progress_health=0x7f02003f; + public static final int ui_purple_foreground=0x7f020040; + public static final int ui_red_foreground=0x7f020041; + public static final int ui_startbackground=0x7f020042; + public static final int ui_statustext=0x7f020043; + public static final int ui_yellow_foreground=0x7f020044; } public static final class id { - public static final int about_button1=0x7f0a0001; - public static final int about_button2=0x7f0a0002; - public static final int about_button3=0x7f0a0003; - public static final int about_contents=0x7f0a0004; - public static final int about_version=0x7f0a0000; - public static final int combatview_actionbar=0x7f0a0005; - public static final int combatview_endturn=0x7f0a0008; - public static final int combatview_flee=0x7f0a0007; - public static final int combatview_monsterbar=0x7f0a000b; - public static final int combatview_monsterhealth=0x7f0a000d; - public static final int combatview_monsterinfo=0x7f0a000c; - public static final int combatview_monsterismoving=0x7f0a000a; - public static final int combatview_moveattack=0x7f0a0006; - public static final int combatview_status=0x7f0a0009; - public static final int conversation_image=0x7f0a0011; - public static final int conversation_leave=0x7f0a0010; - public static final int conversation_next=0x7f0a000f; - public static final int conversation_statements=0x7f0a000e; - public static final int conversation_text=0x7f0a0012; - public static final int heroinfo_ap=0x7f0a0024; - public static final int heroinfo_currentconditions=0x7f0a002b; - public static final int heroinfo_currentconditions_title=0x7f0a002a; - public static final int heroinfo_currenttraits=0x7f0a0028; - public static final int heroinfo_expbar=0x7f0a0027; - public static final int heroinfo_healthbar=0x7f0a0026; - public static final int heroinfo_image=0x7f0a0020; - public static final int heroinfo_itemeffects=0x7f0a0029; - public static final int heroinfo_level=0x7f0a0022; - public static final int heroinfo_levelup=0x7f0a002c; - public static final int heroinfo_movecost=0x7f0a0025; - public static final int heroinfo_quests=0x7f0a002d; - public static final int heroinfo_stats_attack=0x7f0a002f; - public static final int heroinfo_stats_defense=0x7f0a0030; - public static final int heroinfo_stats_gold=0x7f0a002e; - public static final int heroinfo_tab1=0x7f0a0013; - public static final int heroinfo_tab2=0x7f0a0014; - public static final int heroinfo_title=0x7f0a0021; - public static final int heroinfo_totalexperience=0x7f0a0023; - public static final int heroinfo_worn_body=0x7f0a0017; - public static final int heroinfo_worn_center=0x7f0a0015; - public static final int heroinfo_worn_feet=0x7f0a001a; - public static final int heroinfo_worn_hand=0x7f0a0019; - public static final int heroinfo_worn_head=0x7f0a0016; - public static final int heroinfo_worn_neck=0x7f0a0018; - public static final int heroinfo_worn_ringleft=0x7f0a001c; - public static final int heroinfo_worn_ringright=0x7f0a001e; - public static final int heroinfo_worn_shield=0x7f0a001d; - public static final int heroinfo_worn_weapon=0x7f0a001b; - public static final int inv_image=0x7f0a0031; - public static final int inv_menu_drop=0x7f0a0099; - public static final int inv_menu_equip=0x7f0a0096; - public static final int inv_menu_info=0x7f0a0095; - public static final int inv_menu_unequip=0x7f0a0097; - public static final int inv_menu_use=0x7f0a0098; - public static final int inv_text=0x7f0a0032; - public static final int inventorylist_root=0x7f0a001f; - public static final int itemeffect_onequip_change_maxap=0x7f0a0036; - public static final int itemeffect_onequip_change_maxhp=0x7f0a0035; - public static final int itemeffect_onequip_change_movecost=0x7f0a0037; - public static final int itemeffect_onequip_conditions=0x7f0a0038; - public static final int itemeffect_onequip_title=0x7f0a0033; - public static final int itemeffect_onequip_traits=0x7f0a0034; - public static final int itemeffect_onhit=0x7f0a003c; - public static final int itemeffect_onhit_title=0x7f0a003b; - public static final int itemeffect_onkill=0x7f0a003e; - public static final int itemeffect_onkill_title=0x7f0a003d; - public static final int itemeffect_onuse=0x7f0a003a; - public static final int itemeffect_onuse_conditions_source=0x7f0a0041; - public static final int itemeffect_onuse_conditions_source_title=0x7f0a0040; - public static final int itemeffect_onuse_conditions_target=0x7f0a0043; - public static final int itemeffect_onuse_conditions_target_title=0x7f0a0042; - public static final int itemeffect_onuse_list=0x7f0a003f; - public static final int itemeffect_onuse_title=0x7f0a0039; - public static final int iteminfo_action=0x7f0a0048; - public static final int iteminfo_category=0x7f0a0046; - public static final int iteminfo_close=0x7f0a0049; - public static final int iteminfo_effects=0x7f0a0047; - public static final int iteminfo_image=0x7f0a0044; - public static final int iteminfo_title=0x7f0a0045; - public static final int levelup_add_attackchance=0x7f0a004e; - public static final int levelup_add_attackdamage=0x7f0a004f; - public static final int levelup_add_blockchance=0x7f0a0050; - public static final int levelup_add_health=0x7f0a004d; - public static final int levelup_description=0x7f0a004c; - public static final int levelup_image=0x7f0a004b; - public static final int levelup_titlelayout=0x7f0a004a; - public static final int loadsave_description=0x7f0a0054; - public static final int loadsave_image=0x7f0a0052; - public static final int loadsave_slot_1=0x7f0a0055; - public static final int loadsave_slot_2=0x7f0a0056; - public static final int loadsave_slot_3=0x7f0a0057; - public static final int loadsave_slot_4=0x7f0a0058; - public static final int loadsave_title=0x7f0a0053; - public static final int loadsave_titlelayout=0x7f0a0051; - public static final int main_combatview=0x7f0a005b; - public static final int main_container=0x7f0a0059; - public static final int main_mainview=0x7f0a005c; - public static final int main_statusview=0x7f0a005a; - public static final int monsterencounter_attack=0x7f0a0062; - public static final int monsterencounter_cancel=0x7f0a0064; - public static final int monsterencounter_description=0x7f0a0061; - public static final int monsterencounter_image=0x7f0a005f; - public static final int monsterencounter_info=0x7f0a0063; - public static final int monsterencounter_title=0x7f0a0060; - public static final int monsterinfo_close=0x7f0a006b; - public static final int monsterinfo_currenttraits=0x7f0a0069; - public static final int monsterinfo_difficulty=0x7f0a0067; - public static final int monsterinfo_healthbar=0x7f0a0068; - public static final int monsterinfo_image=0x7f0a0065; - public static final int monsterinfo_onhiteffects=0x7f0a006a; - public static final int monsterinfo_title=0x7f0a0066; - public static final int questlog_contents=0x7f0a006d; - public static final int questlog_entrytext=0x7f0a006e; - public static final int questlog_includecompleted=0x7f0a006c; - public static final int rangebar_label=0x7f0a006f; - public static final int rangebar_progress=0x7f0a0070; - public static final int rangebar_text=0x7f0a0071; - public static final int shop_buy_gc=0x7f0a0073; - public static final int shop_buy_list=0x7f0a0074; - public static final int shop_sell_gc=0x7f0a0076; - public static final int shop_sell_list=0x7f0a0077; - public static final int shop_tab1=0x7f0a0072; - public static final int shop_tab2=0x7f0a0075; - public static final int shopitem_image=0x7f0a0078; - public static final int shopitem_infobutton=0x7f0a007a; - public static final int shopitem_shopbutton=0x7f0a0079; - public static final int shopitem_text=0x7f0a007b; - public static final int startscreen_about=0x7f0a0082; - public static final int startscreen_continue=0x7f0a007f; - public static final int startscreen_currenthero=0x7f0a007c; - public static final int startscreen_enterheroname=0x7f0a007d; - public static final int startscreen_load=0x7f0a0081; - public static final int startscreen_newgame=0x7f0a0080; - public static final int startscreen_quit=0x7f0a0083; - public static final int startscreen_version=0x7f0a007e; - public static final int status_image=0x7f0a0084; - public static final int statusview_activeconditions=0x7f0a005e; - public static final int statusview_exp=0x7f0a0086; - public static final int statusview_health=0x7f0a0085; - public static final int statusview_statustext=0x7f0a005d; - public static final int traitsinfo_attack_chance=0x7f0a008a; - public static final int traitsinfo_attack_cost=0x7f0a0088; - public static final int traitsinfo_attack_damage=0x7f0a008c; - public static final int traitsinfo_attack_row1=0x7f0a0087; - public static final int traitsinfo_attack_row2=0x7f0a0089; - public static final int traitsinfo_attack_row3=0x7f0a008b; - public static final int traitsinfo_critical_row1=0x7f0a008d; - public static final int traitsinfo_critical_row2=0x7f0a008f; - public static final int traitsinfo_criticalhit_chance=0x7f0a008e; - public static final int traitsinfo_criticalhit_multiplier=0x7f0a0090; - public static final int traitsinfo_defense_chance=0x7f0a0092; - public static final int traitsinfo_defense_damageresist=0x7f0a0094; - public static final int traitsinfo_defense_row1=0x7f0a0091; - public static final int traitsinfo_defense_row2=0x7f0a0093; + public static final int about_button1=0x7f0b0001; + public static final int about_button2=0x7f0b0002; + public static final int about_button3=0x7f0b0003; + public static final int about_contents=0x7f0b0004; + public static final int about_version=0x7f0b0000; + public static final int combatview_actionbar=0x7f0b0005; + public static final int combatview_endturn=0x7f0b0008; + public static final int combatview_flee=0x7f0b0007; + public static final int combatview_monsterbar=0x7f0b000b; + public static final int combatview_monsterhealth=0x7f0b000d; + public static final int combatview_monsterinfo=0x7f0b000c; + public static final int combatview_monsterismoving=0x7f0b000a; + public static final int combatview_moveattack=0x7f0b0006; + public static final int combatview_status=0x7f0b0009; + public static final int conversation_image=0x7f0b0011; + public static final int conversation_leave=0x7f0b0010; + public static final int conversation_next=0x7f0b000f; + public static final int conversation_statements=0x7f0b000e; + public static final int conversation_text=0x7f0b0012; + public static final int heroinfo_ap=0x7f0b0024; + public static final int heroinfo_currentconditions=0x7f0b002b; + public static final int heroinfo_currentconditions_title=0x7f0b002a; + public static final int heroinfo_currenttraits=0x7f0b0028; + public static final int heroinfo_expbar=0x7f0b0027; + public static final int heroinfo_healthbar=0x7f0b0026; + public static final int heroinfo_image=0x7f0b0020; + public static final int heroinfo_itemeffects=0x7f0b0029; + public static final int heroinfo_level=0x7f0b0022; + public static final int heroinfo_levelup=0x7f0b002c; + public static final int heroinfo_movecost=0x7f0b0025; + public static final int heroinfo_quests=0x7f0b002d; + public static final int heroinfo_stats_attack=0x7f0b002f; + public static final int heroinfo_stats_defense=0x7f0b0030; + public static final int heroinfo_stats_gold=0x7f0b002e; + public static final int heroinfo_tab1=0x7f0b0013; + public static final int heroinfo_tab2=0x7f0b0014; + public static final int heroinfo_title=0x7f0b0021; + public static final int heroinfo_totalexperience=0x7f0b0023; + public static final int heroinfo_worn_body=0x7f0b0017; + public static final int heroinfo_worn_center=0x7f0b0015; + public static final int heroinfo_worn_feet=0x7f0b001a; + public static final int heroinfo_worn_hand=0x7f0b0019; + public static final int heroinfo_worn_head=0x7f0b0016; + public static final int heroinfo_worn_neck=0x7f0b0018; + public static final int heroinfo_worn_ringleft=0x7f0b001c; + public static final int heroinfo_worn_ringright=0x7f0b001e; + public static final int heroinfo_worn_shield=0x7f0b001d; + public static final int heroinfo_worn_weapon=0x7f0b001b; + public static final int inv_image=0x7f0b0031; + public static final int inv_menu_drop=0x7f0b0099; + public static final int inv_menu_equip=0x7f0b0096; + public static final int inv_menu_info=0x7f0b0095; + public static final int inv_menu_unequip=0x7f0b0097; + public static final int inv_menu_use=0x7f0b0098; + public static final int inv_text=0x7f0b0032; + public static final int inventorylist_root=0x7f0b001f; + public static final int itemeffect_onequip_change_maxap=0x7f0b0036; + public static final int itemeffect_onequip_change_maxhp=0x7f0b0035; + public static final int itemeffect_onequip_change_movecost=0x7f0b0037; + public static final int itemeffect_onequip_conditions=0x7f0b0038; + public static final int itemeffect_onequip_title=0x7f0b0033; + public static final int itemeffect_onequip_traits=0x7f0b0034; + public static final int itemeffect_onhit=0x7f0b003c; + public static final int itemeffect_onhit_title=0x7f0b003b; + public static final int itemeffect_onkill=0x7f0b003e; + public static final int itemeffect_onkill_title=0x7f0b003d; + public static final int itemeffect_onuse=0x7f0b003a; + public static final int itemeffect_onuse_conditions_source=0x7f0b0041; + public static final int itemeffect_onuse_conditions_source_title=0x7f0b0040; + public static final int itemeffect_onuse_conditions_target=0x7f0b0043; + public static final int itemeffect_onuse_conditions_target_title=0x7f0b0042; + public static final int itemeffect_onuse_list=0x7f0b003f; + public static final int itemeffect_onuse_title=0x7f0b0039; + public static final int iteminfo_action=0x7f0b0048; + public static final int iteminfo_category=0x7f0b0046; + public static final int iteminfo_close=0x7f0b0049; + public static final int iteminfo_effects=0x7f0b0047; + public static final int iteminfo_image=0x7f0b0044; + public static final int iteminfo_title=0x7f0b0045; + public static final int levelup_add_attackchance=0x7f0b004e; + public static final int levelup_add_attackdamage=0x7f0b004f; + public static final int levelup_add_blockchance=0x7f0b0050; + public static final int levelup_add_health=0x7f0b004d; + public static final int levelup_description=0x7f0b004c; + public static final int levelup_image=0x7f0b004b; + public static final int levelup_titlelayout=0x7f0b004a; + public static final int loadsave_description=0x7f0b0054; + public static final int loadsave_image=0x7f0b0052; + public static final int loadsave_slot_1=0x7f0b0055; + public static final int loadsave_slot_2=0x7f0b0056; + public static final int loadsave_slot_3=0x7f0b0057; + public static final int loadsave_slot_4=0x7f0b0058; + public static final int loadsave_title=0x7f0b0053; + public static final int loadsave_titlelayout=0x7f0b0051; + public static final int main_combatview=0x7f0b005b; + public static final int main_container=0x7f0b0059; + public static final int main_mainview=0x7f0b005c; + public static final int main_statusview=0x7f0b005a; + public static final int monsterencounter_attack=0x7f0b0062; + public static final int monsterencounter_cancel=0x7f0b0064; + public static final int monsterencounter_description=0x7f0b0061; + public static final int monsterencounter_image=0x7f0b005f; + public static final int monsterencounter_info=0x7f0b0063; + public static final int monsterencounter_title=0x7f0b0060; + public static final int monsterinfo_close=0x7f0b006b; + public static final int monsterinfo_currenttraits=0x7f0b0069; + public static final int monsterinfo_difficulty=0x7f0b0067; + public static final int monsterinfo_healthbar=0x7f0b0068; + public static final int monsterinfo_image=0x7f0b0065; + public static final int monsterinfo_onhiteffects=0x7f0b006a; + public static final int monsterinfo_title=0x7f0b0066; + public static final int questlog_contents=0x7f0b006d; + public static final int questlog_entrytext=0x7f0b006e; + public static final int questlog_includecompleted=0x7f0b006c; + public static final int rangebar_label=0x7f0b006f; + public static final int rangebar_progress=0x7f0b0070; + public static final int rangebar_text=0x7f0b0071; + public static final int shop_buy_gc=0x7f0b0073; + public static final int shop_buy_list=0x7f0b0074; + public static final int shop_sell_gc=0x7f0b0076; + public static final int shop_sell_list=0x7f0b0077; + public static final int shop_tab1=0x7f0b0072; + public static final int shop_tab2=0x7f0b0075; + public static final int shopitem_image=0x7f0b0078; + public static final int shopitem_infobutton=0x7f0b007a; + public static final int shopitem_shopbutton=0x7f0b0079; + public static final int shopitem_text=0x7f0b007b; + public static final int startscreen_about=0x7f0b0082; + public static final int startscreen_continue=0x7f0b007f; + public static final int startscreen_currenthero=0x7f0b007c; + public static final int startscreen_enterheroname=0x7f0b007d; + public static final int startscreen_load=0x7f0b0081; + public static final int startscreen_newgame=0x7f0b0080; + public static final int startscreen_quit=0x7f0b0083; + public static final int startscreen_version=0x7f0b007e; + public static final int status_image=0x7f0b0084; + public static final int statusview_activeconditions=0x7f0b005e; + public static final int statusview_exp=0x7f0b0086; + public static final int statusview_health=0x7f0b0085; + public static final int statusview_statustext=0x7f0b005d; + public static final int traitsinfo_attack_chance=0x7f0b008a; + public static final int traitsinfo_attack_cost=0x7f0b0088; + public static final int traitsinfo_attack_damage=0x7f0b008c; + public static final int traitsinfo_attack_row1=0x7f0b0087; + public static final int traitsinfo_attack_row2=0x7f0b0089; + public static final int traitsinfo_attack_row3=0x7f0b008b; + public static final int traitsinfo_critical_row1=0x7f0b008d; + public static final int traitsinfo_critical_row2=0x7f0b008f; + public static final int traitsinfo_criticalhit_chance=0x7f0b008e; + public static final int traitsinfo_criticalhit_multiplier=0x7f0b0090; + public static final int traitsinfo_defense_chance=0x7f0b0092; + public static final int traitsinfo_defense_damageresist=0x7f0b0094; + public static final int traitsinfo_defense_row1=0x7f0b0091; + public static final int traitsinfo_defense_row2=0x7f0b0093; } public static final class layout { public static final int about=0x7f030000; @@ -290,7 +296,7 @@ public final class R { public static final int traitsinfoview=0x7f030019; } public static final class menu { - public static final int inventoryitem=0x7f090000; + public static final int inventoryitem=0x7f0a0000; } public static final class string { public static final int about_button1=0x7f0500e9; @@ -598,7 +604,7 @@ public final class R { public static final int traitsinfo_defense_damageresist=0x7f0500b3; } public static final class style { - public static final int Theme_NoBackground=0x7f080000; + public static final int Theme_NoBackground=0x7f090000; } public static final class xml { public static final int blackwater_mountain0=0x7f040000; diff --git a/AndorsTrail/res/drawable/ui_gradientshape_translucent.xml b/AndorsTrail/res/drawable/ui_gradientshape_translucent.xml new file mode 100644 index 000000000..65c7072de --- /dev/null +++ b/AndorsTrail/res/drawable/ui_gradientshape_translucent.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/AndorsTrail/res/drawable/ui_statustext.xml b/AndorsTrail/res/drawable/ui_statustext.xml index ecfe7a638..177d5c5e9 100644 --- a/AndorsTrail/res/drawable/ui_statustext.xml +++ b/AndorsTrail/res/drawable/ui_statustext.xml @@ -2,16 +2,20 @@ + android:color="#8222"/> + + - + diff --git a/AndorsTrail/res/layout/combatview.xml b/AndorsTrail/res/layout/combatview.xml index e8c9a73bb..13f9f6e27 100644 --- a/AndorsTrail/res/layout/combatview.xml +++ b/AndorsTrail/res/layout/combatview.xml @@ -21,7 +21,7 @@ android:layout_height="@dimen/smalltext_buttonheight" android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:textSize="@dimen/smalltext" + android:textSize="@dimen/actionbar_text" android:text="Action" /> @@ -30,7 +30,7 @@ android:layout_height="@dimen/smalltext_buttonheight" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:textSize="@dimen/smalltext" + android:textSize="@dimen/actionbar_text" android:text="@string/combat_flee" /> @@ -39,7 +39,7 @@ android:layout_height="@dimen/smalltext_buttonheight" android:layout_toLeftOf="@id/combatview_flee" android:layout_centerVertical="true" - android:textSize="@dimen/smalltext" + android:textSize="@dimen/actionbar_text" android:text="@string/combat_endturn" /> @@ -48,8 +48,13 @@ android:layout_height="wrap_content" android:layout_toRightOf="@id/combatview_moveattack" android:layout_toLeftOf="@id/combatview_endturn" - android:textSize="@dimen/smalltext" + android:textSize="@dimen/actionbar_text" android:layout_centerVertical="true" + android:shadowDx="1" + android:shadowDy="1" + android:shadowRadius="1" + android:shadowColor="#000" + android:paddingBottom="4sp" android:text="AP" /> @@ -57,8 +62,13 @@ @@ -74,7 +84,7 @@ diff --git a/AndorsTrail/res/layout/startscreen.xml b/AndorsTrail/res/layout/startscreen.xml index bbfe0b9f2..a535aa60e 100644 --- a/AndorsTrail/res/layout/startscreen.xml +++ b/AndorsTrail/res/layout/startscreen.xml @@ -33,7 +33,7 @@ /> + + #80000000 + diff --git a/AndorsTrail/res/values/dimen.xml b/AndorsTrail/res/values/dimen.xml index 9d0fceaf6..12dca72ca 100644 --- a/AndorsTrail/res/values/dimen.xml +++ b/AndorsTrail/res/values/dimen.xml @@ -19,4 +19,7 @@ 5dp 16sp + 12sp + 11sp + diff --git a/AndorsTrail/res/values/droplist.xml b/AndorsTrail/res/values/droplist.xml index f35f020f1..0753888ab 100644 --- a/AndorsTrail/res/values/droplist.xml +++ b/AndorsTrail/res/values/droplist.xml @@ -13,7 +13,7 @@ [id|items[itemID|quantity_Min|quantity_Max|chance|]|]; {startitems|{{gold|12|12|100|}{club1|1|1|100|}{shirt1|1|1|100|}{ring_mikhail|1|1|100|}}|}; -{startitems2|{{gold|3|3|100|}{debug_potion_1|10|10|100|}{debug_potion_2|10|10|100|}{debug_ring_1|1|1|100|}{debug_ring_2|1|1|100|}{debug_ring_3|1|1|100|}{debug_ring_4|1|1|100|}{debug_ring_5|1|1|100|}{debug_ring_6|1|1|100|}{debug_ring_7|1|1|100|}{debug_ring_8|1|1|100|}}|}; +{startitems2|{{gold|12|12|100|}}|}; {shop_thief|{{shirt1|1|1|100|}{shirt2|1|1|100|}{gem1|5|5|100|}{gem2|5|5|100|}{gem3|5|5|100|}{ring_dmg5|1|1|100|}{ring_dmg6|1|1|100|}}|}; {shop_priest|{{health_minor|10|10|100|}{health|10|10|100|}{health_major|10|10|100|}{ring_dmg1|1|1|100|}{ring_dmg2|1|1|100|}{ring_block1|1|1|100|}{ring_atkch1|1|1|100|}}|}; diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml index 0472ab139..1c7eb474c 100644 --- a/AndorsTrail/res/values/strings.xml +++ b/AndorsTrail/res/values/strings.xml @@ -209,8 +209,9 @@ <a href="http://andors.techby2guys.com/">Game forums provided by Scott Devaney</a><br /> Russian translation by Dreamer...<br /> Italian translation by k6blue and liogiu<br /> - Additional programming by Samuel Plentz<br /> Additional maps done by michischmid<br /> + Additional programming by Samuel Plentz<br /> + Additional programming by Uwe Jugel<br /> <br /> <a href="http://rltiles.sourceforge.net">Monster tileset graphics by rltiles.sourceforge.net</a><br /> Part of (or All) the graphic tiles used in this program is the public domain roguelike tileset "RLTiles". diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java index 1e01eacdf..e19aff3fa 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java @@ -1,6 +1,8 @@ package com.gpl.rpg.AndorsTrail.view; +import android.R.color; import android.content.Context; +import android.content.res.Resources; import android.util.AttributeSet; import android.view.View; import android.widget.Button; @@ -40,7 +42,7 @@ public final class CombatView extends FrameLayout { setFocusable(false); inflate(context, R.layout.combatview, this); - this.setBackgroundResource(R.drawable.ui_gradientshape); + this.setBackgroundResource(R.drawable.ui_gradientshape_translucent); final CombatController c = view.combatController; attackMoveButton = (Button) findViewById(R.id.combatview_moveattack); @@ -81,6 +83,11 @@ public final class CombatView extends FrameLayout { monsterBar = findViewById(R.id.combatview_monsterbar); actionBar = findViewById(R.id.combatview_actionbar); monsterActionText = (TextView) findViewById(R.id.combatview_monsterismoving); + + Resources res = getResources(); + + monsterBar.setBackgroundColor(res.getColor(color.transparent)); + actionBar.setBackgroundColor(res.getColor(color.transparent)); } public void updateTurnInfo(Monster currentActiveMonster) {