From c4cb02f73190833636c1442a8610b9818f79d6a9 Mon Sep 17 00:00:00 2001 From: pelya Date: Wed, 6 Jan 2021 01:00:51 +0200 Subject: [PATCH] OpenTTD-JGR: fixed data path --- .../openttd-jgrpp/AndroidAppSettings.cfg | 2 +- .../application/openttd-jgrpp/AndroidBuild.sh | 1 + .../AndroidData/openttd-jgr-0.32.4.cfg | 602 +----------------- .../application/openttd-jgrpp/pack-data.sh | 2 +- project/jni/application/openttd-jgrpp/src | 2 +- 5 files changed, 20 insertions(+), 589 deletions(-) diff --git a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg index f559e0ad8..3756b7517 100644 --- a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg +++ b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg @@ -20,7 +20,7 @@ AppVersionName="0.39.2" # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for obb file # You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries # Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip -AppDataDownloadUrl="!!Data files|openttd-data-0.34.2-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-jgr-0.32.4.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz" +AppDataDownloadUrl="!!Data files|openttd-data-0.39.2-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-jgr-0.32.4.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y diff --git a/project/jni/application/openttd-jgrpp/AndroidBuild.sh b/project/jni/application/openttd-jgrpp/AndroidBuild.sh index 72f6db4c9..f8636cfda 100755 --- a/project/jni/application/openttd-jgrpp/AndroidBuild.sh +++ b/project/jni/application/openttd-jgrpp/AndroidBuild.sh @@ -82,6 +82,7 @@ export ARCH=$1 -DANDROID_ABI=$1 \ -DANDROID_NATIVE_API_LEVEL=$APILEVEL \ -DANDROID_STL=c++_shared \ + -DGLOBAL_DIR="." \ -B openttd-$VER-$1 src } || exit 1 diff --git a/project/jni/application/openttd-jgrpp/AndroidData/openttd-jgr-0.32.4.cfg b/project/jni/application/openttd-jgrpp/AndroidData/openttd-jgr-0.32.4.cfg index b2655d46f..cfc1cf831 100755 --- a/project/jni/application/openttd-jgrpp/AndroidData/openttd-jgr-0.32.4.cfg +++ b/project/jni/application/openttd-jgrpp/AndroidData/openttd-jgr-0.32.4.cfg @@ -1,586 +1,16 @@ -[misc] -small_font = fonts/Roboto-Bold.ttf -medium_font = fonts/Roboto-Bold.ttf -large_font = fonts/DroidSerif-Bold.ttf -mono_font = fonts/DroidSansMono.ttf -small_size = 10 -medium_size = 12 -large_size = 16 -mono_size = 12 -small_aa = true -medium_aa = true -large_aa = true -mono_aa = true -display_opt = SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION|FULL_DETAIL|WAYPOINTS|SHOW_COMPETITOR_SIGNS -fullscreen = false -support8bpp = no -graphicsset = -soundsset = -musicset = -videodriver = -musicdriver = -sounddriver = -blitter = -language = korean.lng -resolution = 853,480 -screenshot_format = -savegame_format = -rightclick_emulate = false -sprite_cache_size_px = 128 -player_face = 0 -transparency_options = 0 -transparency_locks = 0 -invisibility_options = 0 -keyboard = -keyboard_caps = -last_newgrf_count = 11 -gui_zoom = 1 -font_zoom = 2 -zoning_overlay_inner = 0 -zoning_overlay_outer = 0 - -[gui] -osk_activation = disabled -autosave = monthly -threaded_saves = true -date_format_in_default_names = long -show_finances = true -auto_scrolling = 0 -scroll_mode = 3 -smooth_scroll = false -right_mouse_wnd_close = true -measure_tooltip = true -errmsg_duration = 2 -hover_delay_ms = 250 -toolbar_pos = 1 -statusbar_pos = 1 -window_snap_radius = 10 -window_soft_limit = 20 -zoom_min = 0 -zoom_max = 9 -population_in_label = true -link_terraform_toolbar = true -smallmap_land_colour = 0 -liveries = 2 -starting_colour = 16 -prefer_teamchat = false -scrollwheel_scrolling = 0 -scrollwheel_multiplier = 5 -viewport_map_scan_surroundings = true -show_slopes_on_viewport_map = true -show_bridges_on_map = true -show_tunnels_on_map = true -show_vehicle_route = 0 -dash_level_of_route_lines = 0 -use_owner_colour_for_tunnelbridge = true -show_scrolling_viewport_on_map = 3 -default_viewport_map_mode = 0 -action_when_viewport_map_is_dblclicked = 0 -pause_on_newgame = false -advanced_vehicle_list = 1 -timetable_in_ticks = false -timetable_leftover_ticks = false -time_in_minutes = true -timetable_start_text_entry = false -ticks_per_minute = 74 -date_with_time = 0 -clock_offset = 0 -timetable_arrival_departure = true -max_departures = 10 -max_departure_time = 120 -departure_calc_frequency = 10 -departure_show_vehicle = false -departure_show_group = false -departure_show_company = false -departure_show_vehicle_type = false -departure_show_vehicle_color = false -departure_larger_font = false -departure_destination_type = false -departure_show_both = false -departure_only_passengers = false -departure_smart_terminus = true -departure_show_all_stops = false -departure_merge_identical = true -departure_conditionals = 0 -quick_goto = false -loading_indicators = 1 -default_rail_type = 1 -enable_signal_gui = true -coloured_news_year = 2000 -drag_signals_density = 4 -drag_signals_fixed_distance = false -semaphore_build_before = 1950 -vehicle_income_warn = true -order_review_system = 1 -no_depot_order_warn = false -lost_vehicle_warn = true -disable_unsuitable_building = true -new_nonstop = false -stop_location = 2 -keep_all_autosave = false -autosave_on_exit = false -autosave_on_network_disconnect = true -max_num_autosaves = 16 -savegame_overwrite_confirm = yes -auto_euro = true -news_message_timeout = 2 -show_track_reservation = false -default_signal_type = 1 -cycle_signal_types = 2 -station_numtracks = 1 -station_platlength = 5 -station_dragdrop = true -station_show_coverage = false -persistent_buildingtools = true -expenses_layout = false -station_gui_group_order = 0 -station_gui_sort_by = 0 -station_gui_sort_order = 0 -missing_strings_threshold = 25 -graph_line_thickness = 3 -show_vehicle_route_steps = true -show_train_length_in_details = true -show_train_weight_ratios_in_details = false -show_vehicle_group_in_details = true -show_vehicle_list_company_colour = true -show_restricted_signal_default = false -show_adv_tracerestrict_features = true -show_progsig_ui = true -show_veh_list_cargo_filter = true -enable_single_veh_shared_order_gui = false -show_adv_load_mode_features = false -disable_top_veh_list_mass_actions = false -adv_sig_bridge_tun_modes = false -show_depot_sell_gui = false -open_vehicle_gui_clone_share = false -show_newgrf_name = false -show_date_in_logs = false -settings_restriction_mode = 2 -developer = 1 -newgrf_developer_tools = false -ai_developer_tools = false -scenario_developer = false -newgrf_show_old_versions = false -newgrf_default_palette = 1 -console_backlog_timeout = 100 -console_backlog_length = 100 -network_chat_box_width_pct = 40 -network_chat_box_height = 25 -network_chat_timeout = 20 - -[difficulty] -max_no_competitors = 0 -number_towns = 2 -industry_density = 5 -max_loan = 300000 -initial_interest = 2 -vehicle_costs = 0 -competitor_speed = 2 -vehicle_breakdowns = 1 -subsidy_multiplier = 2 -construction_cost = 0 -terrain_type = 1 -quantity_sea_lakes = 0 -economy = false -line_reverse_mode = false -disasters = false -town_council_tolerance = 0 - -[game_creation] -town_name = english -landscape = temperate -snow_line_height = 15 -starting_year = 1950 -land_generator = 1 -oil_refinery_limit = 32 -tgen_smoothness = 1 -variety = 0 -generation_seed = 4294967295 -generation_unique_id = 0 -tree_placer = 2 -heightmap_rotation = 0 -se_flat_world_height = 1 -map_x = 8 -map_y = 8 -water_borders = 15 -custom_town_number = 1 -custom_sea_level = 2 -min_river_length = 16 -river_route_random = 5 -amount_of_rivers = 2 - -[vehicle] -road_side = right -train_acceleration_model = 1 -roadveh_acceleration_model = 1 -train_slope_steepness = 3 -roadveh_slope_steepness = 7 -max_train_length = 7 -smoke_amount = 1 -never_expire_vehicles = false -max_trains = 500 -max_roadveh = 500 -max_aircraft = 200 -max_ships = 300 -wagon_speed_limits = true -disable_elrails = false -freight_trains = 1 -plane_speed = 4 -dynamic_engines = true -plane_crashes = 2 -improved_breakdowns = false -ship_collision_avoidance = true -no_train_crash_other_company = false -flip_direction_all_trains = false -roadveh_articulated_overtaking = true -extend_vehicle_life = 0 -adjacent_crossings = true -safer_crossings = false -pay_for_repair = true -repair_cost = 100 -servint_ispercent = false -servint_trains = 150 -servint_roadveh = 150 -servint_ships = 360 -servint_aircraft = 100 -auto_timetable_by_default = false -auto_separation_by_default = true - -[construction] -max_heightlevel = 30 -build_on_slopes = true -command_pause_level = 1 -enable_build_river = false -enable_remove_water = true -terraform_per_64k_frames = 4194304 -terraform_frame_burst = 4096 -clear_per_64k_frames = 4194304 -clear_frame_burst = 4096 -tree_per_64k_frames = 4194304 -tree_frame_burst = 4096 -purchase_land_per_64k_frames = 1048576 -purchase_land_frame_burst = 1024 -autoslope = true -extra_dynamite = true -max_bridge_length = 64 -max_bridge_height = 12 -max_tunnel_length = 64 -chunnel = false -simulated_wormhole_signals = 2 -train_signal_side = 1 -road_stop_on_town_road = true -road_stop_on_competitor_road = true -road_custom_bridge_heads = true -rail_custom_bridge_heads = true -allow_grf_objects_under_bridges = false -allow_stations_under_bridges = false -allow_road_stops_under_bridges = true -allow_docks_under_bridges = false -purchase_land_permitted = 1 -raw_industry_construction = 0 -industry_platform = 1 -maximum_signal_evaluations = 256 -freeform_edges = true -extra_tree_placement = 2 -trees_around_snow_line_enabled = true -trees_around_snow_line_range = 8 -tree_growth_rate = 0 - -[station] -never_expire_airports = false -station_spread = 12 -modified_catchment = true -catchment_increase = 0 -cargo_class_rating_wait_time = false -serve_neutral_industries = true -adjacent_stations = true -distant_join_stations = true - -[economy] -town_layout = 0 -allow_town_roads = true -found_town = 0 -allow_town_level_crossings = true -town_cargogen_mode = 1 -town_cargo_scale_factor = 0 -station_noise_level = false -inflation = true -day_length_factor = 1 -multiple_industry_per_town = false -bribe = true -exclusive_rights = true -fund_buildings = true -fund_roads = true -give_money = true -smooth_economy = true -allow_shares = false -min_years_for_shares = 6 -feeder_payment_share = 75 -feeder_payment_src_station = false -town_growth_rate = 2 -town_growth_cargo_transported = 0 -larger_towns = 4 -initial_city_size = 2 -mod_road_rebuild = true -town_min_distance = 20 -infrastructure_sharing[0] = false -infrastructure_sharing[1] = false -infrastructure_sharing[2] = false -infrastructure_sharing[3] = false -sharing_fee[0] = 100 -sharing_fee[1] = 100 -sharing_fee[2] = 100 -sharing_fee[3] = 100 -sharing_payment_in_debt = false -dist_local_authority = 20 -town_noise_population[0] = 800 -town_noise_population[1] = 2000 -town_noise_population[2] = 4000 -infrastructure_maintenance = false -random_road_reconstruction = 0 - -[linkgraph] -recalc_interval = 4 -recalc_time = 16 -recalc_not_scaled_by_daylength = true -distribution_pax = 0 -distribution_mail = 0 -distribution_armoured = 0 -distribution_default = 0 -accuracy = 16 -demand_distance = 100 -demand_size = 100 -short_path_saturation = 80 - -[pf] -forbid_90_deg = false -roadveh_queue = true -pathfinder_for_trains = 2 -pathfinder_for_roadvehs = 2 -pathfinder_for_ships = 2 -reverse_at_signals = false -wait_oneway_signal = 15 -wait_twoway_signal = 41 -wait_for_pbs_path = 30 -reserve_paths = false -path_backoff_interval = 20 -npf.npf_max_search_nodes = 10000 -npf.npf_rail_firstred_penalty = 1000 -npf.npf_rail_firstred_exit_penalty = 10000 -npf.npf_rail_lastred_penalty = 1000 -npf.npf_rail_station_penalty = 100 -npf.npf_rail_slope_penalty = 100 -npf.npf_rail_curve_penalty = 100 -npf.npf_rail_depot_reverse_penalty = 5000 -npf.npf_rail_pbs_cross_penalty = 300 -npf.npf_rail_pbs_signal_back_penalty = 1500 -npf.npf_buoy_penalty = 200 -npf.npf_water_curve_penalty = 100 -npf.npf_road_curve_penalty = 100 -npf.npf_crossing_penalty = 300 -npf.npf_road_drive_through_penalty = 800 -npf.npf_road_dt_occupied_penalty = 800 -npf.npf_road_bay_occupied_penalty = 1500 -npf.maximum_go_to_depot_penalty = 2000 -yapf.disable_node_optimization = false -yapf.max_search_nodes = 10000 -yapf.rail_firstred_twoway_eol = false -yapf.rail_firstred_penalty = 1000 -yapf.rail_firstred_exit_penalty = 10000 -yapf.rail_lastred_penalty = 1000 -yapf.rail_lastred_exit_penalty = 10000 -yapf.rail_station_penalty = 1000 -yapf.rail_slope_penalty = 200 -yapf.rail_curve45_penalty = 100 -yapf.rail_curve90_penalty = 600 -yapf.rail_depot_reverse_penalty = 5000 -yapf.rail_crossing_penalty = 300 -yapf.rail_look_ahead_max_signals = 10 -yapf.rail_look_ahead_signal_p0 = 500 -yapf.rail_look_ahead_signal_p1 = -100 -yapf.rail_look_ahead_signal_p2 = 5 -yapf.rail_pbs_cross_penalty = 300 -yapf.rail_pbs_station_penalty = 800 -yapf.rail_pbs_signal_back_penalty = 1500 -yapf.rail_doubleslip_penalty = 100 -yapf.rail_longer_platform_penalty = 800 -yapf.rail_longer_platform_per_tile_penalty = 0 -yapf.rail_shorter_platform_penalty = 4000 -yapf.rail_shorter_platform_per_tile_penalty = 0 -yapf.road_slope_penalty = 200 -yapf.road_curve_penalty = 100 -yapf.road_crossing_penalty = 300 -yapf.road_stop_penalty = 800 -yapf.road_stop_occupied_penalty = 800 -yapf.road_stop_bay_occupied_penalty = 1500 -yapf.maximum_go_to_depot_penalty = 2000 -yapf.ship_curve45_penalty = 100 -yapf.ship_curve90_penalty = 600 - -[order] -no_servicing_if_no_breakdowns = true -improved_load = true -selectgoods = true -serviceathelipad = true -nonstop_only = false -gradual_loading = true - -[script] -settings_profile = easy -script_max_opcode_till_suspend = 10000 -script_max_memory_megabytes = 1024 - -[ai] -ai_in_multiplayer = true -ai_disable_veh_train = false -ai_disable_veh_roadveh = false -ai_disable_veh_aircraft = false -ai_disable_veh_ship = false - -[locale] -currency = GBP -units_velocity = metric -units_power = metric -units_weight = metric -units_volume = metric -units_force = si -units_height = metric -digit_group_separator = -digit_group_separator_currency = -digit_decimal_separator = - -[sound] -news_ticker = true -news_full = true -new_year = true -confirm = true -click_beep = true -disaster = true -vehicle = true -ambient = true - -[music] -playlist = 0 -music_vol = 127 -effect_vol = 127 -custom_1 = 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -custom_2 = 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -playing = true -shuffle = false - -[news_display] -arrival_player = summarized -arrival_other = summarized -accident = summarized -company_info = summarized -open = summarized -close = summarized -economy = summarized -production_player = summarized -production_other = off -production_nobody = off -advice = full -new_vehicles = summarized -acceptance = summarized -subsidies = summarized -general = summarized - -[network] -commands_per_frame = 2 -max_commands_in_queue = 16 -bytes_per_frame = 8 -bytes_per_frame_burst = 256 -max_init_time = 100 -max_join_time = 500 -max_download_time = 1000 -max_password_time = 2000 -max_lag_time = 500 -pause_on_join = true -server_port = 3979 -server_admin_port = 3977 -server_admin_chat = true -server_advertise = false -lan_internet = 1 -client_name = -server_password = -rcon_password = -admin_password = -settings_password = -default_company_pass = -server_name = -connect_to_ip = -network_id = 72e054ecc0e18097e566738851de50a1 -autoclean_companies = false -autoclean_unprotected = 12 -autoclean_protected = 36 -autoclean_novehicles = 0 -max_companies = 15 -max_clients = 25 -max_spectators = 15 -restart_game_year = 0 -min_active_clients = 0 -server_lang = ANY -reload_cfg = false -last_host = -last_port = 0 -no_http_content_downloads = false - -[currency] -rate = 1 -separator = . -to_euro = 0 -prefix = "" -suffix = " credits" - -[company] -engine_renew = false -engine_renew_months = 6 -engine_renew_money = 100000 -renew_keep_length = false -auto_timetable_separation_rate = 40 -timetable_autofill_rounding = 74 -order_occupancy_smoothness = 75 -infra_others_buy_in_depot[0] = false -infra_others_buy_in_depot[1] = false -infra_others_buy_in_depot[2] = false -infra_others_buy_in_depot[3] = false -advance_order_on_clone = false - -[server_bind_addresses] - -[servers] - -[bans] - -[ai_players] -none = start_date=730 -none = start_date=730 -none = start_date=730 -none = start_date=730 -none = start_date=730 -none = start_date=730 -none = start_date=730 -none = start_date=730 -none = start_date=730 -none = start_date=730 -none = start_date=730 -none = start_date=730 -none = start_date=730 -none = start_date=730 -none = start_date=730 - -[game_scripts] -none = - -[version] -version_string = jgrpp-0.32.4 -version_number = 1A006D64 - -[win32] -display_hz = 0 -force_full_redraw = false -window_maximize = false - -[newgrf] - -[newgrf-static] +[misc] +small_font = fonts/Roboto-Bold.ttf +medium_font = fonts/Roboto-Bold.ttf +large_font = fonts/DroidSerif-Bold.ttf +mono_font = fonts/DroidSansMono.ttf +small_size = 10 +medium_size = 12 +large_size = 16 +mono_size = 12 +small_aa = true +medium_aa = true +large_aa = true +mono_aa = true + +[gui] +osk_activation = disabled diff --git a/project/jni/application/openttd-jgrpp/pack-data.sh b/project/jni/application/openttd-jgrpp/pack-data.sh index b6dc985bc..769946291 100755 --- a/project/jni/application/openttd-jgrpp/pack-data.sh +++ b/project/jni/application/openttd-jgrpp/pack-data.sh @@ -1,6 +1,6 @@ #!/bin/sh -VER=0.33.2-0 +VER=0.39.2-0 cd data rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip diff --git a/project/jni/application/openttd-jgrpp/src b/project/jni/application/openttd-jgrpp/src index 64f12cda5..fee10c46e 160000 --- a/project/jni/application/openttd-jgrpp/src +++ b/project/jni/application/openttd-jgrpp/src @@ -1 +1 @@ -Subproject commit 64f12cda569fe639b58cb5700aa9a80dd001c29e +Subproject commit fee10c46e84dbb10b565d0d89388c31f5706ca87