Merge branch 'develop'

Fixed a bug in DisplaySecondWeaponRange that didn't display correct weapon range when the secondary mode is aimed (e.g. spear and throwing knife)
Removed trilling spaces in previous commit.

.gitignore

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

MPClient/DebugEditor.Designer.cs

@@ -24,17 +24,16 @@
         /// </summary>
         private void InitializeComponent() {
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
-            this.Column0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bGlobals = new System.Windows.Forms.Button();
             this.bMapVars = new System.Windows.Forms.Button();
             this.bCritters = new System.Windows.Forms.Button();
             this.bSGlobals = new System.Windows.Forms.Button();
             this.bArrays = new System.Windows.Forms.Button();
+            this.Column0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bEdit = new System.Windows.Forms.Button();
-            this.bCrittersLvar = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -42,38 +41,84 @@
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
-            this.dataGridView1.AllowUserToResizeRows = false;
             this.dataGridView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dataGridView1.ColumnHeadersHeight = 22;
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Column0,
             this.Column1,
             this.Column2,
             this.Column3});
             this.dataGridView1.Location = new System.Drawing.Point(12, 12);
-            this.dataGridView1.MultiSelect = false;
             this.dataGridView1.Name = "dataGridView1";
-            this.dataGridView1.RowHeadersVisible = false;
-            this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dataGridView1.Size = new System.Drawing.Size(561, 354);
+            this.dataGridView1.Size = new System.Drawing.Size(444, 215);
             this.dataGridView1.TabIndex = 0;
-            this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
             this.dataGridView1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellEndEdit);
-            this.dataGridView1.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.dataGridView1_RowsAdded);
+            // 
+            // bGlobals
+            // 
+            this.bGlobals.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.bGlobals.Location = new System.Drawing.Point(12, 233);
+            this.bGlobals.Name = "bGlobals";
+            this.bGlobals.Size = new System.Drawing.Size(100, 23);
+            this.bGlobals.TabIndex = 1;
+            this.bGlobals.Text = "Globals";
+            this.bGlobals.UseVisualStyleBackColor = true;
+            this.bGlobals.Click += new System.EventHandler(this.bGlobals_Click);
+            // 
+            // bMapVars
+            // 
+            this.bMapVars.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.bMapVars.Location = new System.Drawing.Point(118, 233);
+            this.bMapVars.Name = "bMapVars";
+            this.bMapVars.Size = new System.Drawing.Size(100, 23);
+            this.bMapVars.TabIndex = 2;
+            this.bMapVars.Text = "Map variables";
+            this.bMapVars.UseVisualStyleBackColor = true;
+            this.bMapVars.Click += new System.EventHandler(this.bMapVars_Click);
+            // 
+            // bCritters
+            // 
+            this.bCritters.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.bCritters.Location = new System.Drawing.Point(118, 262);
+            this.bCritters.Name = "bCritters";
+            this.bCritters.Size = new System.Drawing.Size(100, 23);
+            this.bCritters.TabIndex = 3;
+            this.bCritters.Text = "Critters";
+            this.bCritters.UseVisualStyleBackColor = true;
+            this.bCritters.Click += new System.EventHandler(this.bCritters_Click);
+            // 
+            // bSGlobals
+            // 
+            this.bSGlobals.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.bSGlobals.Location = new System.Drawing.Point(225, 233);
+            this.bSGlobals.Name = "bSGlobals";
+            this.bSGlobals.Size = new System.Drawing.Size(100, 23);
+            this.bSGlobals.TabIndex = 4;
+            this.bSGlobals.Text = "sfall globals";
+            this.bSGlobals.UseVisualStyleBackColor = true;
+            this.bSGlobals.Click += new System.EventHandler(this.bSGlobals_Click);
+            // 
+            // bArrays
+            // 
+            this.bArrays.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.bArrays.Location = new System.Drawing.Point(12, 262);
+            this.bArrays.Name = "bArrays";
+            this.bArrays.Size = new System.Drawing.Size(100, 23);
+            this.bArrays.TabIndex = 5;
+            this.bArrays.Text = "sfall arrays";
+            this.bArrays.UseVisualStyleBackColor = true;
+            this.bArrays.Click += new System.EventHandler(this.bArrays_Click);
             // 
             // Column0
             // 
             this.Column0.HeaderText = "ID";
             this.Column0.Name = "Column0";
             this.Column0.ReadOnly = true;
-            this.Column0.Width = 50;
             // 
             // Column1
             // 
-            this.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.Column1.HeaderText = "Name";
             this.Column1.Name = "Column1";
             this.Column1.ReadOnly = true;
@@ -88,65 +133,10 @@
             this.Column3.HeaderText = "Value (Float)";
             this.Column3.Name = "Column3";
             // 
-            // bGlobals
-            // 
-            this.bGlobals.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.bGlobals.Location = new System.Drawing.Point(12, 372);
-            this.bGlobals.Name = "bGlobals";
-            this.bGlobals.Size = new System.Drawing.Size(100, 23);
-            this.bGlobals.TabIndex = 1;
-            this.bGlobals.Text = "Globals";
-            this.bGlobals.UseVisualStyleBackColor = true;
-            this.bGlobals.Click += new System.EventHandler(this.bGlobals_Click);
-            // 
-            // bMapVars
-            // 
-            this.bMapVars.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.bMapVars.Location = new System.Drawing.Point(118, 372);
-            this.bMapVars.Name = "bMapVars";
-            this.bMapVars.Size = new System.Drawing.Size(100, 23);
-            this.bMapVars.TabIndex = 2;
-            this.bMapVars.Text = "Map variables";
-            this.bMapVars.UseVisualStyleBackColor = true;
-            this.bMapVars.Click += new System.EventHandler(this.bMapVars_Click);
-            // 
-            // bCritters
-            // 
-            this.bCritters.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.bCritters.Location = new System.Drawing.Point(12, 401);
-            this.bCritters.Name = "bCritters";
-            this.bCritters.Size = new System.Drawing.Size(100, 23);
-            this.bCritters.TabIndex = 3;
-            this.bCritters.Text = "Critters";
-            this.bCritters.UseVisualStyleBackColor = true;
-            this.bCritters.Click += new System.EventHandler(this.bCritters_Click);
-            // 
-            // bSGlobals
-            // 
-            this.bSGlobals.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.bSGlobals.Location = new System.Drawing.Point(367, 372);
-            this.bSGlobals.Name = "bSGlobals";
-            this.bSGlobals.Size = new System.Drawing.Size(100, 23);
-            this.bSGlobals.TabIndex = 4;
-            this.bSGlobals.Text = "sfall globals";
-            this.bSGlobals.UseVisualStyleBackColor = true;
-            this.bSGlobals.Click += new System.EventHandler(this.bSGlobals_Click);
-            // 
-            // bArrays
-            // 
-            this.bArrays.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.bArrays.Location = new System.Drawing.Point(473, 372);
-            this.bArrays.Name = "bArrays";
-            this.bArrays.Size = new System.Drawing.Size(100, 23);
-            this.bArrays.TabIndex = 5;
-            this.bArrays.Text = "sfall arrays";
-            this.bArrays.UseVisualStyleBackColor = true;
-            this.bArrays.Click += new System.EventHandler(this.bArrays_Click);
-            // 
             // bEdit
             // 
-            this.bEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.bEdit.Location = new System.Drawing.Point(473, 401);
+            this.bEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.bEdit.Location = new System.Drawing.Point(225, 262);
             this.bEdit.Name = "bEdit";
             this.bEdit.Size = new System.Drawing.Size(100, 23);
             this.bEdit.TabIndex = 6;
@@ -154,24 +144,11 @@
             this.bEdit.UseVisualStyleBackColor = true;
             this.bEdit.Click += new System.EventHandler(this.bEdit_Click);
             // 
-            // bCrittersLvar
-            // 
-            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(118, 401);
-            this.bCrittersLvar.Name = "bCrittersLvar";
-            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
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(585, 436);
-            this.Controls.Add(this.bCrittersLvar);
+            this.ClientSize = new System.Drawing.Size(468, 297);
             this.Controls.Add(this.bEdit);
             this.Controls.Add(this.bArrays);
             this.Controls.Add(this.bSGlobals);
@@ -179,10 +156,8 @@
             this.Controls.Add(this.bMapVars);
             this.Controls.Add(this.bGlobals);
             this.Controls.Add(this.dataGridView1);
-            this.MinimumSize = new System.Drawing.Size(450, 300);
             this.Name = "DebugEditor";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "sfall Debug Editor";
+            this.Text = "DebugEditor";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DebugEditor_FormClosing);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             this.ResumeLayout(false);
@@ -197,12 +172,11 @@
         private System.Windows.Forms.Button bCritters;
         private System.Windows.Forms.Button bSGlobals;
         private System.Windows.Forms.Button bArrays;
-        private System.Windows.Forms.Button bEdit;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column0;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
-        private System.Windows.Forms.Button bCrittersLvar;
+        private System.Windows.Forms.Button bEdit;
 
     }
 }

MPClient/EditorConnection.cs

@@ -3,9 +3,7 @@ using System.Net.Sockets;
 using System.IO;
 
 namespace FalloutClient {
-
-    class EditorConnection
-    {
+    class EditorConnection {
         private TcpClient client;
         private NetworkStream stream;
         private BinaryReader br;
@@ -13,81 +11,73 @@ namespace FalloutClient {
 
         public readonly int[] Globals;
         public readonly int[] MapVars;
-        public readonly uint[,] Critters;
+        public readonly uint[] Critters;
         public readonly ulong[] SGlobalKeys;
         public readonly int[] sGlobals;
         public readonly uint[] Arrays;
         public readonly int[] ArrayLengths;
-        public readonly int[] ArrayFlag;
-        public readonly bool[] ArrayIsMap;
+        public readonly int[] ArrayDataSizes;
 
         public EditorConnection() {
             System.Threading.Thread.Sleep(1000);
-            client = new TcpClient("127.0.0.1", 4245);
-            stream = client.GetStream();
-            br = new BinaryReader(stream);
-            bw = new BinaryWriter(stream);
-            Globals = new int[br.ReadInt32()];
-            MapVars = new int[br.ReadInt32()];
-            SGlobalKeys = new ulong[br.ReadInt32()];
-            sGlobals = new int[SGlobalKeys.Length];
-            Arrays = new uint[br.ReadInt32()];
-            ArrayLengths = new int[Arrays.Length];
-            ArrayFlag = new int[Arrays.Length];
-            ArrayIsMap = new bool[Arrays.Length];
-            Critters = new uint[br.ReadInt32(), 2];
+            client=new TcpClient("127.0.0.1", 4245);
+            stream=client.GetStream();
+            br=new BinaryReader(stream);
+            bw=new BinaryWriter(stream);
+            Globals=new int[br.ReadInt32()];
+            MapVars=new int[br.ReadInt32()];
+            SGlobalKeys=new ulong[br.ReadInt32()];
+            sGlobals=new int[SGlobalKeys.Length];
+            Arrays=new uint[br.ReadInt32()];
+            ArrayLengths=new int[Arrays.Length];
+            ArrayDataSizes=new int[Arrays.Length];
+            Critters=new uint[br.ReadInt32()];
 
-            for (int i = 0; i < Globals.Length; i++) Globals[i] = br.ReadInt32();
-            for (int i = 0; i < MapVars.Length; i++) MapVars[i] = br.ReadInt32();
-            for (int i = 0; i < sGlobals.Length; i++) {
-                SGlobalKeys[i] = br.ReadUInt64();
-                sGlobals[i] = br.ReadInt32();
+            for(int i=0;i<Globals.Length;i++) Globals[i]=br.ReadInt32();
+            for(int i=0;i<MapVars.Length;i++) MapVars[i]=br.ReadInt32();
+            for(int i=0;i<sGlobals.Length;i++) {
+                SGlobalKeys[i]=br.ReadUInt64();
+                sGlobals[i]=br.ReadInt32();
                 br.ReadInt32();
             }
-            for (int i = 0; i < Arrays.Length; i++) {
-                Arrays[i] = br.ReadUInt32();
-                ArrayIsMap[i] = (br.ReadInt32() != 0);
-                ArrayLengths[i] = br.ReadInt32();
-                ArrayFlag[i] = br.ReadInt32();
-            }
-            for (int i = 0; i < Critters.Length / 2; i++) {
-                Critters[i, 0] = br.ReadUInt32();
-                Critters[i, 1] = br.ReadUInt32();
+            for(int i=0;i<Arrays.Length;i++) {
+                Arrays[i]=br.ReadUInt32();
+                ArrayLengths[i]=br.ReadInt32();
+                ArrayDataSizes[i]=br.ReadInt32();
             }
+            for(int i=0;i<Critters.Length;i++) Critters[i]=br.ReadUInt32();
         }
 
         public void Close() {
             stream.Close();
             client.Close();
-            stream = null;
-            client = null;
+            stream=null;
+            client=null;
         }
 
         public void WriteDataType(DataTypeSend type) {
             stream.WriteByte((byte)type);
             //bw.Write((byte)type);
         }
-
         public void WriteByte(byte b) { bw.Write(b); }
         public void WriteInt16(short value) { bw.Write(value); }
         public void WriteInt(int value) { bw.Write(value); }
         public void WriteBytes(byte[] buf) { bw.Write(buf); }
-
         public void WriteBytes(byte[] buf, int start, int len) {
             bw.Write(buf, start, len);
         }
 
         public void Read(byte[] buffer) {
-            int upto = 0;
-            while (upto < buffer.Length) {
-                upto += stream.Read(buffer, upto, buffer.Length - upto);
+            int upto=0;
+            while(upto<buffer.Length) {
+                upto+=stream.Read(buffer, upto, buffer.Length-upto);
             }
         }
         public void Read(byte[] buffer, int offset, int length) {
-            int upto = 0;
+            int upto=0;
             //System.Diagnostics.Debug.WriteLine("Read - offset: "+offset+" length: "+length);
-            while (upto < length) {
-                upto += stream.Read(buffer, offset + upto, length - upto);
+            while(upto<length) {
+                upto+=stream.Read(buffer, offset+upto, length-upto);
             }
         }
         public int ReadByte() {

MPClient/EditorWindow.Designer.cs

@@ -29,14 +29,13 @@
             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();
             // 
             // bSave
             // 
-            this.bSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.bSave.Location = new System.Drawing.Point(12, 336);
+            this.bSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.bSave.Location = new System.Drawing.Point(281, 265);
             this.bSave.Name = "bSave";
             this.bSave.Size = new System.Drawing.Size(75, 23);
             this.bSave.TabIndex = 0;
@@ -47,7 +46,7 @@
             // bCancel
             // 
             this.bCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.bCancel.Location = new System.Drawing.Point(371, 336);
+            this.bCancel.Location = new System.Drawing.Point(200, 265);
             this.bCancel.Name = "bCancel";
             this.bCancel.Size = new System.Drawing.Size(75, 23);
             this.bCancel.TabIndex = 1;
@@ -59,77 +58,49 @@
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
-            this.dataGridView1.AllowUserToResizeRows = false;
             this.dataGridView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dataGridView1.ColumnHeadersHeight = 22;
+            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Column1,
             this.Column2,
             this.Column3});
             this.dataGridView1.Location = new System.Drawing.Point(12, 12);
-            this.dataGridView1.MultiSelect = false;
             this.dataGridView1.Name = "dataGridView1";
-            this.dataGridView1.RowHeadersVisible = false;
-            this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dataGridView1.Size = new System.Drawing.Size(434, 318);
+            this.dataGridView1.Size = new System.Drawing.Size(344, 247);
             this.dataGridView1.TabIndex = 2;
             this.dataGridView1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellEndEdit);
             // 
             // Column1
             // 
-            this.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.Column1.HeaderText = "Element";
+            this.Column1.HeaderText = "Name";
             this.Column1.Name = "Column1";
             this.Column1.ReadOnly = true;
-            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             // 
             // Column2
             // 
             this.Column2.HeaderText = "Type";
             this.Column2.Name = "Column2";
             this.Column2.ReadOnly = true;
-            this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Column2.Width = 75;
             // 
             // Column3
             // 
             this.Column3.HeaderText = "Value";
             this.Column3.Name = "Column3";
-            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.ClientSize = new System.Drawing.Size(368, 300);
             this.Controls.Add(this.dataGridView1);
             this.Controls.Add(this.bCancel);
             this.Controls.Add(this.bSave);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
-            this.MinimumSize = new System.Drawing.Size(300, 200);
             this.Name = "EditorWindow";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Edit Values";
+            this.Text = "EditorWindow";
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -141,6 +112,5 @@
         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

@@ -3,93 +3,32 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 
 namespace FalloutClient {
-
-    public enum DataType : int { None = 0, Int = 1, Float = 2, String = 3 }
-
-    public partial class EditorWindow : Form
-    {
-        private readonly DataType[] types = null;
-        private string[] values;
+    public enum DataType : int { None=0, Int=1, Float=2, String=3 }
+    public partial class EditorWindow : Form {
+        private readonly DataType[] types;
+        private readonly 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;
 
+        private EditorWindow(string[] names, DataType[] types, string[] values) {
+            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();
-                    if (isMap && (i % 2) == 0) element += " - Key";
-                    dataGridView1.Rows.Add(element, types[i].ToString(), values[i]);
-                }
-            else
-                for (int i = 0; i < types.Length; i++) dataGridView1.Rows.Add("[0x" + (i * 4).ToString("x").ToUpper() + "]" + names[i], types[i].ToString(), values[i]);
+            if(names==null) for(int i=0;i<types.Length;i++) dataGridView1.Rows.Add(i.ToString(), types[i].ToString(), values[i]);
+            else for(int i=0;i<types.Length;i++) dataGridView1.Rows.Add(names[i], types[i].ToString(), values[i]);
             dataGridView1.ResumeLayout();
         }
 
-        public static string[] ShowEditor(DebugEditor form, string[] names, DataType[] types, string[] values, bool isMap = false) {
-            EditorWindow editor = new EditorWindow(names, types, values, isMap);
+        public static string[] ShowEditor(string[] names, DataType[] types, string[] values) {
+            EditorWindow editor=new EditorWindow(names, types, values);
             editor.ShowDialog();
-            if (editor.save) {
-                if (valueInHex) editor.ConvertValues(false);
-                return editor.values;
-            }
-            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;
+            if(editor.save) return editor.values;
+            else return null;
         }
 
         private bool CheckInput(DataType type, string str) {
-            switch (type) {
+            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:
@@ -100,11 +39,9 @@ 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 != null) ? types[e.RowIndex] : DataType.Int), str))
-                values[e.RowIndex] = str;
-            else
-                dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = values[e.RowIndex];
+            string str=(string)dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value;
+            if(CheckInput(types[e.RowIndex], str)) values[e.RowIndex]=str;
+            else dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value=values[e.RowIndex];
         }
 
         private void bCancel_Click(object sender, EventArgs e) {
@@ -112,16 +49,8 @@ namespace FalloutClient {
         }
 
         private void bSave_Click(object sender, EventArgs e) {
-            save = true;
+            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/MPClient.csproj

@@ -16,21 +16,6 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>false</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -48,8 +33,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -79,18 +62,6 @@
       <DependentUpon>EditorWindow.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -100,7 +71,6 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>copy "$(TargetPath)" "C:\Games\Fallout2\$(TargetName)$(TargetExt)"</PostBuildEvent>
   </PropertyGroup>
 </Project>

MPClient/MPClient.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SfallDebugEditor", "SfallDebugEditor.csproj", "{80ED0DCE-100E-4EC9-A79D-2FBFA4CAD1E3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MPClient", "MPClient.csproj", "{80ED0DCE-100E-4EC9-A79D-2FBFA4CAD1E3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

MPClient/Program.cs

@@ -12,25 +12,17 @@ namespace FalloutClient {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 
-            if (args.Length == 1 && args[0] == "-debugedit") {
+            if(args.Length==1&&args[0]=="-debugedit") {
                 Application.Run(new DebugEditor(new EditorConnection()));
             } else {
-                MessageBox.Show("The debug editor can only be run from the game.",
-                    "sfall Debug Editor", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+                throw new Exception("Multiplayer is no longer supported");
             }
         }
     }
 
     enum DataTypeSend {
-        SetGlobal = 0,
-        SetMapVar = 1,
-        RetrieveCritter = 2,
-        SetCritter = 3,
-        SetSGlobal = 4,
-        GetArray = 9,
-        SetArray = 10,
-        GetLocal = 11,
-        SetLocal = 12,
-        Exit = 254
+        Mouse=0, LMouseDown=1, LMouseUp=2, RMouseDown=3, RMouseUp=4, TakeChar=5, ReleaseChar=6,
+        SetGlobal=0, SetMapVar=1, RetrieveCritter=2, SetCritter=3, SetSGlobal=4, GetArray=9, SetArray=10,
+        Exit=254
     } 
 }

MPClient/Properties/AssemblyInfo.cs

@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("sfall Debug Editor")]
+[assembly: AssemblyTitle("FalloutClient")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("sfall")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyProduct("FalloutClient")]
+[assembly: AssemblyCopyright("Copyright ©  2009")]
 [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("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

artifacts/config_files/CriticalOverrides.ini

@@ -14,16 +14,15 @@ Part_0=1  ; Tell sfall that we want to modify the head entries
 
 [c_00_0]  ; The entries for the head table of the men critter type.
 e0_DamageMultiplier=100  ;First level critical
-e0_EffectFlags=0  ; The value of the flags (see DAM_* in Define.h)
-                  ; For multiple effects, use the sum of the flags (e.g. 2050 = knocked down + bypass armor)
+e0_EffectFlags=0
 e0_StatCheck=0
 e0_StatMod=0
 e0_FailureEffect=0
 e0_Message=0       ; This is an index into the msg file, not a string
 e0_FailMessage=0
-;e1_...  ; Second level critical
-;...     ; And so on up to the hardest hitting level 5 critical
-;e5_...
+e1_...  ; Second level critical
+...     ; And so on up to the hardest hitting level 5 critical
+e5_...
 
 ;You can skip any entries from this section to leave them at their defaults
 ;Any missing entries for critters 19-37 will be replaced by a 0, since they have no default

artifacts/config_files/Perks.ini

@@ -7,8 +7,8 @@
 ; have an additional NoHardcode option in this file which can
 ; be used to remove their hardcoded effects, and add new stat/skill effects
 
-;Name=The name of the perk (max 63 characters)
-;Desc=The description of the perk (max 255 characters)
+;Name=The name of the perk
+;Desc=The description of the perk
 ;Image=The line number (0-indexed) of the corresponding FRM in skilldex.lst
 ;Ranks=The number of perk levels
 ;Level=The minimum required level

artifacts/config_files/Translations.ini

@@ -7,12 +7,8 @@ HighlightFail2=Your motion sensor is out of charge.
 SuperStimExploitMsg=You cannot use a super stim 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.
 
 [AppearanceMod]
 RaceText=Race
 StyleText=Style
-DoneBtn=Done
+MainButtonText=Appearance

artifacts/config_files/books.ini

@@ -1,13 +1,12 @@
-; Allows to reassign books to different object PIDs, text messages, and skills.
-; Maximum 50 books are allowed
+; Allows to reassign books to different object PIDs, text messages.
+; Maximum 30 books are allowed (25 if overrideVanilla is 0)
 
 [main]
 ; total number of books in this file
-count=1
+count=5
 
-; set to 1 to override all vanilla books, so you will have to define ALL the necessary books in this file;
-; otherwise only new books are defined here. To just override the text/skill of a vanilla book,
-; specify its PID in the new book and set the parameters
+; set to 1 to override all vanilla books, so you will have to define ALL books in this file;
+; otherwise only new books are defined here
 overrideVanilla=0
 
 ; count starts from 1

artifacts/config_files/elevators.ini

@@ -1,12 +1,11 @@
 ;Controls the elevators
-;Image must match up with the image of an existing elevator (can be overrided in sfall 4.1.4/3.8.14 or newer)
+;Image must match up with the image of an existing elevator
 ;Make sure you specify the correct number of exit targets
 ;The maximum number of elevators is currently capped at 50
-;Use the line number (0-indexed) of the corresponding FRM in intrface.lst to set the appearance of the elevator
 
 ;Override elevator 0
-[0]
-;This elevator will use the settings of the original forth elevator
+[000]
+;This elevator uses the frm of the original forth elevator
 Image=4
 
 ;Set up the first exit point
@@ -25,22 +24,3 @@ Elevation3=0
 Tile3=12944
 
 ;No forth exit point
-
-;Override FRM images of elevator 0. Set ButtonsFrm to -1 to use default buttons from MainFrm
-MainFrm=143
-ButtonsFrm=-1
-
-
-;An example of a new elevator
-[24]
-;Set Image to 24 to create a new elevator type (0-23 are the original elevator types)
-Image=24
-
-;Set the number of buttons
-ButtonCount=3
-
-;Set the appearance of the elevator
-MainFrm=148
-ButtonsFrm=151
-
-;Set up the exit points for all three buttons (see examples above)

artifacts/config_files/npcarmor.ini

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

artifacts/config_files/sfall-mods.ini

@@ -5,10 +5,10 @@
 Key=42
 
 ; Set to 1 to also highlight containers
-Containers=1
+Containers=0
 
 ; Set to 1 to also highlight lootable corpses
-Corpses=1
+Corpses=0
 
 ; Set to 1 to only highlight objects in the player's line-of-sight
 CheckLOS=0
@@ -28,3 +28,13 @@ OutlineColor=16
 ; 1 - requires Motion Scanner present in player inventory to activate highlighting
 ; 2 - requires Motion Scanner and also requires 1 charge on every use (depleted scanner will not work anymore)
 MotionScanner=0
+
+
+[CombatControl]
+;Allows you to directly control other critters in combat
+;Set to 0 to disable
+;Set to 1 to control all critters in combat
+;Set to 2 to control all party members
+;If you want to control only specific critters, uncomment the PIDList line and set a comma delimited list of PIDs
+Mode=0
+;PIDList=62,89,97,107,160,161

artifacts/ddraw.ini

@@ -1,12 +1,12 @@
 ;sfall configuration settings
-;v3.8.19.1
+;v4.0.5
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
 UseCommandLine=0
 
 ;Uncomment and point to a file to get alternate translations for some sfall messages
-;TranslationsINI=.\Translations.ini
+;TranslationsINI=./Translations.ini
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Sound]
@@ -15,14 +15,13 @@ UseCommandLine=0
 NumSoundBuffers=0
 
 ;Set to 1 to allow attaching sound files to combat float messages
-AllowSoundForFloats=0
+AllowSoundForFloats=1
 
-;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
+;Set to 1 to automatically search for alternative formats when Fallout tries to play an acm
 ;This does not effect the play_sfall_sound and stop_sfall_sound script functions
 AllowDShowSound=0
 
-;Set to 1 to override the music path used by default (i.e. data\sound\music\) if not present in the cfg
+;Set to 1 to override the music path used by default if not present in the cfg
 ;Set to 2 to overwrite all occurances of the music path
 OverrideMusicDir=2
 
@@ -34,21 +33,18 @@ Enable=1
 ;The speeds corresponding to each slot in percent. (i.e. 100 is normal speed)
 SpeedMulti0=50
 SpeedMulti1=100
-SpeedMulti2=200
-SpeedMulti3=300
-SpeedMulti4=400
+SpeedMulti2=150
+SpeedMulti3=200
+SpeedMulti4=300
 SpeedMulti5=500
-SpeedMulti6=600
-SpeedMulti7=700
-SpeedMulti8=800
-SpeedMulti9=900
+SpeedMulti6=1000
+SpeedMulti7=100
+SpeedMulti8=100
+SpeedMulti9=100
 
 ;The initial speed at game startup
 SpeedMultiInitial=100
 
-;Set to 1 to also affect the playback speed of mve video files without an audio track
-AffectPlayback=0
-
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Graphics]
 ;Set to 0 for 8 bit fullscreen
@@ -70,24 +66,13 @@ GraphicsHeight=0
 ;GPU is faster, but requires v2.0 pixel shader support
 GPUBlt=0
 
-;Set to 1 to allow using 32-bit textures for talking heads
-;The texture files should be placed in art\heads\<name of the talking head FRM file>\ (w/o extension)
-;The files in the folder should be numbered according to the number of frames in the talking head FRM file (0.png, 1.png, etc.)
-;See the text file in the modders pack for a detailed description
-;Requires DX9 graphics mode and v2.0 pixel shader support (see GPUBlt option)
+;Set to 1 to allow using 32 bit graphics for talking heads
+;Requires graphics mode 4 or 5, and GPUBlt set to 1
 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
-AllowDShowMovies=0
-
-;Fade effect time percentage modifier
-;Default is 100. Decrease/increase this value to speed up/slow down fade effects
-FadeMultiplier=100
-
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Input]
-;Set to 1 to enable the mouse scroll wheel to scroll through the inventory, barter, and loot screens
+;Set to 1 to enable the mouse scroll wheel to scroll through inventory, barter, and loot screens
 UseScrollWheel=1
 
 ;The mouse Z position is divided by this modifier to calculate the number of inventory
@@ -142,46 +127,26 @@ SpeedKey9=0x00
 ;Set to -1 for either ctrl key, -2 for either alt key or -3 for either shift key
 WindowScrollKey=0
 
-;A key to press to toggle the highlighting of all items on the ground on the current map
-;Set to 0 if you don't want a toggle key, or a DX scancode otherwise
-ToggleItemHighlightsKey=42
-
-;Set to 1 to also highlight containers
-HighlightContainers=1
-
-;Set the color of outlines, available colors:
-;0x01 - glowing red
-;0x02 - red
-;0x04 - grey
-;0x08 - glowing green
-;0x10 - bright yellow
-;0x20 - dark yellow
-;0x40 - purple
-OutlineColor=0x10
-
 ;A key to press to reload your currently equipped weapon
 ;Set to 0 if you don't want a reload key, or a DX scancode otherwise
 ReloadWeaponKey=0
 
 ;A key to hold down to let you move/drop a whole stack of items at once without the 'Move Items' window
 ;Set to 0 if you don't want to use a modifier key, or a DX scancode otherwise
-ItemFastMoveKey=29
+ItemFastMoveKey=0x1d
 
-;Set to 1 to skip the 'Move Items' window when taking items from containers or corpses and not holding down ItemFastMoveKey
-;Requires ItemFastMoveKey to be enabled
-FastMoveFromContainer=0
-
-;A key to press to open a debug game editor
+;A key to press to open a debug game editor (requires FalloutClient.exe from the modders pack)
 ;Set to 0 to disable, or a DX scancode otherwise
-;Requires sfall debugging mode to be enabled and FalloutClient.exe from the modders pack
 DebugEditorKey=0
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Misc]
+
 ;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
-;Set to -2 or -3 to remove the time limit, automatically reset the date, but override Fallout's GetDate function to return the correct year
+;Set to -2 to remove the time limit without resetting the date. The game will lock up on 8th of March 2255
+;Set to -3 to remove the time limit, automatically reset the date, but override Fallout's GetDate function to return the correct year
 TimeLimit=13
 
 ;World map travel time percentage modifier
@@ -189,6 +154,9 @@ TimeLimit=13
 ;100 is normal speed, 0 stops time from passing
 WorldMapTimeMod=100
 
+;Set to 1 to enable functions relating to overriding the file system
+UseFileSystemOverride=0
+
 ;Set to 1 to use the Fallout 1 code to control world map speed
 WorldMapFPSPatch=1
 
@@ -215,17 +183,17 @@ WorldMapSlots=0
 ;To use a config file other than fallout2.cfg, uncomment the next line and add the name of your new file
 ;ConfigFile=
 
-;Set to 1 to enable functions relating to overriding the file system
-UseFileSystemOverride=0
-
 ;To use a patch file other than patch000.dat, uncomment the next line and add your new file name
-;If you want to load multiple patch files (up to 1000) at once, you can include a %d in the file name (sprintf syntax)
+;If you want to check for multiple patch files, you can include a %d in the file name (sprintf syntax)
+;By default, only the first patch file found will be used.
+;If you want to load multiple patch files (up to 1000) at once, uncomment the MultiPatches line and set it to 1
 ;PatchFile=patch%03d.dat
+;MultiPatches=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=1
+DataLoadOrderPatch=0
 
 ;To change the default and starting player models, uncomment the next four lines.
 ;The default models can also be changed ingame via script
@@ -261,7 +229,7 @@ Movie17=credits.mve
 ;StartDay=-1
 
 ;To change the limit of the distance away from the player to which you're allowed to scroll the local maps, uncomment the next two lines
-;Defaults are 480 in the x direction and 400 in the y direction.
+;Defaults are 0x1E0 in the x direction and 0x190 in the y direction.
 ;Not compatible with the res patch!
 ;LocalMapXLimit=480
 ;LocalMapYLimit=400
@@ -360,11 +328,6 @@ 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
-CorpseDeleteTime=6
-
 ;Set a number of milliseconds to idle each input loop
 ;Set to -1 to disable
 ;Set to 0 to idle only if other processes are waiting for processor time
@@ -372,28 +335,19 @@ CorpseDeleteTime=6
 ProcessorIdle=-1
 
 ;Set to 1 if using the hero appearance mod
-;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.
-;Only NPCs with AP left equal to or greater than the value given here will be considered.
+;Causes NPCs who complete their combat turn with ap left over will try and find other ways to spend it.
+;Only NPCs with ap left equal to or greater than the value given here will be considered.
 ;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
-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 80x36 in size. sfall will just split and resave them at startup
+;Allows the use of tiles over 80*36 in size. sfall will just split and resave them at startup
 ;Set to 1 to check all tiles on started (slow)
-;Set to 2 if you provide a XLtiles.lst file in art\tiles\ containing a list of the tile ids that need checking
+;Set to 2 if you provide a XLtiles.lst file in art/tiles/ containing a list of the tile ids that need checking
 AllowLargeTiles=0
 
 ;Set to 1 to boost the maximum number of tile FRMs from 4096 to 16383
@@ -409,14 +363,11 @@ Doctor=293
 Science=293
 Repair=293
 
-;Set to 1 to add scroll buttons to the pipboy quest list, and remove the quests per area limit
-;Set to 2 to use a different set of scroll buttons
-UseScrollingQuestsList=1
+;Remove window position rounding
+RemoveWindowRounding=0
 
-;To change the location of quest list scroll buttons, uncomment the next two lines
-;Defaults are 140 for the X-axis and 334 for the Y-axis
-;QuestsScrollButtonsX=140
-;QuestsScrollButtonsY=334
+;Set to 1 to add scroll buttons to the pip boy quest list, and remove the quests per area limit
+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
@@ -424,8 +375,7 @@ UseScrollingQuestsList=1
 ;PremadeFIDs=201,203,202
 
 ;Use this line to modify the list of cities and their associated global variables used for city reputations
-;Syntax is 'city id:global id', with each city/global pair separated by a comma.
-;CityRepsCount=19
+;Syntax is 'city id : global id', with each city/global pair separated by a comma.
 ;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
@@ -436,12 +386,10 @@ ExtraSaveSlots=0
 
 ;Set to 1 to speed up the HP/AC counter animations
 ;Set to 2 to update the HP/AC counters instantly
-;Set to 3 to update the AC counter instantly when switching to other controlled critters in combat
 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
 
@@ -453,7 +401,7 @@ ScienceOnCritters=0
 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
+;The line must contain a 5 digits, 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.
@@ -484,29 +432,27 @@ NPCStage6Fix=0
 ;2 - Restoring the -1 AP bonus for HtH attacks (i.e. Fallout 1 behaviour)
 FastShotFix=1
 
-;Set to 1 to boost the maximum number of script names from 1450 to 10000
-BoostScriptDialogLimit=0
-
 ;Allows you to edit the skill tables
 ;Point the next line at an ini file containing the replacement skill data
 ;SkillsFile=Skills.ini
 
+;Set to 1 to boost the maximum number of script names from 1450 to 10000
+BoostScriptDialogLimit=0
+
 ;To change the relationship between SPECIAL stats and derived stats, uncomment the next line
 ;See the Stats.ini in the modders pack for an example file
 ;DerivedStats=Stats.ini
 
 ;These options modify the checks to see if a critter can carry an additional item, changing which items are counted towards the weight limit and adding an additional size check
 ;Set the mode to 0 to disable the size check, 1 to apply to the PC only, 2 to apply to the PC and party members, or 3 to apply to all critters
-;Only the PC uses CritterInvSizeLimit. Other critters will use the unused stat (STAT_unused = 10) or have the size limit of 100 if the stat is not set
+;Only the PC uses CritterInvSizeLimit. Other critters will use the extra unused stat (STAT_unused = 10)
 ;Add 4 to the mode to limit the weight check to used items only
-;You can use line number 542/543 in proto.msg and line number 35 in inventry.msg to set up custom messages for item size
 CritterInvSizeLimitMode=0
-CritterInvSizeLimit=100
+CritterInvSizeLimit=200
 
 ;Some bit flags to alter behaviour of the motion sensor
 ;1 - Allow sensor use on automap when motion sensor is in pack rather than hands
 ;2 - Motion sensor doesn't require charges
-;4 - Motion sensor is required to use the item highlight feature
 MotionScannerFlags=1
 
 ;Set to non-0 to adjust the maximum encounter table size
@@ -529,24 +475,9 @@ SuperStimExploitFix=0
 InventoryApCost=4
 QuickPocketsApCostReduction=2
 
-;Set to 1 to allow objects seeing through other objects that have their ShootThru flag set
-;Note that enabling this option can cause unexpected NPC behavior in some situations
+;Set to 1 to allow objects seeing through other objects with their ShootThru flag set
 ObjCanSeeObj_ShootThru_Fix=0
 
-;Set to 1 to fix the broken obj_can_hear_obj script function
-ObjCanHearObjFix=0
-
-;Set to 1 to enable the mood argument of start_gdialog script function to be available for talking heads
-;If the argument value is -1, the mood will be determined by the local variable 0 of the script (vanilla behavior)
-StartGDialogFix=0
-
-;Set to 1 to fix and repurpose the unused called_shot/num_attacks arguments of attack_complex script function
-;This also changes the behavior of the result flags arguments
-;called_shot - additional damage, when the damage received by the target is above the specified minimum damage
-;num_attacks - the number of free action points on the first turn only
-;attacker_results - unused, must be 0 or not equal to the target_results argument when specifying result flags for the target
-AttackComplexFix=0
-
 ;Set to 1 to enable the balanced bullet distribution formula for burst attacks
 ComputeSprayMod=0
 
@@ -594,14 +525,6 @@ DialogPanelAnimDelay=33
 ;Controls the speed of pipboy alarm clock animations (lower - faster; valid range: 0..127)
 PipboyTimeAnimDelay=50
 
-;Allows you to directly control other critters in combat
-;Set to 0 to disable
-;Set to 1 to control all critters in combat
-;Set to 2 to control all party members
-;If you want to control only specific critters, uncomment the ControlCombatPIDList line and set a comma delimited list of PIDs
-ControlCombat=0
-;ControlCombatPIDList=62,89,97,107,160,161
-
 ;Set to 1 to stack empty identical weapons, no matter what type of ammo was loaded before
 StackEmptyWeapons=0
 
@@ -612,24 +535,22 @@ 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 with maximum number except in the barter screen
+;Set to 1 to change the counter in the 'Move Items' window to start at the maximum number of items
 ItemCounterDefaultMax=0
 
+;Allows 9 options (lines of text) to be displayed correctly in a dialog window
+DialogOptions9Lines=1
+
 ;Set to 1 to leave the music playing in dialogue with talking heads
 EnableMusicInDialogue=0
 
 ;Set to 1 to prevent the player from running while sneaking without Silent Running perk
 DontTurnOffSneakIfYouRun=0
 
-;Changes the distance at which the player will switch to walking when trying to use objects (valid range: 0..3)
-;Set to 0 to disable switching. (Default is 3)
-UseWalkDistance=3
-
-;Set to 1 to fix the bug of being unable to sell used geiger counters or stealth boys
+;Set to 1 to fix the bug that 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 0 if another mod you're using has custom vehicles
 CarChargingFix=1
 
 ;Set to 1 to skip weapon equip/unequip animations when performing various actions
@@ -645,33 +566,16 @@ NumbersInDialogue=0
 ;Set to 1 to use Fallout's normal text font instead of DOS-like font on the world map
 WorldMapFontPatch=0
 
-;Set to 1 to display full item description for weapon/ammo in the barter screen
-FullItemDescInBarter=0
-
-;Set to 1 to display experience points with the bonus from Swift Learner perk when gained from non-scripted situations
-DisplaySwiftLearnerExp=1
-
-;Set to 1 to display party member's current level/AC/addict flag on the combat control panel
-PartyMemberExtraInfo=0
-
-;Set to 1 to prevent the inventory/loot/automap interfaces from being placed on top of other script-created windows
-InterfaceDontMoveOnTop=0
-
-;Overrides the global variable number used to show the special death message of the Modoc toilet explosion
-;Set to -1 to disable the special death message when the global variable is set
-SpecialDeathGVAR=491
-
-;Set to 1 to disable the special handling of map IDs 19 and 37 in the engine when entering the maps
-;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)
-;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
 
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+[Scripts]
+;Comma-separated list of masked paths to load global scripts from
+;Only use single slash \ as directory separator
+;Paths outside of scripts folder are supported
+GlobalScriptPaths=scripts\gl*.int,scripts\sfall\gl*.int
+
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Debugging]
 ;Extra sfall configuration settings that can be used by modders
@@ -681,9 +585,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
-;Does not require enabling 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:
+;Set to 1 to enable debugging output to screen or 2 to create a debug.log file
+;While you don't need to create an environment variable, you do still need to set the appropriate lines in fallout2.cfg
 ;-------
 ;[debug]
 ;mode=environment
@@ -709,21 +612,13 @@ SkipSizeCheck=0
 ;Does not require enabling sfall debugging mode
 ;ExtraCRC=0x00000000,0x00000000
 
-;Set to 1 to stop Fallout from deleting non read-only protos at startup
+;Set to 1 to stop Fallout from deleting non readonly protos at startup
 ;Has pretty nasty side effects when saving/reloading, so don't use for regular gameplay
 DontDeleteProtos=0
 
 ;Set to 1 to give scripts direct access to Fallout's address space, and to make arbitrary calls into Fallout's code
 AllowUnsafeScripting=0
 
-;Set to 1 to hide error messages in debug output when a null value is passed to the function as an object
-;Requires DebugMode to be enabled
-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

artifacts/example_mods/AmmoMod/AmmoGlovz.ini

@@ -1,201 +0,0 @@
-;Glovz's Damage Fix
-
-; PID_EXPLOSIVE_ROCKET
-[1]
-pid=14
-ac_adjust=-10
-dr_adjust=0
-dam_mult=1
-dam_div=1
-
-; PID_10MM_JHP
-[2]
-pid=29
-ac_adjust=0
-dr_adjust=0
-dam_mult=2
-dam_div=1
-
-; PID_10MM_AP
-[3]
-pid=30
-ac_adjust=-5
-dr_adjust=0
-dam_mult=1
-dam_div=2
-
-; PID_44_MAGNUM_JHP
-[4]
-pid=31
-ac_adjust=0
-dr_adjust=-10
-dam_mult=2
-dam_div=1
-
-; PID_FLAMETHROWER_FUEL
-[5]
-pid=32
-ac_adjust=-20
-dr_adjust=0
-dam_mult=1
-dam_div=1
-
-; PID_14MM_AP
-[6]
-pid=33
-ac_adjust=-5
-dr_adjust=-30
-dam_mult=1
-dam_div=2
-
-; PID_223_FMJ
-[7]
-pid=34
-ac_adjust=-15
-dr_adjust=-15
-dam_mult=2
-dam_div=2
-
-; PID_5MM_JHP
-[8]
-pid=35
-ac_adjust=0
-dr_adjust=-15
-dam_mult=2
-dam_div=1
-
-; PID_5MM_AP
-[9]
-pid=36
-ac_adjust=-5
-dr_adjust=-15
-dam_mult=1
-dam_div=2
-
-; PID_ROCKET_AP
-[10]
-pid=37
-ac_adjust=-10
-dr_adjust=0
-dam_mult=1
-dam_div=2
-
-; PID_SMALL_ENERGY_CELL
-[11]
-pid=38
-ac_adjust=-20
-dr_adjust=0
-dam_mult=2
-dam_div=1
-
-; PID_MICRO_FUSION_CELL
-[12]
-pid=39
-ac_adjust=-20
-dr_adjust=0
-dam_mult=2
-dam_div=1
-
-; PID_SHOTGUN_SHELLS
-[13]
-pid=95
-ac_adjust=-15
-dr_adjust=0
-dam_mult=3
-dam_div=1
-
-; PID_44_FMJ_MAGNUM
-[14]
-pid=111
-ac_adjust=-5
-dr_adjust=-10
-dam_mult=2
-dam_div=2
-
-; 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=-10
-dr_adjust=-10
-dam_mult=1
-dam_div=1
-
-; PID_45_CALIBER_AMMO
-[18]
-pid=357
-ac_adjust=0
-dr_adjust=-5
-dam_mult=2
-dam_div=1
-
-; PID_2MM_EC_AMMO
-[19]
-pid=358
-ac_adjust=-25
-dr_adjust=-20
-dam_mult=1
-dam_div=3
-
-; PID_4_7MM_CASELESS
-[20]
-pid=359
-ac_adjust=-5
-dr_adjust=-25
-dam_mult=1
-dam_div=2
-
-; PID_9MM_AMMO
-[21]
-pid=360
-ac_adjust=0
-dr_adjust=0
-dam_mult=2
-dam_div=1
-
-; PID_HN_NEEDLER_CARTRIDGE
-[22]
-pid=361
-ac_adjust=-20
-dr_adjust=-5
-dam_mult=1
-dam_div=1
-
-; PID_HN_AP_NEEDLER_CARTRIDGE
-[23]
-pid=362
-ac_adjust=-20
-dr_adjust=-5
-dam_mult=1
-dam_div=2
-
-; PID_7_62MM_AMMO
-[24]
-pid=363
-ac_adjust=-10
-dr_adjust=-20
-dam_mult=2
-dam_div=2
-
-; PID_FLAMETHROWER_FUEL_MK_II
-[25]
-pid=382
-ac_adjust=-20
-dr_adjust=-15
-dam_mult=1
-dam_div=1

artifacts/example_mods/AmmoMod/AmmoYAAM.ini

@@ -1,201 +0,0 @@
-;YAAM
-
-; PID_EXPLOSIVE_ROCKET
-[1]
-pid=14
-ac_adjust=0
-dr_adjust=0
-dam_mult=3
-dam_div=2
-
-; PID_10MM_JHP
-[2]
-pid=29
-ac_adjust=0
-dr_adjust=0
-dam_mult=3
-dam_div=2
-
-; PID_10MM_AP
-[3]
-pid=30
-ac_adjust=0
-dr_adjust=4
-dam_mult=1
-dam_div=1
-
-; PID_44_MAGNUM_JHP
-[4]
-pid=31
-ac_adjust=0
-dr_adjust=0
-dam_mult=3
-dam_div=2
-
-; PID_FLAMETHROWER_FUEL
-[5]
-pid=32
-ac_adjust=-20
-dr_adjust=0
-dam_mult=3
-dam_div=4
-
-; PID_14MM_AP
-[6]
-pid=33
-ac_adjust=0
-dr_adjust=8
-dam_mult=1
-dam_div=1
-
-; PID_223_FMJ
-[7]
-pid=34
-ac_adjust=-20
-dr_adjust=5
-dam_mult=1
-dam_div=1
-
-; PID_5MM_JHP
-[8]
-pid=35
-ac_adjust=0
-dr_adjust=0
-dam_mult=3
-dam_div=2
-
-; PID_5MM_AP
-[9]
-pid=36
-ac_adjust=0
-dr_adjust=4
-dam_mult=1
-dam_div=1
-
-; PID_ROCKET_AP
-[10]
-pid=37
-ac_adjust=0
-dr_adjust=20
-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=5
-dam_mult=1
-dam_div=1
-
-; PID_9MM_BALL
-[15]
-pid=121
-ac_adjust=0
-dr_adjust=2
-dam_mult=3
-dam_div=2
-
-; 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=10
-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=9
-dam_mult=3
-dam_div=2
-
-; PID_4_7MM_CASELESS
-[20]
-pid=359
-ac_adjust=-5
-dr_adjust=7
-dam_mult=3
-dam_div=2
-
-; PID_9MM_AMMO
-[21]
-pid=360
-ac_adjust=0
-dr_adjust=2
-dam_mult=1
-dam_div=1
-
-; PID_HN_NEEDLER_CARTRIDGE
-[22]
-pid=361
-ac_adjust=-10
-dr_adjust=2
-dam_mult=1
-dam_div=1
-
-; PID_HN_AP_NEEDLER_CARTRIDGE
-[23]
-pid=362
-ac_adjust=-10
-dr_adjust=5
-dam_mult=2
-dam_div=1
-
-; PID_7_62MM_AMMO
-[24]
-pid=363
-ac_adjust=-5
-dr_adjust=2
-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