Fixed broken get_attack_type function (from Mr.Stalin and Crafty)

Replaced some SafeWriteX usages with SafeMemSet for writing serial NOPs.
Minor edits to documents.

.gitignore

@@ -46,8 +46,6 @@ nb-configuration.xml
 *.user
 *.userosscache
 *.sln.docstates
-*.VC.db
-*.VC.opendb
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

artifacts/config_files/Translations.ini

@@ -1,5 +1,5 @@
 [sfall]
-SaveInCombat=Cannot save at this time.
+SaveInCombat=Cannot save at this time
 KarmaGain=You gained %d karma.
 KarmaLoss=You lost %d karma.
 HighlightFail1=You aren't carrying a motion sensor.
@@ -11,4 +11,4 @@ SaveSfallDataFail=ERROR saving extended savegame information! Check if other pro
 [AppearanceMod]
 RaceText=Race
 StyleText=Style
-MainButtonText=Appearance
+MainButtonText=Appearance 

artifacts/config_files/npcarmor.ini

@@ -1,79 +0,0 @@
-
-; This section maps 7 armor types to corresponding armor item PIDs
-[ArmorTypes]
-Jacket   = 74,265
-Leather  = 1,379
-Metal    = 2,240,380
-Power    = 3,232
-AdvPower = 348,349
-Combat   = 17,239,381
-Robe     = 113,524
-
-; Default armor FIDs (the same for all NPCs)
-[Default]
-Power=16777217
-AdvPower=16777287
-Robe=16777218
-
-
-; Sulik
-[1]
-PID=16777313
-WeaponAnims=1,3,4,6
-Default=16777280
-Leather=16777325
-Power=16777324
-Metal=16777323
-Jacket=16777321
-Combat=16777322
-
-; Vic
-[2]
-PID=16777278
-WeaponAnims=1,5,7
-Default=16777307
-Jacket=16777329
-Combat=16777330
-Metal=16777331
-Power=16777332
-Leather=16777333
-
-; Cassidy
-[3]
-PID=16777305
-WeaponAnims=4,5,7
-Default=16777354
-Leather=16777260
-Power=16777328
-Metal=16777327
-Jacket=16777351
-Combat=16777326
-
-; Myron
-[4]
-PID=16777376
-WeaponAnims=1,5
-Default=16777304
-Leather=
-Power=16777349
-Combat=16777350
-
-; Cat Jules
-[5]
-PID=16777734
-WeaponAnims=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-Default=16777353
-Leather=16777347
-Metal=16777348
-Jacket=16777346
-Combat=16777226
-
-; Kitsune
-[6]
-PID=16777724
-WeaponAnims=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-Default=16777222
-Leather=16777221
-Metal=16777223
-Jacket=16777222
-Combat=16777219

artifacts/config_files/sfall-mods.ini

@@ -1,40 +0,0 @@
-[Highlighting]
-
-; DX scancode of a key to press to highlight items on the ground
-;  42 - SHIFT key
-Key=42
-
-; Set to 1 to also highlight containers
-Containers=0
-
-; Set to 1 to also highlight lootable corpses
-Corpses=0
-
-; Set to 1 to only highlight objects in the player's line-of-sight
-CheckLOS=0
-
-; Set the color of outlines, available colors:
-; 1 - glowing red
-; 2 - red
-; 4 - grey
-; 8 - glowing green
-; 16 - bright yellow
-; 32 - dark yellow
-; 64 - purple
-OutlineColor=16
-
-; Motion Scanner mode:
-; 0 - ignored
-; 1 - requires Motion Scanner present in player inventory to activate highlighting
-; 2 - requires Motion Scanner and also requires 1 charge on every use (depleted scanner will not work anymore)
-MotionScanner=0
-
-
-[CombatControl]
-;Allows you to directly control other critters in combat
-;Set to 0 to disable
-;Set to 1 to control all critters in combat
-;Set to 2 to control all party members
-;If you want to control only specific critters, uncomment the PIDList line and set a comma delimited list of PIDs
-Mode=0
-;PIDList=62,89,97,107,160,161

artifacts/ddraw.ini

@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v4.0.6
+;v3.8.9
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -107,7 +107,7 @@ SpeedModKey=-1
 
 ;A key to press to toggle the speed tweak on or off
 ;Specify 0 if you don't want a toggle key, or a DX scancode otherwise
-SpeedToggleKey=0
+SpeedToggleKey=0x00
 
 ;The keys corresponding to the 10 speed slots
 ;Set to 0 to disable a slot, otherwise specify the DX scancode of the key you want to use
@@ -127,16 +127,26 @@ SpeedKey9=0x00
 ;Set to -1 for either ctrl key, -2 for either alt key or -3 for either shift key
 WindowScrollKey=0
 
+;A key to press to toggle the highlighting of all items on the ground on the current map
+ToggleItemHighlightsKey=42
+
+;Set to 1 to also highlight containers
+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
-;Set to 0 if you don't want a reload key, or a DX scancode otherwise
 ReloadWeaponKey=0
 
-;A key to hold down to let you move/drop a whole stack of items at once without the 'Move Items' window
-;Set to 0 if you don't want to use a modifier key, or a DX scancode otherwise
-ItemFastMoveKey=0x1d
-
-;A key to press to open a debug game editor (requires FalloutClient.exe from the modders pack)
-;Set to 0 to disable, or a DX scancode otherwise
+;A key to press to open a debug game editor
 DebugEditorKey=0
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -170,7 +180,7 @@ WorldMapEncounterRate=5
 
 ;The number of slots available in the locations list panel of the world map
 ;Set to 0 to leave unchanged. 17 is default.
-;Setting this greater than 17 requires a replacement background FRM, or you'll get glitched graphics
+;Setting this greater than 17 requires a replacement background frm, or you'll get glitched graphics
 WorldMapSlots=0
 
 ;To start a new game somewhere other than artemple.map, uncomment the next line and set it to the map you want to load
@@ -294,7 +304,7 @@ SaveInCombatFix=1
 ;Player's level is capped once the highest specified level is reached
 ;XPTable=50,100,200
 
-;Set to 1 to enable additional weapon animation codes from o-t
+;Set to 1 to enable additional weapon animations codes from o-t
 ;The 4 byte value at 0x39 of weapon protos may range from 0 to 15 rather than 0 to 10
 ;Since the letters 'n' and 'r' are in use for other animations, an animation code of 11 corrisponds to 's' and 15 to 't'
 AdditionalWeaponAnims=1
@@ -350,10 +360,7 @@ NPCsTryToSpendExtraAP=0
 ;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
 
-;Set to 1 to boost the maximum number of tile FRMs from 4096 to 16383
-MoreTiles=0
-
-;Change the Skilldex cursor FRM numbers
+;Change the Skilldex cursor frm numbers
 ;Default is 293 for all skills
 Lockpick=293
 Steal=293
@@ -376,6 +383,7 @@ UseScrollingQuestsList=1
 
 ;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.
+;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
 
 ;Set this to a valid path to save a copy of the console contents
@@ -388,8 +396,9 @@ ExtraSaveSlots=0
 ;Set to 2 to update the HP/AC counters instantly
 SpeedInterfaceCounterAnims=0
 
-;These lines allow you to control the karma FRMs displayed on the character screen
+;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
 
@@ -410,9 +419,6 @@ BonusHtHDamageFix=1
 ;Set to 1 to display additional points of damage from Bonus HtH/Ranged Damage perks in the inventory
 DisplayBonusDamage=0
 
-;Set to 1 to display the range of the second attack mode in the inventory when you switch weapon modes in active item slots
-DisplaySecondWeaponRange=1
-
 ;Modify the maximum number of animations allowed to run on a map. (Default is 32, and the maximum is 127)
 AnimationsAtOnceLimit=120
 
@@ -453,6 +459,7 @@ CritterInvSizeLimit=200
 ;Some bit flags to alter behaviour of the motion sensor
 ;1 - Allow sensor use on automap when motion sensor is in pack rather than hands
 ;2 - Motion sensor doesn't require charges
+;4 - Motion sensor is required to use the item highlight feature
 MotionScannerFlags=1
 
 ;Set to non-0 to adjust the maximum encounter table size
@@ -525,6 +532,14 @@ DialogPanelAnimDelay=33
 ;Controls the speed of pipboy alarm clock animations (lower - faster; valid range: 0..127)
 PipboyTimeAnimDelay=50
 
+;Allows you to directly control other critters in combat
+;Set to 0 to disable
+;Set to 1 to control all critters in combat
+;Set to 2 to control all party members
+;If you want to control only specific critters, uncomment the ControlCombatPIDList line and set a comma delimited list of PIDs
+ControlCombat=0
+;ControlCombatPIDList=62,89,97,107,160,161
+
 ;Set to 1 to stack empty identical weapons, no matter what type of ammo was loaded before
 StackEmptyWeapons=0
 
@@ -535,9 +550,6 @@ StackEmptyWeapons=0
 ;If the amount of ammo boxes in the inventory is less than or equal to the reserve, only one box will be used
 ReloadReserve=-1
 
-;Set to 1 to change the counter in the 'Move Items' window to start at the maximum number of items
-ItemCounterDefaultMax=0
-
 ;Allows 9 options (lines of text) to be displayed correctly in a dialog window
 DialogOptions9Lines=1
 
@@ -563,19 +575,9 @@ InstantWeaponEquip=0
 ;Set to 1 to display numbered dialogue options
 NumbersInDialogue=0
 
-;Set to 1 to use Fallout's normal text font instead of DOS-like font on the world map
-WorldMapFontPatch=0
-
 ;Set to 1 to display sfall built-in credits at the bottom of credits.txt contents instead of at the top
 CreditsAtBottom=0
 
-;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-[Scripts]
-;Comma-separated list of masked paths to load global scripts from
-;Only use single slash \ as directory separator
-;Paths outside of scripts folder are supported
-GlobalScriptPaths=scripts\gl*.int,scripts\sfall\gl*.int
-
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Debugging]
 ;Extra sfall configuration settings that can be used by modders

artifacts/mods/gl_highlighting.ssl

@@ -1,126 +0,0 @@
-/**
-
-   Item Highlight mod.
-
-   Previously was part of sfall itself, now a separate mod.
-   Features:
-   - highlighting items, containers (optional) and lootable corpses (optional) on the ground
-   - configurable hotkey is used to trigger highlight
-   - only objects in direct line-of-sight of player are highlighted (optional)
-   - motion scanner is required to enable highlight (optional)
-   - motion scanner charges are decreased on each use (optional)
-
-   NOTE: this script requires compiler from sfall modderspack with -s option
-   (short circuit evaluation)
-
-   version 1.0
-
-**/
-
-#include "main.h"
-//#include "..\..\..\!SRC\headers\define.h"
-
-#define CRITTER_IS_DEAD    (1)
-#define PID_MOTION_SENSOR  (59)
-#define NO_HIGHLIGHT(obj)  (get_flags(obj) bwand FLAG_NOHIGHLIGHT)
-#define NO_STEAL(obj)      (get_proto_data(obj_pid(obj), PROTO_CR_FLAGS) bwand CFLG_NOSTEAL)
-
-variable configSection := "Highlighting";
-variable highlightKey;
-variable isHighlight;
-variable alsoContainer;
-variable alsoCorpse;
-variable checkLOS;
-variable outlineColor;
-variable motionScanner;
-variable highlightFailMsg1;
-variable highlightFailMsg2;
-
-procedure ToggleHighlightObject(variable obj, variable enable) begin
-   if obj and (not enable or not checkLOS or not obj_blocking_line(dude_obj, tile_num(obj), BLOCKING_TYPE_SHOOT)) then begin
-      if (alsoContainer and obj_item_subtype(obj) == item_type_container) or (not NO_HIGHLIGHT(obj)) then begin
-         if (enable) then set_outline(obj, outlineColor);
-         else set_outline(obj, 0);
-      end
-   end
-end
-
-procedure ToggleHighlight(variable enable) begin
-   variable obj;
-   foreach obj in list_as_array(LIST_GROUNDITEMS) begin
-      if obj != outlined_object then begin
-         call ToggleHighlightObject(obj, enable);
-      end
-   end
-   if (alsoCorpse) then begin
-      foreach obj in list_as_array(LIST_CRITTERS) begin
-         if critter_state(obj) == CRITTER_IS_DEAD and not NO_STEAL(obj) then begin
-            call ToggleHighlightObject(obj, enable);
-         end
-      end
-   end
-   tile_refresh_display;
-end
-
-procedure KeyPressHandler begin
-   variable pressed := get_sfall_arg,
-            scanCode := get_sfall_arg,
-            scanner, charges;
-
-   if scanCode == highlightKey then begin
-      if pressed then begin
-         isHighlight := true;
-         if motionScanner then begin
-            scanner := obj_carrying_pid_obj(dude_obj, PID_MOTION_SENSOR);
-            if scanner then begin
-               if motionScanner >= 2 then begin
-                  charges := get_weapon_ammo_count(scanner);
-                  if charges > 0 then begin
-                     set_weapon_ammo_count(scanner, charges - 1);
-                     intface_redraw;
-                     call ToggleHighlight(true);
-                  end else begin
-                     display_msg(highlightFailMsg2);
-                  end
-               end else begin
-                  call ToggleHighlight(true);
-               end
-            end else begin
-               display_msg(highlightFailMsg1);
-            end
-         end else begin
-            call ToggleHighlight(true);
-         end
-      end else begin
-         isHighlight := false;
-         call ToggleHighlight(false);
-      end
-   end
-end
-
-procedure CombatTurnHandler begin
-   if isHighlight then begin
-      isHighlight := false;
-      call ToggleHighlight(false);
-   end
-end
-
-procedure start begin
-   if game_loaded and (sfall_ver_major >= 4) then begin
-      call InitConfigs;
-
-      highlightKey := GetConfig(configSection, "Key", 0);
-      alsoContainer := GetConfig(configSection, "Containers", 0);
-      alsoCorpse := GetConfig(configSection, "Corpses", 0);
-      checkLOS := GetConfig(configSection, "CheckLOS", 0);
-      outlineColor := GetConfig(configSection, "OutlineColor", 16);
-      if (outlineColor < 1) then outlineColor := 64;
-      motionScanner := GetConfig(configSection, "MotionScanner", 0);
-
-      highlightFailMsg1 := Translate("HighlightFail1", "You aren't carrying a motion sensor.");
-      highlightFailMsg2 := Translate("HighlightFail2", "Your motion sensor is out of charge.");
-
-      register_hook_proc(HOOK_KEYPRESS, KeyPressHandler);
-      register_hook_proc(HOOK_COMBATTURN, CombatTurnHandler);
-   end
-end

artifacts/mods/gl_npcarmor.ssl

@@ -1,154 +0,0 @@
-/*
-
-   NPC Armor Appearance mod
-
-   Used to replace the scripted part of B-Team mod.
-   Appropriate graphics are required for this mod to work.
-   Can be adopted to any mod by adjusting armor PIDs, allowed weapon anim codes, NPC PIDs and NPC FIDs in INI file.
-
-   NOTE: this script requires compiler from sfall modderspack with -s option
-   (short circuit evaluation)
-
-   version 1.1
-
-*/
-
-#include "main.h"
-
-#define IS_ARMOR(item)  (obj_type(item) == OBJ_TYPE_ITEM and obj_item_subtype(item) == item_type_armor)
-#define IS_WEAPON(item)  (obj_type(item) == OBJ_TYPE_ITEM and obj_item_subtype(item) == item_type_weapon)
-
-variable
-   modIni := "npcarmor.ini",
-   defaultFids,
-   armorPidMap, // maps armor PID to it's "type" - leather armor, metal, power armor, etc.
-   npcMap;
-
-procedure check_armor_change(variable critter, variable item, variable isWorn) begin
-   variable npc, armorType, fid;
-   if (npcMap[obj_pid(critter)]) then begin
-      npc := npcMap[obj_pid(critter)];
-      if (not isWorn) then begin
-         // display_msg("No armor fid: " + npc["Default"]);
-         return npc["Default"];
-      end else if (item) then begin
-         armorType := armorPidMap[obj_pid(item)];
-         fid := npc[armorType] or defaultFids[armorType];
-         if (fid == 0 or fid == -1) then fid := npc["Default"];
-         // display_msg("Change fid: " + fid + ", npc: " + npc[armorType] + ", default:" + defaultFids[armorType]);
-         return fid;
-      end
-   end
-   return -1;
-end
-
-procedure check_weapon_change(variable critter, variable item, variable isWield) begin
-   variable npc, newWeaponAnim, weaponAnimList, i;
-   if (npcMap[obj_pid(critter)]) then begin
-      npc := npcMap[obj_pid(critter)];
-      if isWield then begin
-         newWeaponAnim := get_proto_data(obj_pid(item), PROTO_WP_ANIM);
-         weaponAnimList := string_split(npc["WeaponAnims"], ",");
-         if newWeaponAnim then begin
-            foreach (i in weaponAnimList) begin
-               if (newWeaponAnim == atoi(i)) then return -1;
-            end
-         end else begin // anim code 0 - none/unarmed
-            return -1;
-         end
-      end
-   end
-   return 0;
-end
-
-// for NPCs when they change armor/weapon themselves
-procedure invenwield_handler begin
-   variable critter, item, fid, slot, isWorn, canWield;
-   critter := get_sfall_arg;
-   item := get_sfall_arg;
-   slot := get_sfall_arg;
-   isWorn := get_sfall_arg;
-
-   if (critter and item and slot == INVEN_TYPE_WORN) then begin
-      fid := check_armor_change(critter, item, isWorn);
-      if (fid != -1) then begin
-         art_change_fid_num(critter, fid);
-      end
-   end
-
-   if (critter and item and (slot == INVEN_TYPE_RIGHT_HAND or slot == INVEN_TYPE_LEFT_HAND)) then begin
-      canWield := check_weapon_change(critter, item, isWorn);
-      set_sfall_return(canWield);
-   end
-end
-
-// when changing armor from inventory while controlling other NPCs
-procedure adjustfid_handler begin
-   variable fid, armor;
-   if (dude_obj != real_dude_obj) then begin
-      armor := critter_inven_obj(dude_obj, INVEN_TYPE_WORN);
-      fid := check_armor_change(dude_obj, armor, armor != 0);
-      if (fid != -1) then begin
-         set_sfall_return(fid);
-      end
-   end
-end
-
-// when changing weapon from inventory while controlling other NPCs
-procedure inventorymove_handler begin
-   variable slot, item, canWield;
-   slot := get_sfall_arg;
-   item := get_sfall_arg;
-   if (dude_obj != real_dude_obj) then begin
-      if (IS_WEAPON(item) and (slot == INVEN_TYPE_RIGHT_HAND or slot == INVEN_TYPE_LEFT_HAND)) then begin
-         canWield := check_weapon_change(dude_obj, item, item != 0);
-         set_sfall_return(canWield);
-      end
-   end
-end
-
-
-procedure start begin
-   variable sect, sects, armorTypes, armorType, npc, pid, pids, i;
-   if game_loaded and (sfall_ver_major >= 4) then begin
-      register_hook_proc(HOOK_INVENWIELD, invenwield_handler);
-      register_hook_proc(HOOK_ADJUSTFID, adjustfid_handler);
-      register_hook_proc(HOOK_INVENTORYMOVE, inventorymove_handler);
-
-      defaultFids := get_ini_section(modIni, "Default");
-      fix_array(defaultFids);
-      foreach (armorType: i in defaultFids) begin
-         defaultFids[armorType] := atoi(i);
-      end
-
-      armorPidMap := create_array_map;
-      armorTypes := get_ini_section(modIni, "ArmorTypes");
-      foreach (armorType: pids in armorTypes) begin
-         pids := string_split(pids, ",");
-         foreach (pid in pids) begin
-            armorPidMap[atoi(pid)] := armorType;
-         end
-      end
-
-      npcMap := create_array_map;
-
-      i := 1;
-      sect := get_ini_section(modIni, ""+i);
-      while (sect.PID) do begin
-         npc := create_array_map;
-         npc["WeaponAnims"] := sect["WeaponAnims"];
-         npc["Default"] := atoi(sect["Default"]);
-         foreach (armorType: pids in armorTypes) begin
-            if (sect[armorType]) then begin
-               npc[armorType] := atoi(sect[armorType]);
-            end
-         end
-         npcMap[atoi(sect.PID)] := npc;
-
-         i += 1;
-         sect := get_ini_section(modIni, ""+i);
-      end
-   end
-
-end
-

artifacts/mods/gl_partycontrol.ssl

@@ -1,57 +0,0 @@
-/*
-
-   NPC Combat Control
-
-   Allows to take control of your party member or other NPCs during combat
-
-   NOTE: this script requires compiler from sfall modderspack with -s option
-   (short circuit evaluation)
-
-   version 1.0
-
-*/
-
-#include "..\headers\define.h"
-#include "main.h"
-
-variable
-   configSection := "CombatControl",
-   controlMode,
-   pidList,
-   hasGeckoSkinning := false;
-
-
-procedure combatturn_handler begin
-   variable
-      status := get_sfall_arg,
-      critter := get_sfall_arg,
-      arg3 := get_sfall_arg,
-      pid;
-
-   // display_msg("Combat Turn: " + status + ", by "  + obj_name(critter) + ", arg3: " + arg3);
-   pid := obj_pid(critter);
-   if (status == 1
-      and (len_array(pidList) == 0 or scan_array(pidList, pid bwand 0xFFFFFF) != -1)
-      and (controlMode == 1 or party_member_obj(pid))) then begin
-      set_dude_obj(critter);
-      if hasGeckoSkinning then critter_add_trait(critter, TRAIT_PERK, PERK_gecko_skinning_perk, 1);
-   end else begin
-      set_dude_obj(real_dude_obj);
-   end
-end
-
-procedure start begin
-   if game_loaded and (sfall_ver_major >= 4) then begin
-      set_perk_ranks(PERK_gecko_skinning_perk, 1);
-      set_perk_level(PERK_gecko_skinning_perk, 999); // prevent it from appearing in the perk selection window
-      controlMode := GetConfig("CombatControl", "Mode", 0);
-      if (controlMode > 2) then controlMode := 0;
-      if (controlMode > 0) then begin
-         pidList := GetConfigListInt("CombatControl", "PIDList");
-         fix_array(pidList);
-         if has_trait(TRAIT_PERK, dude_obj, PERK_gecko_skinning_perk) then hasGeckoSkinning := true;
-
-         register_hook_proc(HOOK_COMBATTURN, combatturn_handler);
-      end
-   end
-end

artifacts/mods/main.h

@@ -1,57 +0,0 @@
-
-#include "..\scripting\headers\sfall.h"
-#include "..\scripting\headers\define_lite.h"
-#include "..\scripting\headers\define_extra.h"
-
-#include "..\scripting\headers\lib.arrays.h"
-#include "..\scripting\headers\lib.strings.h"
-// #include "..\scripting\headers\lib.inven.h"
-
-variable ini := "sfall-mods.ini";
-variable translationIni;
-
-// Gets the integer value from ddraw.ini
-procedure GetConfig(variable section, variable key, variable def) begin
-   variable val := get_ini_setting(ini + "|" + section + "|" + key);
-   if val == -1 then val := def;
-   return val;
-end
-
-// Gets the string value from ddraw.ini
-procedure GetConfigStr(variable section, variable key, variable def) begin
-   variable val := get_ini_string(ini + "|" + section + "|" + key);
-   if val == -1 or val == "" then val := def;
-   return val;
-end
-
-// Gets the value from ddraw.ini as a temp array of strings
-procedure GetConfigList(variable section, variable key) begin
-   variable val := get_ini_string(ini + "|" + section + "|" + key);
-   if val == -1 or val == "" then return [];
-
-   return string_split(val, ",");
-end
-
-// Gets the value from ddraw.ini as a temp array of ints
-procedure GetConfigListInt(variable section, variable key) begin
-   variable arr, i, item;
-
-   arr := GetConfigList(section, key);
-   for (i := 0; i < len_array(arr); i++) begin
-      arr[i] := atoi(arr[i]);
-   end
-   return arr;
-end
-
-// Translates given string using Translations.ini
-procedure Translate(variable id, variable def) begin
-   variable str := get_ini_string(translationIni + "|Sfall|" + id);
-   if not str or (strlen(str) == 0) then begin
-      str := def;
-   end
-   return str;
-end
-
-procedure InitConfigs begin
-   translationIni := GetConfigStr("Main", "TranslationsINI", "./Translations.ini");
-end

artifacts/mods/readme.txt

@@ -1,2 +0,0 @@
-To install each mod, copy *.int file into your <Fallout Dir>\data\scripts\ folder.
-For gl_npcarmor.int, you also need to copy npcarmor.ini to your Fallout directory.

artifacts/scripting/headers/define_extra.h

@@ -39,32 +39,6 @@
 #define ATKMODE_SEC_BURST     112  // 0x00000070
 #define ATKMODE_SEC_FLAME     128  // 0x00000080
 
-/* Object flags for get/set_flags */
-#define FLAG_MOUSE_3D            (0x1)
-#define FLAG_WALKTHRU            (0x4)
-#define FLAG_FLAT                (0x8)
-#define FLAG_NOBLOCK            (0x10)
-#define FLAG_LIGHTING           (0x20)
-#define FLAG_TEMP              (0x400)
-#define FLAG_MULTIHEX          (0x800)
-#define FLAG_NOHIGHLIGHT      (0x1000)
-#define FLAG_USED             (0x2000)
-#define FLAG_TRANSRED         (0x4000)
-#define FLAG_TRANSNONE        (0x8000)
-#define FLAG_TRANSWALL       (0x10000)
-#define FLAG_TRANSGLASS      (0x20000)
-#define FLAG_TRANSSTEAM      (0x40000)
-#define FLAG_TRANSENERGY     (0x80000)
-#define FLAG_LEFT_HAND     (0x1000000)
-#define FLAG_RIGHT_HAND    (0x2000000)
-#define FLAG_WORN          (0x4000000)
-#define FLAG_HIDDENITEM    (0x8000000)
-#define FLAG_WALLTRANSEND (0x10000000)
-#define FLAG_LIGHTTHRU    (0x20000000)
-#define FLAG_SEEN         (0x40000000)
-#define FLAG_SHOOTTHRU    (0x80000000)
-
-
 /* Critter Flags */
 #define CFLG_BARTER             2  // 0x00000002 - Barter (can trade with)
 #define CFLG_NOSTEAL           32  // 0x00000020 - Steal (cannot steal from)

artifacts/scripting/headers/sfall.h

@@ -1,23 +1,19 @@
 //Recognised modes for set_shader_mode and get_game_mode
-#define WORLDMAP    (0x1)
-#define LOCALMAP    (0x2) //No point hooking this: would always be 1 at any point at which scripts are running
-#define DIALOG      (0x4)
-#define ESCMENU     (0x8)
-#define SAVEGAME    (0x10)
-#define LOADGAME    (0x20)
-#define COMBAT      (0x40)
-#define OPTIONS     (0x80)
-#define HELP        (0x100)
-#define CHARSCREEN  (0x200)
-#define PIPBOY      (0x400)
-#define PCOMBAT     (0x800)
-#define INVENTORY   (0x1000)
-#define AUTOMAP     (0x2000)
-#define SKILLDEX    (0x4000)
-#define INTFACEUSE  (0x8000)
-#define INTFACELOOT (0x10000)
-#define BARTER      (0x20000)
-#define HEROWIN     (0x40000)
+#define WORLDMAP   (0x1)
+#define LOCALMAP   (0x2) //No point hooking this: would always be 1 at any point at which scripts are running
+#define DIALOG     (0x4)
+#define ESCMENU    (0x8)
+#define SAVEGAME   (0x10)
+#define LOADGAME   (0x20)
+#define COMBAT     (0x40)
+#define OPTIONS    (0x80)
+#define HELP       (0x100)
+#define CHARSCREEN (0x200)
+#define PIPBOY     (0x400)
+#define PCOMBAT    (0x800)
+#define INVENTORY  (0x1000)
+#define AUTOMAP    (0x2000)
+#define SKILLDEX   (0x4000)
 
 //Valid arguments to register_hook
 #define HOOK_TOHIT            (0)
@@ -46,12 +42,6 @@
 #define HOOK_WITHINPERCEPTION (23)
 #define HOOK_INVENTORYMOVE    (24)
 #define HOOK_INVENWIELD       (25)
-#define HOOK_ADJUSTFID        (26)
-#define HOOK_COMBATTURN       (27)
-#define HOOK_CARTRAVEL        (28)
-#define HOOK_SETGLOBALVAR     (29)
-#define HOOK_RESTTIMER        (30)
-#define HOOK_GAMEMODECHANGE   (31)
 
 //Valid arguments to list_begin
 #define LIST_CRITTERS    (0)
@@ -139,7 +129,6 @@
 #define set_attack_explosion_radius(x)        metarule2_explosions(3, x, 0)
 #define set_attack_is_explosion(x)            metarule2_explosions(4, x, 0)
 #define set_attack_is_explosion_fire          set_attack_is_explosion(DMG_fire)
-#define set_explosion_radius(grenade, rocket) metarule2_explosions(5, grenade, rocket)
 
 
 #define GAME_MSG_COMBAT      (0)
@@ -169,24 +158,6 @@
 #define GAME_MSG_PRO_TILE   (0x1004)
 #define GAME_MSG_PRO_MISC   (0x1005)
 
-#define OUTLINE_NONE        (0)
-#define OUTLINE_RED_GLOW    (0x01)
-#define OUTLINE_RED         (0x02)
-#define OUTLINE_GREY        (0x04)
-#define OUTLINE_GREEN_GLOW  (0x08)
-#define OUTLINE_YELLOW      (0x10)
-#define OUTLINE_DARK_YELLOW (0x20)
-#define OUTLINE_PURPLE      (0x40)
-
-#define CURSOR_MOVEMENT     (0)
-#define CURSOR_COMMAND      (1)
-#define CURSOR_TARGETING    (2)
-
-//Valid flags for set_rest_mode
-#define RESTMODE_DISABLED   (1) // disable resting on all maps
-#define RESTMODE_STRICT     (2) // disable resting on maps with "can_rest_here=No" in Maps.txt, even if there are no other critters
-#define RESTMODE_NO_HEALING (4) // disable healing during resting
-
 #define mstr_combat(x)      (message_str_game(GAME_MSG_COMBAT, x))
 #define mstr_ai(x)          (message_str_game(GAME_MSG_AI, x))
 #define mstr_scrname(x)     (message_str_game(GAME_MSG_SCRNAME, x))
@@ -218,37 +189,12 @@
 #define party_member_list_all           party_member_list(1)
 
 
-#define attack_is_aimed                       sfall_func0("attack_is_aimed")
-#define car_gas_amount                        sfall_func0("car_gas_amount")
 #define critter_inven_obj2(obj, type)         sfall_func2("critter_inven_obj2", obj, type)
-#define display_stats                         sfall_func0("display_stats")
 #define exec_map_update_scripts               sfall_func0("exec_map_update_scripts")
 #define floor2(value)                         sfall_func1("floor2", value)
-#define get_cursor_mode                       sfall_func0("get_cursor_mode")
-#define get_flags(obj)                        sfall_func1("get_flags", obj)
-#define get_ini_section(file, sect)           sfall_func2("get_ini_section", file, sect)
-#define get_ini_sections(file)                sfall_func1("get_ini_sections", file)
-#define get_map_enter_position                sfall_func0("get_map_enter_position")
-#define get_outline(obj)                      sfall_func1("get_outline", obj)
 #define intface_hide                          sfall_func0("intface_hide")
 #define intface_is_hidden                     sfall_func0("intface_is_hidden")
 #define intface_redraw                        sfall_func0("intface_redraw")
 #define intface_show                          sfall_func0("intface_show")
-#define item_weight(obj)                      sfall_func1("item_weight", obj)
-#define lock_is_jammed(obj)                   sfall_func1("lock_is_jammed", obj)
-#define outlined_object                       sfall_func0("outlined_object")
-#define real_dude_obj                         sfall_func0("real_dude_obj")
-#define set_car_intface_art(artIndex)         sfall_func1("set_car_intface_art", artIndex)
-#define set_cursor_mode(mode)                 sfall_func1("set_cursor_mode", mode)
-#define set_dude_obj(critter)                 sfall_func1("set_dude_obj", critter)
-#define set_flags(obj, flags)                 sfall_func2("set_flags", obj, flags)
-#define set_iface_tag_text(tag, text, color)  sfall_func3("set_iface_tag_text", tag, text, color)
 #define set_ini_setting(setting, value)       sfall_func2("set_ini_setting", setting, value)
-#define set_map_enter_position(tile, elev, rot) sfall_func3("set_map_enter_position", tile, elev, rot)
-#define set_outline(obj, color)               sfall_func2("set_outline", obj, color)
-#define set_rest_heal_time(time)              sfall_func1("set_rest_heal_time", time)
-#define set_rest_mode(mode)                   sfall_func1("set_rest_mode", mode)
-#define set_unjam_locks_time(time)            sfall_func1("set_unjam_locks_time", time)
 #define spatial_radius(obj)                   sfall_func1("spatial_radius", obj)
-#define tile_refresh_display                  sfall_func0("tile_refresh_display")
-#define unjam_lock(obj)                       sfall_func1("unjam_lock", obj)

artifacts/scripting/hookscripts.txt

@@ -189,7 +189,7 @@ Critter arg1 - The critter that just died
 
 HOOK_FINDTARGET (hs_findtarget.int)
 
-Runs when the ai is trying to pick a target in combat. Fallout first chooses a list of 4 likely suspects, then normally sorts them in order of weakness/distance/etc depending on the ai caps of the attacker. This hook replaces that sorting function, allowing you to sort the targets in some arbitrary way. Use sfall_return to give the 4 targets, in order of preference. All 4 must be given if you want to override normal sorting; if you want to specify less than 4 targets fill in the extra spaces with 0's. If you do not give 4 targets, the NPCs normal sorting mechanism will be used.
+Runs when the ai is trying to pick a target in combat. Fallout first chooses a list of 4 likely suspects, then normally sorts them in order of weakness/distance/etc depending on the ai caps of the attacker. This hook replaces that sorting function, allowing you to sort the targets in some arbitrary way. Use sfall_return to give the 4 targets, in order of preference. All 4 must be given if you want to override normal sorting; if you want to specify less than 4 targets fill in the extra spaces with 0's. If you do not give 4 targets, the npcs normal sorting mechanism will be used.
 
 The return values can include critters that weren't in the list of possible targets, but the additional targets may still be discarded later on in the combat turn if they are out of the attackers perception or the chance of a successful hit is too low. The list of possible targets often includes duplicated entries.
 
@@ -312,7 +312,7 @@ int     arg2 - The default max damage
 Item    arg3 - The weapon used. (0 if unarmed)
 Critter arg4 - The critter doing the attacking
 int     arg5 - The type of attack
-int     arg6 - non-zero if this is an attack using a melee weapon
+int     arg6 - non zero if this is an attack using a melee weapon
 
 int     ret1 - Either the damage to be used, if ret2 isn't given, or the new minimum damage if it is
 int     ret2 - The new maximum damage
@@ -416,9 +416,9 @@ What you can do:
 - add AP costs for all inventory movement including reloading
 - apply or remove some special scripted effects depending on PC's armor
 
-int     arg1 - Target slot (0 - main backpack, 1 - left hand, 2 - right hand, 3 - armor slot, 4 - weapon, when reloading it by dropping ammo, 5 - container, like bag/backpack, 6 - dropping on the ground)
+int     arg1 - Target slot (0 - main backpack, 1 - left hand, 2 - right hand, 3 - armor slot, 4 - weapon, when reloading it by dropping ammo)
 Item    arg2 - Item being moved
-Item    arg3 - Item being replaced, weapon being reloaded, or container being filled (can be 0)
+Item    arg3 - Item being replaced or weapon being reloaded (can be 0)
 
 int     ret1 - Override setting (-1 - use engine handler, any other value - prevent relocation of item/reloading weapon)
 
@@ -432,77 +432,8 @@ NOTE: when replacing a previously wielded armor or weapon, the unwielding hook w
 If you need to rely on this, try checking if armor/weapon already equipped when wielding hook is executed.
 
 Critter arg1 - critter
-Obj     arg2 - item being wielded or unwielded (weapon/armor)
+Obj     arg2 - item being wielded or unwielded (weapon/armor), may be 0 when unwielding
 int     arg3 - slot (INVEN_TYPE_*)
 int     arg4 - 1 when wielding, 0 when unwielding
 
 int     ret1 - overrides hard-coded handler (-1 - use engine handler, any other value - override) - NOT RECOMMENDED
-
--------------------------------------------
-
-HOOK_ADJUSTFID (hs_adjustfid.int)
-
-Runs after calculating character figure FID on the inventory screen, whenever the game decides that character appearance might change.
-Also happens on other screens, like barter.
-
-NOTE: FID has following format: 0x0ABBCDDD, where A is object type, BB - animation code (always 0 in this case), C - weapon code, DDD - FRM index in LST file.
-
-int     arg1 - the vanilla fid calculated by the engine according to critter base FID and armor/weapon being used
-
-int     ret1 - overrides the calculated FID with provided value
-
--------------------------------------------
-
-HOOK_COMBATTURN (hs_combatturn.int)
-
-Runs before and after each turn in combat (for both PC and NPC).
-
-int     arg1 - event type: 1 - start of turn, 0 - normal end of turn, -1 - combat ended abruptly (by script or by pressing Enter during PC turn)
-int     arg2 - critter doing the turn
-int     arg3 - unknown boolean argument
-
-int     ret1 - pass 1 at the start of turn to skip the turn, pass -1 at the end of turn to force end of combat
-
--------------------------------------------
-
-HOOK_CARTRAVEL (hs_cartravel.int)
-
-Runs continuously during worldmap travel on car.
-
-int     arg1 - vanilla car speed (between 3 and 8 "steps")
-int     arg2 - vanilla fuel consumption (100 and below)
-
-int     ret1 - car speed override (pass -1 if you just want to override fuel consumption)
-int     ret2 - fuel consumption override
-
--------------------------------------------
-
-HOOK_SETGLOBALVAR (hs_setglobalvar.int)
-
-Runs when setting the value of a global variable.
-
-int     arg1 - the index number of the global variable being set
-int     arg2 - the set value of the global variable
-
-int     ret1 - overrides the value of the global variable
-
--------------------------------------------
-
-HOOK_RESTTIMER (hs_resttimer.int)
-
-Runs continuously while the player is resting (using pipboy alarm clock).
-
-int     arg1 - the game time in ticks
-int     arg2 - event type: 1 - when the resting ends normally, -1 - when pressing ESC to cancel the timer, 0 - otherwise
-int     arg3 - the hour part of the length of resting time
-int     arg4 - the minute part of the length of resting time
-
-int     ret1 - pass 1 to interrupt the resting
-
--------------------------------------------
-
-HOOK_GAMEMODECHANGE (hs_gamemodechange.int)
-
-Runs once every time when the game mode was changed, like opening/closing the inventory, character screen, pipboy, etc.
-
-int     arg1 - event type: 1 - when the player exits the game, 0 - otherwise

artifacts/scripting/sfall function notes.txt

@@ -50,7 +50,7 @@ has_fake_trait and has_fake_perk return the number of levels the player has of t
 
 perk_add_mode, set_selectable_perk, set_perkbox_title, hide_real_perks, show_real_perks and clear_selectable_perks control the behaviour of the select a perk box. set_selectable_perk can be used to add additional items by setting the 'active' parameter to 1, and to remove them again by setting it to 0. set_perkbox_title can be used to change the title of the box, or by using "" it will be set back to the default. hide and show_real_perks can be used to prevent the dialog from displaying any of the original 119 perks. perk_add_mode modifies what happens when a fake perk is selected from the perks dialog. It is treated as a set of flags - if bit 1 is set then it is added to the players traits, if bit 2 is set it is added to the players perks, and if bit 3 is set it is removed from the list of selectable perks. The default is 0x2. clear_selectable_perks restores the dialog to it's default state.
 
-show_iface_tag, hide_iface_tag and is_iface_tag_active relate to the boxes that appear above the interface such as SNEAK and LEVEL. You can use 3 for LEVEL and 4 for ADDICT, or the range from 5 to 9 for custom boxes. Remember to add your messages to intrface.msg and set up the font colours in ddraw.ini if you're going to use custom boxes.
+show_iface_tag, hide_iface_tag and is_iface_tag_active relate to the boxes that appear above the interface such as SNEAK and LEVEL. You can use 3 for LEVEL and 4 for ADDICT, or the range from 5 to 9 for custom boxes. Remember to add your messages to intrface.msg and setup the font colours in ddraw.ini if you're going to use custom boxes.
 
 get/set_bodypart_hit_modifier alter the hit percentage modifiers for aiming at specific bodyparts. Valid bodypart id's are from 0 to 8. Changes are not saved, and will reset to the defaults (or to the values specified in ddraw.ini if they exist) at each reload.
 
@@ -72,7 +72,7 @@ arrays are created and manipulated with the xxx_array functions. An array must f
 
 NOTE: the above description only applies when "arraysBehavior" is set to 0 in ddraw.ini. Refer to "arrays.txt" for detailed description of new arrays behavior.
 
-force_aimed_shots and disable_aimed_shots allow overriding the normal rules regarding which weapons are allowed to make aimed attacks. (e.g. weapons that cause explosive damage normally cannot normally make aimed shots.) force_aimed_shots will allow a weapon to make aimed shots even if it normally couldn't, and disable_aimed_shots stops a weapon from making aimed shots even if it normally could. Both of these functions affect player and NPCs alike. force_aimed_shots does not override the effects of the fast shot trait. The list of edited weapons is not saved over game loads, so you need to call the functions once at each reload. Use a pid of 0 to represent unarmed.
+force_aimed_shots and disable_aimed_shots allow overriding the normal rules regarding which weapons are allowed to make aimed attacks. (e.g. weapons that cause explosive damage normally cannot normally make aimed shots.) force_aimed_shots will allow a weapon to make aimed shots even if it normally couldn't, and disable_aimed_shots stops a weapon from making aimed shots even if it normally could. Both of these functions affect player and npcs alike. force_aimed_shots does not override the effects of the fast shot trait. The list of edited weapons is not saved over game loads, so you need to call the functions once at each reload. Use a pid of 0 to represent unarmed.
 
 get/set_critter_skill_points will get/set the number of additional points a critter has in a skill, on top of whatever they have from their stats and other bonuses. Note that skill points are part of the proto, so calling set_skill_points on a critter will affect all critters that share the same proto.
 
@@ -101,10 +101,10 @@ array - array ID to be used with array-related functions (actually an integer)
 - returns 1 the first time it is called after a new game or game load, and 0 any time after. It works on an individual basis for each script, so one script wont interfere with others. It's primary use is for global scripts, so that they know when to call set_global_script_repeat, but it can be called from normal scripts too.
 
 > void inc_npc_level(string npc)
-- takes an NPC name as an argument. The NPC must be in your party. This function ignores player level requirements and the minimum 3 player level delay between NPC level gains. It also ignores the random element, regardless of sfall's NPCAutoLevel setting.
+- takes an npc name as an argument. The npc must be in your party. This function ignores player level requirements and the minimum 3 player level delay between npc level gains. It also ignores the random element, regardless of sfall's NPCAutoLevel setting.
 
 > int get_npc_level(string npc)
-- also takes the NPC name as an argument, and returns the NPC's current level. Again, the NPC needs to be in your party.
+- also takes the npc name as an argument, and returns the npc's current level. Again, the npc needs to be in your party.
 
 > void set_car_current_town(int town)
 - changes the current town index for the player's car
@@ -231,10 +231,6 @@ was made as a dirty easy hack to allow dynamically change some explosion paramet
 > void set_attack_is_explosion_fire
 - if you call this right before using a weapon with fire damage type, it will produce explosion effects (and radius damage) just like "explosion" type, but all targets will still receive fire damage.
 
-> void set_explosion_radius(grenade, rocket)
-- sets a permanent radius of the explosion for grenades and/or rockets. Passing 0 means not changing the corresponding radius.
-- changed radius will be reset each time the player reloads the game.
-
 
 Some utility/math functions are available:
 
@@ -389,103 +385,6 @@ Some utility/math functions are available:
 - works just like vanilla floor function, but returns correct integers for negative values
 - vanilla floor function works exactly the same as ceil for negative values, much like trunc in C/C++
 
-> int sfall_func1("item_weight", object)
-- gets the current weight of an object
-
-> int sfall_func1("get_outline", object)
-- gets the current outline color for an object
-
-> void sfall_func2("set_outline", object, int color)
-- sets the outline color of an object
-- 0 means or any value above 0x00FFFFFF disables the outline
-- call "tile_refresh_display" after changing outline of objects to properly redraw the scene
-
-> int sfall_func1("get_flags", object)
-- gets the current value of object flags (see define_extra.h for available flags)
-
-> void sfall_func2("set_flags", object, int flags)
-- sets the current flags of an object
-- all flags are rewritten with given integer, so first get current flags with "get_flags" and use bwor/bwand to set/remove specific flag
-
-> void sfall_func0("tile_refresh_display")
-- redraws the game scene (tiles, walls, objects, etc.)
-
-> object sfall_func0("outlined_object")
-- returns an object that is currently highlighted by hovering the mouse above it
-
-> object sfall_func1("set_dude_obj", critter)
-- take control of a given critter
-- passing 0 will reset control back to "real" dude
-
-> void sfall_func0("real_dude_obj")
-- returns the initial dude_obj after set_dude_obj was used
-
-> array sfall_func1("get_ini_sections", string fileName)
-- returns an array of names of all sections in a given INI file
-
-> array sfall_func2("get_ini_section", string fileName, string section)
-- returns an associative array of keys and values for a given INI file and section
-
-> int sfall_func0("car_gas_amount")
-- returns current amount of fuel in player's car (between 0 and 80000)
-- to change fuel amount, use vanilla function: metarule(METARULE_GIVE_CAR_GAS, amount) - amount can be positive or negative
-
-> void sfall_func1("set_car_intface_art", int artIndex)
-- changes the interface art (index in LST file) for the car image on worldmap screen
-- should be called before going to worldmap
-- vanilla art index is 0x1B1
-
-> int sfall_func0("get_cursor_mode")
-- returns the current cursor mode (0 - movement cursor, 1 - command cursor, 2 - targeting cursor)
-- mode 4 to 10 are Skilldex skills (yellow targeting cursor)
-
-> void sfall_func1("set_cursor_mode", int mode)
-- sets the current cursor mode
-
-> void sfall_func0("display_stats")
-- displays player stats in the inventory screen display window
-- works only in opened inventory
-
-> int sfall_func1("lock_is_jammed", object)
-- returns 1 if the lock (container or scenery) is currently jammed, 0 otherwise
-
-> void sfall_func1("unjam_lock", object)
-- unjams a lock immediately without having to wait until the next day, or leave the map and then return after 24 hours
-- does not work in use_skill_on_p_proc procedure
-
-> void sfall_func1("set_unjam_locks_time", int time)
-- sets after how many hours (up to 127 hours) jammed locks will be unjammed if the player leaves the map
-- also disables the auto unjam that occurs at midnight when the player is on the map
-- passing 0 will disable the auto unjam mechanism completely
-- The auto unjam mechanism will be reset each time the player reloads the game
-
-> array sfall_func0("get_map_enter_position")
-- returns an array of the player's position data (index 0 - tile, 1 - elevation, 2 - rotation) when entering the map through exit grids
-- if entering from the world map, the tile value will be -1
-- should be called in map_enter_p_proc procedure to get the correct position data
-
-> void sfall_func3("set_map_enter_position", int tile, int elevation, int rotation)
-- overrides the player's entry position when entering the map through exit grids
-- setting the tile to 0 will put the player on the start hex (default tile and elevation) of the map
-- works only in map_enter_p_proc procedure
-
-> void sfall_func1("set_rest_heal_time", int minutes)
-- sets the time interval in minutes for healing during resting. The default is 180
-- The time interval will be reset each time the player reloads the game
-
-> void sfall_func1("set_rest_mode", int mode)
-- sets the bit flags for the rest mode (see RESTMODE_* constants in sfall.h)
-- passing 0 will reset the rest mode. It will also be reset each time the player reloads the game
-
-> int sfall_func0("attack_is_aimed")
-- returns 1 if the aimed attack mode is selected, 0 otherwise
-
-> void sfall_func3("set_iface_tag_text", int tag, string text, int color)
-- sets the text messages and colors for custom notification boxes to the interface without the need to add messages to intrface.msg and set up the font colors in ddraw.ini
-- tag value is the same as used in show_iface_tag, hide_iface_tag, and is_iface_tag_active. The valid range is from 5 to 9 (custom boxes)
-- The text is limited to 19 characters
-- available colors: 0 - green, 1 - red, 2 - white, 3 - yellow, 4 - dark yellow, 5 - blue, 6 - purple
-
 ------------------------
 ------ MORE INFO -------
 ------------------------

sfall/AI.cpp

@@ -16,24 +16,17 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <unordered_map>
-
-#include "..\main.h"
-
+#include "main.h"
 #include "AI.h"
-#include "..\FalloutEngine\Fallout2.h"
-#include "..\SafeWrite.h"
+#include "FalloutEngine.h"
+#include "SafeWrite.h"
 
-namespace sfall 
-{
+#include <hash_map>
 
-typedef std::unordered_map<DWORD, DWORD> :: const_iterator iter;
+typedef stdext::hash_map<DWORD, DWORD> :: const_iterator iter;
 
-static std::unordered_map<DWORD,DWORD> targets;
-static std::unordered_map<DWORD,DWORD> sources;
-
-static DWORD combatDisabled;
-static std::string combatBlockedMessage;
+static stdext::hash_map<DWORD,DWORD> targets;
+static stdext::hash_map<DWORD,DWORD> sources;
 
 DWORD _stdcall AIGetLastAttacker(DWORD target) {
 	iter itr=sources.find(target);
@@ -59,19 +52,22 @@ static void __declspec(naked) combat_attack_hook() {
 		push eax;
 		call CombatAttackHook;
 		popad;
-		jmp fo::funcoffs::combat_attack_;
+		jmp combat_attack_;
 	}
 }
 
+static DWORD CombatDisabled;
+static char CombatBlockedMessage[128];
+
 static void _stdcall CombatBlocked() {
-	fo::func::display_print(combatBlockedMessage.c_str());
+	DisplayConsoleMessage(CombatBlockedMessage);
 }
 
 static const DWORD BlockCombatHook1Ret1=0x45F6B4;
 static const DWORD BlockCombatHook1Ret2=0x45F6D7;
 static void __declspec(naked) BlockCombatHook1() {
 	__asm {
-		mov eax, combatDisabled;
+		mov eax, CombatDisabled;
 		test eax, eax;
 		jz end;
 		call CombatBlocked;
@@ -84,10 +80,10 @@ end:
 
 static void __declspec(naked) BlockCombatHook2() {
 	__asm {
-		mov eax, dword ptr ds:[FO_VAR_intfaceEnabled];
+		mov eax, dword ptr ds:[_intfaceEnabled];
 		test eax, eax;
 		jz end;
-		mov eax, combatDisabled;
+		mov eax, CombatDisabled;
 		test eax, eax;
 		jz succeed;
 		pushad;
@@ -103,17 +99,18 @@ end:
 }
 
 void _stdcall AIBlockCombat(DWORD i) {
-	combatDisabled = i ? 1 : 0;
+	if(i) CombatDisabled=1;
+	else CombatDisabled=0;
 }
 
-void AI::init() {
+void AIInit() {
 	//HookCall(0x42AE1D, ai_attack_hook);
 	//HookCall(0x42AE5C, ai_attack_hook);
 	HookCall(0x426A95, combat_attack_hook);
 	HookCall(0x42A796, combat_attack_hook);
 	MakeJump(0x45F6AF, BlockCombatHook1);
 	HookCall(0x4432A6, BlockCombatHook2);
-	combatBlockedMessage = Translate("sfall", "BlockedCombat", "You cannot enter combat at this time.");
+	GetPrivateProfileString("sfall", "BlockedCombat", "You cannot enter combat at this time.", CombatBlockedMessage, 128, translationIni);
 }
 
 void _stdcall AICombatStart() {
@@ -125,5 +122,3 @@ void _stdcall AICombatEnd() {
 	targets.clear();
 	sources.clear();
 }
-
-}

sfall/AI.h

@@ -16,18 +16,7 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Module.h"
-
-namespace sfall 
-{
-
-class AI : public Module {
-public:
-	const char* name() { return "AI"; }
-	void init();
-};
-
-// TODO: use subscription instead
+void AIInit();
 void _stdcall AICombatStart();
 void _stdcall AICombatEnd();
 
@@ -35,5 +24,3 @@ DWORD _stdcall AIGetLastAttacker(DWORD target);
 DWORD _stdcall AIGetLastTarget(DWORD source);
 
 void _stdcall AIBlockCombat(DWORD i);
-
-}