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

Fixed inherited perks in gl_partycontrol

Browse Source
This commit is contained in:
NovaRain
2019-10-15 22:17:08 +08:00
parent d762f57cbc
commit 9fab4b32ee
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/mods/gl_partycontrol.int
BIN
View File
Binary file not shown.
artifacts/mods/gl_partycontrol.ssl
+11 -2
View File
@@ -36,7 +36,7 @@ procedure combatturn_handler begin
variable
status := get_sfall_arg,
critter := get_sfall_arg,
pid, perkID, level;
pid, perkID, level, i;
//display_msg("Combat Turn: " + status + ", by " + obj_name(critter) + ", arg3: " + get_sfall_arg);
if npcControl then begin
@@ -55,7 +55,9 @@ procedure combatturn_handler begin
foreach (perkID in perksList) begin
level := has_trait(TRAIT_PERK, real_dude_obj, perkID);
if (level) then begin
critter_add_trait(critter, TRAIT_PERK, perkID, level);
for (i := 0; i < level; i++) begin
critter_add_trait(critter, TRAIT_PERK, perkID, 1);
end
end
end
intface_redraw;
@@ -77,6 +79,13 @@ procedure combatturn_handler begin
end
end
end else if inControl then begin
// remove perks before switching control (only work with 4.1.8+)
foreach (perkID in perksList) begin
level := has_trait(TRAIT_PERK, real_dude_obj, perkID);
if (level) then begin
critter_rm_trait(critter, TRAIT_PERK, perkID, level);
end
end
if isShowTag then begin
hide_iface_tag(displayName);
isShowTag := false;