diff --git a/artifacts/mods/gl_highlighting.int b/artifacts/mods/gl_highlighting.int index ecfbf585..406a49f4 100644 Binary files a/artifacts/mods/gl_highlighting.int and b/artifacts/mods/gl_highlighting.int differ diff --git a/artifacts/mods/gl_npcarmor.int b/artifacts/mods/gl_npcarmor.int index 9f8c4ba2..0912fbc0 100644 Binary files a/artifacts/mods/gl_npcarmor.int and b/artifacts/mods/gl_npcarmor.int differ diff --git a/artifacts/mods/gl_npcarmor.ssl b/artifacts/mods/gl_npcarmor.ssl index 7719a799..9b93fb27 100644 --- a/artifacts/mods/gl_npcarmor.ssl +++ b/artifacts/mods/gl_npcarmor.ssl @@ -164,7 +164,9 @@ end procedure start begin variable sect, sects, armorTypes, armorType, npc, pid, pids, i; - if game_loaded and (sfall_ver_major >= 4) then begin + if game_loaded then begin + if (sfall_ver_major < 4) then return; + armorTypes := get_ini_section(modIni, "ArmorTypes"); armorPidMap := create_array_map; foreach (armorType: pids in armorTypes) begin diff --git a/artifacts/mods/gl_partycontrol.int b/artifacts/mods/gl_partycontrol.int index 7ca2d091..5843a228 100644 Binary files a/artifacts/mods/gl_partycontrol.int and b/artifacts/mods/gl_partycontrol.int differ diff --git a/artifacts/mods/gl_partycontrol.ssl b/artifacts/mods/gl_partycontrol.ssl index f80796be..9e251afe 100644 --- a/artifacts/mods/gl_partycontrol.ssl +++ b/artifacts/mods/gl_partycontrol.ssl @@ -2,7 +2,12 @@ NPC Combat Control - Allows to take control of your party member or other NPCs during combat + Previously was part of sfall itself, now a separate mod. + Features: + - allows you to take control of your party members or other NPCs during combat + - configurable list of perk IDs for perks being inherited from the player (optional, not all perks can work) + - allows the player to gain a positive reputation when killing NPCs while controlling other critters (optional) + - a notification box to display the name of the controlled critter above the interface bar (optional) NOTE: this script requires compiler from sfall modderspack with -s option (short circuit evaluation) diff --git a/artifacts/mods/main.h b/artifacts/mods/main.h index 5f545e45..ad8a92dc 100644 --- a/artifacts/mods/main.h +++ b/artifacts/mods/main.h @@ -12,7 +12,7 @@ #include "..\scripting\headers\lib.inven.h" */ -variable ini := "sfall-mods.ini"; +variable ini := "mods\\sfall-mods.ini"; variable translationIni; // Gets the integer value from the specified ini diff --git a/artifacts/scripting/headers/command_lite.h b/artifacts/scripting/headers/command_lite.h index 59f535af..f6de703e 100644 --- a/artifacts/scripting/headers/command_lite.h +++ b/artifacts/scripting/headers/command_lite.h @@ -185,10 +185,10 @@ // visibility #define self_visible obj_is_visible_flag(self_obj) -#define set_obj_invisible(cr) set_obj_visibility(cr,1) -#define set_obj_visible(cr) set_obj_visibility(cr,0) -#define set_self_invisible set_obj_visibility(self_obj, true) -#define set_self_visible set_obj_visibility(self_obj, false) +#define set_obj_invisible(cr) set_obj_visibility(cr,true) +#define set_obj_visible(cr) set_obj_visibility(cr,false) +#define set_self_invisible set_obj_visibility(self_obj,true) +#define set_self_visible set_obj_visibility(self_obj,false) #define is_visible(cr) has_trait(TRAIT_OBJECT,cr,OBJECT_VISIBILITY) // aka obj_is_visible_flag(x) #define self_cur_hits (get_critter_stat(self_obj,STAT_current_hp)) diff --git a/artifacts/sfall.dat b/artifacts/sfall.dat index 116c0a98..241cfa53 100644 Binary files a/artifacts/sfall.dat and b/artifacts/sfall.dat differ diff --git a/artifacts/sfall_ru.dat b/artifacts/sfall_ru.dat index 2b8d73e0..48a2cba1 100644 Binary files a/artifacts/sfall_ru.dat and b/artifacts/sfall_ru.dat differ diff --git a/artifacts/sfall_zh.dat b/artifacts/sfall_zh.dat index 87e62ea8..2c739770 100644 Binary files a/artifacts/sfall_zh.dat and b/artifacts/sfall_zh.dat differ