Fixed NPCs not fully reloading a weapon sometimes

* NPCs use only one box per reload. If the weapon has more ammo
capacity than a box of ammo (e.g. miniguns and BB gun), it'll take
several tries for them to fully reload it.

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;
+        }
+
+        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")]

README.md

@@ -2,7 +2,7 @@
 
 A set of engine modifications for the classic game Fallout 2 in form of a DLL, which modifies executable in memory without changing anything in EXE file itself.
 
-Engine modifications include:   
+**Engine modifications include:**
 - Better support for modern operating systems
 - Externalizing many settings like starting map and game time, skills, perks, critical hit tables, books, etc.
 - Bug fixes

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/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/GlobalShaders/global.fx

@@ -0,0 +1,116 @@
+// Status: WIP
+
+texture bloomMap;
+sampler s0;
+
+sampler BloomSampler : samplerstate
+{
+	Texture = bloomMap;
+	MinFilter = Linear;
+	MagFilter = Linear;
+	AddressU = Clamp;
+	AddressV = Clamp;
+};
+
+// pseudo gauss blur
+static const float2 offsets[12] = {
+	-0.326212, -0.405805,
+	-0.840144, -0.073580,
+	-0.695914,  0.457137,
+	-0.203345,  0.620716,
+	 0.962340, -0.194983,
+	 0.473434, -0.480026,
+	 0.519456,  0.767022,
+	 0.185461, -0.893124,
+	 0.507431,  0.064425,
+	 0.896420,  0.412458,
+	-0.321940, -0.932615,
+	-0.791559, -0.597705,
+};
+
+float w;
+float h;
+static const float2 resolution = float2(w, h);
+
+// blur setting
+static const float blurFalloff = 8;
+static const float sharpness = 4;
+
+float4 AdjustSaturation(float4 color, float saturation) {
+	float grey = dot(color, float3(0.3, 0.59, 0.11));
+
+	return lerp(grey, color, saturation);
+}
+
+float Brightness(float3 color)
+{
+	return color.r * color.g - 0.75 * color.b;
+}
+
+float3 BlurFunction(float2 uv, float brightness, inout float totalWeight)
+{
+	float3 pointColor =(tex2Dlod(s0, float4(uv, 0, 0)).rgb);
+	float diff = abs(brightness - Brightness(pointColor));
+	float weight = exp2(-0.25 * blurFalloff - diff * sharpness);
+	totalWeight += weight;
+
+	return pointColor * weight;
+}
+
+float4 BlurPS(float2 uv : TEXCOORD0, uniform float2 delta) : COLOR0
+{
+	float3 sumColor = (tex2D(s0, uv).rgb);
+	float totalWeight = 1;
+	float brightness = Brightness(sumColor);
+	delta *= (1 / resolution);
+	float radius = 1;
+
+		float2 pointUV = uv + delta * radius;
+		  sumColor += BlurFunction(pointUV, brightness, totalWeight);
+		pointUV = uv - delta * radius;
+		  sumColor += BlurFunction(pointUV, brightness, totalWeight);
+
+	return float4((sumColor / totalWeight),1);
+//	return AdjustSaturation(Color, 0.5);
+}
+
+float4 BloomT(float2 texCoord : TEXCOORD0) : COLOR0 {
+	float4 c = tex2D(s0, texCoord);
+	float BloomThreshold = 0.2;
+
+	return saturate((c - BloomThreshold) / (1 - BloomThreshold));
+}
+
+float4 Bloom(float4 color : COLOR0, float2 texCoord : TEXCOORD0) : COLOR0 {
+	float BaseIntensity = 1.0;
+	float BaseSaturation = 1;
+	float BloomIntensity = 1; // 0.4
+	float BloomSaturation = 0.5;
+	float BlurPower = 0.01;
+	float BloomThreshold = 0.5;
+
+	float4 original = tex2D(s0, texCoord);
+
+	// blur
+	float4 sum = tex2D(s0, texCoord);
+	for(int i = 0; i < 12; i++){
+		sum += tex2D(s0, texCoord + BlurPower * offsets[i]);
+	}
+	sum /= 13;
+
+	original = AdjustSaturation(original, BaseSaturation) * BaseIntensity;
+	sum = AdjustSaturation(sum, BloomSaturation) * BloomIntensity;
+
+	sum = saturate((sum - BloomThreshold) / (1 - BloomThreshold));
+
+	return sum + original;
+//	return sum;
+}
+
+technique Blur
+{
+//	pass P2 { PixelShader = compile ps_2_0 BloomT(); }
+//	pass P3 { PixelShader = compile ps_2_0 Bloom();  }
+	Pass P0 { PixelShader = compile ps_3_0 BlurPS(float2(1, 0)); }
+	Pass P1 { PixelShader = compile ps_3_0 BlurPS(float2(0, 1)); }
+}

artifacts/example_mods/ItemHighlight_Lite/main.h

@@ -1,30 +1,48 @@
+#ifndef MAIN_H
+#define MAIN_H
 
 #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 +50,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 +71,7 @@ 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
+
+#endif

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.