From ef0ca29bb0a9997f0a5ad93c0b2d2fc0775030b5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 30 May 2024 22:54:11 +0000 Subject: [PATCH] deploy: f9faa73b9c00baf2a050bf2e596dd20fd99a921d --- assets/js/search-data.json | 2 +- feed.xml | 2 +- hook-types/index.html | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/js/search-data.json b/assets/js/search-data.json index 922a8a44..45a89176 100644 --- a/assets/js/search-data.json +++ b/assets/js/search-data.json @@ -435,7 +435,7 @@ },"62": { "doc": "Hook types", "title": "Encounter", - "content": "HOOK_ENCOUNTER (hs_encounter.int) . Runs whenever a random encounter occurs (except the Horrigan meeting and scripted encounters), or when the player enters a local map from the world map. You can override the map for loading or the encounter. int arg0 - event type: 0 - when a random encounter occurs, 1 - when the player enters from the world map int arg1 - the map ID that the encounter will load (see MAPS.h or Maps.txt) int arg2 - 1 when the encounter occurs is a special encounter, 0 otherwise int ret0 - overrides the map ID, or pass -1 for event type 0 to cancel the encounter and continue traveling int ret1 - pass 1 to cancel the encounter and load the specified map from the ret0 (only for event type 0) . ", + "content": "HOOK_ENCOUNTER (hs_encounter.int) . Runs whenever a random encounter occurs (except the Horrigan meeting and scripted encounters), or when the player enters a local map from the world map. You can override the map for loading or the encounter. int arg0 - event type: 0 - when a random encounter occurs, 1 - when the player enters from the world map int arg1 - the map ID that the encounter will load (see MAPS.h or Maps.txt) int arg2 - 1 when the encounter occurs is a special encounter, 0 otherwise int arg3 - encounter table index or -1 if not an encounter int arg4 - encounter index in the table, or -1 if not an encounter int ret0 - overrides the map ID, or pass -1 for event type 0 to cancel the encounter and continue traveling int ret1 - pass 1 to cancel the encounter and load the specified map from the ret0 (only for event type 0) . ", "url": "/sfall/hook-types/#encounter", "relUrl": "/hook-types/#encounter" diff --git a/feed.xml b/feed.xml index 5ba2fb50..ac2c98e5 100644 --- a/feed.xml +++ b/feed.xml @@ -1 +1 @@ -Jekyll2024-05-28T13:31:51+00:00/sfall/feed.xmlsfallSfall documentation \ No newline at end of file +Jekyll2024-05-30T22:54:04+00:00/sfall/feed.xmlsfallSfall documentation \ No newline at end of file diff --git a/hook-types/index.html b/hook-types/index.html index ce09d6b2..0e332a96 100644 --- a/hook-types/index.html +++ b/hook-types/index.html @@ -125,6 +125,8 @@ String ret0 - the new description text to use

Encounter

HOOK_ENCOUNTER (hs_encounter.int)

Runs whenever a random encounter occurs (except the Horrigan meeting and scripted encounters), or when the player enters a local map from the world map. You can override the map for loading or the encounter.

int     arg0 - event type: 0 - when a random encounter occurs, 1 - when the player enters from the world map
 int     arg1 - the map ID that the encounter will load (see MAPS.h or Maps.txt)
 int     arg2 - 1 when the encounter occurs is a special encounter, 0 otherwise
+int     arg3 - encounter table index or -1 if not an encounter
+int     arg4 - encounter index in the table, or -1 if not an encounter
 
 int     ret0 - overrides the map ID, or pass -1 for event type 0 to cancel the encounter and continue traveling
 int     ret1 - pass 1 to cancel the encounter and load the specified map from the ret0 (only for event type 0)