Merge branch '3.8-maintenance'

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.Size = new System.Drawing.Size(444, 215);
-            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.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.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.bEdit.Location = new System.Drawing.Point(473, 401);
+            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,23 +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(119, 401);
-            this.bCrittersLvar.Name = "bCrittersLvar";
-            this.bCrittersLvar.Size = new System.Drawing.Size(99, 23);
-            this.bCrittersLvar.TabIndex = 7;
-            this.bCrittersLvar.Text = "Local variables";
-            this.bCrittersLvar.UseVisualStyleBackColor = true;
-            // 
             // 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.ClientSize = new System.Drawing.Size(468, 297);
-            this.Controls.Add(this.bCrittersLvar);
             this.Controls.Add(this.bEdit);
             this.Controls.Add(this.bArrays);
             this.Controls.Add(this.bSGlobals);
@@ -178,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 = "DebugEditor";
-            this.Text = "sfall Debug Editor";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DebugEditor_FormClosing);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             this.ResumeLayout(false);
@@ -196,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/DebugEditor.cs

@@ -11,9 +11,7 @@ using BinaryReader = System.IO.BinaryReader;
 using BinaryWriter=System.IO.BinaryWriter;
 
 namespace FalloutClient {
-
+    public partial class DebugEditor : Form {
-    public partial class DebugEditor : Form
-    {
         [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Explicit)]
         private struct ByteConverter {
             [System.Runtime.InteropServices.FieldOffset(0)]
@@ -47,59 +45,61 @@ namespace FalloutClient {
         private readonly Dictionary<uint, string> CritNames=new Dictionary<uint, string>();
 
         private void Redraw() {
-            bEdit.Enabled = false;
-            Column2.ReadOnly = false;
-            Column3.ReadOnly = false;
-            Column2.HeaderText = "Value (Int)";
-            Column3.HeaderText = "Value (Float)";
-            dataGridView1.SelectionMode = DataGridViewSelectionMode.CellSelect;
             dataGridView1.SuspendLayout();
             dataGridView1.Rows.Clear();
             switch(mode) {
             case Mode.Globals:
+                Column2.ReadOnly=false;
+                Column3.ReadOnly=false;
+                Column2.HeaderText="Value (Int)";
+                Column3.HeaderText="Value (Float)";
+                bEdit.Enabled=false;
                 for(int i=0;i<connection.Globals.Length;i++) {
                     string name=GlobNames.ContainsKey(i)?GlobNames[i]:"";
                     dataGridView1.Rows.Add(i, name, connection.Globals[i], converter.GetAsFloat(connection.Globals[i]));
                 }
                 break;
             case Mode.MapVars:
+                Column2.ReadOnly=false;
+                Column3.ReadOnly=false;
+                Column2.HeaderText="Value (Int)";
+                Column3.HeaderText="Value (Float)";
+                bEdit.Enabled=false;
                 for(int i=0;i<connection.MapVars.Length;i++) {
                     dataGridView1.Rows.Add(i, "", connection.MapVars[i], converter.GetAsFloat(connection.MapVars[i]));
                 }
                 break;
             case Mode.SGlobals:
+                Column2.ReadOnly=false;
+                Column3.ReadOnly=false;
+                Column2.HeaderText="Value (Int)";
+                Column3.HeaderText="Value (Float)";
+                bEdit.Enabled=false;
                 for(int i=0;i<connection.SGlobalKeys.Length;i++) {
-                    string s = connection.SGlobalKeys[i] > 0xffffffff
+                    string s=connection.SGlobalKeys[i]>0xffffffff?new string(System.Text.ASCIIEncoding.ASCII.GetChars(converter.GetAsBytes(connection.SGlobalKeys[i]))):("0x"+connection.SGlobalKeys[i].ToString("x"));
-                        ? new string(System.Text.ASCIIEncoding.ASCII.GetChars(converter.GetAsBytes(connection.SGlobalKeys[i])))
-                        : (connection.SGlobalKeys[i].ToString());
                     dataGridView1.Rows.Add(s, "", connection.sGlobals[i], converter.GetAsFloat(connection.sGlobals[i]));
                 }
                 break;
             case Mode.Arrays:
-                dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
                 Column2.ReadOnly=true;
                 Column3.ReadOnly=true;
-                Column2.HeaderText = "Array size";
+                Column2.HeaderText="Array length";
-                Column3.HeaderText = "Array flags";
+                Column3.HeaderText="Element size";
                 bEdit.Enabled=true;
                 for(int i=0;i<connection.Arrays.Length;i++) {
-                    bool isMap = connection.ArrayIsMap[i];
+                    dataGridView1.Rows.Add(connection.Arrays[i], "", connection.ArrayLengths[i], connection.ArrayDataSizes[i]);
-                    int  arrlen = connection.ArrayLengths[i];
-                    if (isMap) arrlen /= 2;
-                    dataGridView1.Rows.Add(connection.Arrays[i], isMap ? "Map" : "", arrlen, "0x" + connection.ArrayFlag[i].ToString("x").ToUpper());
                 }
                 break;
             case Mode.Critters:
-                dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
                 Column2.ReadOnly=true;
                 Column3.ReadOnly=true;
-                Column2.HeaderText = "PID";
+                Column2.HeaderText="pid";
-                Column3.HeaderText = "Pointer";
+                Column3.HeaderText="";
                 bEdit.Enabled=true;
-                for (int i = 0; i < connection.Critters.Length / 2; i++) {
+                for(int i=0;i<connection.Critters.Length;i++) {
-                    uint modcrit = (connection.Critters[i, 0] & 0xfffff);
+                    uint modcrit=(connection.Critters[i]&0xfffff);
                     string name=CritNames.ContainsKey(modcrit)?CritNames[modcrit]:"";
-                    dataGridView1.Rows.Add(i + 1, name, connection.Critters[i, 0].ToString("x").ToUpper(), connection.Critters[i, 1].ToString());
+                    dataGridView1.Rows.Add(i+1, name, connection.Critters[i].ToString("x"), "");
                 }
                 break;
             }
@@ -110,15 +110,7 @@ namespace FalloutClient {
             InitializeComponent();
             this.connection=connection;
             mode=Mode.Globals;
-            if (File.Exists(".\\data\\data\\vault13.gam")) {
+            if(File.Exists("globals.txt")) {
-                StreamReader sr=new StreamReader(".\\data\\data\\vault13.gam");
-                int gvar = 0;
-                while (!sr.EndOfStream) {
-                    string line = sr.ReadLine().TrimStart();
-                    if (line.StartsWith("GVAR_")) GlobNames[gvar++] = line.Remove(line.IndexOf(':')).TrimEnd();
-                }
-                sr.Close();
-            } else if (File.Exists("globals.txt")) {
                 StreamReader sr=new StreamReader("globals.txt");
                 while(!sr.EndOfStream) {
                     string[] line=sr.ReadLine().Split(' ');
@@ -187,9 +179,8 @@ namespace FalloutClient {
                 return;
             }
             if(e.ColumnIndex==2) {
-                string str = dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
                 int val;
-                if (str == null || !int.TryParse(str, out val)) {
+                if(!int.TryParse(dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString(), out val)) {
                     dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value=array[e.RowIndex];
                 } else {
                     array[e.RowIndex]=val;
@@ -198,9 +189,8 @@ namespace FalloutClient {
                     connection.WriteInt(val);
                 }
             } else {
-                string str = dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
                 float val;
-                if (str == null || !float.TryParse(str, out val)) {
+                if(!float.TryParse(dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString(), out val)) {
                     dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value=array[e.RowIndex];
                 } else {
                     array[e.RowIndex]=converter.GetAsInt(val);
@@ -212,28 +202,21 @@ namespace FalloutClient {
         }
 
         private void bEdit_Click(object sender, EventArgs e) {
-            if (dataGridView1.SelectedRows.Count == 0) return;
+            if(dataGridView1.SelectedRows.Count!=1) return;
-            int i = (int)dataGridView1.SelectedRows[0].Tag;
+            int i=dataGridView1.SelectedRows[0].Index;
             switch(mode) {
             case Mode.Arrays: {
                     DataType[] types=new DataType[connection.ArrayLengths[i]];
-                    int[] lenType = new int[connection.ArrayLengths[i]];
                     string[] strings=new string[connection.ArrayLengths[i]];
-                    connection.WriteDataType(DataTypeSend.GetArray); // code
+                    connection.WriteDataType(DataTypeSend.GetArray);
-                    connection.WriteInt(i); // index
+                    connection.WriteInt(i);
-                    int lenData = 0;
+                    for(int j=0;j<strings.Length;j++) types[j]=(DataType)connection.ReadInt();
-                    for (int j = 0; j < strings.Length; j++) {
+                    byte[] buf=connection.ReadBytes(connection.ArrayLengths[i]*connection.ArrayDataSizes[i]);
-                        types[j] = (DataType)connection.ReadInt();
+                    MemoryStream ms=new MemoryStream(buf);
-                        lenType[j] = connection.ReadInt(); // len data of type
+                    BinaryReader br=new BinaryReader(ms);
-                        lenData += lenType[j];
-                    }
-                    byte[] buf = connection.ReadBytes(lenData); // read data
-                    BinaryReader br = new BinaryReader(new MemoryStream(buf));
                     for(int j=0;j<strings.Length;j++) {
+                        ms.Position=j*connection.ArrayDataSizes[i];
                         switch(types[j]) {
-                        case DataType.None:
-                            br.BaseStream.Position += 4;
-                            break;
                         case DataType.Int:
                             strings[j]=br.ReadInt32().ToString();
                             break;
@@ -241,21 +224,21 @@ namespace FalloutClient {
                             strings[j]=br.ReadSingle().ToString();
                             break;
                         case DataType.String:
-                            byte[] bytes = br.ReadBytes(lenType[j]);
+                            byte[] bytes=br.ReadBytes(connection.ArrayDataSizes[i]);
                             strings[j]=System.Text.Encoding.ASCII.GetString(bytes, 0, Array.IndexOf<byte>(bytes, 0));
                             break;
                         }
                     }
                     br.Close();
-                    strings = EditorWindow.ShowEditor(this, null, types, strings, connection.ArrayIsMap[i]);
+                    strings=EditorWindow.ShowEditor(null, types, strings);
-                    if (strings != null) { // save
+                    if(strings!=null) {
-                        MemoryStream ms = new MemoryStream(lenData);
+                        connection.WriteDataType(DataTypeSend.SetArray);
+                        connection.WriteInt(i);
+                        ms=new MemoryStream(connection.ArrayLengths[i]*connection.ArrayDataSizes[i]);
                         BinaryWriter bw=new BinaryWriter(ms);
                         for(int j=0;j<strings.Length;j++) {
+                            ms.Position=j*connection.ArrayDataSizes[i];
                             switch(types[j]) {
-                            case DataType.None:
-                                bw.BaseStream.Position += 4;
-                                break;
                             case DataType.Int:
                                 bw.Write(int.Parse(strings[j]));
                                 break;
@@ -264,81 +247,54 @@ namespace FalloutClient {
                                 break;
                             case DataType.String:
                                 byte[] bytes=System.Text.Encoding.ASCII.GetBytes(strings[j]);
-                                if (bytes.Length < lenType[j])
+                                if(bytes.Length<connection.ArrayDataSizes[i]) bw.Write(bytes);
-                                    bw.Write(bytes);
+                                else bw.Write(bytes, 0, connection.ArrayDataSizes[i]-1);
-                                else
+                                bw.Write(0);
-                                    bw.Write(bytes, 0, lenType[j] - 1);
-                                bw.Write((byte)0);
                                 break;
                             }
                         }
-                        // send data to sfall
+                        connection.WriteBytes(ms.GetBuffer(), 0, connection.ArrayLengths[i]*connection.ArrayDataSizes[i]);
-                        connection.WriteDataType(DataTypeSend.SetArray);
-                        connection.WriteInt(i); // index
-                        connection.WriteInt(lenData);
-                        connection.WriteBytes(ms.GetBuffer(), 0, lenData);
                         bw.Close();
                     }
                 }
                 break;
             case Mode.Critters: {
-                    DataType[] types = new DataType[33];
+                    DataType[] types=new DataType[29];
-                    string[] strings = new string[33];
+                    string[] strings=new string[29];
-                    string[] names = new string[33];
+                    string[] names=new string[29];
                     connection.WriteDataType(DataTypeSend.RetrieveCritter);
                     connection.WriteInt(i);
-                    BinaryReader br = new BinaryReader(new System.IO.MemoryStream(connection.ReadBytes(33 * 4)));
+                    BinaryReader br=new BinaryReader(new System.IO.MemoryStream(connection.ReadBytes(29*4)));
-                    for (int j = 0; j < 33; j++) {
+                    for(int j=0;j<29;j++) {
                         types[j]=DataType.Int;
                         strings[j]=br.ReadInt32().ToString();
+                        names[j]="0x"+(j*4).ToString("x");
                     }
                     br.Close();
-                    names[0] = " ID";
                     names[1]="Tile";
-                    names[6] = " Current frame";
-                    names[7] = " Rotation";
-                    names[8] = " FID";
-                    names[9] = " Flags";
                     names[10]="Elevation";
                     names[11]="Inventory count";
                     names[13]="Inventory pointer";
-                    names[14] = " Reaction";
-                    names[15] = " Combat state";
                     names[16]="Current AP";
-                    names[17] = " Combat flags";
+                    names[17]="Crippled limbs";
-                    names[18] = " Last Turn Damage";
-                    names[19] = " AI Packet";
-                    names[20] = " Team";
-                    names[21] = " Who hit me";
                     names[22]="HP";
                     names[23]="Rads";
                     names[24]="Poison";
                     names[25]="Proto ID";
-                    names[26] = " Combat ID";
+                    strings=EditorWindow.ShowEditor(names, types, strings);
-                    names[29] = " Outline flags";
-                    names[30] = " Script ID";
-                    names[32] = " Script index";
-                    strings = EditorWindow.ShowEditor(this, names, types, strings);
                     if(strings!=null) {
-                        MemoryStream ms = new MemoryStream(33 * 4);
+                        MemoryStream ms=new MemoryStream(29*4);
                         BinaryWriter bw=new BinaryWriter(ms);
-                        for (int j = 0; j < 33; j++) bw.Write(int.Parse(strings[j]));
+                        for(int j=0;j<29;j++) bw.Write(int.Parse(strings[j]));
                         connection.WriteDataType(DataTypeSend.SetCritter);
                         connection.WriteInt(i);
-                        connection.WriteBytes(ms.GetBuffer(), 0, 33 * 4);
+                        connection.WriteBytes(ms.GetBuffer(), 0, 29*4);
                         bw.Close();
                     }
+
                 }
                 break;
             }
         }
-
-        private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) {
-            bEdit.PerformClick();
-        }
-
-        private void dataGridView1_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e) {
-            dataGridView1.Rows[e.RowIndex].Tag = e.RowIndex;
-        }
     }
 }

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,13 +11,12 @@ 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 int[] ArrayDataSizes;
-        public readonly bool[] ArrayIsMap;
 
         public EditorConnection() {
             System.Threading.Thread.Sleep(1000);
@@ -33,9 +30,8 @@ namespace FalloutClient {
             sGlobals=new int[SGlobalKeys.Length];
             Arrays=new uint[br.ReadInt32()];
             ArrayLengths=new int[Arrays.Length];
-            ArrayFlag = new int[Arrays.Length];
+            ArrayDataSizes=new int[Arrays.Length];
-            ArrayIsMap = new bool[Arrays.Length];
+            Critters=new uint[br.ReadInt32()];
-            Critters = new uint[br.ReadInt32(), 2];
 
             for(int i=0;i<Globals.Length;i++) Globals[i]=br.ReadInt32();
             for(int i=0;i<MapVars.Length;i++) MapVars[i]=br.ReadInt32();
@@ -46,14 +42,10 @@ namespace FalloutClient {
             }
             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();
+                ArrayDataSizes[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<Critters.Length;i++) Critters[i]=br.ReadUInt32();
         }
 
         public void Close() {
@@ -67,12 +59,10 @@ namespace FalloutClient {
             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);
         }

MPClient/EditorWindow.Designer.cs

@@ -34,8 +34,8 @@
             // 
             // bSave
             // 
-            this.bSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.bSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.bSave.Location = new System.Drawing.Point(12, 336);
+            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;
@@ -46,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;
@@ -58,61 +58,47 @@
             // 
             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.Size = new System.Drawing.Size(344, 247);
-            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.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 = "Name";
-            this.Column1.HeaderText = "Element";
             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;
             // 
             // 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.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 = "EditorWindow";
-            this.Text = "Edit Values";
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             this.ResumeLayout(false);
 

MPClient/EditorWindow.cs

@@ -3,38 +3,27 @@ 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 {
-    public partial class EditorWindow : Form
-    {
         private readonly DataType[] types;
         private readonly string[] values;
         private bool save;
 
-        private EditorWindow(string[] names, DataType[] types, string[] values, bool isMap) {
+        private EditorWindow(string[] names, DataType[] types, string[] values) {
             this.types=types;
             this.values=values;
             InitializeComponent();
             dataGridView1.SuspendLayout();
-            if (names == null)
+            if(names==null) for(int i=0;i<types.Length;i++) dataGridView1.Rows.Add(i.ToString(), types[i].ToString(), values[i]);
-                for (int i = 0; i < types.Length; i++) {
+            else for(int i=0;i<types.Length;i++) dataGridView1.Rows.Add(names[i], types[i].ToString(), values[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]);
             dataGridView1.ResumeLayout();
         }
 
-        public static string[] ShowEditor(DebugEditor form, string[] names, DataType[] types, string[] values, bool isMap = false) {
+        public static string[] ShowEditor(string[] names, DataType[] types, string[] values) {
-            EditorWindow editor = new EditorWindow(names, types, values, isMap);
+            EditorWindow editor=new EditorWindow(names, types, values);
             editor.ShowDialog();
-            if (editor.save)
+            if(editor.save) return editor.values;
-                return editor.values;
+            else return null;
-            else
-                return null;
         }
 
         private bool CheckInput(DataType type, string str) {
@@ -51,10 +40,8 @@ namespace FalloutClient {
 
         private void dataGridView1_CellEndEdit(object sender, DataGridViewCellEventArgs e) {
             string str=(string)dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value;
-            if (str != null && CheckInput(types[e.RowIndex], str))
+            if(CheckInput(types[e.RowIndex], str)) values[e.RowIndex]=str;
-                values[e.RowIndex] = str;
+            else dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value=values[e.RowIndex];
-            else
-                dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = values[e.RowIndex];
         }
 
         private void bCancel_Click(object sender, EventArgs e) {

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>copy "$(TargetPath)" "C:\Games\Fallout2\$(TargetName)$(TargetExt)"</PostBuildEvent>
-    </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

@@ -15,20 +15,14 @@ namespace FalloutClient {
             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.",
+                throw new Exception("Multiplayer is no longer supported");
-                    "sfall Debug Editor", MessageBoxButtons.OK, MessageBoxIcon.Stop);
             }
         }
     }
 
     enum DataTypeSend {
-        SetGlobal = 0,
+        Mouse=0, LMouseDown=1, LMouseUp=2, RMouseDown=3, RMouseUp=4, TakeChar=5, ReleaseChar=6,
-        SetMapVar = 1,
+        SetGlobal=0, SetMapVar=1, RetrieveCritter=2, SetCritter=3, SetSGlobal=4, GetArray=9, SetArray=10,
-        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: AssemblyProduct("FalloutClient")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyCopyright("Copyright ©  2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("4.1.7.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("4.1.7.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)
+e0_EffectFlags=0
-                  ; For multiple effects, use the sum of the flags (e.g. 2050 = knocked down + bypass armor)
 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
+e1_...  ; Second level critical
-;...     ; And so on up to the hardest hitting level 5 critical
+...     ; And so on up to the hardest hitting level 5 critical
-;e5_...
+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,34 +7,6 @@
 ; 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)
-;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
-;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=The first skill (or -1 for none) to check, but if you set a specific bit
-; (67108864 or 0x4000000), it checks GVAR. For example, if Skill1=67108864, then
-; the perk will check GVAR_PLAYER_REPUTATION (67108864 + 0) on Skill1Mag value
-;Skill1Mag=Positive value is used as the minimum requirements of the first
-; 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
-;Skill2=The second skill/GVAR (or -1 for none) to check
-;Skill2Mag=Same as Skill1Mag, but for Skill2
-;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)
-
 ;This is a modification to perk 119
 [119]
 Name=Example
@@ -64,4 +36,4 @@ Name=Example
 Desc=This is an example trait
 Image=72
 StatMod=0|-1 ;Subtract 1 from strength
-SkillMod=0|20|1|-5 ;Add 20 to the player's small guns skill and subtract 5 from big guns
+SkillMod=0|20|1|-5 ;Add 20 to the players small guns skill and subtract 5 from big guns

artifacts/config_files/Translations.ini

@@ -1,5 +1,5 @@
 [sfall]
-SaveInCombat=Cannot save at this time.
+SaveInCombat=Cannot save at this time
 KarmaGain=You gained %d karma.
 KarmaLoss=You lost %d karma.
 HighlightFail1=You aren't carrying a motion sensor.
@@ -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.
+; Allows to reassign books to different object PIDs, text messages.
-; Maximum 50 books are allowed
+; 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;
+; 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. To just override the text/skill of a vanilla book,
+; otherwise only new books are defined here
-; specify its PID in the new book and set the parameters
 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]
+[000]
-;This elevator will use the settings of the original forth elevator
+;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/ddraw.ini

@@ -1,12 +1,12 @@
 ;sfall configuration settings
-;v3.8.18
+;v3.8.2
 
 [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]
@@ -17,12 +17,11 @@ NumSoundBuffers=0
 ;Set to 1 to allow attaching sound files to combat float messages
 AllowSoundForFloats=1
 
-;Set to 1 to automatically search for alternative formats (mp3/wma/wav) when Fallout tries to play an acm
+;Set to 1 to automatically search for alternative formats 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
 ;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
+SpeedMulti2=150
-SpeedMulti3=300
+SpeedMulti3=200
-SpeedMulti4=400
+SpeedMulti4=300
 SpeedMulti5=500
-SpeedMulti6=600
+SpeedMulti6=1000
-SpeedMulti7=700
+SpeedMulti7=100
-SpeedMulti8=800
+SpeedMulti8=100
-SpeedMulti9=900
+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
+;Set to 1 to allow using 32 bit graphics for talking heads
-;The texture files should be placed in art\heads\<name of the talking head FRM file>\ (w/o extension)
+;Requires graphics mode 4 or 5, and GPUBlt set to 1
-;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)
 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 your inventory
 UseScrollWheel=1
 
 ;The mouse Z position is divided by this modifier to calculate the number of inventory
@@ -113,7 +98,7 @@ ReverseMouseButtons=0
 BackgroundKeyboard=0
 BackgroundMouse=0
 
-;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 ;The modifier key you have to hold down to change any speed settings
 ;Set to 0 if you don't want to use a modifier key, or a DX scancode otherwise
@@ -122,7 +107,7 @@ SpeedModKey=-1
 
 ;A key to press to toggle the speed tweak on or off
 ;Specify 0 if you don't want a toggle key, or a DX scancode otherwise
-SpeedToggleKey=0
+SpeedToggleKey=0x00
 
 ;The keys corresponding to the 10 speed slots
 ;Set to 0 to disable a slot, otherwise specify the DX scancode of the key you want to use
@@ -143,45 +128,26 @@ SpeedKey9=0x00
 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 to 2 for purple outlines
-
+HighlightContainers=0
-;Set the color of outlines, available colors:
-;0x01 - glowing red
-;0x02 - red
-;0x04 - grey
-;0x08 - glowing green
-;0x10 - bright yellow
-;0x20 - dark yellow
-;0x40 - purple
-OutlineColor=0x10
 
 ;A key to press to reload your currently equipped weapon
-;Set to 0 if you don't want a reload key, or a DX scancode otherwise
 ReloadWeaponKey=0
 
-;A key to hold down to let you move/drop a whole stack of items at once without the 'Move Items' window
-;Set to 0 if you don't want to use a modifier key, or a DX scancode otherwise
-ItemFastMoveKey=29
-
-;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
-;Set to 0 to disable, or a DX scancode otherwise
-;Requires sfall debugging mode and FalloutClient.exe from the modders pack
 DebugEditorKey=0
 
-;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [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 +155,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
 
@@ -200,9 +169,24 @@ WorldMapDelay2=66
 WorldMapEncounterFix=0
 WorldMapEncounterRate=5
 
+;XX OBSOLETE  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+;XX 
+;XX ;This will change the physical speed at which you move across the map
+;XX ;Set to 0 to leave at the default. (i.e. limited by vwait in windowed mode, or by processor speed in fullscreen)
+;XX ;If set to something other than 0, it enforces a maximum fps on the world map screen.
+;XX ;Changing this to something other than 0 is not recommended if you've already applied a world map speed patch to your Fallout exe.
+;XX WorldMapFPS=0
+;XX 
+;XX ;Only set to 1 if your systems high performance timer is unreliable for some reason
+;XX ForceLowResolutionTimer=0
+;XX 
+;XX ;Obsolete, but can still be used if you know what it does.
+;XX ;WorldMapDelay=0
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
 ;The number of slots available in the locations list panel of the world map
 ;Set to 0 to leave unchanged. 17 is default.
-;Setting this greater than 17 requires a replacement background FRM, or you'll get glitched graphics
+;Setting this greater than 17 requires a replacement background frm, or you'll get glitched graphics
 WorldMapSlots=0
 
 ;To start a new game somewhere other than artemple.map, uncomment the next line and set it to the map you want to load
@@ -215,14 +199,14 @@ 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
+;Set to 1 to enable the modified data load order for the engine to find game data
 ;Original: patchXXX.dat > critter_patches > critter_dat > f2_res_patches > f2_res_dat > master_patches > master_dat
 ;Modified: master_patches > critter_patches > patchXXX.dat > critter_dat > f2_res_patches > f2_res_dat > master_dat
 DataLoadOrderPatch=0
@@ -261,7 +245,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
@@ -326,7 +310,7 @@ SaveInCombatFix=1
 ;Player's level is capped once the highest specified level is reached
 ;XPTable=50,100,200
 
-;Set to 1 to enable additional weapon animation codes from o-t
+;Set to 1 to enable additional weapon animations codes from o-t
 ;The 4 byte value at 0x39 of weapon protos may range from 0 to 15 rather than 0 to 10
 ;Since the letters 'n' and 'r' are in use for other animations, an animation code of 11 corrisponds to 's' and 15 to 't'
 AdditionalWeaponAnims=1
@@ -360,11 +344,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,33 +351,22 @@ 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
 SkipOpeningMovies=0
 
-;Causes NPCs who complete their combat turn with AP left over will try and find other ways to spend it.
+;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.
+;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 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
+;Change the Skilldex cursor frm numbers
-MoreTiles=0
-
-;Change the Skilldex cursor FRM numbers
 ;Default is 293 for all skills
 Lockpick=293
 Steal=293
@@ -408,14 +376,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
+;Remove window position rounding
-;Set to 2 to use a different set of scroll buttons
+RemoveWindowRounding=0
-UseScrollingQuestsList=1
 
-;To change the location of quest list scroll buttons, uncomment the next two lines
+;Set to 1 to add scroll buttons to the pip boy quest list, and remove the quests per area limit
-;Defaults are 140 for the X-axis and 334 for the Y-axis
+UseScrollingQuestsList=1
-;QuestsScrollButtonsX=140
-;QuestsScrollButtonsY=334
 
 ;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
@@ -435,11 +400,9 @@ 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
+;These lines allow you to control the karma frm's displayed on the character screen
-;Number of KarmaPoints should be 1 less than number of KarmaFRMs
 ;KarmaFRMsCount=3
 ;KarmaFRMs=47,48,49
 ;KarmaPoints=-100,100
@@ -452,7 +415,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.
@@ -461,9 +424,6 @@ BonusHtHDamageFix=1
 ;Set to 1 to display additional points of damage from Bonus HtH/Ranged Damage perks in the inventory
 DisplayBonusDamage=0
 
-;Set to 1 to display the range of the second attack mode in the inventory when you switch weapon modes in active item slots
-DisplaySecondWeaponRange=1
-
 ;Modify the maximum number of animations allowed to run on a map. (Default is 32, and the maximum is 127)
 AnimationsAtOnceLimit=120
 
@@ -474,7 +434,7 @@ RemoveCriticalTimelimits=0
 NPCStage6Fix=0
 
 ;Change the colour of the font used on the main menu for the Fallout/sfall version number
-;It's the last byte ('3c' by default) that picks the colour used. The first byte supplies additional flags
+;It's the last byte ('3c' by default,) that picks the colour used. The first byte supplies additional flags
 ;MainMenuFontColour=0x0600003c
 
 ;Two alternate fixes to the interaction between HtH attacks and the fast shot trait
@@ -483,24 +443,23 @@ 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
+;Set the mode to 0 to disable the size check, 1 to apply to 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
@@ -528,24 +487,9 @@ SuperStimExploitFix=0
 InventoryApCost=4
 QuickPocketsApCostReduction=2
 
-;Set to 1 to allow objects seeing through other objects that have their ShootThru flag set
+;Set to 1 to allow objects seeing through other objects with their ShootThru flag set
-;Note that enabling this option can cause unexpected NPC behavior in some situations
 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
 
@@ -611,24 +555,16 @@ StackEmptyWeapons=0
 ;If the amount of ammo boxes in the inventory is less than or equal to the reserve, only one box will be used
 ReloadReserve=-1
 
-;Set to 1 to change the counter in the 'Move Items' window to start at the maximum number of items
+;Allows 9 options (lines of text) to be displayed correctly in a dialog window
-ItemCounterDefaultMax=0
+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
+;Set to 1 to fix the bug that unable to sell used geiger counters or stealth boys
-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
 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
@@ -641,29 +577,6 @@ InstantWeaponEquip=0
 ;Set to 1 to display numbered dialogue options
 NumbersInDialogue=0
 
-;Set to 1 to use Fallout's normal text font instead of DOS-like font on the world map
-WorldMapFontPatch=0
-
-;Set to 1 to display 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
-
 ;Set to 1 to display sfall built-in credits at the bottom of credits.txt contents instead of at the top
 CreditsAtBottom=0
 
@@ -676,8 +589,8 @@ CreditsAtBottom=0
 Enable=0
 
 ;Fallout 2 Debug Patch
-;Set to 1 to send debug output to the screen, 2 to a debug.log file, or 3 to both the screen and a debug.log file
+;Set to 1 to 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:
+;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
@@ -695,28 +608,19 @@ DebugMode=0
 SkipCompatModeCheck=0
 
 ;Set to 1 to skip the executable file size check
-;Does not require sfall debugging mode
 SkipSizeCheck=0
 
 ;If you're testing changes to the Fallout exe, you can override the CRC that sfall looks for here
 ;You can use several hex values, separated by commas
-;Does not require 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
-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

artifacts/example_mods/AmmoMod/gl_ammomod.ssl

@@ -1,63 +0,0 @@
-/*
-
-Ammo INI Loader mod 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
-
-*/
-
-#include "..\headers\define_extra.h"
-
-procedure set_ammo_mod;
-procedure start;
-procedure map_enter_p_proc;
-
-variable ammoIni;
-variable enabled;
-
-procedure set_ammo_mod begin
-   variable pid, dmg_mod, i := 1;
-
-   while (i > 0) do begin
-      pid := get_ini_setting(ammoIni + "|" + i + "|pid");
-      if (pid < 1) then break;
-      set_proto_data(pid, PROTO_AM_AC_MOD, get_ini_setting(ammoIni + "|" + i + "|ac_adjust"));
-      set_proto_data(pid, PROTO_AM_DR_MOD, get_ini_setting(ammoIni + "|" + i + "|dr_adjust"));
-
-      // dam_mult and dam_div must be positive integers
-      dmg_mod := get_ini_setting(ammoIni + "|" + i + "|dam_mult");
-      if (dmg_mod < 1) then dmg_mod := 1;
-      set_proto_data(pid, PROTO_AM_DMG_MULT, dmg_mod);
-      dmg_mod := get_ini_setting(ammoIni + "|" + i + "|dam_div");
-      if (dmg_mod < 1) then dmg_mod := 1;
-      set_proto_data(pid, PROTO_AM_DMG_DIV, dmg_mod);
-
-      i++;
-   end
-   //debug_msg("AmmoMod: " + ammoIni + " - set " + (i - 1) + " ammo protos.");
-end
-
-procedure start begin
-   if game_loaded then begin
-      ammoIni := get_ini_setting("ddraw.ini|Misc|DamageFormula");
-      if (ammoIni == 1 or ammoIni == 2) then
-         ammoIni := "AmmoGlovz.ini";
-      else if (ammoIni == 5) then
-         ammoIni := "AmmoYAAM.ini";
-      else
-         ammoIni := "AmmoMod.ini";
-
-      enabled := get_ini_setting(ammoIni + "|1|pid");
-      if (enabled > 0) then call set_ammo_mod;
-   end
-end
-
-procedure map_enter_p_proc begin
-   if (enabled > 0) then call set_ammo_mod;
-end

artifacts/example_mods/AmmoMod/readme.txt

@@ -1,12 +0,0 @@
-Ammo INI Loader mod 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.
-
-To use, copy gl_ammomod.int to your scripts folder, and copy the INI files to the same directory as sfall.