mapper: reworked writing paths logic

- Drop "target_path_base" and other references to BIS "fallout/dev/" folder in favor of new dev_temp_path setting
- Clear separation between "mapper temp assets" (.cfg, .txt, .tgt), "shipped assets" (.map, .edg, .pro) and "runtime temp assets" (.sav)
- dev_temp_path is mounted as highest priority xbase, so all saved data goes there by default
- as a consequence, play-mode assets (maps with .sav extension and party member .pro files) are explicitly saved to master_patches_path instead of implicitly by using xfileOpen in write mode

CMakeLists.txt

@@ -614,6 +614,8 @@ if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
     target_sources(mapper-ce PUBLIC
         ${FALLOUT_ENGINE_SOURCES}
         ${FALLOUT_PLATFORM_SOURCES}
+        "src/proto_txt.cc"
+        "src/proto_txt.h"
         "src/mapper/map_edge_setup.cc"
         "src/mapper/map_edge_setup.h"
         "src/mapper/map_func.cc"

CONTRIBUTING.md

@@ -66,9 +66,8 @@ Available commands:
 1. `./<BUILD_DIR>/ce-dat-tool <archive.dat> list [pattern]`
 2. `ce-dat-tool <archive.dat> info [pattern]`
 3. `ce-dat-tool <archive.dat> extract [--lower] <output-dir> [pattern]`
-4. `ce-dat-tool <archive.dat> extract [--lower] (--file-list|--files-from) <list-file> <output-dir>`
-5. `ce-dat-tool <archive.dat> cat <entry>`
-6. `ce-dat-tool create <input-dir> <archive.dat>`
+4. `ce-dat-tool <archive.dat> cat <entry>`
+5. `ce-dat-tool create <input-dir> <archive.dat>`
 
 Use `--lower` with `extract` when you want every extracted file and directory name forced to lowercase.
 For example:

README.md

@@ -144,13 +144,13 @@ In time this stuff will receive in-game interface, right now you have to do it m
 * Expanded 4-row barter screen
 * Expanded AP bar
 * Party members can loot and barter in place of PC
-* Increased pathfinding nodes 5x for more accurate pathfinding, and use accurate path length for walk vs run
+* Increased pathfinding nodes 5x for more accurate pathfinding
 * Ctrl-click to quickly move items when bartering, looting, or stealing
-* _a_ to select "all" when selecting item quantity, and for `Take All` when looting
-* When bartering, caps default to the right amount to balance the trade
+* _a_ to select "all" when selecting item quantity
+* _a_ to `Take All` when looting
+* When bartering, caps default to the right amount to balance the trade (if possible)
 * Music continues playing between maps
 * Auto open doors
-* Integrated "HELP" menu
 * 44.1 kHz stereo sound/music supported, in .ogg and .wav format as well as legacy .acm
 * Last used save slot is remembered
 * Item/Corpse/Container/Critter highlighting (configure using [mods/sfall-mods.ini](https://github.com/sfall-team/sfall/blob/master/artifacts/config_files/sfall-mods.ini))

SFALL_COMPATIBILITY.md

@@ -53,7 +53,7 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | Perks and traits | set_perk_image<br>set_perk_*<br>set_pyromaniac_mod<br>apply_heaveho_fix<br>set_swiftlearner_mod<br>has/set_fake_perk<br>has/set_fake_trait<br>set_selectable_perk<br>set_perkbox_title<br>show/hide_real_perks<br>perk_add_mode<br>clear_selectable_perks<br>add/remove_trait<br>seq_perk_freq | not implemented | - |
 | Virtual file system | fs_create<br>fs_copy<br>fs_find<br>fs_read/write_*<br>fs_delete<br>fs_size<br>fs_pos<br>fs_seek<br>fs_resize | 🚫 | Open an issue if you have a use case for these |
 | Combat / Knockback | set_weapon_knockback<br>set_target_knockback<br>set_attacker_knockback<br>remove_weapon_knockback<br>remove_target_knockback<br>remove_attacker_knockback | not implemented | - |
-| Maps and encounters | in_world_map<br>force_encounter{_with_flags}<br>set_map_time_multi<br>get/set_map_enter_position<br>exec_map_update_scripts<br>get/set_terrain_name<br>set_town_title<br>get/set_can_rest_on_map<br>set_rest_heal_time<br>set_rest_mode<br>set_worldmap_heal_time | implemented: in_world_map, force_encounter, force_encounter_with_flags, set_map_time_multi | - |
+| Maps and encounters | in_world_map<br>force_encounter<br>force_encounter_with_flags<br>set_map_time_multi<br>get/set_map_enter_position<br>exec_map_update_scripts<br>get/set_terrain_name<br>set_town_title<br>get/set_can_rest_on_map<br>set_rest_heal_time<br>set_rest_mode<br>set_worldmap_heal_time | implemented: in_world_map, force_encounter, force_encounter_with_flags, set_map_time_multi | - |
 | Maps and encounters / Worldmap | get_world_map_x/y_pos<br>set_world_map_pos | ✅ | - |
 | Audio | play_sfall_sound<br>stop_sfall_sound | ✅ | `play_sfall_sound` currently supports `.acm`, `.wav`, `.ogg` formats, and can load from `.dat` archives. `.mp3` is not yet supported. |
 | Combat / Weapons and ammo | get/set_weapon_ammo_pid<br>get/set_weapon_ammo_count | ✅ | - |
@@ -63,7 +63,7 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | Lists | list_begin<br>list_next<br>list_end<br>list_as_array<br>party_member_list | ✅ | - |
 | Explosions | set_attack_explosion_pattern<br>set_attack_explosion_art<br>set_attack_explosion_radius<br>set_attack_is_explosion_fire<br>set_explosion_radius<br>set_dynamite_damage<br>set_plastic_damage<br>get_explosion_damage<br>set_explosion_max_targets<br>item_make_explosive | ✅ except item_make_explosive | - |
 | Animations | reg_anim_combat_check<br>reg_anim_destroy<br>reg_anim_animate_and_hide<br>reg_anim_light<br>reg_anim_change_fid<br>reg_anim_take_out<br>reg_anim_turn_towards<br>reg_anim_callback<br>reg_anim_animate_and_move | ✅ except reg_anim_callback | - |
-| Art and appearance | art_exists<br>art_frame_data<br>refresh_pc_art<br>art_cache_clear | ✅ | - |
+| Art and appearance | art_exists<br>refresh_pc_art<br>art_cache_clear<br>set_hero_race<br>set_hero_style | implemented: art_exists, refresh_pc_art, art_cache_clear | - |
 | Tiles and paths | get_tile_fid<br>tile_under_cursor<br>tile_light<br>tile_get_objs<br>tile_refresh_display<br>obj_blocking_tile<br>tile_by_position<br>get_tile_ground_fid<br>get_tile_roof_fid<br>obj_blocking_line<br>path_find_to<br>objects_in_radius | ✅ | - |
 | Utility | sprintf<br>typeof<br>atoi<br>atof | ✅ | - |
 | Utility / Strings | string_split<br>substr<br>strlen<br>charcode<br>get_string_pointer<br>string_find<br>string_find_from<br>string_format<br>string_format_array<br>string_replace<br>string_to_case<br>string_compare | ✅ | `get_string_pointer` is deprecated and intentionally omitted. |
@@ -75,20 +75,18 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | Global scripts / Global script functions | set_global_script_repeat<br>set_global_script_type<br>available_global_script_types | ✅ except available_global_script_types | - |
 | Combat | attack_is_aimed<br>block_combat<br>force_aimed_shots<br>disable_aimed_shots<br>get_attack_type<br>get/set_bodypart_hit_modifier<br>combat_data<br>get/set/reset_critical_table<br>get_last_target<br>get_last_attacker<br>set_critter_burst_disable<br>get/set_critter_current_ap<br>set_spray_settings<br>get/set_combat_free_move | ✅ except block_combat, force_aimed_shots, disable_aimed_shots, get_last_target, get_last_attacker, set_spray_settings | - |
 | Car | set_car_current_town<br>car_gas_amount<br>set_car_intface_art | implemented: all except set_car_intface_art | - |
-| Interface / Windows and images | interface_art_draw<br>interface_print<br>draw_image{_scaled}<br>get_window_under_mouse<br>create_win<br>get_window_attribute<br>message_box<br>set_window_flag<br>win_fill_color<br>interface_overlay<br>dialog_message<br>get_text_width<br>hide_window<br>show_window<br>create_message_window | ✅ except interface_print, interface_overlay | - |
+| Interface / Windows and images | art_frame_data<br>interface_art_draw<br>interface_print<br>draw_image<br>draw_image_scaled<br>get_window_under_mouse<br>create_win<br>get_window_attribute<br>message_box<br>set_window_flag<br>win_fill_color<br>interface_overlay<br>dialog_message<br>get_text_width<br>hide_window<br>show_window<br>create_message_window | implemented: only message_box, get_text_width, show_window, create_message_window | - |
 | Interface / Outline | outlined_object<br>get_outline<br>set_outline | ✅ | - |
 | Interface / Main interface | intface_is_hidden<br>intface_redraw<br>intface_hide<br>intface_show<br>set_quest_failure_value | implemented: only intface_redraw | `intface_redraw` only supports the zero-argument form; the optional-argument path is explicitly unimplemented. |
-| Interface / Inventory | display_stats<br>inventory_redraw<br>critter_inven_obj2<br>get_current_inven_size<br>item_weight | ✅ except get_current_inven_size | - |
+| Interface / Inventory | display_stats<br>inventory_redraw<br>critter_inven_obj2<br>get_current_inven_size<br>item_weight | implemented: critter_inven_obj2, item_weight | - |
 | Interface / Cursor | get/set_cursor_mode | ✅ | - |
 | Locks | lock_is_jammed<br>unjam_lock<br>set_unjam_locks_time | not implemented | - |
-| INI settings | get_ini_setting<br>get_ini_string<br>get_ini_section<br>get_ini_sections<br>get_ini_config<br>get_ini_config_db<br>set_ini_setting | ✅ | `modified_ini` is intentionally omitted as deprecated. |
-| Objects and scripts | set_self<br>set_dude_obj<br>real_dude_obj<br>remove_script<br>get/set_script<br>obj_is_carrying_obj<br>loot_obj<br>dialog_obj<br>obj_under_cursor<br>get/set_object_data<br>get/set_flags<br>set_unique_id<br>set_scr_name<br>obj_is_openable<br>get/set_proto_data<br>get_object_ai_data | implemented: set_self, real_dude_obj, get/set/remove_script, obj_is_carrying_obj, loot_obj, dialog_obj, obj_under_cursor, get_object_data, get_flags, set_flags, set_unique_id, obj_is_openable, get_proto_data, set_proto_data | get_object_data assumes raw memory offsets which may return different values in CE |
+| INI settings | get_ini_setting<br>get_ini_string<br>get_ini_section<br>get_ini_sections<br>get_ini_config<br>get_ini_config_db<br>set_ini_setting | ✅ except get_ini_config, get_ini_config_db | `modified_ini` is intentionally omitted as deprecated. |
+| Objects and scripts | set_self<br>set_dude_obj<br>real_dude_obj<br>remove_script<br>get/set_script<br>obj_is_carrying_obj<br>loot_obj<br>dialog_obj<br>obj_under_cursor<br>get/set_object_data<br>get/set_flags<br>set_unique_id<br>set_scr_name<br>obj_is_openable<br>get/set_proto_data<br>get_object_ai_data | implemented: set_self, get/set/remove_script, obj_is_carrying_obj, loot_obj, dialog_obj, obj_under_cursor, get_object_data, get_flags, set_flags, set_unique_id, obj_is_openable, get_proto_data, set_proto_data | - |
 | Other / Game management | set_movie_path<br>stop/resume_game<br>mark_movie_played<br>game_loaded<br>get_game_mode<br>get_uptime<br>signal_close_game | implemented: game_loaded, get_game_mode, get_uptime, signal_close_game | - |
 | Gameplay tweaks | set_pickpocket_max<br>set_hit_chance_max<br>set_xp_mod<br>set_critter_hit_chance_mod<br>set_base_hit_chance_mod<br>set_hp_per_level_mod<br>gdialog_get_barter_mod<br>get/set_unspent_ap_bonus<br>get/set_unspent_ap_perk_bonus<br>set_base_pickpocket_mod<br>set_critter_pickpocket_mod<br>get/set_inven_ap_cost<br>set_drugs_data<br>get_kill_counter<br>mod_kill_counter<br>set_pipboy_available | implemented: gdialog_get_barter_mod, get/set_unspent_ap{_perk}_bonus, get/set_inven_ap_cost | - |
 | NPCs | inc_npc_level<br>get_npc_level<br>npc_engine_level_up | not implemented | - |
-| Hero Appearance | set_dm/df_model<br>hero_select_win<br>set_hero_race<br>set_hero_style | not implemented | - |
-| Events | add_g_timer_event<br>remove_timer_event<br>create_spatial<br>spatial_radius | not implemented | - |
-| Other | get_year<br>active_hand<br>toggle_active_hand<br>get/set_viewport_x/y<br>get_light_level<br>message_str_game<br>sneak_success<br>unwield_slot<br>add_extra_msg_file<br>get_metarule_table<br>metarule_exist<br> | ✅ except get/set_viewport_x/y, sneak_success  | `input_funcs_available`, `nb_create_char` are deprecated in sfall and intentionally absent in CE. `add_extra_msg_file` does not support the explicit `fileNumber` form in CE. |
+| Other | get_year<br>set_dm/df_model<br>active_hand<br>toggle_active_hand<br>get/set_viewport_x/y<br>hero_select_win<br>get_light_level<br>message_str_game<br>sneak_success<br>create_spatial<br>unwield_slot<br>add_g_timer_event<br>add_extra_msg_file<br>get_metarule_table<br>metarule_exist<br>remove_timer_event<br>spatial_radius | implemented: get_year, active_hand, toggle_active_hand, get_light_level, message_str_game, add_extra_msg_file, metarule_exist | `input_funcs_available`, `nb_create_char` are deprecated in sfall and intentionally absent in CE. `add_extra_msg_file` does not support the explicit `fileNumber` form in CE. |
 
 ## Hooks
 
@@ -106,8 +104,8 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | UseObj | `HOOK_USEOBJ` | ✅ | CE notes an sfall-matching inconsistency around return code `2` behavior between interface contexts. |
 | RemoveInvenObj | `HOOK_REMOVEINVENOBJ` | 🚫 | - |
 | BarterPrice | `HOOK_BARTERPRICE` | ✅ | - |
-| ItemDamage | `HOOK_ITEMDAMAGE` | ✅ | - |
-| MoveCost | `HOOK_MOVECOST` | ✅ | - |
+| MoveCost | `HOOK_MOVECOST` | 🚫 | - |
+| ItemDamage | `HOOK_ITEMDAMAGE` | 🚫 | - |
 | AmmoCost | `HOOK_AMMOCOST` | ✅ | Requires `check_weapon_ammo_cost=1` if you want pre-attack ammo validation to respect per-shot/per-round overrides. |
 | KeyPress | `HOOK_KEYPRESS` | ✅ | Third hook arg is currently `0`; CE doesn't use VK codes. |
 | MouseClick | `HOOK_MOUSECLICK` | ✅ | - |

files/ce.dat/text/english/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{HELP}

files/ce.dat/text/french/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{AIDE}

files/ce.dat/text/german/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{HILFE}

files/ce.dat/text/italian/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{AIUTO}

files/ce.dat/text/polish/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{POMOC}

files/ce.dat/text/portuguese/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{AJUDA}

files/ce.dat/text/russian/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{ПОМОЩЬ}

files/ce.dat/text/spanish/game/ce.msg

@@ -1 +0,0 @@
-{0}{}{AYUDA}

files/fallout2.cfg

@@ -130,8 +130,6 @@ inventory_columns=2
 ;Set to 1 to scale only the main menu background image to fit the screen while maintaining aspect ratio.
 ;Set to 2 to also scale the main menu button panel, red buttons, and button labels with the menu art.
 main_menu_scale_mode=1
-;Set to 1 to show a Help option in the in-game options menu which opens the F1 help screen.
-in_game_menu_help=1
 
 
 [qol]

sfall_testing/gl_test_ini.ssl

@@ -1,6 +1,5 @@
 #include "lib.arrays.h" // For arrays_equal, len_array, etc.
 #include "test_utils.h"   // For assertEquals, VALTYPE_STR, report_test_results
-#include "sfall.h"
 
 // To test: copy test.ini into the game folder before running
 procedure ini_test_suite begin
@@ -30,15 +29,6 @@ procedure ini_test_suite begin
     call assertEquals("TC2 get_ini_setting empty int", get_ini_setting("test.ini|ValidSection|EmptyValue"), 0);
     call assertEquals("TC2 get_ini_string empty string", get_ini_string("test.ini|ValidSection|EmptyValue"), "");
 
-    // Regression: sfall resolves leading-backslash paths relative to the game root.
-    result_array := get_ini_section("\\test.ini", "ValidSection");
-    call assertEquals("TC2B Size", len_array(result_array), 3);
-    call assertEquals("TC2B Key1", result_array["Key1"], "Value1");
-    call assertEquals("TC2B get_ini_setting int", get_ini_setting("\\test.ini|ValidSection|Key2"), 2);
-    call assertEquals("TC2B get_ini_string string", get_ini_string("\\test.ini|ValidSection|Key1"), "Value1");
-    result_array := get_ini_sections("\\test.ini");
-    call assertEquals("TC2B get_ini_sections size", len_array(result_array), 3);
-
     // INI file not found
     result_array := get_ini_section("nonexistent.ini", "AnySection");
     call assertEquals("TC3 Size", len_array(result_array), 0);
@@ -75,12 +65,6 @@ procedure ini_test_suite begin
     call assertEquals("TC7 get_ini_sections size", len_array(result_array), 3);
     call assertTrue("TC7 get_ini_sections", scan_array(result_array, "TestMisc") >= 0);
 
-    // get_ini_config
-    result_array := get_ini_config_db("config\\config_from_db.cfg");
-    call assertEquals("TC8 get_ini_config_db size", len_array(result_array), 2);
-    call assertTrue("TC8 get_ini_config ValidSection", result_array.ValidSection != 0);
-    call assertEquals("TC8 get_ini_config_db ValidValue", result_array.ValidSection.ValidKey, "ValidValue");
-
     call report_test_results("ini");
 end
 

sfall_testing/gl_test_unwield_slot.ssl

@@ -1,43 +0,0 @@
-#include "sfall.h"
-#include "dik.h"
-#include "define_lite.h"
-#include "define_extra.h"
-#include "test_utils.h"
-
-procedure run_unwield_slot_test(variable slot, variable slotName) begin
-    variable equippedItem := critter_inven_obj2(dude_obj, slot);
-
-    if (equippedItem == 0) then begin
-        display_msg("unwield_slot " + slotName + ": slot is empty");
-        return;
-    end
-
-    unwield_slot(dude_obj, slot);
-
-    call assertTrue("unwield_slot clears " + slotName + " slot", critter_inven_obj2(dude_obj, slot) == 0);
-    call report_test_results("unwield_slot");
-end
-
-procedure keypress_handler begin
-    variable pressed := get_sfall_arg_at(0);
-    variable key := get_sfall_arg_at(1);
-
-    if (not pressed) then return;
-
-    if (key == DIK_J) then begin
-        call run_unwield_slot_test(INVEN_TYPE_WORN, "armor");
-    end else if (key == DIK_K) then begin
-        call run_unwield_slot_test(INVEN_TYPE_RIGHT_HAND, "right");
-    end else if (key == DIK_L) then begin
-        call run_unwield_slot_test(INVEN_TYPE_LEFT_HAND, "left");
-    end
-end
-
-procedure start begin
-    if (not game_loaded) then return;
-
-    call assertEquals("unwield_slot metarule exists", metarule_exist("unwield_slot"), 1);
-    call assertEquals("critter_inven_obj2 metarule exists", metarule_exist("critter_inven_obj2"), 1);
-    display_msg("unwield_slot manual test ready: open inventory or barter, then press J armor, K right, L left");
-    register_hook_proc(HOOK_KEYPRESS, keypress_handler);
-end

sfall_testing/hooks/gl_itemdamage.ssl

@@ -1,98 +0,0 @@
-#include "sfall.h"
-#include "dik.h"
-#include "lib.arrays.h"
-#include "../test_utils.h"
-
-variable itemdamage_mode := 0;
-variable itemdamage_seen := 0;
-variable itemdamage_last_min := 0;
-variable itemdamage_last_max := 0;
-variable itemdamage_last_hit_mode := 0;
-variable itemdamage_last_is_melee_weapon := 0;
-variable itemdamage_last_weapon_pid := -1;
-variable itemdamage_last_weapon_name := "<none>";
-
-procedure itemdamage_mode_name begin
-    if (itemdamage_mode == 1) then return "fixed-42";
-    if (itemdamage_mode == 2) then return "range-30-30";
-    return "engine";
-end
-
-procedure itemdamage_weapon_name(variable weapon) begin
-    if (weapon == 0) then return "<unarmed>";
-    return obj_name(weapon);
-end
-
-procedure itemdamage_handler begin
-    variable
-        args := get_sfall_args,
-        weapon := args[2];
-
-    call assertEquals("itemdamage arg count", len_array(args), 6);
-    call assertTrue("itemdamage min <= max", args[0] <= args[1]);
-    call assertTrue("itemdamage melee flag", args[5] == 0 or args[5] == 1);
-
-    itemdamage_seen := itemdamage_seen + 1;
-    itemdamage_last_min := args[0];
-    itemdamage_last_max := args[1];
-    itemdamage_last_hit_mode := args[4];
-    itemdamage_last_is_melee_weapon := args[5];
-    itemdamage_last_weapon_name := itemdamage_weapon_name(weapon);
-
-    if (weapon == 0) then
-        itemdamage_last_weapon_pid := -1;
-    else
-        itemdamage_last_weapon_pid := obj_pid(weapon);
-
-    display_msg(string_format6("itemdamage mode=%s min=%d max=%d weapon=%s hit=%d melee=%d",
-        itemdamage_mode_name,
-        args[0],
-        args[1],
-        itemdamage_last_weapon_name,
-        itemdamage_last_hit_mode,
-        itemdamage_last_is_melee_weapon));
-
-    if (itemdamage_mode == 1) then begin
-        set_sfall_return(42);
-    end else if (itemdamage_mode == 2) then begin
-        set_sfall_return(30);
-        set_sfall_return(30);
-    end
-end
-
-procedure keypress_handler begin
-    variable
-        pressed := get_sfall_arg_at(0),
-        key := get_sfall_arg_at(1);
-
-    if (not pressed) then return;
-
-    if (key == DIK_J) then begin
-        itemdamage_mode := itemdamage_mode + 1;
-        if (itemdamage_mode > 2) then itemdamage_mode := 0;
-        display_msg(string_format1("itemdamage mode -> %s", itemdamage_mode_name));
-    end else if (key == DIK_K) then begin
-        display_msg(string_format7("itemdamage summary mode=%s seen=%d last=%d-%d weapon=%s pid=%d melee=%d",
-            itemdamage_mode_name,
-            itemdamage_seen,
-            itemdamage_last_min,
-            itemdamage_last_max,
-            itemdamage_last_weapon_name,
-            itemdamage_last_weapon_pid,
-            itemdamage_last_is_melee_weapon));
-        call assertTrue("itemdamage observed", itemdamage_seen > 0);
-        call report_test_results("itemdamage");
-    end
-end
-
-procedure start begin
-    if (not game_loaded) then return;
-
-    display_msg("itemdamage manual test ready:");
-    display_msg("press J to cycle engine/fixed-42/range-30-30");
-    display_msg("attack with fists, melee weapons, and ranged weapons");
-    display_msg("press K to report after HOOK_ITEMDAMAGE fires");
-
-    register_hook_proc(HOOK_KEYPRESS, keypress_handler);
-    register_hook_proc(HOOK_ITEMDAMAGE, itemdamage_handler);
-end

sfall_testing/hooks/gl_movecost.ssl

@@ -1,70 +0,0 @@
-#include "sfall.h"
-#include "dik.h"
-
-variable movecost_mode := 0;
-
-procedure movecost_mode_name(variable mode) begin
-    variable name := "unknown";
-
-    if (mode == 0) then name := "engine";
-    else if (mode == 1) then name := "plus_per_hex";
-    else if (mode == 2) then name := "double";
-
-    return name;
-end
-
-procedure cycle_movecost_mode begin
-    if (movecost_mode == 0) then movecost_mode := 1;
-    else if (movecost_mode == 1) then movecost_mode := 2;
-    else movecost_mode := 0;
-
-    display_msg(string_format1("movecost mode=%s", movecost_mode_name(movecost_mode)));
-end
-
-procedure movecost_handler begin
-    variable
-        args := get_sfall_args,
-        critter := args[0],
-        distance := args[1],
-        defaultCost := args[2],
-        modeName := movecost_mode_name(movecost_mode),
-        newCost := defaultCost;
-
-    if (critter != dude_obj) then return;
-
-    display_msg(string_format3("movecost dist=%d default=%d mode=%s",
-        distance,
-        defaultCost,
-        modeName));
-
-    if (movecost_mode == 1) then begin
-        newCost := defaultCost + distance;
-    end else if (movecost_mode == 2) then begin
-        newCost := defaultCost * 2;
-    end else begin
-        return;
-    end
-
-    set_sfall_return(newCost);
-end
-
-procedure keypress_handler begin
-    variable
-        pressed := get_sfall_arg_at(0),
-        key := get_sfall_arg_at(1);
-
-    if (not pressed) then return;
-    if (key != DIK_M) then return;
-
-    call cycle_movecost_mode;
-end
-
-procedure start begin
-    if (not game_loaded) then return;
-
-    display_msg("movecost manual test ready: enter combat, hover a tile, then move");
-    display_msg("press M to cycle hook override: engine -> plus_per_hex -> double");
-
-    register_hook_proc(HOOK_KEYPRESS, keypress_handler);
-    register_hook_proc(HOOK_MOVECOST, movecost_handler);
-end