Merge branch '3.8-maintenance'

artifacts/config_files/Perks.ini

@@ -7,34 +7,6 @@
 ; have an additional NoHardcode option in this file which can
 ; be used to remove their hardcoded effects, and add new stat/skill effects
 
-;Name=The name of the perk
-;Desc=The description of the perk
-;Image=The line number (0-indexed) of the corresponding FRM in skilldex.lst
-;Ranks=The number of perk levels
-;Level=The minimum required level
-;Type=If 0, the perk checks only Skill1 for skill requirements; if 1, it checks
-; Skill1 or Skill2; if 2, it checks both Skill1 and Skill2
-;Stat=The modified stat or -1 if you don't want to change any stats
-;StatMag=The increased/decreased value to the modified stat
-;Skill1=The first skill (or -1 for none) to check, but if you set a specific bit
-; (67108864 or 0x4000000), it checks GVAR. For example, if Skill1=67108864, then
-; the perk will check GVAR_PLAYER_REPUTATION (67108864 + 0) on Skill1Mag value
-;Skill1Mag=Positive value is used as the minimum requirements of the first
-; skill/GVAR, and a negative value is interpreted as the maximum requirement.
-; For example, with Skill1=0 and Skill1Mag=100, if player has small guns skill
-; >= 100 and meets all other requirements, the perk will be available in the
-; selection window; with Skill1=1 and Skill1Mag=-120, the perk will not be
-; available if player has big guns skill >= 120
-;Skill2=The second skill/GVAR (or -1 for none) to check
-;Skill2Mag=Same as Skill1Mag, but for Skill2
-;STR-LCK=Positive values are used as minimum requirements of SPECIAL stats, and
-; negative values are interpreted as maximum requirements. For some special
-; perks processed by the engine (e.g. PERK_armor_powered and PERK_armor_combat),
-; the values are not used as requirements but to add to corresponding SPECIAL
-; stats
-
-;If the value is set to -99999, the variable will be ignored (similar to comment out that line)
-
 ;This is a modification to perk 119
 [119]
 Name=Example
@@ -64,4 +36,4 @@ Name=Example
 Desc=This is an example trait
 Image=72
 StatMod=0|-1 ;Subtract 1 from strength
-SkillMod=0|20|1|-5 ;Add 20 to the player's small guns skill and subtract 5 from big guns
+SkillMod=0|20|1|-5 ;Add 20 to the players small guns skill and subtract 5 from big guns

artifacts/ddraw.ini

@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v3.8.8
+;v3.8.1
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -48,31 +48,31 @@ SpeedMultiInitial=100
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Graphics]
 ;Set to 0 for 8 bit fullscreen
-;Set to 4 for DX9 fullscreen
-;Set to 5 for DX9 windowed
-;A DX9 mode is required for any graphics related script extender functions to work (i.e. fullscreen shaders)
+;Set to 4 for dx9 fullscreen
+;Set to 5 for dx9 windowed
+;A dx9 mode is required for any graphics related script extender functions to work (i.e. fullscreen shaders)
 ;Modes 1, 2 and 3 are no longer supported
 Mode=0
 
-;If using a DX9 mode, this changes the resolution
+;If using a dx9 mode, this changes the resolution
 ;The graphics are simply stretched to fit the new window; this does _not_ let you see more of the map
 ;If set to 0, use Fallout's native resolution
 GraphicsWidth=0
 GraphicsHeight=0
 
-;Set to 1 to do the palette conversion on the GPU
-;Set to 2 to do the palette conversion on the CPU
+;Set to 1 to do the palette conversion on the gpu
+;Set to 2 to do the palette conversion on the cpu
 ;Set to 0 to pick automatically
 ;GPU is faster, but requires v2.0 pixel shader support
 GPUBlt=0
 
 ;Set to 1 to allow using 32 bit graphics for talking heads
-;Requires graphics mode 4 or 5, and GPUBlt set to 1
+;Requires graphics mode 4 or 5, and gpublt set to 1
 Use32BitHeadGraphics=0
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Input]
-;Set to 1 to enable the mouse scroll wheel to scroll through inventory, barter, and loot screens
+;Set to 1 to enable the mouse scroll wheel to scroll through your inventory
 UseScrollWheel=1
 
 ;The mouse Z position is divided by this modifier to calculate the number of inventory
@@ -98,7 +98,7 @@ ReverseMouseButtons=0
 BackgroundKeyboard=0
 BackgroundMouse=0
 
-;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 ;The modifier key you have to hold down to change any speed settings
 ;Set to 0 if you don't want to use a modifier key, or a DX scancode otherwise
@@ -131,25 +131,16 @@ WindowScrollKey=0
 ToggleItemHighlightsKey=42
 
 ;Set to 1 to also highlight containers
+;Set to 2 for purple outlines
 HighlightContainers=0
 
-;Set the color of outlines, available colors:
-;0x01 - glowing red
-;0x02 - red
-;0x04 - grey
-;0x08 - glowing green
-;0x10 - bright yellow
-;0x20 - dark yellow
-;0x40 - purple
-OutlineColor=0x10
-
 ;A key to press to reload your currently equipped weapon
 ReloadWeaponKey=0
 
 ;A key to press to open a debug game editor
 DebugEditorKey=0
 
-;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Misc]
 
 ;Time limit in years. Must be between -3 and 13
@@ -173,10 +164,24 @@ WorldMapFPSPatch=1
 ;Controls the world map speed if WorldMapFPSPatch is 1. Higher values cause slower movement
 WorldMapDelay2=66
 
-;Set to 1 to enable Ray's patch to make world map encounter rate independent of your travel speed
-;Higher values of WorldMapEncounterRate cause a slower encounter rate
-WorldMapEncounterFix=0
-WorldMapEncounterRate=5
+;XX OBSOLETE  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+;XX 
+;XX ;This will change the physical speed at which you move across the map
+;XX ;Set to 0 to leave at the default. (i.e. limited by vwait in windowed mode, or by processor speed in fullscreen)
+;XX ;If set to something other than 0, it enforces a maximum fps on the world map screen.
+;XX ;Changing this to something other than 0 is not recommended if you've already applied a world map speed patch to your Fallout exe.
+;XX WorldMapFPS=0
+;XX 
+;XX ;Only set to 1 if your systems high performance timer is unreliable for some reason
+;XX ForceLowResolutionTimer=0
+;XX 
+;XX ;Set to 1 to enable Ray's patch to make world map encounter rate independent of your travel speed
+;XX WorldMapEncounterFix=0
+;XX WorldMapEncounterRate=6
+;XX 
+;XX ;Obsolete, but can still be used if you know what it does.
+;XX ;WorldMapDelay=0
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 ;The number of slots available in the locations list panel of the world map
 ;Set to 0 to leave unchanged. 17 is default.
@@ -233,7 +238,6 @@ Movie16=artimer4.mve
 Movie17=credits.mve
 
 ;To change the starting year, month or day, uncomment the next 3 lines
-;Both StartMonth and StartDay are 0-indexed
 ;StartYear=-1
 ;StartMonth=-1
 ;StartDay=-1
@@ -253,7 +257,7 @@ PipBoyAvailableAtGameStart=0
 
 ;Set to 1 to double the number of available kill types
 ;If you use this, you need to provide the extra descriptions in proto.msg (entries from 1450 to 1487 are names and 1488 to 1525 are descriptions)
-;Changing this option mid game will not invalidate old save games, but the player's kill counters will be completely screwed.
+;Changing this option mid game will not invalidate old save games, but the players kill counters will be completely screwed.
 ;Setting this to 1 may cause problems if the player kills more than 32767 of any one critter type
 ;Additional kill types must have their new critical tables set! (See the OverrideCriticalTable option)
 ExtraKillTypes=0
@@ -275,8 +279,8 @@ TownMapHotkeysFix=1
 ;Set to 1 to disable the horrigan encounter
 DisableHorrigan=0
 
-;Set to 1 to disable the random element in NPC levelling.
-;This will cause all NPC party members to automatically level up as soon as the player reaches the requirements
+;Set to 1 to disable the random element in npc levelling.
+;This will cause all npc party members to automatically level up as soon as the player reaches the requirements
 NPCAutoLevel=0
 
 ;Change the initial starting location and world map viewport
@@ -301,7 +305,7 @@ SaveInCombatFix=1
 ;ElevatorsFile=Elevators.ini
 
 ;Uncomment and set a comma delimited list of numbers to use a custom xp table.
-;Player's level is capped once the highest specified level is reached
+;Players level is capped once the highest specified level is reached
 ;XPTable=50,100,200
 
 ;Set to 1 to enable additional weapon animations codes from o-t
@@ -313,7 +317,7 @@ AdditionalWeaponAnims=1
 ;BodyHit_Head=-40
 ;BodyHit_Left_Arm=-30
 ;BodyHit_Right_Arm=-30
-;BodyHit_Torso_Uncalled=0
+;BodyHit_Torso=0
 ;BodyHit_Right_Leg=-20
 ;BodyHit_Left_Leg=-20
 ;BodyHit_Eyes=-60
@@ -341,7 +345,7 @@ CorpseLineOfFireFix=0
 ;Set a number of milliseconds to idle each input loop
 ;Set to -1 to disable
 ;Set to 0 to idle only if other processes are waiting for processor time
-;Set to 1 (or some higher number if needed, the maximum is 127) to prevent 100% CPU use
+;Set to 1 (or some higher number if needed, the maximum is 127) to prevent 100% cpu use
 ProcessorIdle=-1
 
 ;Set to 1 if using the hero appearance mod
@@ -350,17 +354,17 @@ EnableHeroAppearanceMod=0
 ;Set to 1 to skip the 3 opening movies
 SkipOpeningMovies=0
 
-;Causes NPCs who complete their combat turn with ap left over will try and find other ways to spend it.
-;Only NPCs with ap left equal to or greater than the value given here will be considered.
+;Causes npc's who complete their combat turn with ap left over will try and find other ways to spend it.
+;Only npcs with ap left equal to or greater than the value given here will be considered.
 ;Set to 0 to disable
 NPCsTryToSpendExtraAP=0
 
 ;Allows the use of tiles over 80*36 in size. sfall will just split and resave them at startup
 ;Set to 1 to check all tiles on started (slow)
-;Set to 2 if you provide a XLtiles.lst file in art/tiles/ containing a list of the tile ids that need checking
+;set to 2 if you provide a XLtiles.lst file in art/tiles/ containing a list of the tile ids that need checking
 AllowLargeTiles=0
 
-;Change the Skilldex cursor frm numbers
+;Change the skilldex cursor frm numbers
 ;Default is 293 for all skills
 Lockpick=293
 Steal=293
@@ -382,7 +386,7 @@ UseScrollingQuestsList=1
 ;PremadeFIDs=201,203,202
 
 ;Use this line to modify the list of cities and their associated global variables used for city reputations
-;Syntax is 'city id : global id', with each city/global pair separated by a comma.
+;Syntax is 'city id : global id',with each city/global pair separated by a comma.
 ;CityRepsCount=19
 ;CityRepsList=0:47,2:48,1:49,4:50,5:51,3:52,8:53,6:54,7:55,13:56,10:57,11:59,14:61,17:63,19:64,18:65,25:66,9:294,20:308
 
@@ -392,12 +396,11 @@ UseScrollingQuestsList=1
 ;Set to 1 to add additional pages of save slots
 ExtraSaveSlots=0
 
-;Set to 1 to speed up the HP/AC counter animations
-;Set to 2 to update the HP/AC counters instantly
+;Set to 1 to speed up the hp/ac counter animations
+;Set to 2 to update the hp/ac counters instantly
 SpeedInterfaceCounterAnims=0
 
 ;These lines allow you to control the karma frm's displayed on the character screen
-;Number of KarmaPoints should be 1 less than number of KarmaFRMs
 ;KarmaFRMsCount=3
 ;KarmaFRMs=47,48,49
 ;KarmaPoints=-100,100
@@ -405,7 +408,7 @@ SpeedInterfaceCounterAnims=0
 ;Set to 1 to allow science and repair to be used on the player, or 2 for all critters. (Rather than only brahmin/robots)
 ScienceOnCritters=0
 
-;Modify this value to change the player's speed of rotation on the inventory and character screens
+;Modify this value to change the players speed of rotation on the inventory and character screens
 ;Default is 166
 SpeedInventoryPCRotation=166
 
@@ -429,7 +432,7 @@ RemoveCriticalTimelimits=0
 NPCStage6Fix=0
 
 ;Change the colour of the font used on the main menu for the Fallout/sfall version number
-;It's the last byte ('3c' by default) that picks the colour used. The first byte supplies additional flags
+;It's the last byte ('3c' by default,) that picks the colour used. The first byte supplies additional flags
 ;MainMenuFontColour=0x0600003c
 
 ;Two alternate fixes to the interaction between HtH attacks and the fast shot trait
@@ -450,7 +453,7 @@ BoostScriptDialogLimit=0
 ;DerivedStats=Stats.ini
 
 ;These options modify the checks to see if a critter can carry an additional item, changing which items are counted towards the weight limit and adding an additional size check
-;Set the mode to 0 to disable the size check, 1 to apply to the PC only, 2 to apply to the PC and party members, or 3 to apply to all critters
+;Set the mode to 0 to disable the size check, 1 to apply to pc only, 2 to apply to the pc and party members, or 3 to apply to all critters
 ;Only the PC uses CritterInvSizeLimit. Other critters will use the extra unused stat (STAT_unused = 10)
 ;Add 4 to the mode to limit the weight check to used items only
 CritterInvSizeLimitMode=0
@@ -556,9 +559,6 @@ DialogOptions9Lines=1
 ;Set to 1 to leave the music playing in dialogue with talking heads
 EnableMusicInDialogue=0
 
-;Set to 1 to prevent the player from running while sneaking without Silent Running perk
-DontTurnOffSneakIfYouRun=0
-
 ;Set to 1 to fix the bug that unable to sell used geiger counters or stealth boys
 CanSellUsedGeiger=1
 
@@ -606,12 +606,10 @@ DebugMode=0
 SkipCompatModeCheck=0
 
 ;Set to 1 to skip the executable file size check
-;Does not require enabling sfall debugging mode
 SkipSizeCheck=0
 
-;If you're testing changes to the Fallout exe, you can override the CRC that sfall looks for here
+;If you're testing changes to the Fallout exe, you can override the crc that sfall looks for here
 ;You can use several hex values, separated by commas
-;Does not require enabling sfall debugging mode
 ;ExtraCRC=0x00000000,0x00000000
 
 ;Set to 1 to stop Fallout from deleting non readonly protos at startup

artifacts/example_mods/AutoDoors/gl_autodoors.ssl

@@ -1,77 +0,0 @@
-/*
-
-Auto Doors mod for Fallout 2 by Mr.Stalin
------------------------------------------
-
-- allows the player to automatically open/walk through unlocked doors when not in combat
-
-Requires sfall 3.7b or higher
-
-NOTE: this script requires compiler from sfall modderspack with -s option
-(short circuit evaluation)
-
-*/
-
-#include "..\headers\define.h"
-#include "..\headers\command.h"
-#include "..\headers\sfall\sfall.h"
-#include "..\headers\sfall\define_extra.h"
-
-procedure start;
-procedure map_enter_p_proc;
-procedure set_door_flag(variable state);
-procedure combatturn_handler;
-
-#define PORTAL      (0)
-#define DOOR_FLAGS  (0x24)
-
-variable only_once := 0;
-
-procedure start begin
-   if game_loaded then begin
-      if (sfall_ver_major >= 4) then
-         register_hook_proc(HOOK_COMBATTURN, combatturn_handler);
-      else
-         set_global_script_repeat(60);
-      call map_enter_p_proc;
-   end else begin
-      if (only_once == 1 and combat_is_initialized) then begin
-         only_once := 2;
-         call set_door_flag(false);
-      end else if (only_once == 2 and not(combat_is_initialized)) then begin
-         only_once := 1;
-         if (sfall_ver_major >= 4) then
-            set_global_script_repeat(0);
-         call set_door_flag(FLAG_WALKTHRU);
-      end
-   end
-end
-
-procedure map_enter_p_proc begin
-   only_once := 1;
-   call set_door_flag(FLAG_WALKTHRU);
-end
-
-procedure set_door_flag(variable state) begin
-   variable objectMap, obj, objPid, arrayPid, i;
-
-   objectMap := list_as_array(LIST_SCENERY);
-   arrayPid := temp_array(1, 0);
-
-   foreach (obj in objectMap) begin
-      objPid := obj_pid(obj);
-
-      if (proto_data(objPid, sc_type) != PORTAL) or is_in_array(objPid, arrayPid) then
-         continue;
-
-      arrayPid[i] := objPid;
-      i++;
-      resize_array(arrayPid, i + 1);
-      set_proto_data(objPid, DOOR_FLAGS, state);
-   end
-end
-
-procedure combatturn_handler begin
-   if (only_once == 1) then
-      set_global_script_repeat(60);
-end

artifacts/example_mods/AutoDoors/readme.txt

@@ -1,9 +0,0 @@
-Auto Doors mod for Fallout 2 by Mr.Stalin
------------------------------------------
-
-- allows the player to automatically open/walk through unlocked doors when not in combat
-
-
-Requires sfall 3.7b or higher.
-
-To use, copy gl_autodoors.int to your scripts folder.

artifacts/example_mods/StealCheat/hs_steal.ssl

@@ -1,24 +1,22 @@
-procedure start;
+procedure start; 
 // adjust include paths if needed
-#include "..\..\scripting_docs\headers\sfall.h"
+#include "..\..\scripting_docs\headers\sfall.h" 
 
 #define RESULT_SUCCESS  (1)
 #define RESULT_FAIL     (0)
-
-procedure start begin
-   if game_loaded then begin
-      register_hook(HOOK_STEAL);
-   end else begin
+ 
+procedure start begin 
+   if not init_hook then begin
       variable
          thief := get_sfall_arg,
          target := get_sfall_arg,
          item := get_sfall_arg,
          action := get_sfall_arg,
          result := RESULT_SUCCESS;
-
-      if (thief == dude_obj) then begin
-         display_msg(sprintf(mstr_skill(570 + result + action*2), obj_name(item)));
-         set_sfall_return(result);
-      end
-   end
+      
+      if (thief == dude_obj) then begin 
+         display_msg(sprintf(mstr_skill(570 + result + action*2), obj_name(item))); 
+         set_sfall_return(result); 
+      end 
+   end 
 end

artifacts/example_mods/TakeAllHotkey/gl_takeallkey.ssl

@@ -1,20 +0,0 @@
-procedure start;
-// adjust include paths if needed
-#include "..\..\scripting_docs\headers\sfall.h"
-#include "..\..\scripting_docs\headers\dik.h"
-
-procedure start begin
-   if game_loaded then begin
-      register_hook(HOOK_KEYPRESS);
-   end else begin
-      variable
-         event := get_sfall_arg,
-         keyDX := get_sfall_arg;
-
-      if (event == 1) and (keyDX == DIK_SEMICOLON) then begin
-         tap_key(DIK_CAPITAL);
-         tap_key(DIK_A);
-         tap_key(DIK_CAPITAL);
-      end
-   end
-end

artifacts/example_mods/TakeAllHotkey/hs_keypress.ssl

@@ -0,0 +1,16 @@
+procedure start;
+#include ".\HEADERS\dik.h"
+
+procedure start begin
+	variable event, keyDX;
+	if not init_hook then begin
+		event := get_sfall_arg;
+		keyDX := get_sfall_arg;
+
+		if ((event == 1) and (keyDX == DIK_SEMICOLON)) then begin
+			tap_key(DIK_CAPITAL);
+			tap_key(DIK_A);
+			tap_key(DIK_CAPITAL);
+		end
+	end
+end

artifacts/example_mods/TakeAllHotkey/readme.txt

@@ -2,8 +2,8 @@
 ----------------------------------------
 
 - makes pressing the semicolon key send an uppercase A after a semicolon.
-- Note: the uppercase A (shift + A if Caps Lock is off) is the built-in hotkey for the TAKE ALL button on the loot screen.
+- the uppercase A (shift + A if Caps Lock is off) is the built-in hotkey for the TAKE ALL button on the loot screen.
 
-To use, copy *.int file to your scripts folder.
+To use, copy hs_keypress.int file to your scripts folder.
 
 This mod is a simple example of how you can use HOOK_KEYPRESS hooks.

artifacts/scripting/headers/define_extra.h

@@ -83,13 +83,11 @@
 #define PROTO_IT_SIZE       (112)
 #define PROTO_IT_WEIGHT     (116)
 #define PROTO_IT_COST       (120)
-#define PROTO_IT_INV_FID    (124)
 
 // weapons
 #define PROTO_WP_ANIM        (36)
 #define PROTO_WP_DMG_MIN     (40)
 #define PROTO_WP_DMG_MAX     (44)
-#define PROTO_WP_DMG_TYPE    (48)
 #define PROTO_WP_RANGE_1     (52)
 #define PROTO_WP_RANGE_2     (56)
 #define PROTO_WP_PROJ_PID    (60)
@@ -161,10 +159,11 @@
 #define PROTO_DR_ADDICT_DELAY   (100)
 
 // critters
-#define PROTO_CR_FLAGS           (32)
+#define PROTO_CR_ACTION_FLAGS    (32)
 #define PROTO_CR_HEAD_FID        (40)
 #define PROTO_CR_AI_PACKET       (44)
 #define PROTO_CR_TEAM_NUM        (48)
+#define PROTO_CR_FLAGS           (52)
 #define PROTO_CR_BODY_TYPE      (388)
 #define PROTO_CR_KILL_EXP       (392)
 #define PROTO_CR_KILL_TYPE      (396)
@@ -225,4 +224,5 @@
 #define WPN_ANIM_MINIGUN            (0x09) // (L)
 #define WPN_ANIM_ROCKET_LAUNCHER    (0x0A) // (M)
 
+
 #endif // DEFINE_EXTRA_H

artifacts/scripting/headers/lib.inven.h

@@ -1,162 +0,0 @@
-
-#ifndef LIB_INVEN_H
-#define LIB_INVEN_H
-
-#include "define_lite.h"
-
-/**
-  Inventory contents as temp array to be used in foreach
-*/
-procedure inven_as_array(variable critter) begin
-   variable i:=0, list;
-   list := temp_array(100, 4);
-   while (inven_ptr(critter, i)) do begin
-      if (i>=len_array(list)) then
-         resize_array(list, len_array(list) + 100);
-      list[i] := inven_ptr(critter, i);
-      i++;
-   end
-   resize_array(list, i);
-   return list;
-end
-
-
-procedure add_items_pid(variable who_obj, variable the_pid, variable pid_qty) begin
-   variable item;
-   item := create_object(the_pid,0,0);
-   add_mult_objs_to_inven(who_obj, item, (pid_qty));
-   return item;
-end
-
-// aliases:
-#define add_item_pid(obj, pid)            add_items_pid(obj, pid, 1)
-
-#ifndef critter_wearing_armor
-#define critter_wearing_armor(x)            (obj_item_subtype(critter_inven_obj(x,INVEN_TYPE_WORN)) == item_type_armor)
-#endif
-
-procedure unwield_armor(variable who_obj) begin
-   variable armor;
-   if (not(who_obj)) then return;
-   if (critter_wearing_armor(who_obj)) then begin
-      armor := critter_inven_obj(who_obj,INVEN_TYPE_WORN);
-      rm_obj_from_inven(who_obj, armor);
-      add_obj_to_inven(who_obj, armor);
-   end
-end
-
-procedure remove_items_pid(variable who_obj, variable the_pid, variable pid_qty) begin
-   variable begin
-      item;
-      removed_qty;
-      tmp;
-   end
-   if (not(who_obj)) then return;
-   removed_qty := obj_is_carrying_obj_pid(who_obj,the_pid);
-   if (pid_qty < removed_qty and pid_qty != -1) then begin
-      removed_qty := pid_qty;
-   end
-   if (removed_qty > 0) then begin
-      item := obj_carrying_pid_obj(who_obj, the_pid);
-      if (obj_type(who_obj) == 1) then begin
-         if (critter_inven_obj(who_obj,INVEN_TYPE_WORN) == item) then begin
-            call unwield_armor(who_obj);
-         end else if ((critter_inven_obj(who_obj, INVEN_TYPE_LEFT_HAND) == item) or (critter_inven_obj(who_obj, INVEN_TYPE_RIGHT_HAND) == item)) then begin
-            inven_unwield(who_obj);
-         end
-      end
-      tmp := rm_mult_objs_from_inven(who_obj, item, removed_qty);
-      destroy_object(item);
-   end
-end
-
-procedure remove_item_obj(variable who_obj, variable item) begin
-   if (obj_type(who_obj) == 1) then begin
-      if (critter_inven_obj(who_obj,INVEN_TYPE_WORN) == item) then begin
-         call unwield_armor(who_obj);
-      end else if ((critter_inven_obj(who_obj, INVEN_TYPE_LEFT_HAND) == item) or (critter_inven_obj(who_obj, INVEN_TYPE_RIGHT_HAND) == item)) then begin
-         inven_unwield(who_obj);
-      end
-   end
-   rm_obj_from_inven(who_obj, item);
-   destroy_object(item);
-end
-
-// aliases:
-#define remove_item_pid(obj, pid)            remove_items_pid(obj, pid, 1)
-#define remove_all_items_pid(obj, pid)       remove_items_pid(obj, pid, -1)
-
-/**
- Set item quantity in inventory, by item pid
- */
-procedure set_items_qty_pid(variable invenobj, variable itempid, variable newcount)
-begin
-   variable begin
-      count;
-      obj;
-   end
-   count := obj_is_carrying_obj_pid(invenobj, itempid);
-   if (newcount > count) then begin
-      obj := create_object_sid(itempid, 0, 0, -1);
-      add_mult_objs_to_inven(invenobj, obj, newcount - count);
-   end else if (newcount < count) then begin
-      call remove_items_pid(invenobj, itempid, count - newcount);
-   end
-end
-
-/*
-
-procedure check_restock_item(the_item, min_amt, max_amt, res_perc)
-      restock_amt := random(min_amt, max_amt);
-      if (obj_is_carrying_obj_pid(self_obj, the_item) < restock_amt) then begin
-         if (res_perc >= random(1,100)) then begin
-            stock_pid_qty(self_obj, the_item, restock_amt)
-         end
-      end else begin
-         stock_pid_qty(self_obj, the_item, restock_amt)
-      end
-procedure check_restock_item_min_limit(the_item, min_amt, max_amt, res_perc)
-      if (obj_is_carrying_obj_pid(self_obj, the_item) < min_amt) then begin
-         check_restock_item(the_item, min_amt, max_amt, res_perc)
-      end
-*/
-
-
-procedure reduce_merchant_loot(variable critter, variable moneyPercent, variable probArmor, variable probDrugs, variable probWeapons, variable probAmmo, variable probMisc) begin
-   variable inv, item, it, prob, tmp;
-   inv := inven_as_array(critter);
-   item_caps_adjust(critter, -(item_caps_total(critter) * moneyPercent / 100));
-   //display_msg("total items "+len_array(inv));
-   foreach item in inv begin
-      if (obj_pid(item) != PID_BOTTLE_CAPS) then begin
-         it := obj_item_subtype(item);
-         if (it == item_type_armor) then
-            prob := probArmor;
-         else if (it == item_type_drug) then
-            prob := probDrugs;
-         else if (it == item_type_weapon) then
-            prob := probWeapons;
-         else if (it == item_type_ammo) then
-            prob := probAmmo;
-         else
-            prob := probMisc;
-         if (random(0, 99) < prob) then begin
-            //display_msg("remove "+obj_name(item));
-            call remove_all_items_pid(critter, obj_pid(item));
-         end
-      end
-   end
-end
-
-procedure item_by_attack_type(variable critter, variable type) begin
-   variable slot;
-   if (type > 3 and type != ATKTYPE_LWEP_RELOAD and type != ATKTYPE_RWEP_RELOAD) then
-      return 0;
-   if (type < 2 or type == ATKTYPE_LWEP_RELOAD) then
-      slot := INVEN_TYPE_LEFT_HAND;
-   else
-      slot := INVEN_TYPE_RIGHT_HAND;
-   return critter_inven_obj(critter, slot);
-end
-
-#endif

artifacts/scripting/headers/lib.math.h

@@ -1,47 +0,0 @@
-#ifndef LIB_MATH_H
-#define LIB_MATH_H
-
-/**
-  Numbers...
-*/
-
-#define MAX(x, y)    ((x > y) * x + (x <= y) * y)
-#define MIN(x, y)    ((x < y) * x + (x >= y) * y)
-#define in_range(x, from, to)    (x >= from and x <= to)
-
-procedure max(variable x, variable y) begin
-   if (x > y) then return x;
-   return y;
-end
-
-procedure min(variable x, variable y) begin
-   if (x < y) then return x;
-   return y;
-end
-
-/*procedure round(variable val) begin
-   variable intp;
-   intp := floor(val);
-   if ((val-intp) >= 0.5) then intp++;
-   return intp;
-end*/
-
-procedure ceil(variable val) begin
-   variable intp;
-   intp := floor(val);
-   if (abs(val-intp) > 0.0) then begin
-      intp++;
-   end
-   return intp;
-end
-
-
-procedure cap_number(variable num, variable min, variable max) begin
-   if (num > max) then num := max;
-   else if (num < min) then num := min;
-   return num;
-end
-
-
-
-#endif

artifacts/scripting/headers/lib.misc.h

@@ -1,85 +0,0 @@
-#ifndef LIB_MISC_H
-#define LIB_MISC_H
-
-/**
-  Some generic procedures
-*/
-/*
-procedure round(variable val) begin
-   variable intp;
-   intp := floor(val);
-   if ((val-intp) >= 0.5) then intp++;
-   return intp;
-end*/
-
-// this fixes strange behavior when using negative float values
-// looks like the only way to create correct negative float is to use atof()
-// DEPRECATED as of sfall 3.4 (engine bug fixed)
-/*procedure itof_safe(variable var) begin
-   if (var < 0) then begin
-      var := atof("-"+(-var));
-   end
-   return var;
-end*/
-
-// Parse keyboard shortcut definition
-procedure parse_hotkey(variable string) begin
-   variable lst;
-   variable n;
-   lst := string_split(string, "+");
-   if (len_array(lst) == 0) then
-      return 0;
-   n := atoi(lst[0]);
-   if (len_array(lst) > 1) then
-      n += atoi(lst[1])*0x10000;
-   return n;
-end
-
-// Check if shortcut is pressed
-procedure hotkey_pressed(variable n) begin
-   if (n < 0x10000) then
-      return key_pressed(n);
-   else
-      return key_pressed(n bwand 0xFFFF) and key_pressed((n bwand 0xFFFF0000) / 0x10000);
-end
-
-// same as above, but suited for hs_keypress hook when keycode is already known
-procedure hotkey_pressed_now(variable n, variable key) begin
-   if (n < 0x10000) then
-      return key == n;
-   else begin
-      variable k1 := (n bwand 0xFFFF),
-               k2 := ((n bwand 0xFFFF0000) / 0x10000);
-      if (k1 == key) then begin
-         if (key_pressed(k2)) then return true;
-      end else if (k2 == key) then begin
-         if (key_pressed(k1)) then return true;
-      end
-      return false;
-   end
-end
-
-
-
-/**
-  Attempt to make list_as_array safe
-*/
-/*procedure list_as_array_safe(variable type) begin
-   variable list, item, arr, i;
-   list := list_begin(type);
-   arr := temp_array(100, 4);
-   i := 0;
-   item := list_next(list);
-   while (item) do begin
-      if (len_array(arr) == i) then resize_array(arr, len_array(arr) + 100);
-      arr[i] := item;
-      item := list_next(list);
-      i++;
-   end
-   resize_array(arr, i);
-   list_end(list);
-   return arr;
-end*/
-
-
-#endif

artifacts/scripting/headers/lib.strings.h

@@ -1,243 +0,0 @@
-/**
-
-  This library contains procedures to work with strings.
-
-  @author phobos2077
-
-*/
-
-#ifndef LIB_STRINGS_H
-#define LIB_STRINGS_H
-
-#define is_in_string(str, substr)         (string_pos(str, substr) != -1)
-#define string_starts_with(str, substr)   (string_pos(str, substr) == 0)
-
-/**
- * Returns position of first occurance of substr in str, or -1 if not found
- */
-procedure string_pos(variable str, variable subst) begin
-   variable lst, n;
-   lst := string_split(str, subst);
-   if (len_array(lst) < 2) then
-      return -1;
-   return strlen(lst[0]);
-end
-
-/**
- * Join array of strings using delimeter
- */
-procedure string_join(variable array, variable join) begin
-   variable str, i, len;
-   str := "";
-   len := len_array(array);
-   if (len > 0) then begin
-      str := array[0];
-      for (i:=1; i<len; i++) begin
-         str += join + array[i];
-      end
-   end
-   return str;
-end
-
-/**
- * replaces all occurances of substring in a string with another substring
- */
-#define string_replace(str, search, replace)    (string_join(string_split(str, search), replace))
-
-/**
- * sprintf with two arguments
- */
-procedure sprintf2(variable str, variable arg1, variable arg2) begin
-   variable split, len, i, j, arg;
-   split := string_split(str, "%");
-   len := len_array(split);
-   str := "";
-   if (len > 0) then begin
-      str := split[0];
-      j := 0;
-      for (i := 1; i < len; i++) begin
-         if (split[i] == "") then begin
-            if (i < len - 1) then begin
-               str += "%" + split[i+1];
-               i++;
-            end
-         end else begin
-            if (j == 0) then
-               arg := arg1;
-            else if (j == 1) then
-               arg := arg2;
-            else
-               arg := 0;
-
-            str += sprintf("%" + split[i], arg);
-            j++;
-         end
-      end
-   end
-   return str;
-end
-
-/**
- * sprintf with unlimited number of arguments
- */
-procedure sprintf_array(variable str, variable args) begin
-   variable split, len, i, j;
-   split := string_split(str, "%");
-   len := len_array(split);
-   str := "";
-   if (len > 0) then begin
-      str := split[0];
-      j := 0;
-      for (i := 1; i < len; i++) begin
-         if (split[i] == "") then begin
-            if (i < len - 1) then begin
-               str += "%" + split[i+1];
-               i++;
-            end
-         end else begin
-            str += sprintf("%" + split[i], args[j]);
-            j++;
-         end
-      end
-   end
-   return str;
-end
-
-/**
- * Returns position of last occurance of substr in str, or -1 if not found
- */
-/*procedure string_rpos(variable str, variable substr) begin
-variable lst, n;
-   lst := string_split(str, substr);
-   n := len_array(lst);
-   if (n < 2) then
-      return -1;
-   return string_len(str) - (string_len(lst[n-1]) + string_len(substr));
-end*/
-
-/**
- * Basically the same as string_split, but delim is of type char instead of string
- */
-procedure string_get_tokens(variable str, variable delim) begin
-   variable lst, line, token, maxlen, len, count;
-   count := 1;
-   maxlen := 4;
-   token := tokenize(str, 0, delim);
-   //if (token != 0) then
-      //count := 1;
-      line := token;
-      while (line != str) do begin
-         count += 1;
-         len := strlen(token);
-         if (len > maxlen) then
-            maxlen := len;
-         token := tokenize(str, line, delim);
-         if (token != 0) then
-            line += delim + token;
-      end
-   //end
-
-   return count;
-end
-
-procedure string_repeat(variable str, variable count) begin
-   variable out := "", i := 0;
-   while (i < count) do begin
-      out += str;
-      i++;
-   end
-   return out;
-end
-
-/**
- * Workaround for string_split bug in sfall 3.3
- * DEPRECATED as of sfall 3.4 (bug fixed)
- */
-procedure string_split_safe(variable str, variable split) begin
-   variable lst;
-   str += split;
-   lst := string_split(str, split);
-   resize_array(lst, len_array(lst) - 1);
-   return lst;
-end
-
-/**
- * The same as sfall string_split, but returns array of integers instead
- * Useful in cunjunction with is_in_array()
- */
-procedure string_split_ints(variable str, variable split) begin
-   variable i := 0;
-   variable list;
-   list := string_split(str, split);
-   while (i < len_array(list)) do begin
-      list[i] := atoi(list[i]);
-      i++;
-   end
-   return list;
-end
-
-
-/**
-  String parse functions. Idea taken from KLIMaka on TeamX forums.
-  Placeholders in format %d% are replaced from string. d refers to variable index (starting from 1).
-  You can repeat one placeholder multiple times, or use placeholders in any order.
-
-  Example:
-  parse_str_2("Hello, %2%. I have only $%1% to spare.", money_amount, dude_name);
-  Will return:
-  Hello, Killiano. I have only $1200 to spare.
-
-  The *_list function takes a temp_array as second parameter.
-*/
-
-#define _TOKENIZE_BEGIN       \
-   variable token, rest, line, result, n; \
-   line := tokenize(str, 0, '%'); \
-   result := line; \
-   while line != str do begin \
-      token := tokenize(str, line, '%'); \
-      line += "%" + token; \
-      if token == "" then result += "%"; \
-      else begin
-
-#define _TOKENIZE_END       \
-      end \
-      rest := tokenize(str, line, '%'); \
-      if (rest != 0) then begin \
-         line += "%" + rest; \
-         result += rest; \
-      end \
-   end \
-   return result;
-
-
-procedure parse_str_list(variable str, variable list) begin
-_TOKENIZE_BEGIN
-      n := atoi(token) - 1;
-      if (n >= 0 and n < len_array(list)) then result += list[n];
-_TOKENIZE_END
-end
-
-procedure parse_str_2(variable str, variable x1, variable x2) begin
-_TOKENIZE_BEGIN
-      n := atoi(token);
-      if (n == 1) then result += x1;
-      else if (n == 2) then result += x2;
-_TOKENIZE_END
-end
-
-procedure parse_str_4(variable str, variable x1, variable x2, variable x3, variable x4) begin
-_TOKENIZE_BEGIN
-      n := atoi(token);
-      if (n == 1) then result += x1;
-      else if (n == 2) then result += x2;
-      else if (n == 3) then result += x3;
-      else if (n == 4) then result += x4;
-_TOKENIZE_END
-end
-
-#undef _TOKENIZE_BEGIN
-#undef _TOKENIZE_END
-
-#endif
-