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 a procedure to search for alternative weapons to NPC armor appearance mod (#222)

Browse Source
This commit is contained in:
NovaRain
2018-12-16 19:37:06 +08:00
parent 48ac68b66f
commit ce338fa5d0
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/mods/gl_npcarmor.int
BIN
View File
Binary file not shown.
artifacts/mods/gl_npcarmor.ssl
+20 -3
View File
@@ -49,19 +49,33 @@ procedure check_weapon_change(variable critter, variable item, variable isWield)
if isWield then begin
newWeaponAnim := get_proto_data(obj_pid(item), PROTO_WP_ANIM);
weaponAnimList := string_split(npc["WeaponAnims"], ",");
if newWeaponAnim then begin
if newWeaponAnim then begin // anim code 0 - none/unarmed
foreach (i in weaponAnimList) begin
if (newWeaponAnim == atoi(i)) then return -1;
end
return 0;
end else begin // anim code 0 - none/unarmed
return -1;
end
end
end
return -1;
end
procedure search_alt_weapon(variable critter) begin
variable obj, res, i := 0;
obj := inven_ptr(critter, 0);
while (obj) do begin
if (obj_item_subtype(obj) == item_type_weapon) then begin
res := check_weapon_change(critter, obj, 1);
if (res == -1) then begin
wield_obj_critter(critter, obj);
break;
end
end
i++;
obj := inven_ptr(critter, i);
end
end
// for NPCs when they change armor/weapon themselves
procedure invenwield_handler begin
variable critter, item, fid, slot, isWorn, canWield;
@@ -80,6 +94,9 @@ procedure invenwield_handler begin
if (critter and item and slot == INVEN_TYPE_RIGHT_HAND) then begin
canWield := check_weapon_change(critter, item, isWorn);
set_sfall_return(canWield);
if (canWield != -1) then begin
call search_alt_weapon(critter);
end
end
end