Merge pull request #59 from phantasmalmira/jp_assets

Add support for JP server
Egoistically · Jan 11, 2020 · c448c12 · c448c12
2 parents 1f4d3d5 + e0a1c71
commit c448c12
Show file tree

Hide file tree

Showing 165 changed files with 1 addition and 1 deletion.
diff --git a/assets/JP/combat/alert_failed_evade.png b/assets/JP/combat/alert_failed_evade.png
diff --git a/assets/JP/combat/alert_lock.png b/assets/JP/combat/alert_lock.png
diff --git a/assets/JP/combat/alert_morale_low.png b/assets/JP/combat/alert_morale_low.png
diff --git a/assets/JP/combat/alert_unable_battle.png b/assets/JP/combat/alert_unable_battle.png
diff --git a/assets/JP/combat/alert_unable_reach.png b/assets/JP/combat/alert_unable_reach.png
diff --git a/assets/JP/combat/button_confirm.png b/assets/JP/combat/button_confirm.png
diff --git a/assets/JP/combat/button_evade.png b/assets/JP/combat/button_evade.png
diff --git a/assets/JP/combat/button_go.png b/assets/JP/combat/button_go.png
diff --git a/assets/JP/combat/button_retreat.png b/assets/JP/combat/button_retreat.png
diff --git a/assets/JP/combat/combat_pause.png b/assets/JP/combat/combat_pause.png
diff --git a/assets/JP/combat/commander.png b/assets/JP/combat/commander.png
diff --git a/assets/JP/combat/fleet_ammo.png b/assets/JP/combat/fleet_ammo.png
diff --git a/assets/JP/combat/fleet_arrow.png b/assets/JP/combat/fleet_arrow.png
diff --git a/assets/JP/combat/fleet_lock.png b/assets/JP/combat/fleet_lock.png
diff --git a/assets/JP/combat/menu_combat_finished.png b/assets/JP/combat/menu_combat_finished.png
diff --git a/assets/JP/combat/menu_emergency.png b/assets/JP/combat/menu_emergency.png
diff --git a/assets/JP/combat/menu_fleet.png b/assets/JP/combat/menu_fleet.png
diff --git a/assets/JP/combat/menu_formation.png b/assets/JP/combat/menu_formation.png
diff --git a/assets/JP/combat/menu_loading.png b/assets/JP/combat/menu_loading.png
diff --git a/assets/JP/combat/menu_select_fleet.png b/assets/JP/combat/menu_select_fleet.png
diff --git a/assets/JP/combat/menu_touch2continue.png b/assets/JP/combat/menu_touch2continue.png
diff --git a/assets/JP/combat/question_mark.png b/assets/JP/combat/question_mark.png
diff --git a/assets/JP/commission/alert_available.png b/assets/JP/commission/alert_available.png
diff --git a/assets/JP/commission/alert_begun.png b/assets/JP/commission/alert_begun.png
diff --git a/assets/JP/commission/alert_completed.png b/assets/JP/commission/alert_completed.png
diff --git a/assets/JP/commission/alert_perfect.png b/assets/JP/commission/alert_perfect.png
diff --git a/assets/JP/commission/button_cancel.png b/assets/JP/commission/button_cancel.png
diff --git a/assets/JP/commission/button_completed.png b/assets/JP/commission/button_completed.png
diff --git a/assets/JP/commission/button_confirm.png b/assets/JP/commission/button_confirm.png
diff --git a/assets/JP/commission/button_go.png b/assets/JP/commission/button_go.png
diff --git a/assets/JP/commission/button_ready.png b/assets/JP/commission/button_ready.png
diff --git a/assets/JP/commission/button_recommend.png b/assets/JP/commission/button_recommend.png
diff --git a/assets/JP/commission/commission_status.png b/assets/JP/commission/commission_status.png
diff --git a/assets/JP/commission/commissions_full.png b/assets/JP/commission/commissions_full.png
diff --git a/assets/JP/enemy/fleet_1_down.png b/assets/JP/enemy/fleet_1_down.png
diff --git a/assets/JP/enemy/fleet_1_up.png b/assets/JP/enemy/fleet_1_up.png
diff --git a/assets/JP/enemy/fleet_2_down.png b/assets/JP/enemy/fleet_2_down.png
diff --git a/assets/JP/enemy/fleet_2_up.png b/assets/JP/enemy/fleet_2_up.png
diff --git a/assets/JP/enemy/fleet_3_down.png b/assets/JP/enemy/fleet_3_down.png
diff --git a/assets/JP/enemy/fleet_3_up.png b/assets/JP/enemy/fleet_3_up.png
diff --git a/assets/JP/enemy/fleet_boss.png b/assets/JP/enemy/fleet_boss.png
diff --git a/assets/JP/enemy/fleet_level.png b/assets/JP/enemy/fleet_level.png
diff --git a/assets/JP/enhancement/alert_enhanced.png b/assets/JP/enhancement/alert_enhanced.png
diff --git a/assets/JP/enhancement/alert_no_items.png b/assets/JP/enhancement/alert_no_items.png
diff --git a/assets/JP/enhancement/button_favorite.png b/assets/JP/enhancement/button_favorite.png
diff --git a/assets/JP/enhancement/menu_details.png b/assets/JP/enhancement/menu_details.png
diff --git a/assets/JP/enhancement/menu_enhance.png b/assets/JP/enhancement/menu_enhance.png
diff --git a/assets/JP/enhancement/menu_level.png b/assets/JP/enhancement/menu_level.png
diff --git a/assets/JP/enhancement/menu_retrofit.png b/assets/JP/enhancement/menu_retrofit.png
diff --git a/assets/JP/event/build_limited.png b/assets/JP/event/build_limited.png
diff --git a/assets/JP/event/crosswave/easy_completed.png b/assets/JP/event/crosswave/easy_completed.png
diff --git a/assets/JP/event/crosswave/ex_completed.png b/assets/JP/event/crosswave/ex_completed.png
diff --git a/assets/JP/event/crosswave/hard_completed.png b/assets/JP/event/crosswave/hard_completed.png
diff --git a/assets/JP/event/crosswave/menu_button.png b/assets/JP/event/crosswave/menu_button.png
diff --git a/assets/JP/event/crosswave/normal_completed.png b/assets/JP/event/crosswave/normal_completed.png
diff --git a/assets/JP/headquarters/academy_alert.png b/assets/JP/headquarters/academy_alert.png
diff --git a/assets/JP/headquarters/affinity_point.png b/assets/JP/headquarters/affinity_point.png
diff --git a/assets/JP/headquarters/cat_lodge_alert.png b/assets/JP/headquarters/cat_lodge_alert.png
diff --git a/assets/JP/headquarters/defense_boost.png b/assets/JP/headquarters/defense_boost.png
diff --git a/assets/JP/headquarters/dorm_alert.png b/assets/JP/headquarters/dorm_alert.png
diff --git a/assets/JP/headquarters/dorm_sign.png b/assets/JP/headquarters/dorm_sign.png
diff --git a/assets/JP/headquarters/dorm_summary_confirm_button.png b/assets/JP/headquarters/dorm_summary_confirm_button.png
diff --git a/assets/JP/headquarters/dorm_token.png b/assets/JP/headquarters/dorm_token.png
diff --git a/assets/JP/headquarters/give_food_button.png b/assets/JP/headquarters/give_food_button.png
diff --git a/assets/JP/headquarters/hq_alert.png b/assets/JP/headquarters/hq_alert.png
diff --git a/assets/JP/headquarters/info_message.png b/assets/JP/headquarters/info_message.png
diff --git a/assets/JP/headquarters/offense_boost.png b/assets/JP/headquarters/offense_boost.png
diff --git a/assets/JP/headquarters/supplies_bar_empty.png b/assets/JP/headquarters/supplies_bar_empty.png
diff --git a/assets/JP/headquarters/support_boost.png b/assets/JP/headquarters/support_boost.png
diff --git a/assets/JP/headquarters/tactical_class.png b/assets/JP/headquarters/tactical_class.png
diff --git a/assets/JP/maps/map_1-1.png b/assets/JP/maps/map_1-1.png
diff --git a/assets/JP/maps/map_1-2.png b/assets/JP/maps/map_1-2.png
diff --git a/assets/JP/maps/map_1-3.png b/assets/JP/maps/map_1-3.png
diff --git a/assets/JP/maps/map_1-4.png b/assets/JP/maps/map_1-4.png
diff --git a/assets/JP/maps/map_10-1.png b/assets/JP/maps/map_10-1.png
diff --git a/assets/JP/maps/map_10-2.png b/assets/JP/maps/map_10-2.png
diff --git a/assets/JP/maps/map_10-3.png b/assets/JP/maps/map_10-3.png
diff --git a/assets/JP/maps/map_10-4.png b/assets/JP/maps/map_10-4.png
diff --git a/assets/JP/maps/map_11-1.png b/assets/JP/maps/map_11-1.png
diff --git a/assets/JP/maps/map_11-2.png b/assets/JP/maps/map_11-2.png
diff --git a/assets/JP/maps/map_11-3.png b/assets/JP/maps/map_11-3.png
diff --git a/assets/JP/maps/map_11-4.png b/assets/JP/maps/map_11-4.png
diff --git a/assets/JP/maps/map_12-1.png b/assets/JP/maps/map_12-1.png
diff --git a/assets/JP/maps/map_12-2.png b/assets/JP/maps/map_12-2.png
diff --git a/assets/JP/maps/map_12-3.png b/assets/JP/maps/map_12-3.png
diff --git a/assets/JP/maps/map_12-4.png b/assets/JP/maps/map_12-4.png
diff --git a/assets/JP/maps/map_2-1.png b/assets/JP/maps/map_2-1.png
diff --git a/assets/JP/maps/map_2-2.png b/assets/JP/maps/map_2-2.png
diff --git a/assets/JP/maps/map_2-3.png b/assets/JP/maps/map_2-3.png
diff --git a/assets/JP/maps/map_2-4.png b/assets/JP/maps/map_2-4.png
diff --git a/assets/JP/maps/map_3-1.png b/assets/JP/maps/map_3-1.png
diff --git a/assets/JP/maps/map_3-2.png b/assets/JP/maps/map_3-2.png
diff --git a/assets/JP/maps/map_3-3.png b/assets/JP/maps/map_3-3.png
diff --git a/assets/JP/maps/map_3-4.png b/assets/JP/maps/map_3-4.png
diff --git a/assets/JP/maps/map_4-1.png b/assets/JP/maps/map_4-1.png
diff --git a/assets/JP/maps/map_4-2.png b/assets/JP/maps/map_4-2.png
diff --git a/assets/JP/maps/map_4-3.png b/assets/JP/maps/map_4-3.png
diff --git a/assets/JP/maps/map_4-4.png b/assets/JP/maps/map_4-4.png
diff --git a/assets/JP/maps/map_5-1.png b/assets/JP/maps/map_5-1.png
diff --git a/assets/JP/maps/map_5-2.png b/assets/JP/maps/map_5-2.png
diff --git a/assets/JP/maps/map_5-3.png b/assets/JP/maps/map_5-3.png
diff --git a/assets/JP/maps/map_5-4.png b/assets/JP/maps/map_5-4.png
diff --git a/assets/JP/maps/map_6-1.png b/assets/JP/maps/map_6-1.png
diff --git a/assets/JP/maps/map_6-2.png b/assets/JP/maps/map_6-2.png
diff --git a/assets/JP/maps/map_6-3.png b/assets/JP/maps/map_6-3.png
diff --git a/assets/JP/maps/map_6-4.png b/assets/JP/maps/map_6-4.png
diff --git a/assets/JP/maps/map_7-1.png b/assets/JP/maps/map_7-1.png
diff --git a/assets/JP/maps/map_7-2.png b/assets/JP/maps/map_7-2.png
diff --git a/assets/JP/maps/map_7-3.png b/assets/JP/maps/map_7-3.png
diff --git a/assets/JP/maps/map_7-4.png b/assets/JP/maps/map_7-4.png
diff --git a/assets/JP/maps/map_8-1.png b/assets/JP/maps/map_8-1.png
diff --git a/assets/JP/maps/map_8-2.png b/assets/JP/maps/map_8-2.png
diff --git a/assets/JP/maps/map_8-3.png b/assets/JP/maps/map_8-3.png
diff --git a/assets/JP/maps/map_8-4.png b/assets/JP/maps/map_8-4.png
diff --git a/assets/JP/maps/map_9-1.png b/assets/JP/maps/map_9-1.png
diff --git a/assets/JP/maps/map_9-2.png b/assets/JP/maps/map_9-2.png
diff --git a/assets/JP/maps/map_9-3.png b/assets/JP/maps/map_9-3.png
diff --git a/assets/JP/maps/map_9-4.png b/assets/JP/maps/map_9-4.png
diff --git a/assets/JP/maps/map_E-A1.png b/assets/JP/maps/map_E-A1.png
diff --git a/assets/JP/maps/map_E-A2.png b/assets/JP/maps/map_E-A2.png
diff --git a/assets/JP/maps/map_E-A3.png b/assets/JP/maps/map_E-A3.png
diff --git a/assets/JP/maps/map_E-A4.png b/assets/JP/maps/map_E-A4.png
diff --git a/assets/JP/maps/map_E-B1.png b/assets/JP/maps/map_E-B1.png
diff --git a/assets/JP/maps/map_E-B2.png b/assets/JP/maps/map_E-B2.png
diff --git a/assets/JP/maps/map_E-B3.png b/assets/JP/maps/map_E-B3.png
diff --git a/assets/JP/maps/map_E-B4.png b/assets/JP/maps/map_E-B4.png
diff --git a/assets/JP/maps/map_E-C1.png b/assets/JP/maps/map_E-C1.png
diff --git a/assets/JP/maps/map_E-C2.png b/assets/JP/maps/map_E-C2.png
diff --git a/assets/JP/maps/map_E-C3.png b/assets/JP/maps/map_E-C3.png
diff --git a/assets/JP/maps/map_E-C4.png b/assets/JP/maps/map_E-C4.png
diff --git a/assets/JP/maps/map_E-D1.png b/assets/JP/maps/map_E-D1.png
diff --git a/assets/JP/maps/map_E-D2.png b/assets/JP/maps/map_E-D2.png
diff --git a/assets/JP/maps/map_E-D3.png b/assets/JP/maps/map_E-D3.png
diff --git a/assets/JP/maps/map_E-D4.png b/assets/JP/maps/map_E-D4.png
diff --git a/assets/JP/maps/map_E-SP1.png b/assets/JP/maps/map_E-SP1.png
diff --git a/assets/JP/maps/map_E-SP2.png b/assets/JP/maps/map_E-SP2.png
diff --git a/assets/JP/maps/map_E-SP3.png b/assets/JP/maps/map_E-SP3.png
diff --git a/assets/JP/menu/alert_close.png b/assets/JP/menu/alert_close.png
diff --git a/assets/JP/menu/alert_info.png b/assets/JP/menu/alert_info.png
diff --git a/assets/JP/menu/attack.png b/assets/JP/menu/attack.png
diff --git a/assets/JP/menu/build.png b/assets/JP/menu/build.png
diff --git a/assets/JP/menu/button_battle.png b/assets/JP/menu/button_battle.png
diff --git a/assets/JP/menu/button_normal_mode.png b/assets/JP/menu/button_normal_mode.png
diff --git a/assets/JP/menu/button_sort.png b/assets/JP/menu/button_sort.png
diff --git a/assets/JP/menu/commission.png b/assets/JP/menu/commission.png
diff --git a/assets/JP/menu/dock.png b/assets/JP/menu/dock.png
diff --git a/assets/JP/menu/drop_common.png b/assets/JP/menu/drop_common.png
diff --git a/assets/JP/menu/drop_elite.png b/assets/JP/menu/drop_elite.png
diff --git a/assets/JP/menu/drop_rare.png b/assets/JP/menu/drop_rare.png
diff --git a/assets/JP/menu/drop_ssr.png b/assets/JP/menu/drop_ssr.png
diff --git a/assets/JP/menu/item_found.png b/assets/JP/menu/item_found.png
diff --git a/assets/JP/menu/missions.png b/assets/JP/menu/missions.png
diff --git a/assets/JP/menu/operation.png b/assets/JP/menu/operation.png
diff --git a/assets/JP/mission/alert_completed.png b/assets/JP/mission/alert_completed.png
diff --git a/assets/JP/mission/button_claim.png b/assets/JP/mission/button_claim.png
diff --git a/assets/JP/mission/button_collect.png b/assets/JP/mission/button_collect.png
diff --git a/assets/JP/retirement/alert_bonus.png b/assets/JP/retirement/alert_bonus.png
diff --git a/assets/JP/retirement/bonus.png b/assets/JP/retirement/bonus.png
diff --git a/assets/JP/retirement/button_disassemble.png b/assets/JP/retirement/button_disassemble.png
diff --git a/assets/JP/retirement/button_sort_all.png b/assets/JP/retirement/button_sort_all.png
diff --git a/assets/JP/retirement/button_sort_common.png b/assets/JP/retirement/button_sort_common.png
diff --git a/assets/JP/retirement/button_sort_rare.png b/assets/JP/retirement/button_sort_rare.png
diff --git a/assets/JP/retirement/empty.png b/assets/JP/retirement/empty.png
diff --git a/assets/JP/retirement/selected_none.png b/assets/JP/retirement/selected_none.png
diff --git a/util/config.py b/util/config.py
@@ -132,7 +132,7 @@ def try_cast_to_int(val):
             Logger.log_msg("Validating config")
         self.ok = True
 
-        valid_servers = ['EN']
+        valid_servers = ['EN', 'JP']
         if self.assets['server'] not in valid_servers:
             if len(valid_servers) < 2:
                 Logger.log_error("Invalid assets configured. Only {} is supported.".format(''.join(valid_servers)))