Updated changelog

Updated version number.

.gitattributes

@@ -0,0 +1 @@
+*.ssl linguist-language=Pascal

.gitignore

@@ -26,6 +26,7 @@
 *.exe
 *.out
 *.app
+!ducible.exe
 
 # NetBeans
 nbproject/private/
@@ -46,6 +47,8 @@ nb-configuration.xml
 *.user
 *.userosscache
 *.sln.docstates
+*.VC.db
+*.VC.opendb
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

DebugEditor/DebugEditor.Designer.cs

@@ -23,6 +23,7 @@
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent() {
+            this.components = new System.ComponentModel.Container();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
             this.Column0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -34,6 +35,7 @@
             this.bSGlobals = new System.Windows.Forms.Button();
             this.bArrays = new System.Windows.Forms.Button();
             this.bEdit = new System.Windows.Forms.Button();
+            this.redrawTimer = new System.Windows.Forms.Timer(this.components);
             this.bCrittersLvar = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.SuspendLayout();
@@ -154,6 +156,11 @@
             this.bEdit.UseVisualStyleBackColor = true;
             this.bEdit.Click += new System.EventHandler(this.bEdit_Click);
             // 
+            // redrawTimer
+            // 
+            this.redrawTimer.Interval = 200;
+            this.redrawTimer.Tick += new System.EventHandler(this.timer1_Tick);
+            // 
             // bCrittersLvar
             // 
             this.bCrittersLvar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -202,6 +209,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+        internal System.Windows.Forms.Timer redrawTimer;
         private System.Windows.Forms.Button bCrittersLvar;
 
     }

DebugEditor/DebugEditor.cs

@@ -137,6 +137,7 @@ namespace FalloutClient {
                 sr.Close();
             }
             Redraw();
+            redrawTimer.Start();
         }
 
         private void DebugEditor_FormClosing(object sender, FormClosingEventArgs e) {
@@ -188,6 +189,7 @@ namespace FalloutClient {
             default:
                 return;
             }
+            redrawTimer.Stop();
             if (e.ColumnIndex == 2) {
                 string str = dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
                 int val;
@@ -211,11 +213,13 @@ namespace FalloutClient {
                     connection.WriteInt(converter.GetAsInt(val));
                 }
             }
+            redrawTimer.Start();
         }
 
         private void bEdit_Click(object sender, EventArgs e) {
             if (dataGridView1.SelectedRows.Count == 0) return;
             int i = (int)dataGridView1.SelectedRows[0].Tag;
+            redrawTimer.Stop();
             switch (mode) {
             case Mode.Arrays: {
                     DataType[] types = new DataType[connection.ArrayLengths[i]];
@@ -333,6 +337,7 @@ namespace FalloutClient {
                 }
                 break;
             }
+            redrawTimer.Start();
         }
 
         private void bCrittersLvar_Click(object sender, EventArgs e) {
@@ -381,5 +386,9 @@ namespace FalloutClient {
         private void dataGridView1_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e) {
             dataGridView1.Rows[e.RowIndex].Tag = e.RowIndex;
         }
+
+        private void timer1_Tick(object sender, EventArgs e) {
+            connection.WriteDataType(DataTypeSend.RedrawGame);
+        }
     }
 }

DebugEditor/DebugEditor.resx

@@ -129,4 +129,7 @@
   <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="redrawTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

DebugEditor/EditorWindow.cs

@@ -48,8 +48,10 @@ namespace FalloutClient {
         }
 
         public static string[] ShowEditor(DebugEditor form, string[] names, DataType[] types, string[] values, bool isMap = false) {
+            form.redrawTimer.Start();
             EditorWindow editor = new EditorWindow(names, types, values, isMap);
             editor.ShowDialog();
+            form.redrawTimer.Stop();
             if (editor.save) {
                 if (valueInHex) editor.ConvertValues(false);
                 return editor.values;
@@ -70,8 +72,10 @@ namespace FalloutClient {
         }
 
         public static string[] ShowEditor(DebugEditor form, string[] lvalues) {
+            form.redrawTimer.Start();
             EditorWindow editor = new EditorWindow(lvalues);
             editor.ShowDialog();
+            form.redrawTimer.Stop();
             if (editor.save) {
                 if (valueInHex) editor.ConvertValues(false);
                 return editor.values;

DebugEditor/Program.cs

@@ -32,6 +32,7 @@ namespace FalloutClient {
         SetArray = 10,
         GetLocal = 11,
         SetLocal = 12,
-        Exit = 254
+        Exit = 254,
+        RedrawGame = 255
     }
 }

DebugEditor/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("sfall")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyCopyright("Copyright (C) 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("4.1.9.0")]
-[assembly: AssemblyFileVersion("4.1.9.0")]
+[assembly: AssemblyVersion("4.1.9.1")]
+[assembly: AssemblyFileVersion("4.1.9.1")]

README.md

@@ -1,6 +1,10 @@
 # sfall
 
-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.
+[![License](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+[![Dev Build](https://github.com/phobos2077/sfall/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/phobos2077/sfall/actions/workflows/build.yml)
+[![GitHub Pages](https://github.com/phobos2077/sfall/actions/workflows/gh-pages.yml/badge.svg)](https://github.com/phobos2077/sfall/actions/workflows/gh-pages.yml)
+
+A set of engine modifications for the classic game Fallout 2 in the form of a DLL, which modifies executable in memory without changing anything in EXE file itself.
 
 **Engine modifications include:**
 - Better support for modern operating systems
@@ -9,8 +13,52 @@ A set of engine modifications for the classic game Fallout 2 in form of a DLL, w
 - Many additional features for users, such as item highlight button, party member control, etc.
 - Extended scripting capabilities for modders (many new opcodes to control sfall features as well as previously unavailable vanilla engine functions)
 
+Original author: **Timeslip**
 
-Original author: timeslip
+Original description: A set of engine modifications for the classic game Fallout 2 by Interplay. Includes fixes for bugs in the original engine, allows Fallout to run correctly on modern operating systems, and adds additional features for modders.
 
-Original description: A set of engine modifications for the classic game Fallout 2 by Interplay. Includes fixes for bugs in the original engine, allows fallout to run correctly on modern operating systems, and adds additional features for modders.
+## Installation
 
+- Download `sfall_*.7z` from the [release archive](https://sourceforge.net/projects/sfall/files/).
+
+- Extract `ddraw.dll`, `ddraw.ini`, and `sfall.dat` to Fallout's base directory (i.e. the one that contains `fallout2.exe`).
+
+- __Important Note:__\
+  If you are using a mod that already included sfall (e.g. killap's [Unofficial Patch](https://github.com/BGforgeNet/Fallout2_Unofficial_Patch) or [Restoration Project](https://github.com/BGforgeNet/Fallout2_Restoration_Project)), then that mod has probably included a custom modified `ddraw.ini`. In that case, overwriting it with sfall's vanilla `ddraw.ini` will be likely break your game. Instead, only overwrite `ddraw.dll`, and keep the mod's existing copy of `ddraw.ini`. (Or, if you know what you're doing, you can merge them together by hand.)
+
+- The folder `translations` contains translations of some of the strings that sfall displays in the game. To use a translation, copy this folder to Fallout's base directory too, and then in `ddraw.ini` change the __TranslationsINI__ setting to `.\translations\<your language>.ini`.
+
+## Uninstallation
+
+Delete `ddraw.dll`, `ddraw.ini`, and `sfall.dat` from your Fallout directory.
+
+## Usage
+
+This mod is configured via the `ddraw.ini` file, which can be opened with any text editor. Details of every configerable option are included in that file. Where a comment refers to a DX scancode, the complete list of codes can be found at the link below:\
+https://kippykip.com/b3ddocs/commands/scancodes.htm
+
+In a default installation using an unmodified copy of `ddraw.ini`, the middle mouse button will be set to switch between weapons and the mouse wheel will be set to scroll through any menus that respond to the up/down arrow keys. Holding Ctrl and hitting numpad keys 0 to 6 (with Num Lock off) will adjust the game speed. Holding left Ctrl will let you move a whole stack of items at once. Pressing left Shift will highlight items on the ground. The script extender and any engine fixes are also enabled. Most of the options that change gameplay in some way not originally intended by the developers are disabled.
+
+For [__Wine__](https://www.winehq.org/) users:\
+You need to set DLL overrides for `ddraw.dll` to __"native, builtin"__ in `winecfg` or use `WINEDLLOVERRIDES="ddraw=n,b"` to run Fallout from the command line. If you want to play alternative sound files, you'll also need to install GStreamer Good 32-bit plugins.
+
+## Build Instructions
+
+### Prerequisites:
+
+* Visual C++ 2010 Express SP1 or Visual Studio 2010 SP1.
+* [DirectX SDK (February 2010)](https://archive.org/details/dxsdk_feb10). You will also need `dinput.lib` from DXSDK August 2007. The file can be found in the [DirectX SDK Collection repo](https://github.com/NovaRain/DXSDK_Collection).
+* [DirectX Runtime (June 2010)](https://www.microsoft.com/en-us/download/details.aspx?id=8109).
+
+### Steps:
+
+1. Set up a `postbuild.cmd` using the template from the repo.
+2. Open the solution file and build with the **Release** configuration.
+3. If everything is set up correctly, you should have a new sfall `ddraw.dll` in your Fallout 2 directory.
+
+## Additional info
+
+* [Changelog](CHANGELOG.md)
+* [Scripting Documentation](https://sfall-team.github.io/sfall/)
+* Fallout Engine IDA Database: [for IDA Pro 6.8](https://www.dropbox.com/s/tm0nyx0lnk4yui0/Fallout_1_and_2_IDA68.rar?dl=1 "Download from Dropbox") | [for IDA Pro 7.0](https://www.dropbox.com/s/61srq09pn8grfpu/Fallout_1_and_2_IDA70.rar?dl=1 "Download from Dropbox") (comments are in Russian)
+* [Fallout 2 Reference Edition](https://github.com/alexbatalov/fallout2-re)

artifacts/config_files/Perks.ini

@@ -1,16 +1,45 @@
 ;This file handles modifications to perks and traits
 
-;When adding extra perks to a mod, it's advisable to use the fake perk scripting functions rather than make modifications
-; in this file, as some perks have hardcoded effects which may catch you out
+;When adding extra perks to a mod, it's advisable to use the fake perk scripting functions rather than make
+; modifications in this file, as some perks have hardcoded effects which may catch you out
 
 ;Since traits need to be picked before any scripts run, they have an additional NoHardcode option in this file which can
 ; be used to remove their hardcoded effects, and add new stat/skill effects
 
 [PerksTweak]
+;Changes the Outdoorsman skill bonus for 'Survivalist' perk (ID 16)
+;125 - maximum bonus, 25 - default bonus
+SurvivalistBonus=25
+
 ;Changes the bonus for 'Master Trader' perk (ID 17)
 ;25 - default bonus
 MasterTraderBonus=25
 
+;Changes the Science and Repair skill bonus for 'Mr.Fixit' perk (ID 31)
+;125 - maximum bonus, 10 - default bonus
+MrFixitBonus=10
+
+;Changes the skill bonuses for 'Medic' perk (ID 32)
+;125 - maximum bonus, 10 - default bonus
+MedicFirstAidBonus=10
+MedicDoctorBonus=10
+
+;Changes the Lockpick and Steal skill bonus for 'Master Thief' perk (ID 33)
+;125 - maximum bonus, 15 - default bonus
+MasterThiefBonus=15
+
+;Changes the Speech skill bonus for 'Speaker' perk (ID 34)
+;125 - maximum bonus, 20 - default bonus
+SpeakerBonus=20
+
+;Changes the Sneak skill bonus (when in darkness) for 'Ghost' perk (ID 38)
+;125 - maximum bonus, 20 - default bonus
+GhostBonus=20
+
+;Changes the Outdoorsman skill bonus for 'Ranger' perk (ID 47)
+;125 - maximum bonus, 15 - default bonus
+RangerOutdoorsmanBonus=15
+
 ;Changes the distance bonus for 'Weapon Long Range' weapon perk (ID 58)
 ;2 - no bonus, 4 - default bonus
 WeaponLongRangeBonus=4
@@ -34,9 +63,22 @@ VaultCityInoculationsRadBonus=10
 ;999 - maximum bonus, 10 - default bonus
 DemolitionExpertBonus=10
 
-;Changes the damage bonus for 'Living Anatomy' perk (ID 97)
-;125 - maximum bonus, 5 - default bonus
+;Changes the Gambling skill bonus for 'Gambler' perk (ID 83)
+;125 - maximum bonus, 20 - default bonus
+GamblerBonus=20
+
+;Changes the Steal skill bonus for 'Harmless' perk (ID 91)
+;125 - maximum bonus, 20 - default bonus
+HarmlessBonus=20
+
+;Changes the damage bonus and the Doctor skill bonus for 'Living Anatomy' perk (ID 97)
+;125 - maximum bonus, 5 - default bonus, 10 - default skill bonus
 LivingAnatomyBonus=5
+LivingAnatomyDoctorBonus=10
+
+;Changes the Speech and Barter skill bonus for 'Negotiator' perk (ID 99)
+;125 - maximum bonus, 10 - default bonus
+NegotiatorBonus=10
 
 ;Changes the damage bonus for 'Pyromaniac' perk (ID 101)
 ;125 - maximum bonus, 5 - default bonus
@@ -50,10 +92,23 @@ SalesmanBonus=20
 ;valid range: 0..100, 50 - default percent
 StonewallPercent=50
 
+;Changes the Lockpick, Steal, and Traps skill bonus for 'Thief' perk (ID 105)
+;125 - maximum bonus, 10 - default bonus
+ThiefBonus=10
+
 ;Changes the strength bonus for 'Weapon Handling' perk (ID 106)
 ;0 - no bonus, 10 - maximum bonus, 3 - default bonus
 WeaponHandlingBonus=3
 
+;Changes the skill bonuses for 'Vault City Training' perk (ID 107)
+;125 - maximum bonus, 5 - default bonus
+VaultCityTrainingFirstAidBonus=5
+VaultCityTrainingDoctorBonus=5
+
+;Changes the Speech skill bonus for 'Expert Excrement Expeditor' perk (ID 116)
+;125 - maximum bonus, 5 - default bonus
+ExpertExcrementExpeditorBonus=5
+
 ;##############################################################################
 [Perks]
 ;Set to 1 to enable the modifications for perks
@@ -64,20 +119,25 @@ Enable=0
 ;Image: The line number (0-indexed) of the corresponding FRM in skilldex.lst
 ;Ranks: The number of perk levels
 ;Level: The minimum required level
-;Type: If 0, the perk checks only Skill1 for skill requirements; if 1, it checks Skill1 or Skill2; if 2, it checks both Skill1 and Skill2
+;Type: If 0, the perk checks only Skill1 for skill requirements; if 1, it checks Skill1 or Skill2; if 2, it checks both
+; Skill1 and Skill2
 ;Stat: The modified stat or -1 if you don't want to change any stats
 ;StatMag: The increased/decreased value to the modified stat
 
-;Skill1/Skill2: The first/second skill (or -1 for none) to check, but if you set a specific bit 0x4000000 (67108864), it checks GVAR.
-; For example, if Skill1=0x4000004, then the perk will check GVAR_BAD_MONSTER (0x4000000 + 4) on Skill1Mag value
+;Skill1/Skill2: The first/second skill (or -1 for none) to check, but if you set a specific bit 0x4000000 (67108864),
+; it checks the corresponding GVAR
+; For example, if Skill1=0x4000004, the perk will check GVAR_BAD_MONSTER (0x4000000 + 4) on Skill1Mag value
 
-;Skill1Mag/Skill2Mag: Positive value is used as the minimum requirements of the first/second skill/GVAR, and a negative value is interpreted as the maximum requirement.
-; For example, with Skill1=0 and Skill1Mag=100, if player has small guns skill >= 100 and meets all other requirements, the perk will be available in the
-; selection window; with Skill1=1 and Skill1Mag=-120, the perk will not be available if player has big guns skill >= 120
+;Skill1Mag/Skill2Mag: Positive value is used as the minimum requirements of the first/second skill/GVAR, and a negative
+; value is interpreted as the maximum requirement
+; For example, with Skill1=0 and Skill1Mag=100, if player has small guns skill >= 100 and meets all other requirements,
+; the perk will be available in the selection window; with Skill1=1 and Skill1Mag=-120, the perk will not be available
+; if player has big guns skill >= 120
 
-;STR-LCK: Positive values are used as minimum requirements of SPECIAL stats, and negative values are interpreted as maximum requirements.
-; For some special perks processed by the engine (e.g. PERK_armor_powered and PERK_armor_combat), the values are not used as requirements
-; but to add to corresponding SPECIAL stats
+;STR-LCK: Positive values are used as minimum requirements of SPECIAL stats, and negative values are interpreted as
+; maximum requirements
+; For some special perks processed by the engine (e.g. PERK_armor_powered and PERK_armor_combat), the values are not
+; used as requirements but to add to corresponding SPECIAL stats
 
 ;If the value is set to -99999, the variable will be ignored (similar to comment out that line)
 

artifacts/config_files/Skills.ini

@@ -11,7 +11,7 @@ TagSkillBonus=20
 ;Set to 3 to use both modes
 TagSkillMode=0
 
-;Set to 1 to base skill costs on spent points instead of current level
+;Set to 1 to base skill costs on the number of additional points in a skill instead of the current level
 BasedOnPoints=0
 
 ;Examples

artifacts/config_files/Translations.ini

@@ -4,15 +4,38 @@ KarmaGain=You gained %d karma.
 KarmaLoss=You lost %d karma.
 HighlightFail1=You aren't carrying a motion sensor.
 HighlightFail2=Your motion sensor is out of charge.
-SuperStimExploitMsg=You cannot use a super stim on someone who is not injured!
+SuperStimExploitMsg=You cannot use this item on someone who is not injured!
 BlockedCombat=You cannot enter combat at this time.
 SaveSfallDataFail=ERROR saving extended savegame information! Check if other programs interfere with savegame files/folders and try again.
 PartyLvlMsg=Lvl:
 PartyACMsg=AC:
 PartyAddictMsg=Addict
 NPCPickupFail=%s cannot pick up the item.
+AmmoInfoGlovz=Div: DR/%d, DT/%d
+AmmoInfoYAAM=DT Mod: %d
+
+PartyOrderAttackHuman=I'll take care of it.|Okay, I got it.|Sounds like a plan.
+PartyOrderAttackCreature=::Growl::
+PartyOrderAttackRobot=::Beep::
 
 [AppearanceMod]
 RaceText=Race
 StyleText=Style
 DoneBtn=Done
+
+;Custom names for player's unarmed attacks (max 16 characters)
+[Unarmed]
+;Punch=Punch:
+;Kick=Kick:
+;StrongPunch=Strong Punch:
+;HammerPunch=Hammer Punch:
+;Haymaker=Haymaker:
+;Jab=Jab:
+;PalmStrike=Palm Strike:
+;PiercingStrike=Piercing Strike:
+;StrongKick=Strong Kick:
+;SnapKick=Snap Kick:
+;PowerKick=Power Kick:
+;HipKick=Hip Kick:
+;HookKick=Hook Kick:
+;PiercingKick=Piercing Kick:

artifacts/config_files/Tweaks.ini

@@ -0,0 +1,13 @@
+;Game engine tweaks
+
+[Main]
+
+
+[Items]
+;Override the PIDs of the standard healing drugs that AI will use in combat
+;Set to -1 if you don't want AI to identify this item as a healing drug
+;Note: Starting from sfall 4.3.1/3.8.31, you can set a new flag (FlagsExt: 0x04000000)
+;in the proto for other items, so AI will use them for healing in combat as well
+STIMPAK=40
+SUPER_STIMPAK=144
+HEALING_POWDER=273

artifacts/config_files/Unarmed.ini

@@ -0,0 +1,66 @@
+; This file lets you configure the requirements and effects of unarmed attacks
+
+; You can leave the value empty or omit the parameter to use the engine default value
+
+; Strong Punch
+[8]
+ReqLevel=1    ; required player level
+SkillLevel=55 ; required Unarmed skill level
+
+; Required stats
+Stat0=0 ; ST
+Stat1=0 ; PE
+Stat2=0 ; EN
+Stat3=0 ; CH
+Stat4=0 ; IN
+Stat5=6 ; AG
+Stat6=0 ; LK
+
+MinDamage=1
+MaxDamage=2
+BonusDamage=3 ; bonus damage added to the minimum and maximum damage
+BonusCrit=0   ; value of the critical hit chance
+APCost=
+
+Penetrate=0 ; set to 1 to make the attack reduce target's armor DT (the formula is determined by the engine or a hook script)
+Secondary=0 ; set to 1 to assign the attack to the secondary mode (be careful when setting this parameter)
+
+; Hammer Punch
+[9]
+
+; Haymaker
+[10]
+
+; Jab
+[11]
+
+; Palm Strike
+[12]
+
+; Piercing Strike
+[13]
+
+; Strong Kick
+[14]
+
+; Snap Kick
+[15]
+
+; Power Kick
+[16]
+
+; Hip Kick
+[17]
+
+; Hook Kick
+[18]
+
+; Piercing Kick
+[19]
+
+; Default attacks (any requirements are ignored)
+; Punch
+[4]
+
+; Kick
+[5]

artifacts/example_mods/AmmoMod/AmmoMod.ini

@@ -0,0 +1,201 @@
+;Example Ammo INI for vanilla damage formula
+
+; PID_EXPLOSIVE_ROCKET
+[1]
+pid=14
+ac_adjust=0
+dr_adjust=-25
+dam_mult=1
+dam_div=1
+
+; PID_10MM_JHP
+[2]
+pid=29
+ac_adjust=0
+dr_adjust=25
+dam_mult=2
+dam_div=1
+
+; PID_10MM_AP
+[3]
+pid=30
+ac_adjust=0
+dr_adjust=-25
+dam_mult=1
+dam_div=2
+
+; PID_44_MAGNUM_JHP
+[4]
+pid=31
+ac_adjust=0
+dr_adjust=20
+dam_mult=2
+dam_div=1
+
+; PID_FLAMETHROWER_FUEL
+[5]
+pid=32
+ac_adjust=-20
+dr_adjust=25
+dam_mult=1
+dam_div=1
+
+; PID_14MM_AP
+[6]
+pid=33
+ac_adjust=0
+dr_adjust=-50
+dam_mult=1
+dam_div=2
+
+; PID_223_FMJ
+[7]
+pid=34
+ac_adjust=-20
+dr_adjust=-20
+dam_mult=1
+dam_div=1
+
+; PID_5MM_JHP
+[8]
+pid=35
+ac_adjust=0
+dr_adjust=35
+dam_mult=2
+dam_div=1
+
+; PID_5MM_AP
+[9]
+pid=36
+ac_adjust=0
+dr_adjust=-35
+dam_mult=1
+dam_div=2
+
+; PID_ROCKET_AP
+[10]
+pid=37
+ac_adjust=-15
+dr_adjust=-50
+dam_mult=1
+dam_div=1
+
+; PID_SMALL_ENERGY_CELL
+[11]
+pid=38
+ac_adjust=0
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_MICRO_FUSION_CELL
+[12]
+pid=39
+ac_adjust=0
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_SHOTGUN_SHELLS
+[13]
+pid=95
+ac_adjust=-10
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_44_FMJ_MAGNUM
+[14]
+pid=111
+ac_adjust=0
+dr_adjust=-20
+dam_mult=1
+dam_div=1
+
+; PID_9MM_BALL
+[15]
+pid=121
+ac_adjust=0
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_BBS
+[16]
+pid=163
+ac_adjust=0
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_ROBO_ROCKET_AMMO
+[17]
+pid=274
+ac_adjust=0
+dr_adjust=-25
+dam_mult=1
+dam_div=1
+
+; PID_45_CALIBER_AMMO
+[18]
+pid=357
+ac_adjust=0
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_2MM_EC_AMMO
+[19]
+pid=358
+ac_adjust=-30
+dr_adjust=-20
+dam_mult=3
+dam_div=2
+
+; PID_4_7MM_CASELESS
+[20]
+pid=359
+ac_adjust=-5
+dr_adjust=-10
+dam_mult=3
+dam_div=2
+
+; PID_9MM_AMMO
+[21]
+pid=360
+ac_adjust=0
+dr_adjust=10
+dam_mult=1
+dam_div=2
+
+; PID_HN_NEEDLER_CARTRIDGE
+[22]
+pid=361
+ac_adjust=-10
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_HN_AP_NEEDLER_CARTRIDGE
+[23]
+pid=362
+ac_adjust=-10
+dr_adjust=0
+dam_mult=2
+dam_div=1
+
+; PID_7_62MM_AMMO
+[24]
+pid=363
+ac_adjust=-5
+dr_adjust=-10
+dam_mult=1
+dam_div=1
+
+; PID_FLAMETHROWER_FUEL_MK_II
+[25]
+pid=382
+ac_adjust=-20
+dr_adjust=0
+dam_mult=1
+dam_div=1

artifacts/example_mods/AmmoMod/gl_ammomod.ssl

@@ -1,14 +1,14 @@
 /*
 
-Ammo INI Loader mod for Fallout 2 by NovaRain
----------------------------------------------
+Ammo INI Loader mod v1.1 for Fallout 2 by NovaRain
+--------------------------------------------------
 
 - modifies ammo protos with data from an INI file:
   * AmmoGlovz.ini if DamageFormula=1 or 2 in ddraw.ini
   * AmmoYAAM.ini if DamageFormula=5 in ddraw.ini
   * AmmoMod.ini if not using any bulit-in damage formula
 
-Requires sfall 3.5 or higher
+Requires sfall 4.0/3.8.29 or higher
 
 */
 
@@ -23,7 +23,7 @@ variable ammoData;
 variable enabled;
 
 procedure start begin
-   variable i := 1, ammo, ammoPid, dmgMod;
+   variable i := 1, ammo, ammoSection, dmgMod;
    if game_loaded then begin
       enabled := get_ini_setting("ddraw.ini|Misc|DamageFormula");
       if (enabled == 1 or enabled == 2) then
@@ -37,19 +37,19 @@ procedure start begin
       if (enabled <= 0) then return;
 
       ammoData := create_array_map;
-      ammoPid := enabled; // pid from the first section
-      while (ammoPid > 0) do begin
+      ammoSection := get_ini_section(ammoIni, "" + i);
+      while (ammoSection.pid > 0) do begin
          ammo := create_array_map; // create permanent arrays
-         ammo.ac_adjust := get_ini_setting(ammoIni + "|" + i + "|ac_adjust");
-         ammo.dr_adjust := get_ini_setting(ammoIni + "|" + i + "|dr_adjust");
+         ammo.ac_adjust := atoi(ammoSection.ac_adjust);
+         ammo.dr_adjust := atoi(ammoSection.dr_adjust);
          // dam_mult and dam_div must be positive integers
-         dmgMod := get_ini_setting(ammoIni + "|" + i + "|dam_mult");
+         dmgMod := atoi(ammoSection.dam_mult);
          ammo.dam_mult := dmgMod if (dmgMod > 0) else 1;
-         dmgMod := get_ini_setting(ammoIni + "|" + i + "|dam_div");
+         dmgMod := atoi(ammoSection.dam_div);
          ammo.dam_div := dmgMod if (dmgMod > 0) else 1;
-         ammoData[ammoPid] := ammo;
+         ammoData[atoi(ammoSection.pid)] := ammo;
          i++;
-         ammoPid := get_ini_setting(ammoIni + "|" + i + "|pid");
+         ammoSection := get_ini_section(ammoIni, "" + i);
       end
       call map_enter_p_proc;
       debug_msg("Ammo INI Loader mod: " + ammoIni + " - set " + (i - 1) + " ammo protos.");

artifacts/example_mods/AmmoMod/readme.txt

@@ -1,5 +1,5 @@
-Ammo INI Loader mod for Fallout 2 by NovaRain
----------------------------------------------
+Ammo INI Loader mod v1.1 for Fallout 2 by NovaRain
+--------------------------------------------------
 
 - modifies ammo protos with data from an INI file:
   * AmmoGlovz.ini if DamageFormula=1 or 2 in ddraw.ini
@@ -7,6 +7,6 @@ Ammo INI Loader mod for Fallout 2 by NovaRain
   * AmmoMod.ini if not using any bulit-in damage formula
 
 
-Requires sfall 3.5 or higher.
+Requires sfall 4.0/3.8.29 or higher.
 
 To use, copy gl_ammomod.int to your scripts folder, and copy the INI files to the same directory as sfall.