diff --git a/artifacts/mods/gl_highlighting.int b/artifacts/mods/gl_highlighting.int index 078131e8..d9af49ac 100644 Binary files a/artifacts/mods/gl_highlighting.int and b/artifacts/mods/gl_highlighting.int differ diff --git a/artifacts/mods/gl_highlighting.ssl b/artifacts/mods/gl_highlighting.ssl index 3c2a9023..6c7a88af 100644 --- a/artifacts/mods/gl_highlighting.ssl +++ b/artifacts/mods/gl_highlighting.ssl @@ -51,7 +51,7 @@ end procedure DudeCanSee(variable obj) begin variable block := obj_blocking_line(dude_obj, tile_num(obj), BLOCKING_TYPE_SHOOT); - return not block or block == obj; + return not block or block == obj or tile_num(block) == tile_num(obj); end procedure DudeCanHear(variable obj) begin diff --git a/artifacts/scripting/functions.yml b/artifacts/scripting/functions.yml index edab1e0c..d93fd064 100644 --- a/artifacts/scripting/functions.yml +++ b/artifacts/scripting/functions.yml @@ -293,7 +293,7 @@ opcode: 0x8185 - name: set_perk_int detail: void set_perk_int(int perkID, int value) - opcode: 0x8196 + opcode: 0x8186 - name: set_perk_agl detail: void set_perk_agl(int perkID, int value) opcode: 0x8187 diff --git a/artifacts/scripting/sfall opcode list.md b/artifacts/scripting/sfall opcode list.md index 4b6d18fe..3448413c 100644 --- a/artifacts/scripting/sfall opcode list.md +++ b/artifacts/scripting/sfall opcode list.md @@ -101,7 +101,7 @@ | 0x8183 | `void set_perk_per(int perkID, int value)` | | 0x8184 | `void set_perk_end(int perkID, int value)` | | 0x8185 | `void set_perk_chr(int perkID, int value)` | -| 0x8196 | `void set_perk_int(int perkID, int value)` | +| 0x8186 | `void set_perk_int(int perkID, int value)` | | 0x8187 | `void set_perk_agl(int perkID, int value)` | | 0x8188 | `void set_perk_lck(int perkID, int value)` | | 0x8189 | `void set_perk_name(int perkID, string value)` | diff --git a/artifacts/scripting/sfall opcode list.txt b/artifacts/scripting/sfall opcode list.txt index 74a2e636..2139bff1 100644 --- a/artifacts/scripting/sfall opcode list.txt +++ b/artifacts/scripting/sfall opcode list.txt @@ -99,7 +99,7 @@ 0x8183 - void set_perk_per(int perkID, int value) 0x8184 - void set_perk_end(int perkID, int value) 0x8185 - void set_perk_chr(int perkID, int value) -0x8196 - void set_perk_int(int perkID, int value) +0x8186 - void set_perk_int(int perkID, int value) 0x8187 - void set_perk_agl(int perkID, int value) 0x8188 - void set_perk_lck(int perkID, int value) 0x8189 - void set_perk_name(int perkID, string value) diff --git a/artifacts/sfall_dat/sfall.dat b/artifacts/sfall_dat/sfall.dat index 17372692..f3b55d43 100644 Binary files a/artifacts/sfall_dat/sfall.dat and b/artifacts/sfall_dat/sfall.dat differ diff --git a/artifacts/sfall_dat/sfall_de.dat b/artifacts/sfall_dat/sfall_de.dat index c08a97b3..2ec8f229 100644 Binary files a/artifacts/sfall_dat/sfall_de.dat and b/artifacts/sfall_dat/sfall_de.dat differ diff --git a/artifacts/sfall_dat/sfall_fr.dat b/artifacts/sfall_dat/sfall_fr.dat index 70350618..d460a688 100644 Binary files a/artifacts/sfall_dat/sfall_fr.dat and b/artifacts/sfall_dat/sfall_fr.dat differ diff --git a/artifacts/sfall_dat/sfall_ru.dat b/artifacts/sfall_dat/sfall_ru.dat index 3ad55a0e..d1845a22 100644 Binary files a/artifacts/sfall_dat/sfall_ru.dat and b/artifacts/sfall_dat/sfall_ru.dat differ diff --git a/artifacts/sfall_dat/sfall_zh.dat b/artifacts/sfall_dat/sfall_zh.dat index 0d6af9b6..159d367f 100644 Binary files a/artifacts/sfall_dat/sfall_zh.dat and b/artifacts/sfall_dat/sfall_zh.dat differ