Minor edits to FalloutStructs.h

Removed unnecessary AfterAttackCleanup on reset in LoadGameHook.cpp.
Fixed Debug build configuration in project file.

MPClient/DebugEditor.Designer.cs

@@ -158,12 +158,13 @@
             // 
             this.bCrittersLvar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.bCrittersLvar.Enabled = false;
-            this.bCrittersLvar.Location = new System.Drawing.Point(119, 401);
+            this.bCrittersLvar.Location = new System.Drawing.Point(118, 401);
             this.bCrittersLvar.Name = "bCrittersLvar";
-            this.bCrittersLvar.Size = new System.Drawing.Size(99, 23);
+            this.bCrittersLvar.Size = new System.Drawing.Size(100, 23);
             this.bCrittersLvar.TabIndex = 7;
             this.bCrittersLvar.Text = "Local variables";
             this.bCrittersLvar.UseVisualStyleBackColor = true;
+            this.bCrittersLvar.Click += new System.EventHandler(this.bCrittersLvar_Click);
             // 
             // DebugEditor
             // 

MPClient/DebugEditor.cs

@@ -38,7 +38,7 @@ namespace FalloutClient {
 
         private static ByteConverter converter = new ByteConverter();
 
-        private enum Mode { Globals, MapVars, SGlobals, Arrays, Critters }
+        private enum Mode { Globals, MapVars, SGlobals, Arrays, Critters, LocalVars }
 
         private readonly EditorConnection connection;
         private Mode mode;
@@ -47,6 +47,7 @@ namespace FalloutClient {
         private readonly Dictionary<uint, string> CritNames = new Dictionary<uint, string>();
 
         private void Redraw() {
+            bCrittersLvar.Enabled = false;
             bEdit.Enabled = false;
             Column2.ReadOnly = false;
             Column3.ReadOnly = false;
@@ -96,6 +97,7 @@ namespace FalloutClient {
                 Column2.HeaderText = "PID";
                 Column3.HeaderText = "Pointer";
                 bEdit.Enabled = true;
+                bCrittersLvar.Enabled = true;
                 for (int i = 0; i < connection.Critters.Length / 2; i++) {
                     uint modcrit = (connection.Critters[i, 0] & 0xfffff);
                     string name = CritNames.ContainsKey(modcrit) ? CritNames[modcrit] : "";
@@ -333,6 +335,45 @@ namespace FalloutClient {
             }
         }
 
+        private void bCrittersLvar_Click(object sender, EventArgs e) {
+            if (dataGridView1.SelectedRows.Count == 0) return;
+            int i = (int)dataGridView1.SelectedRows[0].Tag;
+
+            connection.WriteDataType(DataTypeSend.RetrieveCritter);
+            connection.WriteInt(i);
+            BinaryReader br = new BinaryReader(new System.IO.MemoryStream(connection.ReadBytes(33 * 4)));
+            br.BaseStream.Position = 30 * 4;
+            int sid = br.ReadInt32();
+            br.Close();
+            if (sid != -1) {
+                connection.WriteDataType(DataTypeSend.GetLocal);
+                connection.WriteInt(sid);
+                int totalVar = connection.ReadInt();
+                string[] values = new string[totalVar];
+                if (totalVar > 0) {
+                    br = new BinaryReader(new System.IO.MemoryStream(connection.ReadBytes(totalVar * 4)));
+                    for (int j = 0; j < totalVar; j++) {
+                        values[j] = br.ReadInt32().ToString();
+                    }
+                    br.Close();
+                }
+                values = EditorWindow.ShowEditor(this, values);
+                if (values != null) {
+                    int countVar = values.Length;
+                    MemoryStream ms = new MemoryStream(countVar * 4);
+                    BinaryWriter bw = new BinaryWriter(ms);
+                    for (int j = 0; j < countVar; j++) bw.Write(int.Parse(values[j]));
+                    connection.WriteDataType(DataTypeSend.SetLocal);
+                    connection.WriteInt(sid);
+                    connection.WriteInt(countVar);
+                    connection.WriteBytes(ms.GetBuffer(), 0, countVar * 4);
+                    bw.Close();
+                }
+            } else {
+                MessageBox.Show("This critter has no script attached.");
+            }
+        }
+
         private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) {
             bEdit.PerformClick();
         }

MPClient/EditorWindow.Designer.cs

@@ -29,6 +29,7 @@
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.checkBox = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -100,11 +101,24 @@
             this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Column3.Width = 150;
             // 
+            // checkBox
+            // 
+            this.checkBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.checkBox.AutoSize = true;
+            this.checkBox.Location = new System.Drawing.Point(103, 341);
+            this.checkBox.Name = "checkBox";
+            this.checkBox.Size = new System.Drawing.Size(91, 17);
+            this.checkBox.TabIndex = 3;
+            this.checkBox.Text = "Values in Hex";
+            this.checkBox.UseVisualStyleBackColor = true;
+            this.checkBox.Click += new System.EventHandler(this.checkBox_Click);
+            // 
             // EditorWindow
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(458, 371);
+            this.Controls.Add(this.checkBox);
             this.Controls.Add(this.dataGridView1);
             this.Controls.Add(this.bCancel);
             this.Controls.Add(this.bSave);
@@ -115,6 +129,7 @@
             this.Text = "Edit Values";
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -126,5 +141,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+        private System.Windows.Forms.CheckBox checkBox;
     }
 }

MPClient/EditorWindow.cs

@@ -8,15 +8,34 @@ namespace FalloutClient {
 
     public partial class EditorWindow : Form
     {
-        private readonly DataType[] types;
-        private readonly string[] values;
+        private readonly DataType[] types = null;
+        private string[] values;
         private bool save;
+        private static bool valueInHex = false;
+
+        private void ConvertValues(bool toHex) {
+            for (int i = 0; i < values.Length; i++) {
+                if (toHex) {
+                    if (types == null || types[i] == DataType.Int) {
+                        int val = int.Parse(values[i]);
+                        values[i] = "0x" + val.ToString("x").ToUpper();
+                    }
+                } else {
+                    if (types == null || types[i] == DataType.Int) {
+                        values[i] = Convert.ToInt32(values[i], 16).ToString();
+                    }
+                }
+            }
+        }
 
         private EditorWindow(string[] names, DataType[] types, string[] values, bool isMap) {
             this.types = types;
             this.values = values;
+
             InitializeComponent();
+            checkBox.Checked = EditorWindow.valueInHex;
             dataGridView1.SuspendLayout();
+            if (valueInHex) ConvertValues(true);
             if (names == null)
                 for (int i = 0; i < types.Length; i++) {
                     string element = i.ToString();
@@ -31,15 +50,46 @@ namespace FalloutClient {
         public static string[] ShowEditor(DebugEditor form, string[] names, DataType[] types, string[] values, bool isMap = false) {
             EditorWindow editor = new EditorWindow(names, types, values, isMap);
             editor.ShowDialog();
-            if (editor.save)
+            if (editor.save) {
+                if (valueInHex) editor.ConvertValues(false);
                 return editor.values;
-            else
-                return null;
+            }
+            return null;
+        }
+
+        private EditorWindow(string[] values) {
+            this.values = values;
+            InitializeComponent();
+            checkBox.Checked = EditorWindow.valueInHex;
+            dataGridView1.SuspendLayout();
+            if (valueInHex) ConvertValues(true);
+            for (int i = 0; i < values.Length; i++) {
+                dataGridView1.Rows.Add(i.ToString(), "Int", values[i]);
+            }
+            dataGridView1.ResumeLayout();
+        }
+
+        public static string[] ShowEditor(DebugEditor form, string[] lvalues) {
+            EditorWindow editor = new EditorWindow(lvalues);
+            editor.ShowDialog();
+            if (editor.save) {
+                if (valueInHex) editor.ConvertValues(false);
+                return editor.values;
+            }
+            return null;
         }
 
         private bool CheckInput(DataType type, string str) {
             switch (type) {
             case DataType.Int:
+                if (valueInHex) {
+                    try {
+                        Convert.ToInt32(str, 16);
+                        return true;
+                    } catch (Exception) {
+                        return false;
+                    }
+                }
                 int i;
                 return int.TryParse(str, out i);
             case DataType.Float:
@@ -51,7 +101,7 @@ namespace FalloutClient {
 
         private void dataGridView1_CellEndEdit(object sender, DataGridViewCellEventArgs e) {
             string str = (string)dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value;
-            if (str != null && CheckInput(types[e.RowIndex], str))
+            if (str != null && CheckInput(((types != null) ? types[e.RowIndex] : DataType.Int), str))
                 values[e.RowIndex] = str;
             else
                 dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = values[e.RowIndex];
@@ -65,5 +115,13 @@ namespace FalloutClient {
             save = true;
             Close();
         }
+
+        private void checkBox_Click(object sender, EventArgs e) {
+            valueInHex = checkBox.Checked;
+            ConvertValues(valueInHex);
+            for (int i = 0; i < values.Length; i++) {
+                dataGridView1.Rows[i].Cells[2].Value = values[i];
+            }
+        }
     }
 }

MPClient/Program.cs

@@ -29,6 +29,8 @@ namespace FalloutClient {
         SetSGlobal = 4,
         GetArray = 9,
         SetArray = 10,
+        GetLocal = 11,
+        SetLocal = 12,
         Exit = 254
     }
 }

MPClient/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("4.1.7.0")]
-[assembly: AssemblyFileVersion("4.1.7.0")]
+[assembly: AssemblyVersion("4.1.9.0")]
+[assembly: AssemblyFileVersion("4.1.9.0")]

artifacts/config_files/Perks.ini

@@ -7,6 +7,30 @@
 ; have an additional NoHardcode option in this file which can
 ; be used to remove their hardcoded effects, and add new stat/skill effects
 
+[PerksTweak]
+;Change the penalty distance and distance bonus for 'Weapon Scope Range' weapon perk
+;0 - no penalty, 8 - default penalty
+WeaponScopeRangePenalty=8
+;2 - no bonus, 5 - default bonus
+WeaponScopeRangeBonus=5
+
+;Changes the distance bonus for 'Weapon Long Range' weapon perk
+;2 - no bonus, 4 - default bonus
+WeaponLongRangeBonus=4
+
+;Changes the hit chance bonus for 'Weapon Accurate' weapon perk
+;0 - no bonus,  200 - maximum bonus, 20 - default bonus
+WeaponAccurateBonus=20
+
+;Changes the strength bonus for 'Weapon Handling' perk
+;0 - no bonus,  10 - maximum bonus, 3 - default bonus
+WeaponHandlingBonus=3
+
+;##############################################################################
+[Perks]
+;Set to 1 to enable the modifications for perks
+Enable=0
+
 ;Name=The name of the perk (max 63 characters)
 ;Desc=The description of the perk (max 255 characters)
 ;Image=The line number (0-indexed) of the corresponding FRM in skilldex.lst
@@ -35,6 +59,7 @@
 
 ;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
@@ -57,6 +82,11 @@ INT=0
 AGL=0
 LCK=0
 
+;##############################################################################
+[Traits]
+;Set to 1 to enable the modifications for traits
+Enable=0
+
 ;This is a modification to trait 0
 [t0]
 NoHardcode=0

artifacts/ddraw.ini

@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v3.8.18
+;v3.8.21
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -15,7 +15,7 @@ UseCommandLine=0
 NumSoundBuffers=0
 
 ;Set to 1 to allow attaching sound files to combat float messages
-AllowSoundForFloats=1
+AllowSoundForFloats=0
 
 ;Set to 1 to automatically search for alternative formats (mp3/wma/wav) when Fallout tries to play an acm
 ;Set to 2 to play alternative music files even if original acm files are not present in the music folder
@@ -78,7 +78,7 @@ GPUBlt=0
 Use32BitHeadGraphics=0
 
 ;Set to 1 to automatically search for alternative avi video files when Fallout tries to play the game movies
-;Requires graphics mode 4 or 5
+;Requires DX9 graphics mode 4 or 5
 AllowDShowMovies=0
 
 ;Fade effect time percentage modifier
@@ -178,6 +178,11 @@ DebugEditorKey=0
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Misc]
+;Changes some of Fallout 2 engine functions to Fallout 1 behavior:
+;- disables playing the final movie/credits after the endgame slideshow
+;- disables halving the weight for power armor items
+Fallout1Behavior=0
+
 ;Time limit in years. Must be between -3 and 13
 ;Set to 0 if you want to die the instant you leave arroyo
 ;Set to -1 to remove the time limit, and automatically reset the date back to 2241 each time you would have reached it
@@ -225,7 +230,7 @@ UseFileSystemOverride=0
 ;Set to 1 to use the modified data load order for the engine to find game data
 ;Original: patchXXX.dat > critter_patches > critter_dat > f2_res_patches > f2_res_dat > master_patches > master_dat
 ;Modified: master_patches > critter_patches > patchXXX.dat > critter_dat > f2_res_patches > f2_res_dat > master_dat
-DataLoadOrderPatch=0
+DataLoadOrderPatch=1
 
 ;To change the default and starting player models, uncomment the next four lines.
 ;The default models can also be changed ingame via script
@@ -255,7 +260,7 @@ 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
+;Both StartMonth and StartDay are 0-indexed (i.e. 0 is January or the first day of a month)
 ;StartYear=-1
 ;StartMonth=-1
 ;StartDay=-1
@@ -319,7 +324,7 @@ OverrideArtCacheSize=0
 ;Set to 2 to block all saving in combat
 SaveInCombatFix=1
 
-;Point at an ini file containing elevator data
+;Point to an ini file containing elevator data
 ;ElevatorsFile=Elevators.ini
 
 ;Uncomment and set a comma delimited list of numbers to use a custom xp table.
@@ -332,14 +337,17 @@ SaveInCombatFix=1
 AdditionalWeaponAnims=1
 
 ;Uncomment these lines to modify the default modifiers for aimed shots at specific bodyparts
+;Modifiers affect both NPCs and the player
 ;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
 ;BodyHit_Groin=-30
+;The modifier for unaimed shots
+;BodyHit_Torso_Uncalled=0
 
 ;Set to 1 to use a CriticalOverrides.ini file to override the default critical table
 ;Set to 2 to use the default critical with bug fixes (doesn't require an ini)
@@ -347,6 +355,8 @@ AdditionalWeaponAnims=1
 ;If the ExtraKillTypes option is enabled, this should be set to 3, with containing entries for any new types
 ;Must be non-zero to use the edit/get/reset_critical script functions
 OverrideCriticalTable=2
+;To change the path and filename of the critical table file, uncomment the next line
+;OverrideCriticalFile=CriticalOverrides.ini
 
 ;Set to 1 to get notification of karma changes in the notification window
 DisplayKarmaChanges=0
@@ -357,9 +367,6 @@ AlwaysReloadMsgs=0
 ;Set to 1 to force the player to play the idle animation when reloading their weapon
 PlayIdleAnimOnReload=0
 
-;Set to 1 to prevent corpses from blocking line of fire
-CorpseLineOfFireFix=0
-
 ;Changes the timer (in days) for deleting corpses on a map after you leave (valid range: 0..13)
 ;The corpses of critters with 'Ages' flag or on maps with 'dead_bodies_age=No' set in maps.txt will not disappear
 ;Default is 6. Set to 0 for a 12-hour timer
@@ -372,10 +379,12 @@ CorpseDeleteTime=6
 ProcessorIdle=-1
 
 ;Set to 1 if using the hero appearance mod
+;Set to 2 for backward compatibility with scripts that manually fix obj_art_fid/art_change_fid_num script functions for dude_obj
 ;You can add AppChCrt.frm and AppChEdt.frm files to art\intrface\ to set a custom background for the character screen
 EnableHeroAppearanceMod=0
 
 ;Set to 1 to skip the 3 opening movies
+;Set to 2 to also skip the splash screen
 SkipOpeningMovies=0
 
 ;Causes NPCs who complete their combat turn with AP left over will try and find other ways to spend it.
@@ -383,14 +392,15 @@ SkipOpeningMovies=0
 ;Set to 0 to disable
 NPCsTryToSpendExtraAP=0
 
-;Set to 1 to fix NPCs not checking weapon perks properly when searching for the best weapon
-;Note that enabling this option can significantly affect the weapon choice of some NPCs in combat
+;Set to 1 to fix NPCs not checking weapon perks properly when choosing the best weapon in combat
+;Set to 2 to change the priority multiplier for having weapon perk to 3x (the original is 5x)
+;Note that enabling this option can significantly affect the weapon of choice for some NPCs
 AIBestWeaponFix=0
 
 ;Set to 1 to fix NPCs not taking chem_primary_desire in AI.txt as drug use preference when using drugs in their inventory
 AIDrugUsePerfFix=0
 
-;Allows the use of tiles over 80*36 in size. sfall will just split and resave them at startup
+;Allows the use of tiles over 80x36 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
 AllowLargeTiles=0
@@ -419,12 +429,12 @@ UseScrollingQuestsList=1
 
 ;Uncomment these lines to control the premade characters offered when starting a new game
 ;Multiple options should be separated by commas, and there must be the same number of entries in both lines
+;Each name in PremadePaths is limited to 11 characters
 ;PremadePaths=combat,diplomat,stealth
 ;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.
-;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
@@ -440,7 +450,6 @@ SpeedInterfaceCounterAnims=0
 
 ;These lines allow you to control the karma FRMs 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
 
@@ -451,8 +460,11 @@ ScienceOnCritters=0
 ;Default is 166
 SpeedInventoryPCRotation=166
 
-;Uncomment to set the text colour of the extra 5 interface boxes
-;The line must contain 5 digits, each either a 0 for green or 1 for red
+;Modify the number of the extra interface boxes available to modders. (Default is 5, and the maximum is 95)
+BoxBarCount=5
+
+;Uncomment to set the text colour of the extra interface boxes
+;The line must contain the same number of digits as the value of BoxBarCount, each either a 0 for green or 1 for red
 ;BoxBarColours=00000
 
 ;Set to 1 to fix the bug that caused bonus HtH damage to not be applied correctly.
@@ -470,12 +482,11 @@ AnimationsAtOnceLimit=120
 ;Set to 1 to remove the limits that stop the player rolling critical successes/misses in the first few days of game time
 RemoveCriticalTimelimits=0
 
-;Set to 1 to enable party members with level 6 protos to reach level 6
-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
-;MainMenuFontColour=0x0600003c
+;Change the colour of the font used on the main menu for the Fallout/sfall version number and copyright text
+;It's the last byte ('3C' by default) that picks the colour used. The first byte supplies additional flags for this option
+;MainMenuFontColour=0x00003C
+;Change the colour of the font used on the main menu for the button text
+;MainMenuBigFontColour=0x3C
 
 ;Two alternate fixes to the interaction between HtH attacks and the fast shot trait
 ;0 - Fallout 2 original behaviour
@@ -487,7 +498,7 @@ FastShotFix=1
 BoostScriptDialogLimit=0
 
 ;Allows you to edit the skill tables
-;Point the next line at an ini file containing the replacement skill data
+;Point the next line to an ini file containing the replacement skill data
 ;SkillsFile=Skills.ini
 
 ;To change the relationship between SPECIAL stats and derived stats, uncomment the next line
@@ -611,7 +622,7 @@ 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
+;Set to 1 to change the counter in the 'Move Items' window to start with maximum number, except in the barter screen
 ItemCounterDefaultMax=0
 
 ;Set to 1 to leave the music playing in dialogue with talking heads
@@ -627,10 +638,14 @@ UseWalkDistance=3
 ;Set to 1 to fix the bug of being unable to sell used geiger counters or stealth boys
 CanSellUsedGeiger=1
 
-;Set to 1 to fix the issue with being able to charge the car by using cells on other scenary/critters
+;Set to 1 to fix the issue with being able to charge the car by using cells on other scenery/critters
 ;Set to 0 if another mod you're using has custom vehicles
 CarChargingFix=1
 
+;Set to 1 to prevent the car from being lost when entering a location via the Town/World button and then leaving on foot
+;Note that the global variable 633 (GVAR_CAR_PLACED_TILE) will be set to -1 when the player leaves a location
+CarPlacedTileFix=1
+
 ;Set to 1 to skip weapon equip/unequip animations when performing various actions
 InstantWeaponEquip=0
 
@@ -664,6 +679,10 @@ SpecialDeathGVAR=491
 ;Note that enabling this option can break the map changes in Modoc and Vault 15
 DisableSpecialMapIDs=0
 
+;Changes the base value of the duration of the knockout effect (valid range: 35..100; default is 35)
+;The formula for the duration in ticks is: 10 * (value - 3 * EN)
+KnockoutTime=35
+
 ;Set to 1 to display sfall built-in credits at the bottom of credits.txt contents instead of at the top
 CreditsAtBottom=0
 
@@ -676,7 +695,8 @@ CreditsAtBottom=0
 Enable=0
 
 ;Fallout 2 Debug Patch
-;Set to 1 to send debug output to the screen, 2 to a debug.log file, or 3 to both the screen and a debug.log file
+;Set to 1 to send debug output to the screen, 2 to a debug.log file, or 3 to both the screen and debug.log
+;Does not require sfall debugging mode
 ;While you don't need to create an environment variable, you do still need to set the appropriate lines in fallout2.cfg:
 ;-------
 ;[debug]
@@ -691,6 +711,9 @@ Enable=0
 ;-------
 DebugMode=0
 
+;Set to 1 to hide error messages in debug output when a null value is passed to the function as an object
+HideObjIsNullMsg=0
+
 ;Change to 1 to skip the compatibility mode check
 SkipCompatModeCheck=0
 
@@ -708,17 +731,14 @@ SkipSizeCheck=0
 DontDeleteProtos=0
 
 ;Set to 1 to give scripts direct access to Fallout's address space, and to make arbitrary calls into Fallout's code
+;Does not require sfall debugging mode
 AllowUnsafeScripting=0
 
-;Set to 1 to hide error messages in debug output when a null value is passed to the function as an object
-HideObjIsNullMsg=0
-
 ;Set to 1 to force critters to display combat float messages
 ;Requires AllowSoundForFloats to be enabled
 Test_ForceFloats=0
 
 ;These options control what output is saved in the debug log (sfall-log.txt)
-
 ;Prints messages duing sfall initialization
 Init=0
 ;Prints messages relating to hook scripts

artifacts/example_mods/ComputeDamage/gl_compute_damage.ssl

@@ -0,0 +1,206 @@
+/*
+   Example algorithm of how the game engine calculates combat damage
+*/
+
+#include "..\headers\define.h"
+#include "..\headers\command.h"
+#include "..\headers\sfall\sfall.h"
+#include "..\headers\sfall\define_extra.h"
+
+procedure start;
+procedure compute_damage_F2;
+procedure item_w_damage_hook;
+procedure item_w_subtype(variable weapon, variable hit_mode);
+procedure get_ammo_value(variable weapon, variable param);
+
+variable item_w_damage;
+
+procedure start begin
+   if game_loaded then begin
+      register_hook_proc(HOOK_COMBATDAMAGE, compute_damage_F2);
+      register_hook_proc(HOOK_ITEMDAMAGE, item_w_damage_hook);
+   end
+end
+
+procedure compute_damage_F2 begin
+   variable dmg_type, weapon_perk, dmg_thresh, dmg_resist, weapon_subtype, bonus_ranged, difficulty, i, dmg_mult, dmg_div, damage;
+   variable target, flags, knockback, amount;
+
+   variable
+      ctdTarget        := get_sfall_arg,
+      ctdSource        := get_sfall_arg,
+      amountTarget     := get_sfall_arg,
+      amountSource     := get_sfall_arg,
+      flagsTarget      := get_sfall_arg,
+      flagsSource      := get_sfall_arg,
+      weapon           := get_sfall_arg,
+      bodypart         := get_sfall_arg,
+      damageMultiplier := get_sfall_arg,
+      rounds           := get_sfall_arg,
+      amountKnockback  := get_sfall_arg,
+      hit_mode         := get_sfall_arg;
+
+   if (flagsSource bwand DAM_HIT) then begin
+      target := ctdTarget;
+      flags := flagsTarget;
+      knockback := 1;
+   end else begin
+      target := ctdSource;
+      flags := flagsSource;
+      knockback := 0;
+   end
+
+   //amount := 0;
+   if target and (obj_type(target) == OBJ_TYPE_CRITTER) then begin
+      if weapon then begin
+         dmg_type := weapon_dmg_type(weapon);
+         weapon_perk := get_proto_data(obj_pid(weapon), PROTO_WP_PERK);
+      end else begin
+         dmg_type := DMG_normal_dam;
+         weapon_perk := -1;
+      end
+
+      dmg_thresh := get_critter_stat(target, STAT_dmg_thresh + dmg_type);
+      dmg_resist := get_critter_stat(target, STAT_dmg_resist + dmg_type);
+
+      if (flags bwand DAM_BYPASS) and (dmg_type != DMG_emp) then begin
+         dmg_thresh := dmg_thresh * 20 / 100;
+         dmg_resist := dmg_resist * 20 / 100;
+      end else begin
+         if (weapon_perk == PERK_weapon_penetrate)
+            or (hit_mode == ATKTYPE_PALMSTRIKE or hit_mode == ATKTYPE_PIERCINGSTRIKE
+            or hit_mode == ATKTYPE_HOOKKICK or hit_mode == ATKTYPE_PIERCINGKICK) then
+            dmg_thresh := dmg_thresh * 20 / 100;
+
+         if ctdSource == dude_obj and has_trait(TRAIT_TRAIT, ctdSource, TRAIT_finesse) then
+            dmg_resist += 30;
+      end
+
+      weapon_subtype := item_w_subtype(weapon, hit_mode); // item_w_subtype_
+      if (ctdSource != dude_obj) or (weapon_subtype != WEAPON_TYPE_GUNS) then
+         bonus_ranged := 0;
+      else
+         bonus_ranged := has_trait(TRAIT_PERK, ctdSource, PERK_bonus_ranged_damage) * 2;
+
+      difficulty := 100;
+      if (has_trait(TRAIT_OBJECT, ctdSource, OBJECT_TEAM_NUM) != has_trait(TRAIT_OBJECT, dude_obj, OBJECT_TEAM_NUM)) then begin
+         if (combat_difficulty == 0) then
+            difficulty := 75;
+         else if (combat_difficulty == 2) then
+            difficulty := 125;
+      end
+
+      // F2 default start
+      // Damage = (1 - (DR_armor + DR_ammo_adjust) * (((raw_damage * (dmg_mult * damageMultiplier)) / dmg_div) - dmg_thresh)
+      dmg_resist += get_ammo_value(weapon, PROTO_AM_DR_MOD); // item_w_dr_adjust_ (DR Adjust %)
+      if (dmg_resist < 100) then begin
+         if (dmg_resist < 0) then dmg_resist := 0;
+
+         dmg_mult := damageMultiplier * get_ammo_value(weapon, PROTO_AM_DMG_MULT); // item_w_dam_mult_ (Dmg mod A)
+         dmg_div := get_ammo_value(weapon, PROTO_AM_DMG_DIV); // item_w_dam_div_ (Dmg mod B)
+
+         for (i := 1; i <= rounds; i++) begin
+            damage := (item_w_damage + bonus_ranged) * dmg_mult; // item_w_damage_ (raw_damage)
+            if dmg_div then damage /= dmg_div;
+
+            damage := (((damage / 2) * difficulty) / 100) - dmg_thresh;
+            if (damage > 0) then begin
+               damage := damage - ((damage * dmg_resist) / 100); // reduce damage by the percentage of DR_armor + DR_Ammo
+               if (damage > 0) then amount += damage;
+            end
+         end
+      end
+      // F2 default end
+
+      if (ctdSource == dude_obj) then begin
+         if has_trait(TRAIT_PERK, ctdSource, PERK_living_anatomy_perk) and (critter_kill_type(ctdTarget) != KILL_TYPE_robot_kills)
+            and (critter_kill_type(ctdTarget) != KILL_TYPE_alien_kills) then
+            amount += 5;
+         if has_trait(TRAIT_PERK, ctdSource, PERK_pyromaniac_perk) and (dmg_type == DMG_fire) then
+            amount += 5;
+      end
+
+      if knockback and ((get_flags(target) bwand FLAG_MULTIHEX) == 0)
+         and (dmg_type == DMG_explosion or weapon == 0 or weapon_subtype == WEAPON_TYPE_MELEE)
+         and ((get_proto_data(obj_pid(target), PROTO_CR_FLAGS) bwand CFLG_NOKNOCKDOWN) == 0) then begin // critter_flag_check_
+         damage := 0;
+         if (target == dude_obj) and has_trait(TRAIT_PERK, target, PERK_stonewall_perk) then begin
+            damage := 1;
+            if (random(0, 100) < 50) then knockback := 0;
+         end
+         if knockback then begin
+            if (weapon_perk == PERK_weapon_knockback) then
+               amountKnockback := amount / 5;
+            else
+               amountKnockback := amount / 10;
+
+            if damage then amountKnockback /= 2;
+         end
+      end
+   end
+
+   if (flagsSource bwand DAM_HIT) then begin
+      display_msg("amountTarget = " + amountTarget+ ", amount = " + amount);
+      amountTarget := amount;
+      flagsTarget := flags;
+   end else begin
+      display_msg("amountSource = " + amountSource+ ", amount = " + amount);
+      amountSource := amount;
+      flagsSource := flags;
+   end
+
+   set_sfall_return(amountTarget);
+   set_sfall_return(amountSource);
+   set_sfall_return(flagsTarget);
+   set_sfall_return(flagsSource);
+   set_sfall_return(amountKnockback);
+end
+
+procedure item_w_damage_hook begin
+   variable
+      item_w_damage_min := get_sfall_arg,
+      item_w_damage_max := get_sfall_arg;
+      //weapon := get_sfall_arg,
+      //source := get_sfall_arg,
+      //hit_mode := get_sfall_arg,
+      //isMelee := get_sfall_arg;
+
+   item_w_damage := (item_w_damage_min + (item_w_damage_max - item_w_damage_min) / 2);
+   display_msg("item_w_damage_ = " + item_w_damage);
+
+   set_sfall_return(item_w_damage);
+end
+
+procedure item_w_subtype(variable weapon, variable hit_mode) begin
+   variable attack_mode, type := WEAPON_TYPE_UNARMED;
+
+   if weapon and (hit_mode <= ATKTYPE_RWEP2) then begin
+      attack_mode := (get_proto_data(obj_pid(weapon), PROTO_IT_FLAGS));
+
+      if (hit_mode == ATKTYPE_LWEP2) or (hit_mode == ATKTYPE_RWEP2) then
+         attack_mode := (attack_mode bwand 0xF0) / 16; // shift 4 bits to the right
+      else
+         attack_mode := (attack_mode bwand 0x0F);
+
+      if (attack_mode > ATKMODE_PRI_THROW) then
+         type := WEAPON_TYPE_GUNS;
+      else if (attack_mode == ATKMODE_PRI_THROW) then
+         type := WEAPON_TYPE_THROWN;
+      else if (attack_mode > ATKMODE_PRI_KICK) then
+         type := WEAPON_TYPE_MELEE;
+   end
+
+   return type;
+end
+
+procedure get_ammo_value(variable weapon, variable param) begin
+   variable pid := -1, value := 0; // default DR value
+
+   if weapon then begin
+      pid := get_weapon_ammo_pid(weapon);
+      if (pid > -1) then value := get_proto_data(pid, param);
+   end
+   if (pid == -1 and param != PROTO_AM_DR_MOD) then value := 1; // default value for Mult/Div
+
+   return value;
+end

artifacts/example_mods/ItemHighlight_Lite/main.h

@@ -2,29 +2,45 @@
 #include "..\scripting\headers\sfall.h"
 #include "..\scripting\headers\define_lite.h"
 #include "..\scripting\headers\define_extra.h"
-
+#include "..\scripting\headers\dik.h"
+/*
 #include "..\scripting\headers\lib.arrays.h"
 #include "..\scripting\headers\lib.strings.h"
-// #include "..\scripting\headers\lib.inven.h"
+#include "..\scripting\headers\lib.inven.h"
+*/
 
 variable ini := "sfall-mods.ini";
 variable translationIni;
 
-// Gets the integer value from ini
+// Gets the integer value from the specified ini
+procedure GetIniConfig(variable section, variable key, variable def, variable inifile) begin
+   variable val := get_ini_setting(inifile + "|" + section + "|" + key);
+   if val == -1 then val := def;
+   return val;
+end
+
+// Gets the string value from the specified ini
+procedure GetIniConfigStr(variable section, variable key, variable def, variable inifile) begin
+   variable val := get_ini_string(inifile + "|" + section + "|" + key);
+   if val == -1 or val == "" then val := def;
+   return val;
+end
+
+// Gets the integer value from sfall-mods.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 ini
+// Gets the string value from sfall-mods.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 ini as a temp array of strings
+// Gets the value from sfall-mods.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 [];
@@ -32,7 +48,7 @@ procedure GetConfigList(variable section, variable key) begin
    return string_split(val, ",");
 end
 
-// Gets the value from ini as a temp array of ints
+// Gets the value from sfall-mods.ini as a temp array of ints
 procedure GetConfigListInt(variable section, variable key) begin
    variable arr, i, item;
 
@@ -53,5 +69,5 @@ procedure Translate(variable id, variable def) begin
 end
 
 procedure InitConfigs begin
-   translationIni := GetConfigStr("Main", "TranslationsINI", "./Translations.ini");
+   translationIni := GetIniConfigStr("Main", "TranslationsINI", "Translations.ini", "ddraw.ini");
 end

artifacts/example_mods/StealCheat/readme.txt

@@ -1,5 +1,5 @@
-Master Theif cheat for fallout 2 by phobos2077
-----------------------------------------
+Master Thief cheat for fallout 2 by phobos2077
+----------------------------------------------
 
 - forces all steal attempts to succeed
 

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/readme.txt

@@ -1,9 +0,0 @@
-"Take All" Hotkey mod for Fallout 2 by NovaRain
-----------------------------------------
-
-- 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.
-
-To use, copy *.int file to your scripts folder.
-
-This mod is a simple example of how you can use HOOK_KEYPRESS hooks.

artifacts/example_mods/UIHotkeys/gl_uihotkeys.ssl

@@ -0,0 +1,54 @@
+/*
+
+UI Hotkeys mod for Fallout 2 by NovaRain
+----------------------------------------
+
+- closes some game interfaces by pressing their hotkeys again:
+  * 'I' key for Inventory
+  * 'S' key for Skilldex
+  * 'Z' key for Pip-Boy
+
+- extends the functionality of the 'Space' key (Caps Lock must be off):
+  * takes all items in the loot screen
+  * makes the offer in the barter screen
+
+Requires sfall 3.5 or higher
+
+*/
+
+#include "..\headers\sfall\sfall.h"
+#include "..\headers\sfall\dik.h"
+
+procedure start;
+
+procedure start begin
+   if game_loaded then begin
+      register_hook(HOOK_KEYPRESS);
+   end else begin
+      variable
+         event := get_sfall_arg,
+         keyDX := get_sfall_arg,
+         mode;
+
+      if (event) then begin
+         mode := get_game_mode;
+         if (mode bwand COUNTERWIN) then return; // new mode from sfall 4.2/3.8.20
+         if (keyDX == DIK_I and (mode bwand INVENTORY)) then begin
+            tap_key(DIK_ESCAPE);
+         end else if (keyDX == DIK_S and (mode bwand SKILLDEX)) then begin
+            tap_key(DIK_ESCAPE);
+         end else if (keyDX == DIK_Z and (mode bwand PIPBOY)) then begin
+            tap_key(DIK_ESCAPE);
+         end else if (keyDX == DIK_SPACE) then begin
+            if (mode bwand INTFACELOOT) then begin
+               tap_key(DIK_CAPITAL);
+               tap_key(DIK_A);
+               tap_key(DIK_CAPITAL);
+            end else if (mode bwand BARTER) then begin
+               play_sfx("IB2P1XX1");
+               tap_key(DIK_M);
+            end
+         end
+      end
+   end
+end

artifacts/example_mods/UIHotkeys/readme.txt

@@ -0,0 +1,22 @@
+UI Hotkeys mod for Fallout 2 by NovaRain
+----------------------------------------
+
+- closes some game interfaces by pressing their hotkeys again:
+  * 'I' key for Inventory
+  * 'S' key for Skilldex
+  * 'Z' key for Pip-Boy
+
+- extends the functionality of the 'Space' key (Caps Lock must be off):
+  * takes all items in the loot screen
+  * makes the offer in the barter screen
+
+- 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 lowercase 'm' is the built-in hotkey for the OFFER button on the barter screen
+
+
+Requires sfall 3.5 or higher
+
+To use, copy gl_uihotkeys.int to your scripts folder.
+
+This mod is a simple example of how you can use HOOK_KEYPRESS hooks.

artifacts/scripting/arrays.txt

@@ -212,9 +212,11 @@ use macros sort_array, sort_array_reverse, reverse_array, shuffle_array from sfa
 - always returns 0
 
 > void save_array(mixed key, int arrayID):
+- makes the array saveable; it will be saved in sfallgv.sav file when saving the game
 - arrayID is associated with given "key"
 - array becomes permanent (if it was temporary) and "saved"
 - key can be of any type (int, float or string)
+- if you specify 0 as the key for the array ID, it will make the array "unsaved"
 
 > int load_array(mixed key):
 - load array from savegame data by the same key provided in "save_array"