mirror of
https://github.com/fallout2-ce/fallout2-ce.git
synced 2026-07-27 16:47:11 -07:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Mike Klaas
|
d2de6715dd | ||
|
Mike Klaas
|
df4b787e86 | ||
|
Mike Klaas
|
6b442546cc | ||
|
Mike Klaas
|
2c08cc0b3a | ||
|
Mike Klaas
|
09a1971cd8 |
+6
-59
@@ -47,6 +47,8 @@ set(FALLOUT_ENGINE_SOURCES
|
||||
"src/animation.h"
|
||||
"src/art.cc"
|
||||
"src/art.h"
|
||||
"src/audio_file.cc"
|
||||
"src/audio_file.h"
|
||||
"src/audio.cc"
|
||||
"src/audio.h"
|
||||
"src/automap.cc"
|
||||
@@ -159,8 +161,6 @@ set(FALLOUT_ENGINE_SOURCES
|
||||
"src/map_defs.h"
|
||||
"src/map.cc"
|
||||
"src/map.h"
|
||||
"src/map_edge.cc"
|
||||
"src/map_edge.h"
|
||||
"src/memory_defs.h"
|
||||
"src/memory_manager.cc"
|
||||
"src/memory_manager.h"
|
||||
@@ -205,6 +205,8 @@ set(FALLOUT_ENGINE_SOURCES
|
||||
"src/proto_types.h"
|
||||
"src/proto.cc"
|
||||
"src/proto.h"
|
||||
"src/prototype_options.cc"
|
||||
"src/prototype_options.h"
|
||||
"src/queue.cc"
|
||||
"src/queue.h"
|
||||
"src/random.cc"
|
||||
@@ -372,33 +374,14 @@ if(WIN32)
|
||||
)
|
||||
endif()
|
||||
|
||||
if(MINGW)
|
||||
target_compile_definitions(${EXECUTABLE_NAME} PUBLIC
|
||||
_USE_MATH_DEFINES
|
||||
)
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
target_link_libraries(${EXECUTABLE_NAME}
|
||||
winmm
|
||||
)
|
||||
endif()
|
||||
|
||||
if(MSVC)
|
||||
target_link_libraries(${EXECUTABLE_NAME}
|
||||
debug libcpmtd
|
||||
optimized libcpmt
|
||||
)
|
||||
endif()
|
||||
|
||||
if(MINGW)
|
||||
target_link_options(${EXECUTABLE_NAME} PRIVATE
|
||||
-static
|
||||
-static-libgcc
|
||||
-static-libstdc++
|
||||
)
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
target_sources(${EXECUTABLE_NAME} PUBLIC
|
||||
"os/windows/fallout2-ce.ico"
|
||||
@@ -515,7 +498,6 @@ target_link_libraries(${EXECUTABLE_NAME} ${ZLIB_LIBRARIES})
|
||||
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${ZLIB_INCLUDE_DIRS})
|
||||
|
||||
target_link_libraries(${EXECUTABLE_NAME} ${SDL2_LIBRARIES})
|
||||
target_link_libraries(${EXECUTABLE_NAME} ${SDL2_MAIN_LIBRARIES})
|
||||
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})
|
||||
|
||||
if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
|
||||
@@ -542,13 +524,6 @@ if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
|
||||
if(WIN32)
|
||||
target_link_libraries(ce-dat-tool winmm)
|
||||
endif()
|
||||
if(MINGW)
|
||||
target_link_options(ce-dat-tool PRIVATE
|
||||
-static
|
||||
-static-libgcc
|
||||
-static-libstdc++
|
||||
)
|
||||
endif()
|
||||
target_include_directories(ce-dat-tool PRIVATE "src")
|
||||
target_include_directories(ce-dat-tool PRIVATE ${ZLIB_INCLUDE_DIRS})
|
||||
target_include_directories(ce-dat-tool PRIVATE ${SDL2_INCLUDE_DIRS})
|
||||
@@ -572,14 +547,6 @@ if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
|
||||
target_include_directories(ce-frm2png PRIVATE ${ZLIB_INCLUDE_DIRS})
|
||||
target_link_libraries(ce-frm2png ${SDL2_LIBRARIES})
|
||||
target_link_libraries(ce-frm2png ${ZLIB_LIBRARIES})
|
||||
|
||||
if(MINGW)
|
||||
target_link_options(ce-frm2png PRIVATE
|
||||
-static
|
||||
-static-libgcc
|
||||
-static-libstdc++
|
||||
)
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
file(GLOB_RECURSE CE_DAT_INPUTS CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/files/ce.dat/*")
|
||||
@@ -640,30 +607,11 @@ if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
|
||||
WIN32_LEAN_AND_MEAN
|
||||
_STATIC_CPPLIB
|
||||
)
|
||||
|
||||
if(MINGW)
|
||||
target_compile_definitions(mapper-ce PUBLIC
|
||||
_USE_MATH_DEFINES
|
||||
)
|
||||
|
||||
target_link_options(mapper-ce PRIVATE
|
||||
-static
|
||||
-static-libgcc
|
||||
-static-libstdc++
|
||||
)
|
||||
endif()
|
||||
|
||||
target_link_libraries(mapper-ce
|
||||
winmm
|
||||
debug libcpmtd
|
||||
optimized libcpmt
|
||||
)
|
||||
|
||||
if(MSVC)
|
||||
target_link_libraries(mapper-ce
|
||||
debug libcpmtd
|
||||
optimized libcpmt
|
||||
)
|
||||
endif()
|
||||
|
||||
target_sources(mapper-ce PUBLIC
|
||||
"os/windows/fallout2-ce.rc"
|
||||
)
|
||||
@@ -687,7 +635,6 @@ if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
|
||||
fpattern_windows::fpattern_windows
|
||||
${ZLIB_LIBRARIES}
|
||||
${SDL2_LIBRARIES}
|
||||
${SDL2_MAIN_LIBRARIES}
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -139,77 +139,6 @@
|
||||
"cacheVariables": {
|
||||
"CMAKE_SYSTEM_NAME": "iOS"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Mingw-base",
|
||||
"hidden": true,
|
||||
"description": "Base preset for all MinGW builds.",
|
||||
"inherits":[
|
||||
"base"
|
||||
],
|
||||
"generator": "Ninja",
|
||||
"toolchainFile": "${sourceDir}/cmake/toolchain/mingw.cmake",
|
||||
"cacheVariables": {
|
||||
"CMAKE_SYSTEM_NAME": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Mingw-x86-base",
|
||||
"hidden": true,
|
||||
"description": "Base preset for all MinGW x86 builds.",
|
||||
"inherits": [
|
||||
"Mingw-base"
|
||||
],
|
||||
"cacheVariables": {
|
||||
"CMAKE_C_FLAGS": "-m32",
|
||||
"CMAKE_CXX_FLAGS": "-m32",
|
||||
"CMAKE_SYSTEM_PROCESSOR": "i686"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Mingw-x86-debug",
|
||||
"displayName": "MinGW x86 Debug",
|
||||
"description": "Cross-compile a Debug Windows x86 build with MinGW-w64 and Ninja.",
|
||||
"inherits": [
|
||||
"Mingw-x86-base"
|
||||
],
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Mingw-x86-release",
|
||||
"displayName": "MinGW x86 Release",
|
||||
"description": "Cross-compile a RelWithDebInfo Windows x86 build with MinGW-w64 and Ninja.",
|
||||
"inherits": [
|
||||
"Mingw-x86-debug"
|
||||
],
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Mingw-x64-debug",
|
||||
"displayName": "MinGW x64 Debug",
|
||||
"description": "Cross-compile a Debug Windows x64 build with MinGW-w64 and Ninja.",
|
||||
"inherits": [
|
||||
"Mingw-base"
|
||||
],
|
||||
"cacheVariables": {
|
||||
"CMAKE_SYSTEM_PROCESSOR": "x86_64",
|
||||
"CMAKE_BUILD_TYPE": "Debug"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Mingw-x64-release",
|
||||
"displayName": "MinGW x64 Release",
|
||||
"description": "Cross-compile a RelWithDebInfo Windows x64 build with MinGW-w64 and Ninja.",
|
||||
"inherits": [
|
||||
"Mingw-x64-debug"
|
||||
],
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
||||
}
|
||||
}
|
||||
],
|
||||
"buildPresets": [
|
||||
@@ -268,26 +197,6 @@
|
||||
"name": "ios-release",
|
||||
"configurePreset": "ios",
|
||||
"configuration": "RelWithDebInfo"
|
||||
},
|
||||
{
|
||||
"name": "Mingw-x86-Debug",
|
||||
"displayName": "MinGW x86 Debug",
|
||||
"configurePreset": "Mingw-x86-debug"
|
||||
},
|
||||
{
|
||||
"name": "Mingw-x86-Release",
|
||||
"displayName": "MinGW x86 Release",
|
||||
"configurePreset": "Mingw-x86-release"
|
||||
},
|
||||
{
|
||||
"name": "Mingw-x64-Debug",
|
||||
"displayName": "MinGW x64 Debug",
|
||||
"configurePreset": "Mingw-x64-debug"
|
||||
},
|
||||
{
|
||||
"name": "Mingw-x64-Release",
|
||||
"displayName": "MinGW x64 Release",
|
||||
"configurePreset": "Mingw-x64-release"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -143,7 +143,6 @@ In time this stuff will receive in-game interface, right now you have to do it m
|
||||
* Expanded 2-column inventory
|
||||
* 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
|
||||
* Ctrl-click to quickly move items when bartering, looting, or stealing
|
||||
* _a_ to select "all" when selecting item quantity
|
||||
@@ -151,8 +150,6 @@ In time this stuff will receive in-game interface, right now you have to do it m
|
||||
* When bartering, caps default to the right amount to balance the trade (if possible)
|
||||
* Music continues playing between maps
|
||||
* Auto open doors
|
||||
* 44.1 kHz stereo sound/music supported, in .ogg and .wav format as well as legacy .acm
|
||||
* Last used save slot is remembered
|
||||
|
||||
## Contributing
|
||||
|
||||
|
||||
+5
-17
@@ -4,18 +4,6 @@ This document tracks Fallout 2 CE compatibility with sfall. This is for modders
|
||||
|
||||
For now, this covers opcodes/metarules, and hooks. In the future, it will include other ways of modifying the engine (like ini files), and other Sfall-specific behaviour.
|
||||
|
||||
## HRP EDG Scroll-Blocker Support
|
||||
|
||||
CE supports the `.edg` file format from the HRP (High Resolution Patch), which defines per-map scroll boundaries and square-level render clipping.
|
||||
|
||||
**How it works in CE:**
|
||||
|
||||
- On map load, `maps/<mapname>.edg` is read if present. Missing file = silent fallback to the scroll-blocker object system.
|
||||
- The `.edg` file defines per-elevation rectangle boundary zones. Multiple chained zones per elevation are supported.
|
||||
- When loaded, these zones are used for both scroll blocking and visible area clipping (black bars), replacing both vanilla scroll blocking and CE hi-res stencil system.
|
||||
- v2 EDG files also contain a `SquareRect` that defines "Angled edges", or square-grid stencil. This is also supported.
|
||||
|
||||
|
||||
## Settings (ddraw.ini → fallout2.cfg / game.cfg)
|
||||
|
||||
Settings previously read from `ddraw.ini` have been moved into standard CE config files.
|
||||
@@ -67,7 +55,7 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
|
||||
| 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. |
|
||||
| Interface / Tags | show_iface_tag<br>hide_iface_tag<br>is_iface_tag_active<br>set_iface_tag_text<br>add_iface_tag | âś… | Legacy `BoxBarCount`, `BoxBarColors` ddraw.ini settings not supported. |
|
||||
| Interface / Tags | show_iface_tag<br>hide_iface_tag<br>is_iface_tag_active<br>set_iface_tag_text<br>add_iface_tag | âś… except set_iface_tag_text, add_iface_tag | CE only handles built-in interface tags here; custom tag creation/text is not supported yet. |
|
||||
| Global variables | set_sfall_global<br>get_sfall_global_int<br>get_sfall_global_float | âś… except get_sfall_global_float | Current CE storage is int-backed; `set_sfall_global` stores integer values |
|
||||
| Hooks / Hook functions | init_hook<br>get_sfall_arg<br>get_sfall_args<br>get_sfall_arg_at<br>set_sfall_return<br>set_sfall_arg<br>register_hook<br>register_hook_proc<br>register_hook_proc_spec | âś… | See below for implemented hooks. `init_hook` is deprecated and will not be implemented. register_hook_proc and register_hook_proc_spec both add hooks to the *end* of the hook list, instead of beginning and end, respectively. |
|
||||
| Arrays / Array functions | create_array<br>temp_array<br>fix_array<br>get/set_array<br>resize_array<br>free_array<br>scan_array<br>len_array<br>save/load_array<br>array_key<br>arrayexpr | âś… | - |
|
||||
@@ -82,7 +70,7 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
|
||||
| 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 | âś… 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 | - |
|
||||
| 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, 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 | - |
|
||||
@@ -109,7 +97,7 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
|
||||
| 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` | âś… | - |
|
||||
| UseSkill | `HOOK_USESKILL` | âś… | - |
|
||||
| UseSkill | `HOOK_USESKILL` | đźš« | - |
|
||||
| Steal | `HOOK_STEAL` | âś… | - |
|
||||
| WithinPerception | `HOOK_WITHINPERCEPTION` | âś… | - |
|
||||
| InventoryMove | `HOOK_INVENTORYMOVE` | âś… | - |
|
||||
@@ -125,13 +113,13 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
|
||||
| UseAnimObj | `HOOK_USEANIMOBJ` | đźš« | Et tu; (maybe) |
|
||||
| ExplosiveTimer | `HOOK_EXPLOSIVETIMER` | âś… | - |
|
||||
| DescriptionObj | `HOOK_DESCRIPTIONOBJ` | đźš« | Et tu |
|
||||
| UseSkillOn | `HOOK_USESKILLON` | âś… | - |
|
||||
| UseSkillOn | `HOOK_USESKILLON` | đźš« | Et tu |
|
||||
| OnExplosion | `HOOK_ONEXPLOSION` | đźš« | (maybe) |
|
||||
| SubCombatDamage | `HOOK_SUBCOMBATDAMAGE` | đźš« | (maybe) |
|
||||
| SetLighting | `HOOK_SETLIGHTING` | đźš« | Et tu; (maybe) |
|
||||
| Sneak | `HOOK_SNEAK` | đźš« | - |
|
||||
| TargetObject | `HOOK_TARGETOBJECT` | đźš« | (maybe) |
|
||||
| Encounter | `HOOK_ENCOUNTER` | âś… | - |
|
||||
| Encounter | `HOOK_ENCOUNTER` | đźš« | Et tu |
|
||||
| AdjustPoison | `HOOK_ADJUSTPOISON` | đźš« | (maybe) |
|
||||
| AdjustRads | `HOOK_ADJUSTRADS` | đźš« | (maybe) |
|
||||
| RollCheck | `HOOK_ROLLCHECK` | đźš« | - |
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
# specify the cross compiler
|
||||
set(CMAKE_C_COMPILER ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc)
|
||||
set(CMAKE_CXX_COMPILER ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-g++)
|
||||
set(CMAKE_RC_COMPILER ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-windres)
|
||||
|
||||
# where is the target environment
|
||||
set(CMAKE_FIND_ROOT_PATH /usr/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32)
|
||||
|
||||
# search for programs in the build host directories
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
# for libraries and headers in the target directories
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
|
||||
|
||||
# CMake determines how to examine dependencies based on the *host* system, leading to
|
||||
# a `file unknown error` unless the target platform is explicitly specified.
|
||||
set(CMAKE_GET_RUNTIME_DEPENDENCIES_PLATFORM "windows+pe")
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 63 KiB |
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 70 KiB |
@@ -110,8 +110,6 @@ iface_bar_mode=0
|
||||
iface_bar_side_art=2
|
||||
iface_bar_sides_ori=0
|
||||
iface_bar_width=800
|
||||
;Whether to load EDG files (HRP format) when loading maps. If loaded, they override default edge clipping and scroll blocking behavior.
|
||||
edg_support=1
|
||||
ignore_map_edges=0
|
||||
;Set to 1 to display numbered dialogue options
|
||||
numbers_in_dialogue=0
|
||||
@@ -128,7 +126,5 @@ inventory_columns=2
|
||||
auto_open_doors=0
|
||||
; Overrides distance at which walk animation is used when using an object.
|
||||
use_walk_distance=5
|
||||
; Allow opening party member inventory from the long-press world menu.
|
||||
party_trade_from_menu=1
|
||||
; Allow switching to companions' inventories in loot screens (and barter, in the future)
|
||||
party_loot_and_barter=1
|
||||
|
||||
@@ -1,63 +1,5 @@
|
||||
#include "test_utils.h"
|
||||
#include "sfall.h"
|
||||
#include "dik.h"
|
||||
|
||||
variable manual_extra_tag := 0;
|
||||
variable manual_tag5_color := 2;
|
||||
|
||||
procedure print_custom_tag_state(variable tag, variable label) begin
|
||||
display_msg(label + ": " + is_iface_tag_active(tag));
|
||||
end
|
||||
|
||||
procedure toggle_custom_tag(variable tag, variable label) begin
|
||||
if (is_iface_tag_active(tag)) then begin
|
||||
hide_iface_tag(tag);
|
||||
display_msg(label + " hidden");
|
||||
end else begin
|
||||
show_iface_tag(tag);
|
||||
display_msg(label + " shown");
|
||||
end
|
||||
|
||||
call print_custom_tag_state(tag, label);
|
||||
end
|
||||
|
||||
procedure apply_tag5_color begin
|
||||
set_iface_tag_text(5, "TAG FIVE", manual_tag5_color);
|
||||
display_msg(string_format1("custom tag 5 color -> %d", manual_tag5_color));
|
||||
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_B) then begin
|
||||
call toggle_custom_tag(5, "custom tag 5");
|
||||
end else if (key == DIK_C) then begin
|
||||
manual_tag5_color := manual_tag5_color + 1;
|
||||
if (manual_tag5_color > 7) then begin
|
||||
manual_tag5_color := 0;
|
||||
end
|
||||
|
||||
call apply_tag5_color;
|
||||
end else if (key == DIK_N) then begin
|
||||
call toggle_custom_tag(6, "custom tag 6");
|
||||
end else if (key == DIK_M) then begin
|
||||
if (manual_extra_tag == 0) then begin
|
||||
display_msg("manual extra tag is not initialized");
|
||||
return;
|
||||
end
|
||||
|
||||
call toggle_custom_tag(manual_extra_tag, "manual extra tag");
|
||||
end else if (key == DIK_V) then begin
|
||||
call print_custom_tag_state(5, "custom tag 5");
|
||||
call print_custom_tag_state(6, "custom tag 6");
|
||||
if (manual_extra_tag != 0) then begin
|
||||
call print_custom_tag_state(manual_extra_tag, "manual extra tag");
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
procedure start begin
|
||||
display_msg("Testing iface_tag functions...");
|
||||
@@ -87,47 +29,5 @@ procedure start begin
|
||||
// RADIATED
|
||||
call assertFalse("hide_iface_tag(RADIATED)", is_iface_tag_active(2));
|
||||
|
||||
// Default custom box from BoxBarCount.
|
||||
call apply_tag5_color;
|
||||
call assertFalse("custom tag 5 starts inactive", is_iface_tag_active(5));
|
||||
show_iface_tag(5);
|
||||
call assertTrue("show_iface_tag(custom 5)", is_iface_tag_active(5));
|
||||
show_iface_tag(5);
|
||||
call assertTrue("show_iface_tag(custom 5 again)", is_iface_tag_active(5));
|
||||
hide_iface_tag(5);
|
||||
call assertFalse("hide_iface_tag(custom 5)", is_iface_tag_active(5));
|
||||
hide_iface_tag(5);
|
||||
call assertFalse("hide_iface_tag(custom 5 again)", is_iface_tag_active(5));
|
||||
|
||||
set_iface_tag_text(6, "TAG SIX", 6);
|
||||
call assertFalse("custom tag 6 starts inactive", is_iface_tag_active(6));
|
||||
show_iface_tag(6);
|
||||
call assertTrue("show_iface_tag(custom 6)", is_iface_tag_active(6));
|
||||
show_iface_tag(5);
|
||||
call assertTrue("custom tag 5 still active", is_iface_tag_active(5));
|
||||
call assertTrue("custom tag 6 still active", is_iface_tag_active(6));
|
||||
hide_iface_tag(5);
|
||||
call assertFalse("hide_iface_tag(custom 5 with 6 active)", is_iface_tag_active(5));
|
||||
call assertTrue("custom tag 6 remains active", is_iface_tag_active(6));
|
||||
hide_iface_tag(6);
|
||||
call assertFalse("hide_iface_tag(custom 6)", is_iface_tag_active(6));
|
||||
|
||||
// Dynamically added custom box.
|
||||
variable extra_tag := add_iface_tag;
|
||||
call assertTrue("add_iface_tag lower bound", extra_tag >= 10);
|
||||
call assertTrue("add_iface_tag upper bound", extra_tag <= 126);
|
||||
manual_extra_tag := extra_tag;
|
||||
set_iface_tag_text(extra_tag, "EXTRA TAG", 3);
|
||||
call assertFalse("added custom tag starts inactive", is_iface_tag_active(extra_tag));
|
||||
show_iface_tag(extra_tag);
|
||||
call assertTrue("show_iface_tag(added custom)", is_iface_tag_active(extra_tag));
|
||||
hide_iface_tag(extra_tag);
|
||||
call assertFalse("hide_iface_tag(added custom)", is_iface_tag_active(extra_tag));
|
||||
|
||||
variable next_tag := add_iface_tag;
|
||||
call assertEquals("add_iface_tag increments", next_tag, extra_tag + 1);
|
||||
|
||||
call report_test_results("iface_tag");
|
||||
display_msg("iface_tag manual test ready: B toggle tag 5, C cycle tag 5 color, N toggle tag 6, M toggle extra tag, V print states");
|
||||
register_hook_proc(HOOK_KEYPRESS, keypress_handler);
|
||||
end
|
||||
|
||||
@@ -1,136 +0,0 @@
|
||||
#include "define_lite.h"
|
||||
#include "sfall.h"
|
||||
#include "dik.h"
|
||||
#include "define_extra.h"
|
||||
#include "lib.inven.h"
|
||||
#include "test_utils.h"
|
||||
|
||||
#define TEST_ITEM_PID 40
|
||||
#define PARTY_UNIQUE_ID_LOWER_BOUND 18000
|
||||
#define UNIQUE_ID_LOWER_BOUND 0x10000000
|
||||
|
||||
procedure find_random_inventory_item_for_unique_id begin
|
||||
variable items;
|
||||
variable length;
|
||||
variable start;
|
||||
variable scan;
|
||||
variable index;
|
||||
variable item;
|
||||
variable item_id;
|
||||
|
||||
items := inven_as_array(dude_obj);
|
||||
length := len_array(items);
|
||||
if (length <= 0) then return 0;
|
||||
|
||||
start := random(0, length - 1);
|
||||
scan := 0;
|
||||
while (scan < length) do begin
|
||||
index := start + scan;
|
||||
if (index >= length) then index -= length;
|
||||
|
||||
item := items[index];
|
||||
item_id := get_object_data(item, OBJ_DATA_ID);
|
||||
if (item_id < PARTY_UNIQUE_ID_LOWER_BOUND) then begin
|
||||
return item;
|
||||
end
|
||||
|
||||
scan += 1;
|
||||
end
|
||||
|
||||
return items[start];
|
||||
end
|
||||
|
||||
procedure assign_unique_id_to_random_inventory_item begin
|
||||
variable item;
|
||||
variable old_id;
|
||||
variable new_id;
|
||||
|
||||
item := find_random_inventory_item_for_unique_id;
|
||||
if (item == 0) then begin
|
||||
display_msg("unique_id manual test: inventory is empty");
|
||||
return;
|
||||
end
|
||||
|
||||
old_id := get_object_data(item, OBJ_DATA_ID);
|
||||
new_id := set_unique_id(item);
|
||||
|
||||
if (new_id == old_id) then begin
|
||||
display_msg(string_format3("unique_id manual U: %s pid=%d id unchanged=%d", obj_name(item), obj_pid(item), new_id));
|
||||
end else begin
|
||||
display_msg(string_format4("unique_id manual U: %s pid=%d %d->%d", obj_name(item), obj_pid(item), old_id, new_id));
|
||||
end
|
||||
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_U) then begin
|
||||
call assign_unique_id_to_random_inventory_item();
|
||||
end
|
||||
end
|
||||
|
||||
procedure start begin
|
||||
variable item_a;
|
||||
variable item_b;
|
||||
variable item_c;
|
||||
variable baseline_total;
|
||||
variable unique_id_a;
|
||||
variable unique_id_a_again;
|
||||
variable unique_id_c;
|
||||
variable engine_id_a;
|
||||
variable regular_count;
|
||||
variable total;
|
||||
|
||||
if (not game_loaded) then return;
|
||||
|
||||
display_msg("Testing set_unique_id...");
|
||||
|
||||
call assertEquals("metarule exists", metarule_exist("set_unique_id"), 1);
|
||||
|
||||
baseline_total := obj_is_carrying_obj_pid(dude_obj, TEST_ITEM_PID);
|
||||
item_a := create_object_sid(TEST_ITEM_PID, 0, 0, -1);
|
||||
item_b := create_object_sid(TEST_ITEM_PID, 0, 0, -1);
|
||||
item_c := create_object_sid(TEST_ITEM_PID, 0, 0, -1);
|
||||
|
||||
unique_id_a := set_unique_id(item_a);
|
||||
call assertTrue("unique id lower bound", unique_id_a >= UNIQUE_ID_LOWER_BOUND);
|
||||
call assertEquals("unique id stored on object", get_object_data(item_a, OBJ_DATA_ID), unique_id_a);
|
||||
|
||||
unique_id_a_again := set_unique_id(item_a);
|
||||
call assertEquals("existing unique id reused", unique_id_a_again, unique_id_a);
|
||||
|
||||
add_obj_to_inven(dude_obj, item_a);
|
||||
add_obj_to_inven(dude_obj, item_b);
|
||||
call assertEquals("unique item stays separate", obj_is_carrying_obj(dude_obj, item_a), 1);
|
||||
regular_count := obj_is_carrying_obj(dude_obj, item_b);
|
||||
call assertTrue("regular item still exists after unique item add", regular_count >= 1);
|
||||
total := obj_is_carrying_obj_pid(dude_obj, TEST_ITEM_PID);
|
||||
call assertEquals("unique and regular items add two total items", total, baseline_total + 2);
|
||||
|
||||
unique_id_c := set_unique_id(item_c);
|
||||
call assertNotEquals("second unique item gets new id", unique_id_c, unique_id_a);
|
||||
add_obj_to_inven(dude_obj, item_c);
|
||||
call assertEquals("second unique item stays separate", obj_is_carrying_obj(dude_obj, item_c), 1);
|
||||
|
||||
total := obj_is_carrying_obj_pid(dude_obj, TEST_ITEM_PID);
|
||||
call assertEquals("pid total counts all three added items", total, baseline_total + 3);
|
||||
|
||||
engine_id_a := unset_unique_id(item_a);
|
||||
call assertTrue("unset returns engine id", engine_id_a < UNIQUE_ID_LOWER_BOUND);
|
||||
call assertNotEquals("unset replaces unique id", engine_id_a, unique_id_a);
|
||||
call assertEquals("engine id stored on object", get_object_data(item_a, OBJ_DATA_ID), engine_id_a);
|
||||
|
||||
call assertEquals("remove unique item a", rm_mult_objs_from_inven(dude_obj, item_a, 1), 1);
|
||||
call assertEquals("remove regular item b", rm_mult_objs_from_inven(dude_obj, item_b, 1), 1);
|
||||
call assertEquals("remove unique item c", rm_mult_objs_from_inven(dude_obj, item_c, 1), 1);
|
||||
destroy_object(item_a);
|
||||
destroy_object(item_b);
|
||||
destroy_object(item_c);
|
||||
|
||||
call report_test_results("unique_id");
|
||||
display_msg("unique_id manual test ready: press U to assign/print a unique id for a random inventory item");
|
||||
register_hook_proc(HOOK_KEYPRESS, keypress_handler);
|
||||
end
|
||||
@@ -1,93 +0,0 @@
|
||||
#include "sfall.h"
|
||||
#include "dik.h"
|
||||
#include "../test_utils.h"
|
||||
|
||||
#define AREA_ARROYO (0)
|
||||
#define AREA_RND_CITY (28)
|
||||
#define MAP_RND_CITY1 (68)
|
||||
|
||||
variable mode := 0;
|
||||
variable pending_event := -1;
|
||||
variable expected_map := -1;
|
||||
variable arroyo_known_before := 0;
|
||||
variable car_town_before := 0;
|
||||
|
||||
procedure mode_name(variable value) begin
|
||||
if (value == 0) then return "observe";
|
||||
if (value == 1) then return "reroute_worldmap_enter";
|
||||
if (value == 2) then return "cancel_encounters";
|
||||
return "unknown";
|
||||
end
|
||||
|
||||
procedure log_mode begin
|
||||
display_msg(string_format2("encounter mode=%d (%s)", mode, mode_name(mode)));
|
||||
end
|
||||
|
||||
procedure begin_pending_assertions(variable event_type) begin
|
||||
pending_event := event_type;
|
||||
expected_map := MAP_RND_CITY1;
|
||||
arroyo_known_before := town_known(AREA_ARROYO);
|
||||
car_town_before := car_current_town;
|
||||
end
|
||||
|
||||
procedure encounter_handler begin
|
||||
variable
|
||||
event_type := get_sfall_arg_at(0),
|
||||
map_id := get_sfall_arg_at(1),
|
||||
is_special := get_sfall_arg_at(2),
|
||||
table_num := get_sfall_arg_at(3),
|
||||
entry_num := get_sfall_arg_at(4);
|
||||
|
||||
display_msg(string_format5("encounter event=%d map=%d special=%d table=%d entry=%d", event_type, map_id, is_special, table_num, entry_num));
|
||||
|
||||
if (mode == 1 and event_type == 1) then begin
|
||||
call begin_pending_assertions(event_type);
|
||||
display_msg(string_format1("encounter rerouting worldmap entry to map %d", expected_map));
|
||||
set_sfall_return(expected_map);
|
||||
end else if (mode == 2 and event_type == 0) then begin
|
||||
display_msg("canceling encounter");
|
||||
set_sfall_return(-1);
|
||||
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_X) then return;
|
||||
|
||||
mode := mode + 1;
|
||||
if (mode > 2) then mode := 0;
|
||||
call log_mode;
|
||||
end
|
||||
|
||||
procedure start begin
|
||||
if (not game_loaded) then return;
|
||||
|
||||
display_msg("encounter manual test ready:");
|
||||
display_msg("press X to cycle mode: observe, reroute worldmap enter, cancel encounters");
|
||||
display_msg("mode 1: enter any location from the world map");
|
||||
display_msg("mode 2: cancel encounters");
|
||||
call log_mode;
|
||||
|
||||
register_hook_proc(HOOK_KEYPRESS, keypress_handler);
|
||||
register_hook_proc(HOOK_ENCOUNTER, encounter_handler);
|
||||
end
|
||||
|
||||
procedure map_enter_p_proc begin
|
||||
if (expected_map == -1) then return;
|
||||
|
||||
call assertEquals("encounter reroute loaded expected map", cur_map_index, expected_map);
|
||||
call assertEquals("encounter reroute load area matches rerouted map", map_get_load_area, AREA_RND_CITY);
|
||||
call assertEquals("encounter reroute does not mutate Arroyo known state", town_known(AREA_ARROYO), arroyo_known_before);
|
||||
|
||||
call assertEquals("encounter reroute preserves car town", car_current_town, car_town_before);
|
||||
|
||||
if (pending_event == 1) then
|
||||
call report_test_results("hook_encounter_worldmap_enter");
|
||||
|
||||
pending_event := -1;
|
||||
expected_map := -1;
|
||||
end
|
||||
@@ -1,153 +0,0 @@
|
||||
#include "sfall.h"
|
||||
#include "dik.h"
|
||||
#include "define_lite.h"
|
||||
#include "../test_utils.h"
|
||||
|
||||
variable seen_adjustfid := 0;
|
||||
variable seen_invenwield := 0;
|
||||
variable seen_invenwield_remove := 0;
|
||||
variable seen_canuseweapon_player := 0;
|
||||
variable seen_canuseweapon_ai := 0;
|
||||
variable temp_container := 0;
|
||||
variable invenwield_override_enabled := false;
|
||||
variable canuseweapon_override := -1;
|
||||
|
||||
procedure invenwield_mode_name begin
|
||||
if (invenwield_override_enabled) then return "suppress";
|
||||
return "engine";
|
||||
end
|
||||
|
||||
procedure canuseweapon_mode_name(variable value) begin
|
||||
if (value == -1) then return "engine";
|
||||
if (value == 1) then return "on";
|
||||
if (value == 0) then return "off";
|
||||
return "unknown";
|
||||
end
|
||||
|
||||
procedure cycle_canuseweapon_override begin
|
||||
if (canuseweapon_override == -1) then canuseweapon_override := 1;
|
||||
else if (canuseweapon_override == 1) then canuseweapon_override := 0;
|
||||
else canuseweapon_override := -1;
|
||||
|
||||
display_msg(string_format1("hook_item_compat canuseweapon mode=%s", canuseweapon_mode_name(canuseweapon_override)));
|
||||
end
|
||||
|
||||
procedure adjustfid_handler begin
|
||||
variable args := get_sfall_args;
|
||||
|
||||
call assertEquals("adjustfid arg count", len_array(args), 2);
|
||||
call assertEquals("adjustfid arg0 type", typeof(args[0]), VALTYPE_INT);
|
||||
call assertEquals("adjustfid arg1 type", typeof(args[1]), VALTYPE_INT);
|
||||
|
||||
seen_adjustfid := seen_adjustfid + 1;
|
||||
display_msg(string_format2("adjustfid vanilla=%d modified=%d", args[0], args[1]));
|
||||
end
|
||||
|
||||
procedure invenwield_handler begin
|
||||
variable
|
||||
args := get_sfall_args,
|
||||
item := args[1],
|
||||
slot := args[2],
|
||||
is_wield := args[3],
|
||||
is_remove := args[4];
|
||||
|
||||
call assertEquals("invenwield arg count", len_array(args), 5);
|
||||
call assertTrue("invenwield slot range", slot >= 0 and slot <= 2);
|
||||
call assertTrue("invenwield is_wield flag", is_wield == 0 or is_wield == 1);
|
||||
call assertTrue("invenwield is_remove flag", is_remove == 0 or is_remove == 1);
|
||||
|
||||
seen_invenwield := seen_invenwield + 1;
|
||||
if (is_remove) then begin
|
||||
seen_invenwield_remove := seen_invenwield_remove + 1;
|
||||
end
|
||||
|
||||
display_msg(string_format4("invenwield item=%s slot=%d wield=%d remove=%d", obj_name(item), slot, is_wield, is_remove));
|
||||
|
||||
if (invenwield_override_enabled) then begin
|
||||
set_sfall_return(0);
|
||||
end
|
||||
end
|
||||
|
||||
procedure canuseweapon_handler begin
|
||||
variable
|
||||
args := get_sfall_args,
|
||||
hit_mode := args[2],
|
||||
result := args[3],
|
||||
weapon := args[1];
|
||||
|
||||
call assertEquals("canuseweapon arg count", len_array(args), 4);
|
||||
call assertTrue("canuseweapon result flag", result == 0 or result == 1);
|
||||
|
||||
if (hit_mode == -1) then begin
|
||||
seen_canuseweapon_player := seen_canuseweapon_player + 1;
|
||||
end else begin
|
||||
seen_canuseweapon_ai := seen_canuseweapon_ai + 1;
|
||||
end
|
||||
|
||||
display_msg(string_format3("canuseweapon item=%s hitmode=%d result=%d", obj_name(weapon), hit_mode, result));
|
||||
|
||||
if (canuseweapon_override != -1) then begin
|
||||
set_sfall_return(canuseweapon_override);
|
||||
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_Z) then begin
|
||||
display_msg("hook_item_compat: unwield armor");
|
||||
unwield_slot(dude_obj, INVEN_TYPE_WORN);
|
||||
end else if (key == DIK_X) then begin
|
||||
display_msg("hook_item_compat: unwield right hand");
|
||||
unwield_slot(dude_obj, INVEN_TYPE_RIGHT_HAND);
|
||||
end else if (key == DIK_C) then begin
|
||||
display_msg("hook_item_compat: unwield left hand");
|
||||
unwield_slot(dude_obj, INVEN_TYPE_LEFT_HAND);
|
||||
end else if (key == DIK_V) then begin
|
||||
display_msg("hook_item_compat: toggle active hand");
|
||||
toggle_active_hand;
|
||||
end else if (key == DIK_N) then begin
|
||||
display_msg("hook_item_compat: move inventory to temp container");
|
||||
if (temp_container == 0) then begin
|
||||
temp_container := create_object_sid(467, 0, 0, -1);
|
||||
end
|
||||
move_obj_inven_to_obj(dude_obj, temp_container);
|
||||
end else if (key == DIK_M) then begin
|
||||
invenwield_override_enabled := not invenwield_override_enabled;
|
||||
display_msg(string_format1("hook_item_compat invenwield mode=%s", invenwield_mode_name));
|
||||
end else if (key == DIK_G) then begin
|
||||
call cycle_canuseweapon_override;
|
||||
end else if (key == DIK_B) then begin
|
||||
display_msg(string_format7("hook_item_compat summary inven_mode=%s canuse_mode=%s adjust=%d inven=%d remove=%d player=%d ai=%d",
|
||||
invenwield_mode_name,
|
||||
canuseweapon_mode_name(canuseweapon_override),
|
||||
seen_adjustfid,
|
||||
seen_invenwield,
|
||||
seen_invenwield_remove,
|
||||
seen_canuseweapon_player,
|
||||
seen_canuseweapon_ai));
|
||||
call assertTrue("adjustfid observed", seen_adjustfid > 0);
|
||||
call assertTrue("invenwield observed", seen_invenwield > 0);
|
||||
call assertTrue("player canuseweapon observed", seen_canuseweapon_player > 0);
|
||||
call report_test_results("hook_item_compat");
|
||||
end
|
||||
end
|
||||
|
||||
procedure start begin
|
||||
if (not game_loaded) then return;
|
||||
|
||||
display_msg("hook_item_compat ready:");
|
||||
display_msg("open inventory/barter to trigger adjustfid");
|
||||
display_msg("press Z armor, X right, C left, V swap hand");
|
||||
display_msg("press N disposable-save inventory move, M invenwield mode");
|
||||
display_msg("press G canuseweapon mode (engine/on/off), B report");
|
||||
|
||||
register_hook_proc(HOOK_KEYPRESS, keypress_handler);
|
||||
register_hook_proc(HOOK_INVENWIELD, invenwield_handler);
|
||||
register_hook_proc(HOOK_ADJUSTFID, adjustfid_handler);
|
||||
register_hook_proc(HOOK_CANUSEWEAPON, canuseweapon_handler);
|
||||
end
|
||||
@@ -1,145 +0,0 @@
|
||||
#include "sfall.h"
|
||||
#include "dik.h"
|
||||
#include "lib.arrays.h"
|
||||
#include "../test_utils.h"
|
||||
|
||||
variable useskill_mode := 0;
|
||||
variable useskillon_calls := 0;
|
||||
variable useskill_calls := 0;
|
||||
variable last_useskillon_skill := -1;
|
||||
variable last_useskill_skill := -1;
|
||||
|
||||
procedure skill_name(variable skill) begin
|
||||
if (skill == SKILL_FIRST_AID) then return "first_aid";
|
||||
if (skill == SKILL_DOCTOR) then return "doctor";
|
||||
if (skill == SKILL_LOCKPICK) then return "lockpick";
|
||||
if (skill == SKILL_STEAL) then return "steal";
|
||||
if (skill == SKILL_TRAPS) then return "traps";
|
||||
if (skill == SKILL_SCIENCE) then return "science";
|
||||
if (skill == SKILL_REPAIR) then return "repair";
|
||||
if (skill == SKILL_SNEAK) then return "sneak";
|
||||
return string_format1("skill_%d", skill);
|
||||
end
|
||||
|
||||
procedure obj_name_safe(variable obj) begin
|
||||
if (obj == 0) then return "<null>";
|
||||
return obj_name(obj);
|
||||
end
|
||||
|
||||
procedure useskill_mode_name(variable mode) begin
|
||||
if (mode == 1) then return "useskillon_cancel";
|
||||
if (mode == 2) then return "useskillon_user_override";
|
||||
if (mode == 3) then return "useskillon_allow_combat";
|
||||
if (mode == 4) then return "useskill_override";
|
||||
if (mode == 5) then return "useskill_cancel_steal";
|
||||
return "vanilla";
|
||||
end
|
||||
|
||||
procedure print_mode begin
|
||||
display_msg(string_format1("useskill mode -> %s", useskill_mode_name(useskill_mode)));
|
||||
end
|
||||
|
||||
procedure useskillon_handler begin
|
||||
variable
|
||||
args := get_sfall_args,
|
||||
user := args[0],
|
||||
target := args[1],
|
||||
skill := args[2];
|
||||
|
||||
useskillon_calls++;
|
||||
last_useskillon_skill := skill;
|
||||
|
||||
display_msg(string_format("useskillon mode=%s user=%s target=%s skill=%s",
|
||||
useskill_mode_name(useskill_mode),
|
||||
obj_name_safe(user),
|
||||
obj_name_safe(target),
|
||||
skill_name(skill)));
|
||||
display_msg(string_format1("useskillon args=%s", debug_array_str(args)));
|
||||
|
||||
call assertEquals("useskillon arg count", len_array(args), 3);
|
||||
call assertTrue("useskillon user is set", user != 0);
|
||||
call assertTrue("useskillon target is set", target != 0);
|
||||
|
||||
if (useskill_mode == 1) then begin
|
||||
display_msg("useskillon cancelling skill action");
|
||||
set_sfall_return(-1);
|
||||
end else if (useskill_mode == 2) then begin
|
||||
if (skill == SKILL_STEAL) then begin
|
||||
display_msg("useskillon returning dude_obj for Steal; engine should ignore this return value");
|
||||
end else begin
|
||||
display_msg("useskillon returning dude_obj as user override");
|
||||
end
|
||||
set_sfall_return(dude_obj);
|
||||
end else if (useskill_mode == 3) then begin
|
||||
display_msg("useskillon allowing combat use");
|
||||
set_sfall_return(0);
|
||||
set_sfall_return(1);
|
||||
end
|
||||
end
|
||||
|
||||
procedure useskill_handler begin
|
||||
variable
|
||||
args := get_sfall_args,
|
||||
user := args[0],
|
||||
target := args[1],
|
||||
skill := args[2],
|
||||
skill_bonus := args[3];
|
||||
|
||||
useskill_calls++;
|
||||
last_useskill_skill := skill;
|
||||
|
||||
display_msg(string_format("useskill mode=%s user=%s target=%s skill=%s bonus=%d",
|
||||
useskill_mode_name(useskill_mode),
|
||||
obj_name_safe(user),
|
||||
obj_name_safe(target),
|
||||
skill_name(skill),
|
||||
skill_bonus));
|
||||
display_msg(string_format1("useskill args=%s", debug_array_str(args)));
|
||||
|
||||
call assertEquals("useskill arg count", len_array(args), 4);
|
||||
call assertTrue("useskill user is set", user != 0);
|
||||
call assertTrue("useskill target is set", target != 0);
|
||||
|
||||
if (useskill_mode == 4) then begin
|
||||
display_msg("useskill overriding hard-coded handler with result 1");
|
||||
set_sfall_return(1);
|
||||
end else if (useskill_mode == 5) then begin
|
||||
if (skill == SKILL_STEAL) then begin
|
||||
display_msg("useskill canceling steal by overriding hard-coded handler with result 0");
|
||||
set_sfall_return(0);
|
||||
end
|
||||
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_U) then begin
|
||||
useskill_mode += 1;
|
||||
if (useskill_mode > 5) then useskill_mode := 0;
|
||||
call print_mode;
|
||||
end else if (key == DIK_Y) then begin
|
||||
display_msg(string_format("useskill stats: on=%d skill=%s, handler=%d skill=%s",
|
||||
useskillon_calls,
|
||||
skill_name(last_useskillon_skill),
|
||||
useskill_calls,
|
||||
skill_name(last_useskill_skill)));
|
||||
call report_test_results("hook_useskill");
|
||||
end
|
||||
end
|
||||
|
||||
procedure start begin
|
||||
if (not game_loaded) then return;
|
||||
|
||||
display_msg("useskill manual test ready");
|
||||
display_msg("press U to cycle modes: vanilla / useskillon_cancel / useskillon_user_override / useskillon_allow_combat / useskill_override / useskill_cancel_steal");
|
||||
display_msg("use a Skilldex skill or a medical kit on a valid target; press Y to report assertions");
|
||||
|
||||
register_hook_proc(HOOK_KEYPRESS, keypress_handler);
|
||||
register_hook_proc(HOOK_USESKILLON, useskillon_handler);
|
||||
register_hook_proc(HOOK_USESKILL, useskill_handler);
|
||||
end
|
||||
+22
-25
@@ -1262,18 +1262,20 @@ int actionPickUp(Object* critter, Object* item)
|
||||
return reg_anim_end();
|
||||
}
|
||||
|
||||
// This is primarily used to loot critters, namely corpses. I don't believe it can
|
||||
// be called with a living creature, but am not 100% certain.
|
||||
// TODO: Looks like the name is a little misleading, container can only be a
|
||||
// critter, which is enforced by this function as well as at the call sites.
|
||||
// Used to loot corpses, so probably should be something like actionLootCorpse.
|
||||
// Check if it can be called with a living critter.
|
||||
//
|
||||
// 0x4123E8 was _action_loot_container
|
||||
int actionLootCritter(Object* critter, Object* target)
|
||||
// 0x4123E8
|
||||
int _action_loot_container(Object* critter, Object* container)
|
||||
{
|
||||
if (FID_TYPE(target->fid) != OBJ_TYPE_CRITTER) {
|
||||
if (FID_TYPE(container->fid) != OBJ_TYPE_CRITTER) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
// SFALL: Fix for trying to loot corpses with the "NoSteal" flag.
|
||||
if (critterFlagCheck(target->pid, CRITTER_NO_STEAL)) {
|
||||
if (critterFlagCheck(container->pid, CRITTER_NO_STEAL)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -1286,20 +1288,20 @@ int actionLootCritter(Object* critter, Object* target)
|
||||
|
||||
if (isInCombat()) {
|
||||
reg_anim_begin(ANIMATION_REQUEST_RESERVED);
|
||||
animationRegisterMoveToObject(critter, target, critter->data.critter.combat.ap, 0);
|
||||
animationRegisterMoveToObject(critter, container, critter->data.critter.combat.ap, 0);
|
||||
} else {
|
||||
reg_anim_begin(critter == gDude ? ANIMATION_REQUEST_RESERVED : ANIMATION_REQUEST_UNRESERVED);
|
||||
|
||||
if (objectWithinWalkDistance(critter, target)) {
|
||||
animationRegisterMoveToObject(critter, target, -1, 0);
|
||||
if (objectWithinWalkDistance(critter, container)) {
|
||||
animationRegisterMoveToObject(critter, container, -1, 0);
|
||||
} else {
|
||||
animationRegisterRunToObject(critter, target, -1, 0);
|
||||
animationRegisterRunToObject(critter, container, -1, 0);
|
||||
}
|
||||
}
|
||||
|
||||
animationRegisterCallbackForced(critter, target, (AnimationCallback*)_is_next_to, -1);
|
||||
animationRegisterCallback(critter, target, (AnimationCallback*)checkSceneryUseActionPointCost, -1);
|
||||
animationRegisterCallback(critter, target, (AnimationCallback*)scriptsRequestLooting, -1);
|
||||
animationRegisterCallbackForced(critter, container, (AnimationCallback*)_is_next_to, -1);
|
||||
animationRegisterCallback(critter, container, (AnimationCallback*)checkSceneryUseActionPointCost, -1);
|
||||
animationRegisterCallback(critter, container, (AnimationCallback*)scriptsRequestLooting, -1);
|
||||
return reg_anim_end();
|
||||
}
|
||||
|
||||
@@ -1336,15 +1338,10 @@ static int _action_use_skill_in_combat_error(Object* critter)
|
||||
// 0x41255C
|
||||
int actionUseSkill(Object* user, Object* target, int skill)
|
||||
{
|
||||
UseSkillOnHookResult hookResult = scriptHooks_UseSkillOn(&user, target, skill);
|
||||
if (!hookResult.shouldContinue) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
switch (skill) {
|
||||
case SKILL_FIRST_AID:
|
||||
case SKILL_DOCTOR:
|
||||
if (isInCombat() && !hookResult.allowInCombat) {
|
||||
if (isInCombat()) {
|
||||
// NOTE: Uninline.
|
||||
return _action_use_skill_in_combat_error(user);
|
||||
}
|
||||
@@ -1354,7 +1351,7 @@ int actionUseSkill(Object* user, Object* target, int skill)
|
||||
}
|
||||
break;
|
||||
case SKILL_LOCKPICK:
|
||||
if (isInCombat() && !hookResult.allowInCombat) {
|
||||
if (isInCombat()) {
|
||||
// NOTE: Uninline.
|
||||
return _action_use_skill_in_combat_error(user);
|
||||
}
|
||||
@@ -1365,7 +1362,7 @@ int actionUseSkill(Object* user, Object* target, int skill)
|
||||
|
||||
break;
|
||||
case SKILL_STEAL:
|
||||
if (isInCombat() && !hookResult.allowInCombat) {
|
||||
if (isInCombat()) {
|
||||
// NOTE: Uninline.
|
||||
return _action_use_skill_in_combat_error(user);
|
||||
}
|
||||
@@ -1380,7 +1377,7 @@ int actionUseSkill(Object* user, Object* target, int skill)
|
||||
|
||||
break;
|
||||
case SKILL_TRAPS:
|
||||
if (isInCombat() && !hookResult.allowInCombat) {
|
||||
if (isInCombat()) {
|
||||
// NOTE: Uninline.
|
||||
return _action_use_skill_in_combat_error(user);
|
||||
}
|
||||
@@ -1392,7 +1389,7 @@ int actionUseSkill(Object* user, Object* target, int skill)
|
||||
break;
|
||||
case SKILL_SCIENCE:
|
||||
case SKILL_REPAIR:
|
||||
if (isInCombat() && !hookResult.allowInCombat) {
|
||||
if (isInCombat()) {
|
||||
// NOTE: Uninline.
|
||||
return _action_use_skill_in_combat_error(user);
|
||||
}
|
||||
@@ -1433,9 +1430,9 @@ int actionUseSkill(Object* user, Object* target, int skill)
|
||||
|
||||
// Performer is either dude, or party member who's best at the specified
|
||||
// skill in entire party, and this skill is his/her own best.
|
||||
Object* performer = hookResult.userOverridden ? user : gDude;
|
||||
Object* performer = gDude;
|
||||
|
||||
if (user == gDude && !hookResult.userOverridden) {
|
||||
if (user == gDude) {
|
||||
Object* partyMember = partyMemberGetBestInSkill(skill);
|
||||
|
||||
if (partyMember == gDude) {
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ int _action_attack(Attack* attack);
|
||||
int _action_use_an_item_on_object(Object* user, Object* targetObj, Object* item);
|
||||
int _action_use_an_object(Object* user, Object* targetObj);
|
||||
int actionPickUp(Object* critter, Object* item);
|
||||
int actionLootCritter(Object* critter, Object* target);
|
||||
int _action_loot_container(Object* critter, Object* container);
|
||||
int _action_skill_use(int skill);
|
||||
int actionUseSkill(Object* user, Object* target, int skill);
|
||||
bool _is_hit_from_front(const Object* attacker, const Object* defender);
|
||||
|
||||
+161
-9
@@ -1,6 +1,9 @@
|
||||
#include "art.h"
|
||||
|
||||
#include <lodepng.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -134,6 +137,7 @@ static int* gArtCritterFidShoudRunData;
|
||||
|
||||
static std::unordered_map<std::string, std::shared_ptr<NamedCacheEntry>> gNamedArtCache;
|
||||
constexpr int kNamedCacheMaxBytes = 32 * 1024 * 1024; // 32MB soft limit
|
||||
constexpr size_t kMaxNamedPngPixels = 16 * 1024 * 1024;
|
||||
static unsigned int gNamedArtCacheMruCounter = 0;
|
||||
static int gNamedArtCacheCurrentBytes = 0;
|
||||
|
||||
@@ -1116,7 +1120,7 @@ static int artReadFrameData(unsigned char* data, File* stream, int count, int* p
|
||||
// 0x419E1C
|
||||
static int artReadHeader(Art* art, File* stream)
|
||||
{
|
||||
if (fileReadInt32(stream, &(art->field_0)) == -1) return -1;
|
||||
if (fileReadInt32(stream, &(art->version)) == -1) return -1;
|
||||
if (fileReadInt16(stream, &(art->framesPerSecond)) == -1) return -1;
|
||||
if (fileReadInt16(stream, &(art->actionFrame)) == -1) return -1;
|
||||
if (fileReadInt16(stream, &(art->frameCount)) == -1) return -1;
|
||||
@@ -1133,13 +1137,137 @@ static int artReadHeader(Art* art, File* stream)
|
||||
return 0;
|
||||
}
|
||||
|
||||
// NOTE: Original function was slightly different, but never used. Basically
|
||||
// it's a memory allocating variant of `artRead` (which reads data into given
|
||||
// buffer). This function is useful to load custom `frm` files since `Art` now
|
||||
// needs more memory then it's on-disk size (due to memory padding).
|
||||
//
|
||||
// 0x419EC0
|
||||
Art* artLoad(const char* path)
|
||||
static bool artPathHasExtension(const char* path, const char* extension)
|
||||
{
|
||||
size_t pathLength = strlen(path);
|
||||
size_t extensionLength = strlen(extension);
|
||||
if (pathLength < extensionLength) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return compat_stricmp(path + pathLength - extensionLength, extension) == 0;
|
||||
}
|
||||
|
||||
static bool artReadFile(const char* path, std::vector<unsigned char>& data)
|
||||
{
|
||||
int size = 0;
|
||||
if (dbGetFileSize(path, &size) != 0 || size <= 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
data.resize(size);
|
||||
return dbGetFileContents(path, data.data()) == 0;
|
||||
}
|
||||
|
||||
static bool artUnpackIndexedPngPixels(const std::vector<unsigned char>& indexedData, unsigned width, unsigned height, unsigned bitdepth, unsigned char* output)
|
||||
{
|
||||
size_t pixelCount = static_cast<size_t>(width) * static_cast<size_t>(height);
|
||||
if (bitdepth == 8) {
|
||||
if (indexedData.size() < pixelCount) {
|
||||
return false;
|
||||
}
|
||||
|
||||
memcpy(output, indexedData.data(), pixelCount);
|
||||
return true;
|
||||
}
|
||||
|
||||
unsigned char mask = static_cast<unsigned char>((1 << bitdepth) - 1);
|
||||
size_t neededBytes = (pixelCount * bitdepth + 7) / 8;
|
||||
if (indexedData.size() < neededBytes) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (size_t index = 0; index < pixelCount; index++) {
|
||||
size_t bitOffset = index * bitdepth;
|
||||
unsigned char byte = indexedData[bitOffset / 8];
|
||||
unsigned shift = 8 - bitdepth - static_cast<unsigned>(bitOffset % 8);
|
||||
output[index] = (byte >> shift) & mask;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static Art* artLoadIndexedPng(const char* path)
|
||||
{
|
||||
std::vector<unsigned char> encoded;
|
||||
if (!artReadFile(path, encoded)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
lodepng::State state;
|
||||
state.decoder.color_convert = 0;
|
||||
|
||||
std::vector<unsigned char> indexedData;
|
||||
unsigned width = 0;
|
||||
unsigned height = 0;
|
||||
unsigned error = lodepng::decode(indexedData, width, height, state, encoded);
|
||||
if (error != 0) {
|
||||
debugPrint("ART: failed to decode indexed PNG %s: %s\n", path, lodepng_error_text(error));
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (state.info_png.color.colortype != LCT_PALETTE) {
|
||||
debugPrint("ART: PNG is not palette-indexed: %s\n", path);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (lodepng_has_palette_alpha(&state.info_png.color)) {
|
||||
debugPrint("ART: indexed PNG transparency is unsupported, reserve palette index 0 instead: %s\n", path);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
size_t pixelCount = static_cast<size_t>(width) * static_cast<size_t>(height);
|
||||
|
||||
if (width == 0 || height == 0 || width > SHRT_MAX || height > SHRT_MAX) {
|
||||
debugPrint("ART: invalid indexed PNG dimensions for %s: %ux%u\n", path, width, height);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (pixelCount > kMaxNamedPngPixels || pixelCount > INT_MAX) {
|
||||
debugPrint("ART: indexed PNG is too large: %s\n", path);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
Art header = {};
|
||||
header.version = 4;
|
||||
header.framesPerSecond = 10;
|
||||
header.actionFrame = 0;
|
||||
header.frameCount = 1;
|
||||
header.dataSize = sizeof(ArtFrame) + static_cast<int>(pixelCount);
|
||||
|
||||
int currentPadding = paddingForSize(sizeof(Art));
|
||||
for (int rotation = 0; rotation < ROTATION_COUNT; rotation++) {
|
||||
header.dataOffsets[rotation] = 0;
|
||||
header.padding[rotation] = currentPadding;
|
||||
}
|
||||
|
||||
int dataSize = artGetDataSize(&header);
|
||||
unsigned char* data = reinterpret_cast<unsigned char*>(internal_malloc(dataSize));
|
||||
if (data == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
memset(data, 0, dataSize);
|
||||
Art* art = reinterpret_cast<Art*>(data);
|
||||
*art = header;
|
||||
|
||||
ArtFrame* frame = reinterpret_cast<ArtFrame*>(data + sizeof(Art) + art->padding[0]);
|
||||
frame->width = static_cast<short>(width);
|
||||
frame->height = static_cast<short>(height);
|
||||
frame->size = static_cast<int>(pixelCount);
|
||||
frame->x = 0;
|
||||
frame->y = 0;
|
||||
|
||||
if (!artUnpackIndexedPngPixels(indexedData, width, height, state.info_png.color.bitdepth, reinterpret_cast<unsigned char*>(frame) + sizeof(ArtFrame))) {
|
||||
debugPrint("ART: failed to read indexed PNG pixels: %s\n", path);
|
||||
internal_free(data);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
return art;
|
||||
}
|
||||
|
||||
static Art* artLoadFrm(const char* path)
|
||||
{
|
||||
File* stream = fileOpen(path, "rb");
|
||||
if (stream == nullptr) {
|
||||
@@ -1167,6 +1295,30 @@ Art* artLoad(const char* path)
|
||||
return reinterpret_cast<Art*>(data);
|
||||
}
|
||||
|
||||
// NOTE: Original function was slightly different, but never used. Basically
|
||||
// it's a memory allocating variant of `artRead` (which reads data into given
|
||||
// buffer). This function is useful to load custom `frm` files since `Art` now
|
||||
// needs more memory then it's on-disk size (due to memory padding).
|
||||
//
|
||||
// 0x419EC0
|
||||
Art* artLoad(const char* path)
|
||||
{
|
||||
if (path == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (artPathHasExtension(path, ".png")) {
|
||||
return artLoadIndexedPng(path);
|
||||
}
|
||||
|
||||
Art* art = artLoadFrm(path);
|
||||
if (art != nullptr) {
|
||||
return art;
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
static Art* artLoadLocalized(const char* path)
|
||||
{
|
||||
const char* localizedPath;
|
||||
@@ -1239,7 +1391,7 @@ int artWriteFrameData(unsigned char* data, File* stream, int count)
|
||||
// 0x41A138
|
||||
int artWriteHeader(Art* art, File* stream)
|
||||
{
|
||||
if (fileWriteInt32(stream, art->field_0) == -1) return -1;
|
||||
if (fileWriteInt32(stream, art->version) == -1) return -1;
|
||||
if (fileWriteInt16(stream, art->framesPerSecond) == -1) return -1;
|
||||
if (fileWriteInt16(stream, art->actionFrame) == -1) return -1;
|
||||
if (fileWriteInt16(stream, art->frameCount) == -1) return -1;
|
||||
|
||||
@@ -69,7 +69,7 @@ typedef enum Background {
|
||||
} Background;
|
||||
|
||||
typedef struct Art {
|
||||
int field_0;
|
||||
int version;
|
||||
short framesPerSecond;
|
||||
short actionFrame;
|
||||
short frameCount;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user