fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added description of HOOK_RESTTIMER, set_rest_heal_time, and set_rest_mode to documents.

Browse Source 
Renamed the bit flags for set_rest_mode.
Fixed compilation error in Worldmap.cpp.
This commit is contained in:
NovaRain
2018-05-08 12:30:53 +08:00
parent 9fa59a0d75
commit ee9010217e
5 changed files with 65 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/scripting/headers/sfall.h
+5 -5
View File
@@ -180,6 +180,11 @@
#define CURSOR_COMMAND (1)
#define CURSOR_TARGETING (2)
//Valid flags for set_rest_mode
#define RESTMODE_DISABLED (1) // disable resting on all maps
#define RESTMODE_STRICT (2) // disable resting on maps with "can_rest_here=No" in Maps.txt, even if there are no other critters
#define RESTMODE_NO_HEALING (4) // disable healing during resting
#define mstr_combat(x) (message_str_game(GAME_MSG_COMBAT, x))
#define mstr_ai(x) (message_str_game(GAME_MSG_AI, x))
#define mstr_scrname(x) (message_str_game(GAME_MSG_SCRNAME, x))
@@ -207,11 +212,6 @@
#define BLOCKING_TYPE_AI (2)
#define BLOCKING_TYPE_SIGHT (3) // not really useful (works not as you would expect), game uses this only when checking if you can talk to a person
//Rest mode flags
#define DISABLE_REST (1)
#define DISABLE_REST_FIX (2)
#define DISABLE_REST_HEAL (4)
#define party_member_list_critters party_member_list(0)
#define party_member_list_all party_member_list(1)
artifacts/scripting/hookscripts.txt
+13
View File
@@ -485,3 +485,16 @@ int arg1 - the index number of the global variable being set
int arg2 - the set value of the global variable
int ret1 - overrides the value of the global variable
-------------------------------------------
HOOK_RESTTIMER (hs_resttimer.int)
Runs continuously while the player is resting (using pipboy alarm clock).
int arg1 - the game time in ticks
int arg2 - event type: 1 - when the resting ends normally, -1 - when pressing ESC to cancel the timer, 0 - otherwise
int arg3 - the hour part of the length of resting time
int arg4 - the minute part of the length of resting time
int ret1 - pass 1 to interrupt the resting
artifacts/scripting/sfall function notes.txt
+4
View File
@@ -466,8 +466,12 @@ Some utility/math functions are available:
- works only in map_enter_p_proc procedure
> void sfall_func1("set_rest_heal_time", int minutes)
- sets the time interval in minutes for healing during resting. The default is 180
- The time interval will be reset each time the player reloads the game
> void sfall_func1("set_rest_mode", int mode)
- sets the bit flags for the rest mode (see REST_* constants in sfall.h)
- passing 0 will reset the rest mode. It will also be reset each time the player reloads the game
------------------------
------ MORE INFO -------
sfall/Modules/HookScripts/MiscHs.cpp
+8 -8
View File
@@ -289,9 +289,9 @@ static void __declspec(naked) SetGlobalVarHook() {
}
}
static int restTicks; // previous ticks
static int restTicks;
static void _stdcall RestTimerHookScript() {
int addrHook;
DWORD addrHook;
__asm {
mov addrHook, ebx;
mov args[0], eax;
@@ -317,8 +317,8 @@ static void __declspec(naked) RestTimerLoopHook() {
__asm {
pushad;
mov ebx, [esp + 32];
mov ecx, [esp+36+0x40]; // hours_
mov edx, [esp+36+0x44]; // minutes_
mov ecx, [esp + 36 + 0x40]; // hours_
mov edx, [esp + 36 + 0x44]; // minutes_
call RestTimerHookScript;
popad;
cmp cRet, 1;
@@ -333,12 +333,12 @@ skip:
static void __declspec(naked) RestTimerEscapeHook() {
__asm {
cmp eax, 0x1B;
cmp eax, 0x1B; // ESC ASCII code
jnz skip;
pushad;
mov ebx, [esp+32];
mov ecx, [esp+36+0x40]; // hours_
mov edx, [esp+36+0x44]; // minutes_
mov ebx, [esp + 32];
mov ecx, [esp + 36 + 0x40]; // hours_
mov edx, [esp + 36 + 0x44]; // minutes_
call RestTimerHookScript;
popad;
cmp cRet, 1;
sfall/Modules/Worldmap.cpp
+25 -32
View File
@@ -225,6 +225,18 @@ static __declspec(naked) void PathfinderFix() {
}
}
static void RestRestore() {
if (!restMode) return;
restMode = false;
SafeWrite8(0x49952C, 0x85);
SafeWrite8(0x497557, 0x85);
SafeWrite8(0x42E587, 0xC7);
SafeWrite32(0x42E588, 0x10C2444);
SafeWrite16(0x499FD4, 0xC201);
SafeWrite16(0x499E93, 0x0574);
}
void WorldLimitsPatches() {
DWORD date = GetConfigInt("Misc", "LocalMapXLimit", 0);
if (date) {
@@ -297,17 +309,11 @@ void TimeLimitPatch() {
HookCall(0x4A34F9, &TimerReset);
HookCall(0x4A3551, &TimerReset);
SafeWrite32(0x4A34EF, 0x90909090);
SafeWrite32(0x4A34F3, 0x90909090);
SafeWrite16(0x4A34F7, 0x9090);
SafeWrite32(0x4A34FE, 0x90909090);
SafeWrite16(0x4A3502, 0x9090);
SafeMemSet(0x4A34EF, 0x90, 10);
SafeMemSet(0x4A34FE, 0x90, 6);
SafeWrite32(0x4A3547, 0x90909090);
SafeWrite32(0x4A354B, 0x90909090);
SafeWrite16(0x4A354F, 0x9090);
SafeWrite32(0x4A3556, 0x90909090);
SafeWrite16(0x4A355A, 0x9090);
SafeMemSet(0x4A3547, 0x90, 10);
SafeMemSet(0x4A3556, 0x90, 6);
} else {
SafeWrite8(0x4A34EC, limit);
SafeWrite8(0x4A3544, limit);
@@ -423,8 +429,7 @@ void Worldmap::init() {
LoadGameHook::OnGameReset() += []() {
SetCarInterfaceArt(0x1B1);
if (restTime)
SetRestHealTime(180);
if (restTime) SetRestHealTime(180);
RestRestore();
};
}
@@ -437,44 +442,32 @@ void Worldmap::SetCarInterfaceArt(DWORD artIndex) {
SafeWrite32(0x4C2D9B, artIndex);
}
static void SetRestHealTime(DWORD minutes) {
void Worldmap::SetRestHealTime(DWORD minutes) {
if (minutes > 0) {
SafeWrite32(0x499FDE, minutes);
restTime = (minutes != 180);
}
}
static void SetRestMode(DWORD mode) {
void Worldmap::SetRestMode(DWORD mode) {
RestRestore(); // restore default
restMode = ((mode & 0x7) > 0);
if (!restMode) return;
if (mode & 1) { // bit1 - disable rest
SafeWrite8(0x49952C, 0x31); //test to xor
if (mode & 1) { // bit1 - disable resting on all maps
SafeWrite8(0x49952C, 0x31); // test to xor
SafeWrite8(0x497557, 0x31);
return;
}
if (mode & 2) { // bit2 - fix rest
if (mode & 2) { // bit2 - disable resting on maps with "can_rest_here=No" in Maps.txt, even if there are no other critters
SafeWrite8(0x42E587, 0xE9);
SafeWrite32(0x42E588, 0x94);
SafeWrite32(0x42E588, 0x00000094); // jmp 0x42E620
}
if (mode & 4) { // bit3 - disable heal
if (mode & 4) { // bit3 - disable healing during resting
SafeWrite16(0x499FD4, 0x9090);
SafeWrite16(0x499E93, 0x8FEB);
SafeWrite16(0x499E93, 0x8FEB); // jmp 0x499E24
}
}
static void RestRestore() {
if (!restMode) return;
restMode = false;
SafeWrite8(0x49952C, 0x85);
SafeWrite8(0x497557, 0x85);
SafeWrite8(0x42E587, 0xC7);
SafeWrite32(0x42E588, 0x10C2444);
SafeWrite16(0x499FD4, 0xC201);
SafeWrite16(0x499E93, 0x0574);
}
}